Browse Source

replace deprecated utcnow with utc

add_frost
zebra-lucky 2 weeks ago
parent
commit
308854a2fc
  1. 3
      src/jmclient/auth.py
  2. 12
      test/jmclient/test_auth.py
  3. 3
      test/jmclient/test_wallet_rpc.py

3
src/jmclient/auth.py

@ -76,7 +76,8 @@ class JMTokenAuthority:
def _issue(self, token_type: str) -> str: def _issue(self, token_type: str) -> str:
return jwt.encode( return jwt.encode(
{ {
"exp": datetime.datetime.utcnow() + self.SESSION_VALIDITY[token_type], "exp": datetime.datetime.now(datetime.UTC) +
self.SESSION_VALIDITY[token_type],
"scope": self.scope, "scope": self.scope,
}, },
self.signature_key[token_type], self.signature_key[token_type],

12
test/jmclient/test_auth.py

@ -29,7 +29,9 @@ class TestJMTokenAuthority:
) )
def test_verify_valid(self, sig, token_type): def test_verify_valid(self, sig, token_type):
token = jwt.encode( token = jwt.encode(
{"exp": datetime.datetime.utcnow() + self.validity, "scope": self.scope}, {"exp": datetime.datetime.now(datetime.UTC) +
self.validity,
"scope": self.scope},
sig, sig,
algorithm=self.token_auth.SIGNATURE_ALGORITHM, algorithm=self.token_auth.SIGNATURE_ALGORITHM,
) )
@ -42,7 +44,9 @@ class TestJMTokenAuthority:
def test_verify_expired(self): def test_verify_expired(self):
token = jwt.encode( token = jwt.encode(
{"exp": datetime.datetime.utcnow() - self.validity, "scope": self.scope}, {"exp": datetime.datetime.now(datetime.UTC) -
self.validity,
"scope": self.scope},
self.access_sig, self.access_sig,
algorithm=self.token_auth.SIGNATURE_ALGORITHM, algorithm=self.token_auth.SIGNATURE_ALGORITHM,
) )
@ -52,7 +56,9 @@ class TestJMTokenAuthority:
def test_verify_non_scoped(self): def test_verify_non_scoped(self):
token = jwt.encode( token = jwt.encode(
{"exp": datetime.datetime.utcnow() + self.validity, "scope": "wrong"}, {"exp": datetime.datetime.now(datetime.UTC) +
self.validity,
"scope": "wrong"},
self.access_sig, self.access_sig,
algorithm=self.token_auth.SIGNATURE_ALGORITHM, algorithm=self.token_auth.SIGNATURE_ALGORITHM,
) )

3
test/jmclient/test_wallet_rpc.py

@ -762,7 +762,8 @@ class TrialTestWRPC_JWT(WalletRPCTestBase):
handler(response) handler(response)
def get_token(self, grant_type: str, status: str = "valid"): def get_token(self, grant_type: str, status: str = "valid"):
now, delta = datetime.datetime.utcnow(), datetime.timedelta(hours=1) now = datetime.datetime.now(datetime.UTC)
delta = datetime.timedelta(hours=1)
exp = now - delta if status == "expired" else now + delta exp = now - delta if status == "expired" else now + delta
scope = f"walletrpc {self.daemon.wallet_name}" scope = f"walletrpc {self.daemon.wallet_name}"

Loading…
Cancel
Save