ARTESCA-9954: Fix the RoleArn is invalid issue in console

scality · Oct 24, 2023 · 0f69c3f · 0f69c3f
1 parent 479ce3e
commit 0f69c3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/js/STSClient.ts b/src/js/STSClient.ts
@@ -16,8 +16,7 @@ export default class STSClient {
   }) {
     const { idToken, roleArn, RoleSessionName } = params;
     const p = {
-      DurationSeconds: 900,
-      // 15 minutes
+      DurationSeconds: 900, // 15 minutes
       RoleArn: roleArn,
       RoleSessionName,
       WebIdentityToken: idToken,

diff --git a/src/react/DataServiceRoleProvider.tsx b/src/react/DataServiceRoleProvider.tsx
@@ -100,15 +100,19 @@ const DataServiceRoleProvider = ({ children }: { children: JSX.Element }) => {
     } else if (!storedRole && !role.roleArn && accounts.length) {
       setRoleState({ roleArn: accounts[0].Roles[0].Arn });
     }
-    assumeRoleMutation.mutate(role.roleArn);
+    if (role.roleArn) {
+      assumeRoleMutation.mutate(role.roleArn);
+    }
   }, [role.roleArn, JSON.stringify(accounts)]);
 
   const { getS3Config } = useS3ConfigFromAssumeRoleResult();
 
   const setRole = (role: { roleArn: string }) => {
     setRoleArnStored(role.roleArn);
     setRoleState(role);
-    assumeRoleMutation.mutate(role.roleArn);
+    if (role.roleArn) {
+      assumeRoleMutation.mutate(role.roleArn);
+    }
   };
 
   if (role.roleArn && !assumeRoleMutation.data) {