mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
Code cleanup
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
<div>
|
||||
<img class="mb-4 login-logo" src="assets/images/dspace-logo.png">
|
||||
<h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
|
||||
<!-- <ds-login-container></ds-login-container>-->
|
||||
<ds-auth-methods></ds-auth-methods>
|
||||
</div>
|
||||
</div>
|
||||
|
@@ -1,5 +1,4 @@
|
||||
<ds-loading *ngIf="(loading | async)"
|
||||
message="'Shibboleth log-in successfull. Please wait while we redirect you...'"
|
||||
class="m-5"></ds-loading>
|
||||
|
||||
<ds-loading *ngIf="(loading | async)" message="'Shibboleth log-in successfull. Please wait while we redirect you...'" class="m-5"></ds-loading>
|
||||
<!--<p>
|
||||
Shibboleth login successfull! Please wait while we redirect you...
|
||||
</p>-->
|
||||
|
@@ -1,5 +1,3 @@
|
||||
/*
|
||||
This is a comment*/
|
||||
.login-shibboleth {
|
||||
|
||||
}
|
||||
|
@@ -97,17 +97,13 @@ export class AuthInterceptor implements HttpInterceptor {
|
||||
const completeWWWauthenticateHeader = headers.get('www-authenticate');
|
||||
const regex = /(\w+ (\w+=((".*?")|[^,]*)(, )?)*)/g;
|
||||
const realms = completeWWWauthenticateHeader.match(regex);
|
||||
// console.log('realms: ', realms)
|
||||
|
||||
// tslint:disable-next-line:forin
|
||||
for (const j in realms) {
|
||||
console.log('realm:', realms[j]);
|
||||
|
||||
const splittedRealm = realms[j].split(', ');
|
||||
const methodName = splittedRealm[0].split(' ')[0].trim();
|
||||
// console.log('methodName: ', methodName);
|
||||
|
||||
// console.log('splittedRealm: ', splittedRealm);
|
||||
let authMethodModel: AuthMethodModel;
|
||||
if (splittedRealm.length === 1) {
|
||||
authMethodModel = new AuthMethodModel(methodName);
|
||||
@@ -155,8 +151,6 @@ export class AuthInterceptor implements HttpInterceptor {
|
||||
const token = authService.getToken();
|
||||
let newReq;
|
||||
|
||||
// console.log('intercept() request: ', req);
|
||||
|
||||
if (authService.isTokenExpired()) {
|
||||
authService.setRedirectUrl(this.router.url);
|
||||
// The access token is expired
|
||||
|
@@ -1,31 +1,21 @@
|
||||
import {
|
||||
Component,
|
||||
EventEmitter,
|
||||
Inject,
|
||||
Input,
|
||||
OnDestroy,
|
||||
OnInit,
|
||||
Output,
|
||||
QueryList,
|
||||
ViewChildren
|
||||
} from '@angular/core';
|
||||
import { renderAuthMethodFor } from '../authMethods-decorator';
|
||||
import { AuthMethodType } from '../authMethods-type';
|
||||
import { AuthMethodModel } from '../../../../core/auth/models/auth-method.model';
|
||||
import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
|
||||
import { FormBuilder } from '@angular/forms';
|
||||
import { select, Store } from '@ngrx/store';
|
||||
import { CoreState } from '../../../../core/core.reducers';
|
||||
import { StartShibbolethAuthenticationAction } from '../../../../core/auth/auth.actions';
|
||||
import { Observable, of, Subscription } from 'rxjs';
|
||||
import { Observable } from 'rxjs';
|
||||
import {
|
||||
getAuthenticationMethods,
|
||||
isAuthenticated,
|
||||
isAuthenticationLoading
|
||||
} from '../../../../core/auth/selectors';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import { GLOBAL_CONFIG, GlobalConfig } from '../../../../../config';
|
||||
import { ShibbConstants } from '../../../../+login-page/shibbolethTargetPage/const/shibbConstants';
|
||||
import { tap } from 'rxjs/operators';
|
||||
|
||||
@Component({
|
||||
selector: 'ds-log-in-shibboleth',
|
||||
@@ -60,23 +50,16 @@ export class LogInShibbolethComponent implements OnInit {
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
|
||||
// console.log('Injected authMethodModel', this.injectedAuthMethodModel);
|
||||
|
||||
// set isAuthenticated
|
||||
this.isAuthenticated = this.store.pipe(select(isAuthenticated));
|
||||
|
||||
// set loading
|
||||
this.loading = this.store.pipe(select(isAuthenticationLoading));
|
||||
|
||||
}
|
||||
|
||||
submit() {
|
||||
console.log('submit() was called');
|
||||
this.store.dispatch(new StartShibbolethAuthenticationAction(this.authMethodModel));
|
||||
// e.g. host = 'fis.tiss.tuwien.ac.at';
|
||||
// https://host/Shibboleth.sso/Login?target=https://host/shibboleth
|
||||
// https://fis.tiss.tuwien.ac.at/Shibboleth.sso/Login?target=https://fis.tiss.tuwien.ac.at/shibboleth';
|
||||
window.location.href = this.injectedAuthMethodModel.location;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user