15088: Adds reload after link account operation

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/src/models/link-account.ts b/src/models/link-account.ts
index 8932a3352f39275f5bb3360a72171587f489f0f3..1c2029cfac62471200305a30b4cfa1aad1f23be4 100644 (file)
--- a/src/models/link-account.ts
+++ b/src/models/link-account.ts
@@ -2,6 +2,12 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
+export enum LinkAccountStatus {
+    SUCCESS,
+    CANCELLED,
+    FAILED
+}
+
 export enum LinkAccountType {
     ADD_OTHER_LOGIN,
     ACCESS_OTHER_ACCOUNT

diff --git a/src/services/link-account-service/link-account-service.ts b/src/services/link-account-service/link-account-service.ts
index 74fc5eb6a5338025967f71cba5cfe100a7e768c9..ebae69ac37da2216d3f91aa1a2abc9017837ce77 100644 (file)
--- a/src/services/link-account-service/link-account-service.ts
+++ b/src/services/link-account-service/link-account-service.ts
@@ -4,10 +4,11 @@
 
 import { AxiosInstance } from "axios";
 import { ApiActions } from "~/services/api/api-actions";
-import { AccountToLink } from "~/models/link-account";
+import { AccountToLink, LinkAccountStatus } from "~/models/link-account";
 import { CommonService } from "~/services/common-service/common-service";
 
 export const USER_LINK_ACCOUNT_KEY = 'accountToLink';
+export const ACCOUNT_LINK_STATUS_KEY = 'accountLinkStatus';
 
 export class LinkAccountService {
 
@@ -28,6 +29,19 @@ export class LinkAccountService {
         return data ? JSON.parse(data) as AccountToLink : undefined;
     }
 
+    public saveLinkOpStatus(status: LinkAccountStatus) {
+        sessionStorage.setItem(ACCOUNT_LINK_STATUS_KEY, JSON.stringify(status));
+    }
+
+    public removeLinkOpStatus() {
+        sessionStorage.removeItem(ACCOUNT_LINK_STATUS_KEY);
+    }
+
+    public getLinkOpStatus() {
+        const data = sessionStorage.getItem(ACCOUNT_LINK_STATUS_KEY);
+        return data ? JSON.parse(data) as LinkAccountStatus : undefined;
+    }
+
     public linkAccounts(newUserToken: string, newGroupUuid: string) {
         const params = {
             new_user_token: newUserToken,

diff --git a/src/store/link-account-panel/link-account-panel-actions.ts b/src/store/link-account-panel/link-account-panel-actions.ts
index c175e60446a4188a0e9eb7f12e1c13b2c3a3ffba..61dc657eb21f998104a13467a4e42d819138819d 100644 (file)
--- a/src/store/link-account-panel/link-account-panel-actions.ts
+++ b/src/store/link-account-panel/link-account-panel-actions.ts
@@ -7,13 +7,12 @@ import { RootState } from "~/store/store";
 import { ServiceRepository } from "~/services/services";
 import { setBreadcrumbs } from "~/store/breadcrumbs/breadcrumbs-actions";
 import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions";
-import { LinkAccountType, AccountToLink } from "~/models/link-account";
+import { LinkAccountType, AccountToLink, LinkAccountStatus } from "~/models/link-account";
 import { saveApiToken, saveUser } from "~/store/auth/auth-action";
 import { unionize, ofType, UnionOf } from '~/common/unionize';
 import { UserResource } from "~/models/user";
 import { GroupResource } from "~/models/group";
 import { LinkAccountPanelError, OriginatingUser } from "./link-account-panel-reducer";
-import { navigateToRootProject } from "../navigation/navigation-action";
 import { login, logout } from "~/store/auth/auth-action";
 
 export const linkAccountPanelActions = unionize({
@@ -47,6 +46,36 @@ function validateLink(userToLink: UserResource, targetUser: UserResource) {
     return LinkAccountPanelError.NONE;
 }
 
+export const checkForLinkStatus = () =>
+    (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+        const status = services.linkAccountService.getLinkOpStatus();
+        if (status !== undefined) {
+            let msg: string;
+            let msgKind: SnackbarKind;
+            if (status.valueOf() === LinkAccountStatus.CANCELLED) {
+                msg = "Account link cancelled!", msgKind = SnackbarKind.INFO;
+            }
+            else if (status.valueOf() === LinkAccountStatus.FAILED) {
+                msg = "Account link failed!", msgKind = SnackbarKind.ERROR;
+            }
+            else if (status.valueOf() === LinkAccountStatus.SUCCESS) {
+                msg = "Account link success!", msgKind = SnackbarKind.SUCCESS;
+            }
+            else {
+                msg = "Unknown Error!", msgKind = SnackbarKind.ERROR;
+            }
+            dispatch(snackbarActions.OPEN_SNACKBAR({ message: msg, kind: msgKind, hideDuration: 3000 }));
+            services.linkAccountService.removeLinkOpStatus();
+        }
+    };
+
+export const finishLinking = (status: LinkAccountStatus) =>
+    (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+        services.linkAccountService.removeFromSession();
+        services.linkAccountService.saveLinkOpStatus(status);
+        location.reload();
+    };
+
 export const switchUser = (user: UserResource, token: string) =>
     (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
         dispatch(saveUser(user));
@@ -68,11 +97,16 @@ export const linkFailed = () =>
             }
             dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Account link failed.', kind: SnackbarKind.ERROR , hideDuration: 3000 }));
         }
-        services.linkAccountService.removeFromSession();
+        dispatch(finishLinking(LinkAccountStatus.FAILED));
     };
 
 export const loadLinkAccountPanel = () =>
     async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+
+        // First check if an account link operation has completed
+        dispatch(checkForLinkStatus());
+
+        // Continue loading the link account panel
         dispatch(setBreadcrumbs([{ label: 'Link account'}]));
         const curUser = getState().auth.user;
         const curToken = getState().auth.apiToken;
@@ -121,8 +155,7 @@ export const loadLinkAccountPanel = () =>
                     // This should never really happen, but just in case, switch to the user that
                     // originated the linking operation (i.e. the user saved in session data)
                     dispatch(switchUser(savedUserResource, linkAccountData.token));
-                    dispatch(linkAccountPanelActions.LINK_INIT({targetUser: savedUserResource}));
-                    throw new Error("Invalid link account type.");
+                    dispatch(finishLinking(LinkAccountStatus.FAILED));
                 }
 
                 dispatch(switchUser(params.targetUser, params.targetUserToken));
@@ -174,8 +207,7 @@ export const cancelLinking = () =>
             }
         }
         finally {
-            services.linkAccountService.removeFromSession();
-            dispatch(linkAccountPanelActions.LINK_INIT({ targetUser: user }));
+            dispatch(finishLinking(LinkAccountStatus.CANCELLED));
         }
     };
 
