hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring of auth.interceptor

Browse Source
This commit is contained in:
Julius Gruber
2019-06-05 13:39:18 +02:00
parent 994d96bc95
commit 20794381f1
4 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/app.module.ts
View File

@@ -76,6 +76,7 @@ const ENTITY_IMPORTS = [
IMPORTS.push(
StoreDevtoolsModule.instrument({
maxAge: 100,
// logOnly: false,
logOnly: ENV_CONFIG.production,
})
);

30
src/app/core/auth/auth-request.service.ts
View File

@@ -1,15 +1,15 @@
import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
import { Inject, Injectable } from '@angular/core';
import { HALEndpointService } from '../shared/hal-endpoint.service';
import { RequestService } from '../data/request.service';
import { GLOBAL_CONFIG } from '../../../config';
import { GlobalConfig } from '../../../config/global-config.interface';
import { isNotEmpty } from '../../shared/empty.util';
import { AuthGetRequest, AuthPostRequest, GetRequest, PostRequest, RestRequest } from '../data/request.models';
import { AuthStatusResponse, ErrorResponse } from '../cache/response.models';
import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
import { getResponseFromEntry } from '../shared/operators';
import {Observable, of as observableOf, throwError as observableThrowError} from 'rxjs';
import {distinctUntilChanged, filter, map, mergeMap, tap} from 'rxjs/operators';
import {Inject, Injectable} from '@angular/core';
import {HALEndpointService} from '../shared/hal-endpoint.service';
import {RequestService} from '../data/request.service';
import {GLOBAL_CONFIG} from '../../../config';
import {GlobalConfig} from '../../../config/global-config.interface';
import {isNotEmpty} from '../../shared/empty.util';
import {AuthGetRequest, AuthPostRequest, GetRequest, PostRequest, RestRequest} from '../data/request.models';
import {AuthStatusResponse, ErrorResponse} from '../cache/response.models';
import {HttpOptions} from '../dspace-rest-v2/dspace-rest-v2.service';
import {getResponseFromEntry} from '../shared/operators';
@Injectable()
export class AuthRequestService {
@@ -41,7 +41,9 @@ export class AuthRequestService {
public postToEndpoint(method: string, body: any, options?: HttpOptions): Observable<any> {
return this.halService.getEndpoint(this.linkName).pipe(
filter((href: string) => isNotEmpty(href)),
tap((href: string) => console.log('This is href in postToEndpoint(): ' , href)),
map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
tap((href2) => {console.log('href2', href2)}),
distinctUntilChanged(),
map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)),
tap((request: PostRequest) => this.requestService.configure(request, true)),
@@ -53,9 +55,9 @@ export class AuthRequestService {
console.log('auth.request getRequest() was called');
return this.halService.getEndpoint(this.linkName).pipe(
filter((href: string) => isNotEmpty(href)),
tap((href) => console.log('auth-request.service getRequest()',href)),
tap((href) => console.log('auth-request.service getRequest()', href)),
map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
tap((whatsThis) => console.log('whatsThis: ', whatsThis )),
tap((whatsThis) => console.log('whatsThis: ', whatsThis)),
distinctUntilChanged(),
map((endpointURL: string) => new AuthGetRequest(this.requestService.generateRequestId(), endpointURL, options)),
tap((request: GetRequest) => this.requestService.configure(request, true)),

8
src/app/core/auth/auth.interceptor.ts
View File

@@ -154,10 +154,10 @@ export class AuthInterceptor implements HttpInterceptor {
console.log('error.headers.get("location"): ', location);
console.log('www-authenticate', error.headers.get('www-authenticate'));
let strings = error.headers.get('www-authenticate').split(',');
let string = strings[1];
let s = string.replace('location=', '');
let s1 = s.replace('"', '').trim();
const strings = error.headers.get('www-authenticate').split(',');
const locationstring = strings[1];
const s = locationstring.replace('location=', '');
const s1 = s.replace('"', '').trim();
console.log('This should be the location: ', s1);
location = s1;

3
src/app/shared/log-in/log-in.component.html
View File

@@ -27,6 +27,9 @@
<a class="btn btn-lg btn-primary btn-block mt-2" [href]="(ssoLoginUrl | async)" role="button">{{"login.form.ssoLogin" | translate}}</a>
</div>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">{{"login.form.new-user" | translate}}</a>
<a class="dropdown-item" href="#">{{"login.form.forgot-password" | translate}}</a>