From 0cb42f7de4e520d682224fb8cdf4387ad16ee2c8 Mon Sep 17 00:00:00 2001
From: Sourcery AI <>
Date: Tue, 18 Oct 2022 05:59:55 +0000
Subject: [PATCH] 'Refactored by Sourcery'

---
 gotrue/_async/gotrue_client.py                   | 16 +++++++---------
 gotrue/_sync/gotrue_client.py                    | 16 +++++++---------
 .../test_client_with_auto_confirm_disabled.py    |  5 +----
 .../test_client_with_auto_confirm_disabled.py    |  5 +----
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/gotrue/_async/gotrue_client.py b/gotrue/_async/gotrue_client.py
index a19772ef..d41006c2 100644
--- a/gotrue/_async/gotrue_client.py
+++ b/gotrue/_async/gotrue_client.py
@@ -331,9 +331,11 @@ async def get_session(self) -> Union[Session, None]:
             if current_session.expires_at
             else False
         )
-        if not has_expired:
-            return current_session
-        return await self._call_refresh_token(current_session.refresh_token)
+        return (
+            await self._call_refresh_token(current_session.refresh_token)
+            if has_expired
+            else current_session
+        )
 
     async def get_user(self, jwt: Union[str, None] = None) -> UserResponse:
         """
@@ -582,7 +584,6 @@ async def _save_session(self, session: Session) -> None:
             self._in_memory_session = session
         expire_at = session.expires_at
         if expire_at:
-            pass
             time_now = round(time())
             expire_in = expire_at - time_now
             refresh_duration_before_expires = (
@@ -648,8 +649,7 @@ def _get_valid_session(
         except ValueError:
             return None
         try:
-            session = Session.parse_obj(data)
-            return session
+            return Session.parse_obj(data)
         except Exception:
             return None
 
@@ -658,9 +658,7 @@ def _get_param(
         query_params: Dict[str, List[str]],
         name: str,
     ) -> Union[str, None]:
-        if name in query_params:
-            return query_params[name][0]
-        return None
+        return query_params[name][0] if name in query_params else None
 
     def _is_implicit_grant_flow(self, url: str) -> bool:
         result = urlparse(url)
diff --git a/gotrue/_sync/gotrue_client.py b/gotrue/_sync/gotrue_client.py
index 15571e19..b4a77bf6 100644
--- a/gotrue/_sync/gotrue_client.py
+++ b/gotrue/_sync/gotrue_client.py
@@ -331,9 +331,11 @@ def get_session(self) -> Union[Session, None]:
             if current_session.expires_at
             else False
         )
-        if not has_expired:
-            return current_session
-        return self._call_refresh_token(current_session.refresh_token)
+        return (
+            self._call_refresh_token(current_session.refresh_token)
+            if has_expired
+            else current_session
+        )
 
     def get_user(self, jwt: Union[str, None] = None) -> UserResponse:
         """
@@ -582,7 +584,6 @@ def _save_session(self, session: Session) -> None:
             self._in_memory_session = session
         expire_at = session.expires_at
         if expire_at:
-            pass
             time_now = round(time())
             expire_in = expire_at - time_now
             refresh_duration_before_expires = (
@@ -648,8 +649,7 @@ def _get_valid_session(
         except ValueError:
             return None
         try:
-            session = Session.parse_obj(data)
-            return session
+            return Session.parse_obj(data)
         except Exception:
             return None
 
@@ -658,9 +658,7 @@ def _get_param(
         query_params: Dict[str, List[str]],
         name: str,
     ) -> Union[str, None]:
-        if name in query_params:
-            return query_params[name][0]
-        return None
+        return query_params[name][0] if name in query_params else None
 
     def _is_implicit_grant_flow(self, url: str) -> bool:
         result = urlparse(url)
diff --git a/tests/_async/test_client_with_auto_confirm_disabled.py b/tests/_async/test_client_with_auto_confirm_disabled.py
index 4ba87a4f..5225a6e9 100644
--- a/tests/_async/test_client_with_auto_confirm_disabled.py
+++ b/tests/_async/test_client_with_auto_confirm_disabled.py
@@ -79,10 +79,7 @@ async def test_sign_in(client: AsyncGoTrueClient):
 async def test_sign_in_with_the_wrong_password(client: AsyncGoTrueClient):
     expected_error_message = "Invalid login credentials"
     try:
-        await client.sign_in(
-            email=email,
-            password=password + "2",
-        )
+        await client.sign_in(email=email, password=f"{password}2")
         assert False
     except APIError as e:
         assert e.msg == expected_error_message
diff --git a/tests/_sync/test_client_with_auto_confirm_disabled.py b/tests/_sync/test_client_with_auto_confirm_disabled.py
index 587b5d87..b4c2d325 100644
--- a/tests/_sync/test_client_with_auto_confirm_disabled.py
+++ b/tests/_sync/test_client_with_auto_confirm_disabled.py
@@ -79,10 +79,7 @@ def test_sign_in(client: SyncGoTrueClient):
 def test_sign_in_with_the_wrong_password(client: SyncGoTrueClient):
     expected_error_message = "Invalid login credentials"
     try:
-        client.sign_in(
-            email=email,
-            password=password + "2",
-        )
+        client.sign_in(email=email, password=f"{password}2")
         assert False
     except APIError as e:
         assert e.msg == expected_error_message