fix: error handler fixed

IntellectEU · Feb 23, 2023 · 2a8f30d · 2a8f30d
1 parent 42d3b8f
commit 2a8f30d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 150 deletions.
diff --git a/.github/workflows/sync_upstream_develop.yml b/.github/workflows/sync_upstream_develop.yml
diff --git a/.github/workflows/sync_upstream_main.yml b/.github/workflows/sync_upstream_main.yml
diff --git a/api-gateway/src/api/service/tokens.ts b/api-gateway/src/api/service/tokens.ts
@@ -232,11 +232,12 @@ tokenAPI.put('/:tokenId/associate', permissionHelper(UserRole.USER), async (req:
         const status = await guardians.associateToken(tokenId, userDid);
         return res.json(status);
     } catch (error) {
+        console.log('foooooooo', error);
         new Logger().error(error, ['API_GATEWAY']);
-        if (error.toLowerCase().includes('user not found')) {
+        if (error?.message?.toLowerCase().includes('user not found')) {
             return next(createError(404, 'User not found'));
         }
-        if (error.toLowerCase().includes('token not found')) {
+        if (error?.message?.toLowerCase().includes('token not found')) {
             return next(createError(404, 'Token not found'));
         }
         return next(error);
@@ -276,10 +277,10 @@ tokenAPI.put('/:tokenId/dissociate', permissionHelper(UserRole.USER), async (req
         return res.json(status);
     } catch (error) {
         new Logger().error(error, ['API_GATEWAY']);
-        if (error.toLowerCase().includes('user not found')) {
+        if (error?.message?.toLowerCase().includes('user not found')) {
             return next(createError(404, 'User not found'));
         }
-        if (error.toLowerCase().includes('token not found')) {
+        if (error?.message?.toLowerCase().includes('token not found')) {
             return next(createError(404, 'Token not found'));
         }
         return next(error);
@@ -318,10 +319,10 @@ tokenAPI.put('/:tokenId/:username/grant-kyc', permissionHelper(UserRole.STANDARD
         return res.json(await guardians.grantKycToken(tokenId, username, userDid));
     } catch (error) {
         new Logger().error(error, ['API_GATEWAY']);
-        if (error.toLowerCase().includes('user not found')) {
+        if (error?.message?.toLowerCase().includes('user not found')) {
             return next(createError(404, 'User not found'));
         }
-        if (error.toLowerCase().includes('token not found')) {
+        if (error?.message?.toLowerCase().includes('token not found')) {
             return next(createError(404, 'Token not found'));
         }
         return next(error);
@@ -363,10 +364,10 @@ tokenAPI.put('/:tokenId/:username/revoke-kyc', permissionHelper(UserRole.STANDAR
         return res.json(result);
     } catch (error) {
         new Logger().error(error, ['API_GATEWAY']);
-        if (error.toLowerCase().includes('user not found')) {
+        if (error?.message?.toLowerCase().includes('user not found')) {
             return next(createError(404, 'User not found'));
         }
-        if (error.toLowerCase().includes('token not found')) {
+        if (error?.message?.toLowerCase().includes('token not found')) {
             return next(createError(404, 'Token not found'));
         }
         return next(error);
@@ -408,10 +409,10 @@ tokenAPI.put('/:tokenId/:username/freeze', permissionHelper(UserRole.STANDARD_RE
         return res.json(result);
     } catch (error) {
         new Logger().error(error, ['API_GATEWAY']);
-        if (error.toLowerCase().includes('user not found')) {
+        if (error?.message?.toLowerCase().includes('user not found')) {
             return next(createError(404, 'User not found'));
         }
-        if (error.toLowerCase().includes('token not found')) {
+        if (error?.message?.toLowerCase().includes('token not found')) {
             return next(createError(404, 'Token not found'));
         }
         return next(error);
@@ -431,10 +432,10 @@ tokenAPI.put('/:tokenId/:username/unfreeze', permissionHelper(UserRole.STANDARD_
         return res.json(result);
     } catch (error) {
         new Logger().error(error, ['API_GATEWAY']);
-        if (error.toLowerCase().includes('user not found')) {
+        if (error?.message?.toLowerCase().includes('user not found')) {
             return next(createError(404, 'User not found'));
         }
-        if (error.toLowerCase().includes('token not found')) {
+        if (error?.message?.toLowerCase().includes('token not found')) {
             return next(createError(404, 'Token not found'));
         }
         return next(error);
@@ -499,10 +500,10 @@ tokenAPI.get('/:tokenId/:username/info', permissionHelper(UserRole.STANDARD_REGI
         return res.json(result as ITokenInfo);
     } catch (error) {
         new Logger().error(error, ['API_GATEWAY']);
-        if (error.toLowerCase().includes('user not found')) {
+        if (error?.message?.toLowerCase().includes('user not found')) {
             return next(createError(404, 'User not found'));
         }
-        if (error.toLowerCase().includes('token not found')) {
+        if (error?.message?.toLowerCase().includes('token not found')) {
             return next(createError(404, 'Token not found'));
         }
         return next(error);

diff --git a/api-gateway/src/api/service/trustchains.ts b/api-gateway/src/api/service/trustchains.ts
diff --git a/frontend/src/app/views/header/header.component.ts b/frontend/src/app/views/header/header.component.ts
@@ -158,8 +158,10 @@ export class HeaderComponent implements OnInit {
             this.balanceType = '';
         });
 
-        this.authSubscription = this.auth.subscribe(() => {
-            this.getBallance();
+        this.authSubscription = this.auth.subscribe((token) => {
+            if (token) {
+                this.getBallance();
+            }
         })
     }