hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 18:44:14 +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( IMPORTS.push(
StoreDevtoolsModule.instrument({ StoreDevtoolsModule.instrument({
maxAge: 100, maxAge: 100,
// logOnly: false,
logOnly: ENV_CONFIG.production, logOnly: ENV_CONFIG.production,
}) })
); );

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

@@ -41,7 +41,9 @@ export class AuthRequestService {
public postToEndpoint(method: string, body: any, options?: HttpOptions): Observable<any> { public postToEndpoint(method: string, body: any, options?: HttpOptions): Observable<any> {
return this.halService.getEndpoint(this.linkName).pipe( return this.halService.getEndpoint(this.linkName).pipe(
filter((href: string) => isNotEmpty(href)), filter((href: string) => isNotEmpty(href)),
tap((href: string) => console.log('This is href in postToEndpoint(): ' , href)),
map((endpointURL) => this.getEndpointByMethod(endpointURL, method)), map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
tap((href2) => {console.log('href2', href2)}),
distinctUntilChanged(), distinctUntilChanged(),
map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)), map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)),
tap((request: PostRequest) => this.requestService.configure(request, true)), tap((request: PostRequest) => 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('error.headers.get("location"): ', location);
console.log('www-authenticate', error.headers.get('www-authenticate')); console.log('www-authenticate', error.headers.get('www-authenticate'));
let strings = error.headers.get('www-authenticate').split(','); const strings = error.headers.get('www-authenticate').split(',');
let string = strings[1]; const locationstring = strings[1];
let s = string.replace('location=', ''); const s = locationstring.replace('location=', '');
let s1 = s.replace('"', '').trim(); const s1 = s.replace('"', '').trim();
console.log('This should be the location: ', s1); console.log('This should be the location: ', s1);
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> <a class="btn btn-lg btn-primary btn-block mt-2" [href]="(ssoLoginUrl | async)" role="button">{{"login.form.ssoLogin" | translate}}</a>
</div> </div>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">{{"login.form.new-user" | translate}}</a> <a class="dropdown-item" href="#">{{"login.form.new-user" | translate}}</a>
<a class="dropdown-item" href="#">{{"login.form.forgot-password" | translate}}</a> <a class="dropdown-item" href="#">{{"login.form.forgot-password" | translate}}</a>