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

Refactor environment variables.

Browse Source
This commit is contained in:
Spencer Ofwiti
2021-03-16 18:32:26 +03:00
parent 03be46e169
commit 124a6bf295
4 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/_interceptors/error.interceptor.ts
View File

@@ -8,6 +8,7 @@ import {
import {Observable, throwError} from 'rxjs';
import {catchError} from 'rxjs/operators';
import {ErrorDialogService} from '@app/_services';
import {environment} from '@src/environments/environment';
@Injectable()
export class ErrorInterceptor implements HttpInterceptor {
@@ -16,10 +17,12 @@ export class ErrorInterceptor implements HttpInterceptor {
intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
return next.handle(request).pipe(catchError((err: HttpErrorResponse) => {
this.errorDialogService.openDialog({
message: err.error.message || err.statusText,
status: err.status
});
if (!environment.production) {
this.errorDialogService.openDialog({
message: err.error.message || err.statusText || 'Unknown Error',
status: err.status || 0
});
}
if ([401, 403].indexOf(err.status) !== -1) {
location.reload(true);
}

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

@@ -37,7 +37,7 @@ export class AuthService {
getWithToken(): void {
const xhr = new XMLHttpRequest();
xhr.responseType = 'text';
xhr.open('GET', environment.cicAuthUrl + window.location.search.substring(1));
xhr.open('GET', environment.cicMetaUrl + window.location.search.substring(1));
xhr.setRequestHeader('Authorization', 'Bearer ' + this.sessionToken);
xhr.setRequestHeader('Content-Type', 'application/json');
xhr.setRequestHeader('x-cic-automerge', 'none');
@@ -55,7 +55,7 @@ export class AuthService {
sendResponse(hobaResponseEncoded): void {
const xhr = new XMLHttpRequest();
xhr.responseType = 'text';
xhr.open('GET', environment.cicAuthUrl + window.location.search.substring(1));
xhr.open('GET', environment.cicMetaUrl + window.location.search.substring(1));
xhr.setRequestHeader('Authorization', 'HOBA ' + hobaResponseEncoded);
xhr.setRequestHeader('Content-Type', 'application/json');
xhr.setRequestHeader('x-cic-automerge', 'none');
@@ -75,7 +75,7 @@ export class AuthService {
getChallenge(): void {
const xhr = new XMLHttpRequest();
xhr.responseType = 'arraybuffer';
xhr.open('GET', environment.cicAuthUrl + window.location.search.substring(1));
xhr.open('GET', environment.cicMetaUrl + window.location.search.substring(1));
xhr.onload = (e) => {
if (xhr.status === 401) {
const authHeader = xhr.getResponseHeader('WWW-Authenticate');
@@ -107,7 +107,7 @@ export class AuthService {
async loginResponse(o): Promise<any> {
const r = await signChallenge(o.challenge, o.realm, environment.cicAuthUrl, this.mutableKeyStore);
const r = await signChallenge(o.challenge, o.realm, environment.cicMetaUrl, this.mutableKeyStore);
this.sendResponse(r);
}