Merge branch 'bugfix/ZKUI-190-assume-role-when-list-buckets' into q/1.4

src/js/ZenkoClient.ts

@@ -15,12 +15,14 @@ import ZenkoClientBase from 'zenkoclient';
 class ZenkoClient extends S3Client implements ZenkoClientInterface {
   endpoint: string;
   _xmlClient: ZenkoClientBase;
+  _isLogin: boolean;
 
   constructor(endpoint) {
     super(endpoint);
     this.endpoint = endpoint;
 
     this._init();
+    this._isLogin = false;
   }
 
   _init() {
@@ -91,6 +93,8 @@ class ZenkoClient extends S3Client implements ZenkoClientInterface {
     // but seems to work for all the other S3 calls.
     // this.client.config.update({
     //     accessKeyId: accessKey, secretAccessKey: secretKey, sessionToken });
+
+    this._isLogin = true;
   }
 
   searchBucket(params: SearchParams): Promise<SearchBucketResp> {
@@ -132,6 +136,10 @@ class ZenkoClient extends S3Client implements ZenkoClientInterface {
     };
     return this._jsonClient.resumeIngestionSite(params).promise();
   }
+
+  getIsLogin() {
+    return this._isLogin;
+  }
 }
 
 export default ZenkoClient;

src/react/Routes.tsx

@@ -28,6 +28,7 @@ import DataServiceRoleProvider, {
 import BucketCreate from './databrowser/buckets/BucketCreate';
 import makeMgtClient from '../js/managementClient';
 import { useQuery } from 'react-query';
+import { getClients } from './utils/actions';
 
 export const RemoveTrailingSlash = ({ ...rest }) => {
   const location = useLocation();
@@ -67,7 +68,10 @@ function WithAssumeRole({
 }: PropsWithChildren<Record<string, unknown>>) {
   const dispatch = useDispatch();
   const user = useSelector((state: AppState) => state.oidc.user);
+  const { zenkoClient } = getClients(useSelector((state: AppState) => state));
+  const isZenkoClientLogin = zenkoClient.getIsLogin();
   const { roleArn } = useDataServiceRole();
+
   useEffect(() => {
     const isAuthenticated = !!user && !user.expired;
 
@@ -76,7 +80,15 @@ function WithAssumeRole({
     }
   }, [dispatch, user, roleArn]);
 
-  return <>{children}</>;
+  if (isZenkoClientLogin) {
+    return <>{children}</>;
+  } else {
+    return (
+      <Loader>
+        <div>Loading</div>
+      </Loader>
+    );
+  }
 }
 
 function PrivateRoutes() {
@@ -126,9 +138,11 @@ function PrivateRoutes() {
   }, [dispatch, isAuthenticated, user, latestConfiguration]);
 
   const oidcLogout = useSelector((state: AppState) => state.auth.oidcLogout);
-  useMemo(() => {if (!isAuthenticated && oidcLogout) {
-    oidcLogout(true);
-  }}, [isAuthenticated, oidcLogout])
+  useMemo(() => {
+    if (!isAuthenticated && oidcLogout) {
+      oidcLogout(true);
+    }
+  }, [isAuthenticated, oidcLogout]);
 
   if (!isClientsLoaded) {
     return (

src/types/zenko.ts

@@ -70,4 +70,5 @@ export interface ZenkoClient extends S3Client {
     KeyMarker: string | undefined;
     VersionIdMarker: string | undefined;
   }): Promise<SearchBucketVersionsResp>;
+  getIsLogin(): boolean;
 }