@@ -201,17 +233,14 @@ export const linkAccount = () =>
             try {
                 // The merge api links the user sending the request into the user
                 // specified in the request, so switch users for this api call
-                dispatch(switchUser(linkState.userToLink, linkState.userToLinkToken));
+                dispatch(saveApiToken(linkState.userToLinkToken));
                 await services.linkAccountService.linkAccounts(linkState.targetUserToken, newGroup.uuid);
                 dispatch(switchUser(linkState.targetUser, linkState.targetUserToken));
-                dispatch(navigateToRootProject);
-                dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Account link success!', kind: SnackbarKind.SUCCESS, hideDuration: 3000 }));
-                dispatch(linkAccountPanelActions.LINK_INIT({targetUser: linkState.targetUser}));
             }
             catch(e) {
                 // If the link operation fails, delete the previously made project
                 try {
-                    dispatch(switchUser(linkState.targetUser, linkState.targetUserToken));
+                    dispatch(saveApiToken(linkState.targetUserToken));
                     await services.projectService.delete(newGroup.uuid);
                 }
                 finally {
@@ -220,7 +249,7 @@ export const linkAccount = () =>
                 throw e;
             }
             finally {
-                services.linkAccountService.removeFromSession();
+                dispatch(finishLinking(LinkAccountStatus.SUCCESS));
             }
         }
     };
\ No newline at end of file