From 08dca3b19a679c1da898dcb7c03dfd1351679711 Mon Sep 17 00:00:00 2001
From: Jim Baldwin <14864200+jimwbaldwin@users.noreply.github.com>
Date: Wed, 2 Oct 2024 12:34:38 +1000
Subject: [PATCH] Resolve auto login issue when refreshToken is missing

Resolve auto login issue when refreshToken is missing
---
 yawsso/core.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/yawsso/core.py b/yawsso/core.py
index d80c39f..d949cec 100644
--- a/yawsso/core.py
+++ b/yawsso/core.py
@@ -88,19 +88,22 @@ def append_cli_global_options(cmd: str, profile: dict):
 
 
 def create_access_token(cached_login):
-    cmd_create_token = f"{aws_bin} sso-oidc create-token " \
-                       f"--output json " \
-                       f"--client-id {cached_login['clientId']} " \
-                       f"--client-secret {cached_login['clientSecret']} " \
-                       f"--grant-type refresh_token " \
-                       f"--refresh-token {cached_login['refreshToken']}"
-
-    create_token_success, create_token_output = u.invoke(cmd_create_token)
+    if not cached_login.get('refreshToken'):
+        logger.log(TRACE, "refreshToken not found in cached login.")
+        return False, ""
+    else:
+        cmd_create_token = f"{aws_bin} sso-oidc create-token " \
+                           f"--output json " \
+                           f"--client-id {cached_login['clientId']} " \
+                           f"--client-secret {cached_login['clientSecret']} " \
+                           f"--grant-type refresh_token " \
+                           f"--refresh-token {cached_login['refreshToken']}"
+        create_token_success, create_token_output = u.invoke(cmd_create_token)
 
-    if not create_token_success:
-        logger.log(TRACE, f"EXCEPTION: '{create_token_output}'")
+        if not create_token_success:
+            logger.log(TRACE, f"EXCEPTION: '{create_token_output}'")
 
-    return create_token_success, create_token_output
+        return create_token_success, create_token_output
 
 
 def get_role_credentials(profile_name, profile, access_token):