Merge pull request #469 from Viicos/use-fstrings

Author: adamjmcgrath

auth0/asyncify.py

@@ -66,7 +66,7 @@ def __init__(
             for method in methods:
                 setattr(
                     self,
-                    "{}_async".format(method),
+                    f"{method}_async",
                     _gen_async(self._async_client, method),
                 )
 

auth0/authentication/async_token_verifier.py

@@ -111,9 +111,7 @@ async def get_key(self, key_id):
             keys = await self._fetch_jwks(force=True)
             if keys and key_id in keys:
                 return keys[key_id]
-        raise TokenValidationError(
-            'RSA Public Key with ID "{}" was not found.'.format(key_id)
-        )
+        raise TokenValidationError(f'RSA Public Key with ID "{key_id}" was not found.')
 
 
 class AsyncTokenVerifier(TokenVerifier):

auth0/authentication/client_authentication.py

@@ -24,7 +24,7 @@ def create_client_assertion_jwt(
         {
             "iss": client_id,
             "sub": client_id,
-            "aud": "https://{}/".format(domain),
+            "aud": f"https://{domain}/",
             "iat": now,
             "exp": now + datetime.timedelta(seconds=180),
             "jti": str(uuid.uuid4()),

auth0/authentication/database.py

@@ -72,7 +72,7 @@ def signup(
             body.update({"picture": picture})
 
         return self.post(
-            "{}://{}/dbconnections/signup".format(self.protocol, self.domain), data=body
+            f"{self.protocol}://{self.domain}/dbconnections/signup", data=body
         )
 
     def change_password(self, email, connection, password=None):
@@ -89,6 +89,6 @@ def change_password(self, email, connection, password=None):
         }
 
         return self.post(
-            "{}://{}/dbconnections/change_password".format(self.protocol, self.domain),
+            f"{self.protocol}://{self.domain}/dbconnections/change_password",
             data=body,
         )

auth0/authentication/delegated.py

@@ -38,6 +38,4 @@ def get_token(
         else:
             raise ValueError("Either id_token or refresh_token must have a value")
 
-        return self.post(
-            "{}://{}/delegation".format(self.protocol, self.domain), data=data
-        )
+        return self.post(f"{self.protocol}://{self.domain}/delegation", data=data)

auth0/authentication/get_token.py

@@ -36,7 +36,7 @@ def authorization_code(
         """
 
         return self.authenticated_post(
-            "{}://{}/oauth/token".format(self.protocol, self.domain),
+            f"{self.protocol}://{self.domain}/oauth/token",
             data={
                 "client_id": self.client_id,
                 "code": code,
@@ -74,7 +74,7 @@ def authorization_code_pkce(
         """
 
         return self.post(
-            "{}://{}/oauth/token".format(self.protocol, self.domain),
+            f"{self.protocol}://{self.domain}/oauth/token",
             data={
                 "client_id": self.client_id,
                 "code_verifier": code_verifier,
@@ -106,7 +106,7 @@ def client_credentials(
         """
 
         return self.authenticated_post(
-            "{}://{}/oauth/token".format(self.protocol, self.domain),
+            f"{self.protocol}://{self.domain}/oauth/token",
             data={
                 "client_id": self.client_id,
                 "audience": audience,
@@ -154,7 +154,7 @@ def login(
         """
 
         return self.authenticated_post(
-            "{}://{}/oauth/token".format(self.protocol, self.domain),
+            f"{self.protocol}://{self.domain}/oauth/token",
             data={
                 "client_id": self.client_id,
                 "username": username,
@@ -190,7 +190,7 @@ def refresh_token(
         """
 
         return self.authenticated_post(
-            "{}://{}/oauth/token".format(self.protocol, self.domain),
+            f"{self.protocol}://{self.domain}/oauth/token",
             data={
                 "client_id": self.client_id,
                 "refresh_token": refresh_token,
@@ -223,7 +223,7 @@ def passwordless_login(self, username, otp, realm, scope, audience):
         """
 
         return self.authenticated_post(
-            "{}://{}/oauth/token".format(self.protocol, self.domain),
+            f"{self.protocol}://{self.domain}/oauth/token",
             data={
                 "client_id": self.client_id,
                 "username": username,

auth0/authentication/passwordless.py

@@ -45,7 +45,7 @@ def email(self, email, send="link", auth_params=None):
             data.update({"authParams": auth_params})
 
         return self.authenticated_post(
-            "{}://{}/passwordless/start".format(self.protocol, self.domain), data=data
+            f"{self.protocol}://{self.domain}/passwordless/start", data=data
         )
 
     def sms(self, phone_number):
@@ -68,5 +68,5 @@ def sms(self, phone_number):
         }
 
         return self.authenticated_post(
-            "{}://{}/passwordless/start".format(self.protocol, self.domain), data=data
+            f"{self.protocol}://{self.domain}/passwordless/start", data=data
         )

auth0/authentication/revoke_token.py

@@ -26,5 +26,5 @@ def revoke_refresh_token(self, token):
         }
 
         return self.authenticated_post(
-            "{}://{}/oauth/revoke".format(self.protocol, self.domain), data=body
+            f"{self.protocol}://{self.domain}/oauth/revoke", data=body
         )

auth0/authentication/social.py

@@ -27,7 +27,7 @@ def login(self, access_token, connection, scope="openid"):
         """
 
         return self.post(
-            "{}://{}/oauth/access_token".format(self.protocol, self.domain),
+            f"{self.protocol}://{self.domain}/oauth/access_token",
             data={
                 "client_id": self.client_id,
                 "access_token": access_token,

auth0/authentication/token_verifier.py

@@ -236,9 +236,7 @@ def get_key(self, key_id):
             keys = self._fetch_jwks(force=True)
             if keys and key_id in keys:
                 return keys[key_id]
-        raise TokenValidationError(
-            'RSA Public Key with ID "{}" was not found.'.format(key_id)
-        )
+        raise TokenValidationError(f'RSA Public Key with ID "{key_id}" was not found.')
 
 
 class TokenVerifier: