From 11c814b2436fca71f4b102da11cc54cbbea7134f Mon Sep 17 00:00:00 2001
From: Spencer Ofwiti <maxspencer56@gmail.com>
Date: Mon, 14 Jun 2021 17:19:49 +0300
Subject: [PATCH] Add check for meta url before adding bearer token.

---
 src/app/_interceptors/http-config.interceptor.ts | 13 +++++++++----
 src/app/_services/registry.service.ts            |  8 ++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/app/_interceptors/http-config.interceptor.ts b/src/app/_interceptors/http-config.interceptor.ts
index 0bce86a..cb4431c 100644
--- a/src/app/_interceptors/http-config.interceptor.ts
+++ b/src/app/_interceptors/http-config.interceptor.ts
@@ -4,6 +4,7 @@ import { Injectable } from '@angular/core';
 
 // Third party imports
 import { Observable } from 'rxjs';
+import { environment } from '@src/environments/environment';
 
 /** Intercepts and handles setting of configurations to outgoing HTTP request. */
 @Injectable()
@@ -19,11 +20,15 @@ export class HttpConfigInterceptor implements HttpInterceptor {
    * @returns The forwarded request.
    */
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
-    // const token: string = sessionStorage.getItem(btoa('CICADA_SESSION_TOKEN'));
+    if (request.url.startsWith(environment.cicMetaUrl)) {
+      const token: string = sessionStorage.getItem(btoa('CICADA_SESSION_TOKEN'));
 
-    // if (token) {
-    //   request = request.clone({headers: request.headers.set('Authorization', 'Bearer ' + token)});
-    // }
+      if (token) {
+        request = request.clone({
+          headers: request.headers.set('Authorization', 'Bearer ' + token),
+        });
+      }
+    }
 
     return next.handle(request);
   }
diff --git a/src/app/_services/registry.service.ts b/src/app/_services/registry.service.ts
index 9e94b07..d116efa 100644
--- a/src/app/_services/registry.service.ts
+++ b/src/app/_services/registry.service.ts
@@ -33,9 +33,7 @@ export class RegistryService {
     return new Promise(async (resolve, reject) => {
       if (!RegistryService.tokenRegistry) {
         const registry = await RegistryService.getRegistry();
-        const tokenRegistryAddress = await registry.getContractAddressByName(
-          'TokenRegistry'
-        );
+        const tokenRegistryAddress = await registry.getContractAddressByName('TokenRegistry');
         if (!tokenRegistryAddress) {
           return reject('Unable to initialize Token Registry');
         }
@@ -50,9 +48,7 @@ export class RegistryService {
     return new Promise(async (resolve, reject) => {
       if (!RegistryService.accountRegistry) {
         const registry = await RegistryService.getRegistry();
-        const accountRegistryAddress = await registry.getContractAddressByName(
-          'AccountRegistry'
-        );
+        const accountRegistryAddress = await registry.getContractAddressByName('AccountRegistry');
 
         if (!accountRegistryAddress) {
           return reject('Unable to initialize Account Registry');