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

Changed AuthMethods enum2

Browse Source
This commit is contained in:
Julius Gruber
2019-08-29 10:44:15 +02:00
parent 3517e9bee9
commit 466d01ce09
2 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/core/auth/models/auth-method.model.ts
View File

@@ -1,30 +1,30 @@
export class AuthMethodModel { export class AuthMethodModel {
authMethodName: string; authMethodName: string;
location?: string; location?: string;
authMethodConstant: AuthMethodConstants authMethodConstant: AuthMethodType
constructor(authMethodName: string, location?: string) { constructor(authMethodName: string, location?: string) {
this.authMethodName = authMethodName; this.authMethodName = authMethodName;
this.location = location; this.location = location;
switch (authMethodName) { switch (authMethodName) {
case 'ip': { case 'ip': {
this.authMethodConstant = AuthMethodConstants.IP; this.authMethodConstant = AuthMethodType.Ip;
break; break;
} }
case 'ldap': { case 'ldap': {
this.authMethodConstant = AuthMethodConstants.LDAP; this.authMethodConstant = AuthMethodType.Ldap;
break; break;
} }
case 'shibboleth': { case 'shibboleth': {
this.authMethodConstant = AuthMethodConstants.SHIBBOLETH; this.authMethodConstant = AuthMethodType.Shibboleth;
break; break;
} }
case 'x509': { case 'x509': {
this.authMethodConstant = AuthMethodConstants.X509; this.authMethodConstant = AuthMethodType.X509;
break; break;
} }
case 'password': { case 'password': {
this.authMethodConstant = AuthMethodConstants.PASSWORD; this.authMethodConstant = AuthMethodType.Password;
break; break;
} }
@@ -35,10 +35,10 @@ export class AuthMethodModel {
} }
} }
export enum AuthMethodConstants { export enum AuthMethodType {
IP, Password = 'password',
LDAP, Shibboleth = 'shibboleth',
SHIBBOLETH, Ldap = 'ldap',
X509, Ip = 'ip',
PASSWORD, X509 = 'x509'
} }

19
src/app/shared/log-in/log-in.component.ts
View File

@@ -5,7 +5,7 @@ import {getAuthenticationMethods} from '../../core/auth/selectors';
import {map} from 'rxjs/operators'; import {map} from 'rxjs/operators';
import {AppState} from '../../app.reducer'; import {AppState} from '../../app.reducer';
import {Observable} from 'rxjs'; import {Observable} from 'rxjs';
import {AuthMethodConstants} from '../../core/auth/models/auth-method.model'; import {AuthMethodType} from '../../core/auth/models/auth-method.model';
import {DynamicLoginMethod} from './log-in.model'; import {DynamicLoginMethod} from './log-in.model';
import {LogInPasswordComponent} from './methods/password/log-in-password.component'; import {LogInPasswordComponent} from './methods/password/log-in-password.component';
@@ -54,10 +54,10 @@ export class LogInComponent implements OnDestroy, OnInit {
this.dynamicLoginMethods = this.store.select(getAuthenticationMethods).pipe( this.dynamicLoginMethods = this.store.select(getAuthenticationMethods).pipe(
map(((authMethods) => authMethods.map((authMethod) => { map(((authMethods) => authMethods.map((authMethod) => {
switch (authMethod.authMethodConstant) { switch (authMethod.authMethodConstant) {
case AuthMethodConstants.PASSWORD: case AuthMethodType.Password:
return new DynamicLoginMethod(authMethod.authMethodName, LogInPasswordComponent) return new DynamicLoginMethod(authMethod.authMethodName, LogInPasswordComponent)
break; break;
case AuthMethodConstants.SHIBBOLETH: case AuthMethodType.Shibboleth:
this.shibbolethUrl = authMethod.location; this.shibbolethUrl = authMethod.location;
// this.shibbolethUrl = 'https://fis.tiss.tuwien.ac.at/Shibboleth.sso/Login?target=https://fis.tiss.tuwien.ac.at/shibboleth'; // this.shibbolethUrl = 'https://fis.tiss.tuwien.ac.at/Shibboleth.sso/Login?target=https://fis.tiss.tuwien.ac.at/shibboleth';
return new DynamicLoginMethod(authMethod.authMethodName, DynamicShibbolethComponent, authMethod.location) return new DynamicLoginMethod(authMethod.authMethodName, DynamicShibbolethComponent, authMethod.location)
@@ -73,19 +73,6 @@ export class LogInComponent implements OnDestroy, OnInit {
} }
/* this.dynamicLoginMethods = this.dynamicLoginMethods = [
{
label: 'PasswordComponent',
component: LogInComponent
},
{
label: 'ShibbolethComponent',
component: DynamicShibbolethComponent
},
];
}*/
/** /**
* Lifecycle hook that is called when a directive, pipe or service is destroyed. * Lifecycle hook that is called when a directive, pipe or service is destroyed.
* @method ngOnDestroy * @method ngOnDestroy