grassrootseconomics/cic-staff-client
8
0
Fork 0
Code Issues 26 Pull Requests Projects Releases Wiki Activity

Add check for meta url before adding bearer token.

Browse Source
This commit is contained in:
Spencer Ofwiti 2021-06-14 17:19:49 +03:00
parent f6e709373e
commit 11c814b243
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/_interceptors/http-config.interceptor.ts
View File

@ -4,6 +4,7 @@ import { Injectable } from '@angular/core';
// Third party imports // Third party imports
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { environment } from '@src/environments/environment';
/** Intercepts and handles setting of configurations to outgoing HTTP request. */ /** Intercepts and handles setting of configurations to outgoing HTTP request. */
@Injectable() @Injectable()
@ -19,11 +20,15 @@ export class HttpConfigInterceptor implements HttpInterceptor {
* @returns The forwarded request. * @returns The forwarded request.
*/ */
intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> { 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) { if (token) {
// request = request.clone({headers: request.headers.set('Authorization', 'Bearer ' + token)}); request = request.clone({
// } headers: request.headers.set('Authorization', 'Bearer ' + token),
});
}
}
return next.handle(request); return next.handle(request);
} }

8
src/app/_services/registry.service.ts
View File

@ -33,9 +33,7 @@ export class RegistryService {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
if (!RegistryService.tokenRegistry) { if (!RegistryService.tokenRegistry) {
const registry = await RegistryService.getRegistry(); const registry = await RegistryService.getRegistry();
const tokenRegistryAddress = await registry.getContractAddressByName( const tokenRegistryAddress = await registry.getContractAddressByName('TokenRegistry');
'TokenRegistry'
);
if (!tokenRegistryAddress) { if (!tokenRegistryAddress) {
return reject('Unable to initialize Token Registry'); return reject('Unable to initialize Token Registry');
} }
@ -50,9 +48,7 @@ export class RegistryService {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
if (!RegistryService.accountRegistry) { if (!RegistryService.accountRegistry) {
const registry = await RegistryService.getRegistry(); const registry = await RegistryService.getRegistry();
const accountRegistryAddress = await registry.getContractAddressByName( const accountRegistryAddress = await registry.getContractAddressByName('AccountRegistry');
'AccountRegistry'
);
if (!accountRegistryAddress) { if (!accountRegistryAddress) {
return reject('Unable to initialize Account Registry'); return reject('Unable to initialize Account Registry');