TNO-2293 Fix first time login issue (#1506)

bcgov · Feb 7, 2024 · 572ae71 · 572ae71
1 parent fe4aa27
commit 572ae71
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/app/subscriber/src/store/hooks/app/useApp.ts b/app/subscriber/src/store/hooks/app/useApp.ts
@@ -86,7 +86,7 @@ export const useApp = (): [IAppState, IAppController] => {
     () => ({
       getUserInfo: async (refresh: boolean = false) => {
         if (userInfo.id !== 0 && !refresh) return userInfo;
-        var location: IUserLocationModel;
+        var location: IUserLocationModel | undefined;
         try {
           // Generate a unique key for this user and store in local storage.
           var key = localStorage.getItem('device-key');
@@ -99,6 +99,7 @@ export const useApp = (): [IAppState, IAppController] => {
             () => axios.get('https://geolocation-db.com/json/'),
             'location',
             true,
+            true,
           );
           location = { ...locationResponse.data, key };
         } catch {

diff --git a/app/subscriber/src/store/hooks/useAjaxWrapper.ts b/app/subscriber/src/store/hooks/useAjaxWrapper.ts
@@ -19,6 +19,7 @@ export const useAjaxWrapper = () => {
         request: () => Promise<AxiosResponse<T>>,
         group: string | string[] | undefined = undefined,
         isSilent: boolean = false,
+        onlyThrowError: boolean = false,
       ): Promise<AxiosResponse<T>> => {
         try {
           app.addRequest(name, group, isSilent);
@@ -52,13 +53,15 @@ export const useAjaxWrapper = () => {
               .map((p) => p.toString())
               .toString();
           }
-          app.addError({
-            status: ae.response?.status,
-            statusText: ae.response?.statusText,
-            data: ae.response?.data,
-            message: message,
-            detail,
-          });
+          if (!onlyThrowError) {
+            app.addError({
+              status: ae.response?.status,
+              statusText: ae.response?.statusText,
+              data: ae.response?.data,
+              message: message,
+              detail,
+            });
+          }
 
           throw error;
         } finally {