From 2309c1be3b895f107e1e9d378f13145c9274b334 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 1 Feb 2018 17:13:08 +0100 Subject: [PATCH 01/80] Added login page ang nav menu --- resources/i18n/en.json | 12 ++++++- .../+login-page/login-page-routing.module.ts | 13 ++++++++ src/app/+login-page/login-page.component.html | 5 +++ src/app/+login-page/login-page.component.scss | 15 +++++++++ src/app/+login-page/login-page.component.ts | 10 ++++++ src/app/+login-page/login-page.module.ts | 19 +++++++++++ src/app/app-routing.module.ts | 1 + src/app/app.module.ts | 2 ++ src/app/header/header.component.html | 13 ++++++++ src/app/header/header.component.ts | 10 ++++-- src/app/shared/host-window.service.ts | 6 ++++ .../login-form/login-form.component.html | 11 +++++++ .../login-form/login-form.component.scss | 32 +++++++++++++++++++ .../shared/login-form/login-form.component.ts | 10 ++++++ src/app/shared/shared.module.ts | 2 ++ 15 files changed, 158 insertions(+), 3 deletions(-) create mode 100644 src/app/+login-page/login-page-routing.module.ts create mode 100644 src/app/+login-page/login-page.component.html create mode 100644 src/app/+login-page/login-page.component.scss create mode 100644 src/app/+login-page/login-page.component.ts create mode 100644 src/app/+login-page/login-page.module.ts create mode 100644 src/app/shared/login-form/login-form.component.html create mode 100644 src/app/shared/login-form/login-form.component.scss create mode 100644 src/app/shared/login-form/login-form.component.ts diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 7b3d31c3e0..f93c0e933e 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -46,7 +46,8 @@ } }, "nav": { - "home": "Home" + "home": "Home", + "login": "Log In" }, "pagination": { "results-per-page": "Results Per Page", @@ -145,5 +146,14 @@ "item": "Error fetching item", "objects": "Error fetching objects", "search-results": "Error fetching search results" + }, + "login": { + "title": "Login", + "form": { + "header": "Please log in", + "email": "Email address", + "password": "Password", + "submit": "Log in" + } } } diff --git a/src/app/+login-page/login-page-routing.module.ts b/src/app/+login-page/login-page-routing.module.ts new file mode 100644 index 0000000000..4e932c50ce --- /dev/null +++ b/src/app/+login-page/login-page-routing.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { LoginPageComponent } from './login-page.component'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', component: LoginPageComponent, data: { title: 'login.title' } } + ]) + ] +}) +export class LoginPageRoutingModule { } diff --git a/src/app/+login-page/login-page.component.html b/src/app/+login-page/login-page.component.html new file mode 100644 index 0000000000..5a37df9d2a --- /dev/null +++ b/src/app/+login-page/login-page.component.html @@ -0,0 +1,5 @@ +
+ +

{{"login.form.header" | translate}}

+ +
diff --git a/src/app/+login-page/login-page.component.scss b/src/app/+login-page/login-page.component.scss new file mode 100644 index 0000000000..b71eee7ee1 --- /dev/null +++ b/src/app/+login-page/login-page.component.scss @@ -0,0 +1,15 @@ +.login-container { + height: 100%; + display: -ms-flexbox; + display: -webkit-box; + display: flex; + -ms-flex-align: center; + -ms-flex-pack: center; + -webkit-box-align: center; + align-items: center; + -webkit-box-pack: center; + justify-content: center; + padding-top: 40px; + padding-bottom: 40px; + background-color: #f5f5f5; +} diff --git a/src/app/+login-page/login-page.component.ts b/src/app/+login-page/login-page.component.ts new file mode 100644 index 0000000000..14bb443a4e --- /dev/null +++ b/src/app/+login-page/login-page.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'ds-login-page', + styleUrls: ['./login-page.component.scss'], + templateUrl: './login-page.component.html' +}) +export class LoginPageComponent { + +} diff --git a/src/app/+login-page/login-page.module.ts b/src/app/+login-page/login-page.module.ts new file mode 100644 index 0000000000..4d3f726c40 --- /dev/null +++ b/src/app/+login-page/login-page.module.ts @@ -0,0 +1,19 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { SharedModule } from '../shared/shared.module'; +import { LoginPageComponent } from './login-page.component'; +import { LoginPageRoutingModule } from './login-page-routing.module'; + +@NgModule({ + imports: [ + LoginPageRoutingModule, + CommonModule, + SharedModule, + ], + declarations: [ + LoginPageComponent + ] +}) +export class LoginPageModule { + +} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index dc442cd485..c11881800e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -12,6 +12,7 @@ import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component'; { path: 'collections', loadChildren: './+collection-page/collection-page.module#CollectionPageModule' }, { path: 'items', loadChildren: './+item-page/item-page.module#ItemPageModule' }, { path: 'search', loadChildren: './+search-page/search-page.module#SearchPageModule' }, + { path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule' }, { path: '**', pathMatch: 'full', component: PageNotFoundComponent }, ]) ], diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c2728941d0..0db1a0a1eb 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -28,6 +28,7 @@ import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component'; import { GLOBAL_CONFIG, ENV_CONFIG, GlobalConfig } from '../config'; import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-serializer'; +import { SharedModule } from './shared/shared.module'; export function getConfig() { return ENV_CONFIG; @@ -51,6 +52,7 @@ if (!ENV_CONFIG.production) { @NgModule({ imports: [ CommonModule, + SharedModule, HttpClientModule, AppRoutingModule, CoreModule.forRoot(), diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 0cdb443b8a..ac76ea1dab 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -12,6 +12,19 @@ {{ 'nav.home' | translate }}(current) + diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 624ae209dd..4be64221dc 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -5,6 +5,8 @@ import { Observable } from 'rxjs/Observable'; import { HeaderState } from './header.reducer'; import { HeaderToggleAction } from './header.actions'; import { AppState } from '../app.reducer'; +import { HostWindowService } from '../shared/host-window.service'; +import { fadeInOut } from '../shared/animations/fade'; const headerStateSelector = (state: AppState) => state.header; const navCollapsedSelector = createSelector(headerStateSelector, (header: HeaderState) => header.navCollapsed); @@ -12,13 +14,17 @@ const navCollapsedSelector = createSelector(headerStateSelector, (header: Header @Component({ selector: 'ds-header', styleUrls: ['header.component.scss'], - templateUrl: 'header.component.html' + templateUrl: 'header.component.html', + animations: [ + fadeInOut + ] }) export class HeaderComponent implements OnInit { public isNavBarCollapsed: Observable; constructor( - private store: Store + private store: Store, + private windowService: HostWindowService ) { } diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts index 6fa5a6b32b..02214f57e1 100644 --- a/src/app/shared/host-window.service.ts +++ b/src/app/shared/host-window.service.ts @@ -60,4 +60,10 @@ export class HostWindowService { .map((width) => width >= GridBreakpoint.XL) .distinctUntilChanged(); } + + isMobileView(): Observable { + return this.getWidthObs() + .map((width) => width < GridBreakpoint.MD) + .distinctUntilChanged(); + } } diff --git a/src/app/shared/login-form/login-form.component.html b/src/app/shared/login-form/login-form.component.html new file mode 100644 index 0000000000..6dcc4d1a5c --- /dev/null +++ b/src/app/shared/login-form/login-form.component.html @@ -0,0 +1,11 @@ + + diff --git a/src/app/shared/login-form/login-form.component.scss b/src/app/shared/login-form/login-form.component.scss new file mode 100644 index 0000000000..e6226bc015 --- /dev/null +++ b/src/app/shared/login-form/login-form.component.scss @@ -0,0 +1,32 @@ +@import '../../../styles/variables.scss'; + +.form-login { + width: 100%; + max-width: 330px; + padding: 15px; + margin: 0 auto; +} +.form-login .checkbox { + font-weight: 400; +} +.form-login .form-control { + position: relative; + box-sizing: border-box; + height: auto; + padding: 10px; + font-size: 16px; +} +.form-login .form-control:focus { + z-index: 2; +} +.form-login input[type="email"] { + margin-bottom: -1px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.form-login input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + diff --git a/src/app/shared/login-form/login-form.component.ts b/src/app/shared/login-form/login-form.component.ts new file mode 100644 index 0000000000..39fb3a8936 --- /dev/null +++ b/src/app/shared/login-form/login-form.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'ds-login-form', + styleUrls: ['./login-form.component.scss'], + templateUrl: './login-form.component.html' +}) +export class LoginFormComponent { + +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index ca13067851..2f5a266d9f 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -41,6 +41,7 @@ import { SearchResultGridElementComponent } from './object-grid/search-result-gr import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component'; import { GridThumbnailComponent } from './object-grid/grid-thumbnail/grid-thumbnail.component'; import { VarDirective } from './utils/var.directive'; +import { LoginFormComponent } from './login-form/login-form.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -68,6 +69,7 @@ const COMPONENTS = [ ComcolPageLogoComponent, ErrorComponent, LoadingComponent, + LoginFormComponent, ObjectListComponent, AbstractListableElementComponent, WrapperListElementComponent, From 55c55dc682bd2c5a6d8b32ba0ecd751ea4648b94 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 2 Feb 2018 14:33:48 +0100 Subject: [PATCH 02/80] Added Eperson and group models --- .../eperson/models/NormalizedEperson.model.ts | 37 +++++++++++++++++++ .../eperson/models/NormalizedGroup.model.ts | 18 +++++++++ src/app/core/eperson/models/eperson.model.ts | 22 +++++++++++ src/app/core/eperson/models/group.model.ts | 8 ++++ src/app/core/shared/resource-type.ts | 2 + 5 files changed, 87 insertions(+) create mode 100644 src/app/core/eperson/models/NormalizedEperson.model.ts create mode 100644 src/app/core/eperson/models/NormalizedGroup.model.ts create mode 100644 src/app/core/eperson/models/eperson.model.ts create mode 100644 src/app/core/eperson/models/group.model.ts diff --git a/src/app/core/eperson/models/NormalizedEperson.model.ts b/src/app/core/eperson/models/NormalizedEperson.model.ts new file mode 100644 index 0000000000..0c0b2490d6 --- /dev/null +++ b/src/app/core/eperson/models/NormalizedEperson.model.ts @@ -0,0 +1,37 @@ +import { autoserialize, inheritSerialization } from 'cerialize'; +import { CacheableObject } from '../../cache/object-cache.reducer'; +import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model'; +import { NormalizedDSpaceObject } from '../../cache/models/normalized-dspace-object.model'; +import { Eperson } from './eperson.model'; +import { mapsTo, relationship } from '../../cache/builders/build-decorators'; +import { ResourceType } from '../../shared/resource-type'; + +@mapsTo(Eperson) +@inheritSerialization(NormalizedDSpaceObject) +export class NormalizedEpersonModel extends NormalizedDSpaceObject implements CacheableObject, ListableObject { + + @autoserialize + public handle: string; + + @autoserialize + @relationship(ResourceType.Group, true) + groups: string[]; + + @autoserialize + public netid: string; + + @autoserialize + public lastActive: string; + + @autoserialize + public canLogIn: boolean; + + @autoserialize + public email: string; + + @autoserialize + public requireCertificate: boolean; + + @autoserialize + public selfRegistered: boolean; +} diff --git a/src/app/core/eperson/models/NormalizedGroup.model.ts b/src/app/core/eperson/models/NormalizedGroup.model.ts new file mode 100644 index 0000000000..24f7da8eab --- /dev/null +++ b/src/app/core/eperson/models/NormalizedGroup.model.ts @@ -0,0 +1,18 @@ +import { autoserialize, inheritSerialization } from 'cerialize'; +import { CacheableObject } from '../../cache/object-cache.reducer'; +import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model'; +import { NormalizedDSpaceObject } from '../../cache/models/normalized-dspace-object.model'; +import { Eperson } from './eperson.model'; +import { mapsTo } from '../../cache/builders/build-decorators'; +import { Group } from './group.model'; + +@mapsTo(Group) +@inheritSerialization(NormalizedDSpaceObject) +export class NormalizedGroupModel extends NormalizedDSpaceObject implements CacheableObject, ListableObject { + + @autoserialize + public handle: string; + + @autoserialize + public permanent: boolean; +} diff --git a/src/app/core/eperson/models/eperson.model.ts b/src/app/core/eperson/models/eperson.model.ts new file mode 100644 index 0000000000..373fb42792 --- /dev/null +++ b/src/app/core/eperson/models/eperson.model.ts @@ -0,0 +1,22 @@ +import { DSpaceObject } from '../../shared/dspace-object.model'; +import { Group } from './group.model'; + +export class Eperson extends DSpaceObject { + + public handle: string; + + public groups: Group[]; + + public netid: string; + + public lastActive: string; + + public canLogIn: boolean; + + public email: string; + + public requireCertificate: boolean; + + public selfRegistered: boolean; + +} diff --git a/src/app/core/eperson/models/group.model.ts b/src/app/core/eperson/models/group.model.ts new file mode 100644 index 0000000000..cd41ce9e25 --- /dev/null +++ b/src/app/core/eperson/models/group.model.ts @@ -0,0 +1,8 @@ +import { DSpaceObject } from '../../shared/dspace-object.model'; + +export class Group extends DSpaceObject { + + public handle: string; + + public permanent: boolean; +} diff --git a/src/app/core/shared/resource-type.ts b/src/app/core/shared/resource-type.ts index f3554e18cf..6f4a1c7358 100644 --- a/src/app/core/shared/resource-type.ts +++ b/src/app/core/shared/resource-type.ts @@ -9,4 +9,6 @@ export enum ResourceType { Item = 'item', Collection = 'collection', Community = 'community', + Eperson = 'eperson', + Group = 'group', } From 8f28429fe66ec904cd66a862746fceb1e46ecae3 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 2 Feb 2018 14:35:26 +0100 Subject: [PATCH 03/80] Added auth service --- src/app/core/auth/auth.service.ts | 102 ++++++++++++++++++ src/app/core/auth/authenticated.guard.ts | 60 +++++++++++ .../core/auth/authentication-status.model.ts | 9 ++ 3 files changed, 171 insertions(+) create mode 100644 src/app/core/auth/auth.service.ts create mode 100644 src/app/core/auth/authenticated.guard.ts create mode 100644 src/app/core/auth/authentication-status.model.ts diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts new file mode 100644 index 0000000000..2ca53fd160 --- /dev/null +++ b/src/app/core/auth/auth.service.ts @@ -0,0 +1,102 @@ +import { Injectable } from '@angular/core'; + +import { Observable } from 'rxjs/Observable'; + +import { Eperson } from '../eperson/models/eperson.model'; + +export const MOCK_USER = new Eperson(); +MOCK_USER.id = '92a59227-ccf7-46da-9776-86c3fc64147f'; +MOCK_USER.uuid = '92a59227-ccf7-46da-9776-86c3fc64147f'; +MOCK_USER.name = 'andrea.bollini@4science.it'; +MOCK_USER.email = 'andrea.bollini@4science.it'; +MOCK_USER.metadata = [ + { + key: 'eperson.firstname', + value: 'Andrea', + language: null + }, + { + key: 'eperson.lastname', + value: 'Bollini', + language: null + }, + { + key: 'eperson.language', + value: 'en', + language: null + } +]; + +/** + * The user service. + */ +@Injectable() +export class AuthService { + + /** + * True if authenticated + * @type + */ + private _authenticated = false; + + /** + * Authenticate the user + * + * @param {string} email The user's email address + * @param {string} password The user's password + * @returns {Observable} The authenticated user observable. + */ + public authenticate(email: string, password: string): Observable { + // Normally you would do an HTTP request to determine to + // attempt authenticating the user using the supplied credentials. + + if (email === MOCK_USER.email && password === 'password') { + this._authenticated = true; + return Observable.of(MOCK_USER); + } + + return Observable.throw(new Error('Invalid email or password')); + } + + /** + * Determines if the user is authenticated + * @returns {Observable} + */ + public authenticated(): Observable { + return Observable.of(this._authenticated); + } + + /** + * Returns the authenticated user + * @returns {User} + */ + public authenticatedUser(): Observable { + // Normally you would do an HTTP request to determine if + // the user has an existing auth session on the server + // but, let's just return the mock user for this example. + return Observable.of(MOCK_USER); + } + + /** + * Create a new user + * @returns {User} + */ + public create(user: Eperson): Observable { + // Normally you would do an HTTP request to POST the user + // details and then return the new user object + // but, let's just return the new user for this example. + this._authenticated = true; + return Observable.of(user); + } + + /** + * End session + * @returns {Observable} + */ + public signout(): Observable { + // Normally you would do an HTTP request sign end the session + // but, let's just return an observable of true. + this._authenticated = false; + return Observable.of(true); + } +} diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts new file mode 100644 index 0000000000..3cbecf1215 --- /dev/null +++ b/src/app/core/auth/authenticated.guard.ts @@ -0,0 +1,60 @@ +import { Injectable } from '@angular/core'; +import { ActivatedRouteSnapshot, CanActivate, CanLoad, Route, Router, RouterStateSnapshot } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; +import { Store } from '@ngrx/store'; + +// reducers +import { + isAuthenticated, + State +} from '../app.reducers'; + +/** + * Prevent unauthorized activating and loading of routes + * @class AuthenticatedGuard + */ +@Injectable() +export class AuthenticatedGuard implements CanActivate, CanLoad { + + /** + * @constructor + */ + constructor(private router: Router, private store: Store) {} + + /** + * True when user is authenticated + * @method canActivate + */ + canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | boolean { + // get observable + const observable = this.store.select(isAuthenticated); + + // redirect to sign in page if user is not authenticated + observable.subscribe((authenticated) => { + if (!authenticated) { + this.router.navigate(['/login']); + } + }); + + return observable; + } + + /** + * True when user is authenticated + * @method canLoad + */ + canLoad(route: Route): Observable | Promise | boolean { + // get observable + const observable = this.store.select(isAuthenticated); + + // redirect to sign in page if user is not authenticated + observable.subscribe((authenticated) => { + if (!authenticated) { + this.router.navigate(['/login']); + } + }); + + return observable; + } +} diff --git a/src/app/core/auth/authentication-status.model.ts b/src/app/core/auth/authentication-status.model.ts new file mode 100644 index 0000000000..9ef027d600 --- /dev/null +++ b/src/app/core/auth/authentication-status.model.ts @@ -0,0 +1,9 @@ +import { DSpaceObject } from '../shared/dspace-object.model'; + +export class AuthenticationStatus extends DSpaceObject { + + okay: boolean; + + authenticated: boolean; + +} From 19c9482009ab190c28bc27ab50303087389fc662 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 6 Feb 2018 15:48:05 +0100 Subject: [PATCH 04/80] Added first release of the authentication module --- resources/i18n/en.json | 14 +- src/app/+home-page/home-page.component.html | 1 + src/app/+home-page/home-page.component.ts | 15 +- src/app/+login-page/login-page.component.html | 2 +- .../logout-page-routing.module.ts | 19 ++ .../+logout-page/logout-page.component.html | 5 + .../+logout-page/logout-page.component.scss | 15 ++ src/app/+logout-page/logout-page.component.ts | 10 + src/app/+logout-page/logout-page.module.ts | 19 ++ src/app/app-routing.module.ts | 1 + src/app/app.effects.ts | 1 + src/app/app.reducer.ts | 59 ++--- src/app/core/auth/auth-object-factory.ts | 19 ++ src/app/core/auth/auth-request.service.ts | 58 +++++ .../auth/auth-response-parsing.service.ts | 47 ++++ src/app/core/auth/auth-type.ts | 3 + src/app/core/auth/auth.actions.ts | 219 ++++++++++++++++++ src/app/core/auth/auth.effects.ts | 97 ++++++++ src/app/core/auth/auth.reducers.ts | 181 +++++++++++++++ src/app/core/auth/auth.service.ts | 31 ++- src/app/core/auth/authenticated.guard.ts | 8 +- .../core/auth/authentication-status.model.ts | 9 - src/app/core/auth/models/auth-info.model.ts | 5 + src/app/core/auth/models/auth-status.model.ts | 9 + src/app/core/auth/selectors.ts | 84 +++++++ src/app/core/cache/response-cache.models.ts | 10 + src/app/core/core.effects.ts | 2 + src/app/core/core.module.ts | 6 + src/app/core/core.reducers.ts | 7 +- src/app/core/data/request.effects.ts | 4 +- src/app/core/data/request.models.ts | 49 +++- .../dspace-rest-v2/dspace-rest-v2.service.ts | 34 ++- src/app/core/shared/hal-endpoint.service.ts | 5 +- src/app/header/header.component.html | 14 +- src/app/header/header.component.ts | 12 +- .../auth-nav-menu.component.html | 26 +++ .../auth-nav-menu.component.scss | 0 .../auth-nav-menu/auth-nav-menu.component.ts | 61 +++++ src/app/shared/log-in/log-in.component.html | 29 +++ .../log-in.component.scss} | 0 .../shared/log-in/log-in.component.spec.ts | 116 ++++++++++ src/app/shared/log-in/log-in.component.ts | 163 +++++++++++++ src/app/shared/log-out/log-out.component.html | 9 + src/app/shared/log-out/log-out.component.scss | 1 + .../shared/log-out/log-out.component.spec.ts | 45 ++++ src/app/shared/log-out/log-out.component.ts | 89 +++++++ .../login-form/login-form.component.html | 11 - .../shared/login-form/login-form.component.ts | 10 - src/app/shared/shared.module.ts | 8 +- 49 files changed, 1532 insertions(+), 110 deletions(-) create mode 100644 src/app/+logout-page/logout-page-routing.module.ts create mode 100644 src/app/+logout-page/logout-page.component.html create mode 100644 src/app/+logout-page/logout-page.component.scss create mode 100644 src/app/+logout-page/logout-page.component.ts create mode 100644 src/app/+logout-page/logout-page.module.ts create mode 100644 src/app/core/auth/auth-object-factory.ts create mode 100644 src/app/core/auth/auth-request.service.ts create mode 100644 src/app/core/auth/auth-response-parsing.service.ts create mode 100644 src/app/core/auth/auth-type.ts create mode 100644 src/app/core/auth/auth.actions.ts create mode 100644 src/app/core/auth/auth.effects.ts create mode 100644 src/app/core/auth/auth.reducers.ts delete mode 100644 src/app/core/auth/authentication-status.model.ts create mode 100644 src/app/core/auth/models/auth-info.model.ts create mode 100644 src/app/core/auth/models/auth-status.model.ts create mode 100644 src/app/core/auth/selectors.ts create mode 100644 src/app/shared/auth-nav-menu/auth-nav-menu.component.html create mode 100644 src/app/shared/auth-nav-menu/auth-nav-menu.component.scss create mode 100644 src/app/shared/auth-nav-menu/auth-nav-menu.component.ts create mode 100644 src/app/shared/log-in/log-in.component.html rename src/app/shared/{login-form/login-form.component.scss => log-in/log-in.component.scss} (100%) create mode 100644 src/app/shared/log-in/log-in.component.spec.ts create mode 100644 src/app/shared/log-in/log-in.component.ts create mode 100644 src/app/shared/log-out/log-out.component.html create mode 100644 src/app/shared/log-out/log-out.component.scss create mode 100644 src/app/shared/log-out/log-out.component.spec.ts create mode 100644 src/app/shared/log-out/log-out.component.ts delete mode 100644 src/app/shared/login-form/login-form.component.html delete mode 100644 src/app/shared/login-form/login-form.component.ts diff --git a/resources/i18n/en.json b/resources/i18n/en.json index f93c0e933e..c148b06565 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -47,7 +47,8 @@ }, "nav": { "home": "Home", - "login": "Log In" + "login": "Log In", + "logout": "Log Out" }, "pagination": { "results-per-page": "Results Per Page", @@ -150,10 +151,19 @@ "login": { "title": "Login", "form": { - "header": "Please log in", + "header": "Please log in to DSpace", "email": "Email address", + "forgot-password": "Have you forgotten your password?", + "new-user": "New user? Click here to register.", "password": "Password", "submit": "Log in" } + }, + "logout": { + "title": "Logout", + "form": { + "header": "Log out from DSpace", + "submit": "Log out" + } } } diff --git a/src/app/+home-page/home-page.component.html b/src/app/+home-page/home-page.component.html index 6a3e20ca9d..974ca86f44 100644 --- a/src/app/+home-page/home-page.component.html +++ b/src/app/+home-page/home-page.component.html @@ -1,5 +1,6 @@
+

Loggato

diff --git a/src/app/+home-page/home-page.component.ts b/src/app/+home-page/home-page.component.ts index ad25ec0155..7736d874d9 100644 --- a/src/app/+home-page/home-page.component.ts +++ b/src/app/+home-page/home-page.component.ts @@ -1,10 +1,21 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; +import { isAuthenticated } from '../core/auth/selectors'; +import { Observable } from 'rxjs/Observable'; +import { AppState } from '../app.reducer'; +import { Store } from '@ngrx/store'; @Component({ selector: 'ds-home-page', styleUrls: ['./home-page.component.scss'], templateUrl: './home-page.component.html' }) -export class HomePageComponent { +export class HomePageComponent implements OnInit { + public isAuthenticated: Observable; + + constructor(private store: Store) {} + ngOnInit() { + // set loading + this.isAuthenticated = this.store.select(isAuthenticated); + } } diff --git a/src/app/+login-page/login-page.component.html b/src/app/+login-page/login-page.component.html index 5a37df9d2a..76f4e68ef1 100644 --- a/src/app/+login-page/login-page.component.html +++ b/src/app/+login-page/login-page.component.html @@ -1,5 +1,5 @@

{{"login.form.header" | translate}}

- +
diff --git a/src/app/+logout-page/logout-page-routing.module.ts b/src/app/+logout-page/logout-page-routing.module.ts new file mode 100644 index 0000000000..64894c1f87 --- /dev/null +++ b/src/app/+logout-page/logout-page-routing.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { LogoutPageComponent } from './logout-page.component'; +import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { + canActivate: [AuthenticatedGuard], + path: '', + component: LogoutPageComponent, + data: { title: 'logout.title' } + } + ]) + ] +}) +export class LogoutPageRoutingModule { } diff --git a/src/app/+logout-page/logout-page.component.html b/src/app/+logout-page/logout-page.component.html new file mode 100644 index 0000000000..e427d78ff7 --- /dev/null +++ b/src/app/+logout-page/logout-page.component.html @@ -0,0 +1,5 @@ +
+ +

{{"logout.form.header" | translate}}

+ +
diff --git a/src/app/+logout-page/logout-page.component.scss b/src/app/+logout-page/logout-page.component.scss new file mode 100644 index 0000000000..b71eee7ee1 --- /dev/null +++ b/src/app/+logout-page/logout-page.component.scss @@ -0,0 +1,15 @@ +.login-container { + height: 100%; + display: -ms-flexbox; + display: -webkit-box; + display: flex; + -ms-flex-align: center; + -ms-flex-pack: center; + -webkit-box-align: center; + align-items: center; + -webkit-box-pack: center; + justify-content: center; + padding-top: 40px; + padding-bottom: 40px; + background-color: #f5f5f5; +} diff --git a/src/app/+logout-page/logout-page.component.ts b/src/app/+logout-page/logout-page.component.ts new file mode 100644 index 0000000000..4fa4b9900a --- /dev/null +++ b/src/app/+logout-page/logout-page.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'ds-logout-page', + styleUrls: ['./logout-page.component.scss'], + templateUrl: './logout-page.component.html' +}) +export class LogoutPageComponent { + +} diff --git a/src/app/+logout-page/logout-page.module.ts b/src/app/+logout-page/logout-page.module.ts new file mode 100644 index 0000000000..b085a5117b --- /dev/null +++ b/src/app/+logout-page/logout-page.module.ts @@ -0,0 +1,19 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { SharedModule } from '../shared/shared.module'; +import { LogoutPageComponent } from './logout-page.component'; +import { LogoutPageRoutingModule } from './logout-page-routing.module'; + +@NgModule({ + imports: [ + LogoutPageRoutingModule, + CommonModule, + SharedModule, + ], + declarations: [ + LogoutPageComponent + ] +}) +export class LogoutPageModule { + +} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index c11881800e..72a26fd678 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -13,6 +13,7 @@ import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component'; { path: 'items', loadChildren: './+item-page/item-page.module#ItemPageModule' }, { path: 'search', loadChildren: './+search-page/search-page.module#SearchPageModule' }, { path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule' }, + { path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' }, { path: '**', pathMatch: 'full', component: PageNotFoundComponent }, ]) ], diff --git a/src/app/app.effects.ts b/src/app/app.effects.ts index 7fc42da80d..5cd9c79e30 100644 --- a/src/app/app.effects.ts +++ b/src/app/app.effects.ts @@ -1,6 +1,7 @@ import { HeaderEffects } from './header/header.effects'; import { StoreEffects } from './store.effects'; +import { AuthEffects } from './core/auth/auth.effects'; export const appEffects = [ StoreEffects, diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts index 72b29519de..e69f29ae52 100644 --- a/src/app/app.reducer.ts +++ b/src/app/app.reducer.ts @@ -1,29 +1,30 @@ -import { ActionReducerMap } from '@ngrx/store'; -import * as fromRouter from '@ngrx/router-store'; - -import { headerReducer, HeaderState } from './header/header.reducer'; -import { hostWindowReducer, HostWindowState } from './shared/host-window.reducer'; -import { - SearchSidebarState, - sidebarReducer -} from './+search-page/search-sidebar/search-sidebar.reducer'; -import { - filterReducer, - SearchFiltersState -} from './+search-page/search-filters/search-filter/search-filter.reducer'; - -export interface AppState { - router: fromRouter.RouterReducerState; - hostWindow: HostWindowState; - header: HeaderState; - searchSidebar: SearchSidebarState; - searchFilter: SearchFiltersState; -} - -export const appReducers: ActionReducerMap = { - router: fromRouter.routerReducer, - hostWindow: hostWindowReducer, - header: headerReducer, - searchSidebar: sidebarReducer, - searchFilter: filterReducer -}; +import { ActionReducerMap } from '@ngrx/store'; +import * as fromRouter from '@ngrx/router-store'; + +import { headerReducer, HeaderState } from './header/header.reducer'; +import { hostWindowReducer, HostWindowState } from './shared/host-window.reducer'; +import { + SearchSidebarState, + sidebarReducer +} from './+search-page/search-sidebar/search-sidebar.reducer'; +import { + filterReducer, + SearchFiltersState +} from './+search-page/search-filters/search-filter/search-filter.reducer'; +import { authReducer, AuthState } from './core/auth/auth.reducers'; + +export interface AppState { + router: fromRouter.RouterReducerState; + hostWindow: HostWindowState; + header: HeaderState; + searchSidebar: SearchSidebarState; + searchFilter: SearchFiltersState; +} + +export const appReducers: ActionReducerMap = { + router: fromRouter.routerReducer, + hostWindow: hostWindowReducer, + header: headerReducer, + searchSidebar: sidebarReducer, + searchFilter: filterReducer +}; diff --git a/src/app/core/auth/auth-object-factory.ts b/src/app/core/auth/auth-object-factory.ts new file mode 100644 index 0000000000..e1960e8111 --- /dev/null +++ b/src/app/core/auth/auth-object-factory.ts @@ -0,0 +1,19 @@ + +import { AuthType } from './auth-type'; +import { AuthStatus } from './models/auth-status.model'; +import { GenericConstructor } from '../shared/generic-constructor'; +import { DSpaceObject } from '../shared/dspace-object.model'; + +export class AuthObjectFactory { + public static getConstructor(type): GenericConstructor { + switch (type) { + case AuthType.Status: { + return AuthStatus + } + + default: { + return undefined; + } + } + } +} diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts new file mode 100644 index 0000000000..24bdc16135 --- /dev/null +++ b/src/app/core/auth/auth-request.service.ts @@ -0,0 +1,58 @@ +import { Inject, Injectable } from '@angular/core'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { ResponseCacheService } from '../cache/response-cache.service'; +import { RequestService } from '../data/request.service'; +import { GLOBAL_CONFIG } from '../../../config'; +import { GlobalConfig } from '../../../config/global-config.interface'; +import { Observable } from 'rxjs/Observable'; +import { isNotEmpty } from '../../shared/empty.util'; +import { AuthPostRequest, PostRequest, RestRequest } from '../data/request.models'; +import { ResponseCacheEntry } from '../cache/response-cache.reducer'; +import { AuthSuccessResponse, ErrorResponse, RestResponse } from '../cache/response-cache.models'; +import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; + +@Injectable() +export class AuthRequestService extends HALEndpointService { + protected linkName = 'authn'; + protected browseEndpoint = ''; + + /** + * True if authenticated + * @type + */ + private _authenticated = false; + + constructor(protected responseCache: ResponseCacheService, + protected requestService: RequestService, + @Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig) { + super(); + } + + protected submitRequest(request: RestRequest): Observable { + const [successResponse, errorResponse] = this.responseCache.get(request.href) + .map((entry: ResponseCacheEntry) => entry.response) + .partition((response: RestResponse) => response.isSuccessful); + return Observable.merge( + errorResponse.flatMap((response: ErrorResponse) => + Observable.throw(new Error(`Couldn't send data to server`))), + successResponse + .filter((response: AuthSuccessResponse) => isNotEmpty(response)) + .map((response: AuthSuccessResponse) => response.authResponse) + .distinctUntilChanged()); + } + + protected getEndpointByMethod(endpoint: string, method: string): string { + return isNotEmpty(method) ? `${endpoint}/${method}` : `${endpoint}`; + } + + public postToEndpoint(method: string, body: any, options?: HttpOptions): Observable { + return this.getEndpoint() + .filter((href: string) => isNotEmpty(href)) + .map((endpointURL) => this.getEndpointByMethod(endpointURL, method)) + .distinctUntilChanged() + .map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)) + .do((request: PostRequest) => this.requestService.configure(request)) + .flatMap((request: PostRequest) => this.submitRequest(request)) + .distinctUntilChanged(); + } +} diff --git a/src/app/core/auth/auth-response-parsing.service.ts b/src/app/core/auth/auth-response-parsing.service.ts new file mode 100644 index 0000000000..21a4ae94eb --- /dev/null +++ b/src/app/core/auth/auth-response-parsing.service.ts @@ -0,0 +1,47 @@ +import { Inject, Injectable } from '@angular/core'; + +import { AuthObjectFactory } from './auth-object-factory'; +import { BaseResponseParsingService } from '../data/base-response-parsing.service'; +import { + AuthSuccessResponse, ConfigSuccessResponse, ErrorResponse, + RestResponse +} from '../cache/response-cache.models'; +import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model'; +import { ConfigObject } from '../shared/config/config.model'; +import { ConfigType } from '../shared/config/config-type'; +import { GLOBAL_CONFIG } from '../../../config'; +import { GlobalConfig } from '../../../config/global-config.interface'; +import { isNotEmpty } from '../../shared/empty.util'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { ResponseParsingService } from '../data/parsing.service'; +import { RestRequest } from '../data/request.models'; + +@Injectable() +export class AuthResponseParsingService extends BaseResponseParsingService implements ResponseParsingService { + + protected objectFactory = AuthObjectFactory; + protected toCache = false; + + constructor( + @Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig, + protected objectCache: ObjectCacheService, + ) { super(); + } + + parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse { + /*if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && data.statusCode === '200') { + const configDefinition = this.process(data.payload, request.href); + return new ConfigSuccessResponse(configDefinition[Object.keys(configDefinition)[0]], data.statusCode, this.processPageInfo(data.payload.page)); + } else { + return new ErrorResponse( + Object.assign( + new Error('Unexpected response from config endpoint'), + {statusText: data.statusCode} + ) + ); + }*/ + console.log(data); + return new AuthSuccessResponse(data.payload, data.statusCode) + } + +} diff --git a/src/app/core/auth/auth-type.ts b/src/app/core/auth/auth-type.ts new file mode 100644 index 0000000000..793c9869a0 --- /dev/null +++ b/src/app/core/auth/auth-type.ts @@ -0,0 +1,3 @@ +export enum AuthType { + Status = 'status' +} diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts new file mode 100644 index 0000000000..694d59b9ee --- /dev/null +++ b/src/app/core/auth/auth.actions.ts @@ -0,0 +1,219 @@ +// import @ngrx +import { Action } from '@ngrx/store'; + +// import type function +import { type } from '../../shared/ngrx/type'; + +// import models +import { Eperson } from '../eperson/models/eperson.model'; + +export const AuthActionTypes = { + AUTHENTICATE: type('dspace/auth/AUTHENTICATE'), + AUTHENTICATE_ERROR: type('dspace/auth/AUTHENTICATE_ERROR'), + AUTHENTICATE_SUCCESS: type('dspace/auth/AUTHENTICATE_SUCCESS'), + AUTHENTICATED: type('dspace/auth/AUTHENTICATED'), + AUTHENTICATED_ERROR: type('dspace/auth/AUTHENTICATED_ERROR'), + AUTHENTICATED_SUCCESS: type('dspace/auth/AUTHENTICATED_SUCCESS'), + RESET_ERROR: type('dspace/auth/RESET_ERROR'), + LOG_OUT: type('dspace/auth/LOG_OUT'), + LOG_OUT_ERROR: type('dspace/auth/LOG_OUT_ERROR'), + LOG_OUT_SUCCESS: type('dspace/auth/LOG_OUT_SUCCESS'), + REGISTRATION: type('dspace/auth/REGISTRATION'), + REGISTRATION_ERROR: type('dspace/auth/REGISTRATION_ERROR'), + REGISTRATION_SUCCESS: type('dspace/auth/REGISTRATION_SUCCESS') +}; + +/* tslint:disable:max-classes-per-file */ + +/** + * Authenticate. + * @class AuthenticateAction + * @implements {Action} + */ +export class AuthenticateAction implements Action { + public type: string = AuthActionTypes.AUTHENTICATE; + payload: { + email: string; + password: string + }; + + constructor(email: string, password: string) { + this.payload = { email, password }; + } +} + +/** + * Checks if user is authenticated. + * @class AuthenticatedAction + * @implements {Action} + */ +export class AuthenticatedAction implements Action { + public type: string = AuthActionTypes.AUTHENTICATED; + payload: string; + + constructor(token: string) { + this.payload = token; + } +} + +/** + * Authenticated check success. + * @class AuthenticatedSuccessAction + * @implements {Action} + */ +export class AuthenticatedSuccessAction implements Action { + public type: string = AuthActionTypes.AUTHENTICATED_SUCCESS; + payload: { + authenticated: boolean; + user: Eperson + }; + + constructor(authenticated: boolean, user: Eperson) { + this.payload = { authenticated, user }; + } +} + +/** + * Authenticated check error. + * @class AuthenticatedErrorAction + * @implements {Action} + */ +export class AuthenticatedErrorAction implements Action { + public type: string = AuthActionTypes.AUTHENTICATED_ERROR; + payload: Error; + + constructor(payload: Error) { + this.payload = payload ; + } +} + +/** + * Authentication error. + * @class AuthenticationErrorAction + * @implements {Action} + */ +export class AuthenticationErrorAction implements Action { + public type: string = AuthActionTypes.AUTHENTICATE_ERROR; + payload: Error; + + constructor(payload: Error) { + this.payload = payload ; + } +} + +/** + * Authentication success. + * @class AuthenticationSuccessAction + * @implements {Action} + */ +export class AuthenticationSuccessAction implements Action { + public type: string = AuthActionTypes.AUTHENTICATE_SUCCESS; + payload: Eperson; + + constructor(user: Eperson) { + this.payload = user; + } +} + +/** + * Reset error. + * @class ResetAuthenticationErrorAction + * @implements {Action} + */ +export class ResetAuthenticationErrorAction implements Action { + public type: string = AuthActionTypes.RESET_ERROR; +} + +/** + * Sign out. + * @class LogOutAction + * @implements {Action} + */ +export class LogOutAction implements Action { + public type: string = AuthActionTypes.LOG_OUT; + constructor(public payload?: any) {} +} + +/** + * Sign out error. + * @class LogOutErrorAction + * @implements {Action} + */ +export class LogOutErrorAction implements Action { + public type: string = AuthActionTypes.LOG_OUT_ERROR; + payload: Error; + + constructor(payload: Error) { + this.payload = payload ; + } +} + +/** + * Sign out success. + * @class LogOutSuccessAction + * @implements {Action} + */ +export class LogOutSuccessAction implements Action { + public type: string = AuthActionTypes.LOG_OUT_SUCCESS; + constructor(public payload?: any) {} +} + +/** + * Sign up. + * @class RegistrationAction + * @implements {Action} + */ +export class RegistrationAction implements Action { + public type: string = AuthActionTypes.REGISTRATION; + payload: Eperson; + + constructor(user: Eperson) { + this.payload = user; + } +} + +/** + * Sign up error. + * @class RegistrationErrorAction + * @implements {Action} + */ +export class RegistrationErrorAction implements Action { + public type: string = AuthActionTypes.REGISTRATION_ERROR; + payload: Error; + + constructor(payload: Error) { + this.payload = payload ; + } +} + +/** + * Sign up success. + * @class RegistrationSuccessAction + * @implements {Action} + */ +export class RegistrationSuccessAction implements Action { + public type: string = AuthActionTypes.REGISTRATION_SUCCESS; + payload: Eperson; + + constructor(user: Eperson) { + this.payload = user; + } +} + +/* tslint:enable:max-classes-per-file */ + +/** + * Actions type. + * @type {AuthActions} + */ +export type AuthActions + = + AuthenticateAction + | AuthenticatedAction + | AuthenticatedErrorAction + | AuthenticatedSuccessAction + | AuthenticationErrorAction + | AuthenticationSuccessAction + | RegistrationAction + | RegistrationErrorAction + | RegistrationSuccessAction; diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts new file mode 100644 index 0000000000..75ca333b5a --- /dev/null +++ b/src/app/core/auth/auth.effects.ts @@ -0,0 +1,97 @@ +import { Injectable } from '@angular/core'; + +// import @ngrx +import { Effect, Actions } from '@ngrx/effects'; +import { Action } from '@ngrx/store'; + +// import rxjs +import { Observable } from 'rxjs/Observable'; + +// import services +import { AuthService } from './auth.service'; + +// import actions +import { + AuthActionTypes, AuthenticateAction, AuthenticatedAction, + AuthenticatedErrorAction, + AuthenticatedSuccessAction, + AuthenticationErrorAction, + AuthenticationSuccessAction, LogOutAction, + LogOutErrorAction, + LogOutSuccessAction, RegistrationAction, + RegistrationErrorAction, + RegistrationSuccessAction +} from './auth.actions'; +import { Eperson } from '../eperson/models/eperson.model'; + +/** + * Effects offer a way to isolate and easily test side-effects within your + * application. + * The `toPayload` helper function returns just + * the payload of the currently dispatched action, useful in + * instances where the current state is not necessary. + * + * Documentation on `toPayload` can be found here: + * https://github.com/ngrx/effects/blob/master/docs/api.md#topayload + * + * If you are unfamiliar with the operators being used in these examples, please + * check out the sources below: + * + * Official Docs: http://reactivex.io/rxjs/manual/overview.html#categories-of-operators + * RxJS 5 Operators By Example: https://gist.github.com/btroncone/d6cf141d6f2c00dc6b35 + */ + +@Injectable() +export class AuthEffects { + + /** + * Authenticate user. + * @method authenticate + */ + @Effect() + public authenticate: Observable = this.actions$ + .ofType(AuthActionTypes.AUTHENTICATE) + .debounceTime(500) + .switchMap((action: AuthenticateAction) => { + return this.authService.authenticate(action.payload.email, action.payload.password) + .map((user: Eperson) => new AuthenticationSuccessAction(user)) + .catch((error) => Observable.of(new AuthenticationErrorAction(error))); + }); + + @Effect() + public authenticated: Observable = this.actions$ + .ofType(AuthActionTypes.AUTHENTICATED) + .switchMap((action: AuthenticatedAction) => { + return this.authService.authenticatedUser() + .map((user: Eperson) => new AuthenticatedSuccessAction((user !== null), user)) + .catch((error) => Observable.of(new AuthenticatedErrorAction(error))); + }); + + @Effect() + public createUser: Observable = this.actions$ + .ofType(AuthActionTypes.REGISTRATION) + .debounceTime(500) + .switchMap((action: RegistrationAction) => { + return this.authService.create(action.payload) + .map((user: Eperson) => new RegistrationSuccessAction(user)) + .catch((error) => Observable.of(new RegistrationErrorAction(error))); + }); + + @Effect() + public signOut: Observable = this.actions$ + .ofType(AuthActionTypes.LOG_OUT) + .switchMap((action: LogOutAction) => { + return this.authService.signout() + .map((value) => new LogOutSuccessAction()) + .catch((error) => Observable.of(new LogOutErrorAction(error))); + }); + + /** + * @constructor + * @param {Actions} actions$ + * @param {AuthService} authService + */ + constructor(private actions$: Actions, + private authService: AuthService) { + } +} diff --git a/src/app/core/auth/auth.reducers.ts b/src/app/core/auth/auth.reducers.ts new file mode 100644 index 0000000000..293e7b1527 --- /dev/null +++ b/src/app/core/auth/auth.reducers.ts @@ -0,0 +1,181 @@ +// import actions +import { + AuthActions, AuthActionTypes, AuthenticatedSuccessAction, AuthenticationErrorAction, + AuthenticationSuccessAction, LogOutErrorAction +} from './auth.actions'; + +// import models +import { Eperson } from '../eperson/models/eperson.model'; + +/** + * The auth state. + * @interface State + */ +export interface AuthState { + + // boolean if user is authenticated + authenticated: boolean; + + // error message + error?: string; + + // true if we have attempted existing auth session + loaded: boolean; + + // true when loading + loading: boolean; + + // the authenticated user + user?: Eperson; +} + +/** + * The initial state. + */ +const initialState: AuthState = { + authenticated: null, + loaded: false, + loading: false +}; + +/** + * The reducer function. + * @function reducer + * @param {State} state Current state + * @param {AuthActions} action Incoming action + */ +export function authReducer(state: any = initialState, action: AuthActions): AuthState { + + switch (action.type) { + case AuthActionTypes.AUTHENTICATE: + return Object.assign({}, state, { + error: undefined, + loading: true + }); + + case AuthActionTypes.AUTHENTICATED_ERROR: + return Object.assign({}, state, { + authenticated: false, + error: (action as AuthenticationErrorAction).payload.message, + loaded: true + }); + + case AuthActionTypes.AUTHENTICATED_SUCCESS: + return Object.assign({}, state, { + authenticated: (action as AuthenticatedSuccessAction).payload.authenticated, + loaded: true, + user: (action as AuthenticatedSuccessAction).payload.user + }); + + case AuthActionTypes.AUTHENTICATE_ERROR: + case AuthActionTypes.REGISTRATION_ERROR: + return Object.assign({}, state, { + authenticated: false, + error: (action as AuthenticationErrorAction).payload.message, + loading: false + }); + + case AuthActionTypes.AUTHENTICATE_SUCCESS: + case AuthActionTypes.REGISTRATION_SUCCESS: + const user: Eperson = (action as AuthenticationSuccessAction).payload; + + // verify user is not null + if (user === null) { + return state; + } + + return Object.assign({}, state, { + authenticated: true, + error: undefined, + loading: false, + user: user + }); + + case AuthActionTypes.RESET_ERROR: + return Object.assign({}, state, { + authenticated: null, + loaded: false, + loading: false + }); + + case AuthActionTypes.LOG_OUT_ERROR: + return Object.assign({}, state, { + authenticated: true, + error: (action as LogOutErrorAction).payload.message, + user: undefined + }); + + case AuthActionTypes.LOG_OUT_SUCCESS: + return Object.assign({}, state, { + authenticated: false, + error: undefined, + user: undefined + }); + + case AuthActionTypes.REGISTRATION: + return Object.assign({}, state, { + authenticated: false, + error: undefined, + loading: true + }); + + default: + return state; + } +} + +/** + * Returns true if the user is authenticated. + * @function isAuthenticated + * @param {State} state + * @returns {boolean} + */ +export const isAuthenticated = (state: AuthState) => state.authenticated; + +/** + * Returns true if the authenticated has loaded. + * @function isAuthenticatedLoaded + * @param {State} state + * @returns {boolean} + */ +export const isAuthenticatedLoaded = (state: AuthState) => state.loaded; + +/** + * Return the users state + * @function getAuthenticatedUser + * @param {State} state + * @returns {User} + */ +export const getAuthenticatedUser = (state: AuthState) => state.user; + +/** + * Returns the authentication error. + * @function getAuthenticationError + * @param {State} state + * @returns {Error} + */ +export const getAuthenticationError = (state: AuthState) => state.error; + +/** + * Returns true if request is in progress. + * @function isLoading + * @param {State} state + * @returns {boolean} + */ +export const isLoading = (state: AuthState) => state.loading; + +/** + * Returns the sign out error. + * @function getLogOutError + * @param {State} state + * @returns {Error} + */ +export const getLogOutError = (state: AuthState) => state.error; + +/** + * Returns the sign up error. + * @function getRegistrationError + * @param {State} state + * @returns {Error} + */ +export const getRegistrationError = (state: AuthState) => state.error; diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 2ca53fd160..c59c5d069e 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -3,6 +3,9 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { Eperson } from '../eperson/models/eperson.model'; +import { AuthRequestService } from './auth-request.service'; +import { HttpHeaders } from '@angular/common/http'; +import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; export const MOCK_USER = new Eperson(); MOCK_USER.id = '92a59227-ccf7-46da-9776-86c3fc64147f'; @@ -27,6 +30,8 @@ MOCK_USER.metadata = [ } ]; +export const TOKENITEM = 'ds-token'; + /** * The user service. */ @@ -39,18 +44,36 @@ export class AuthService { */ private _authenticated = false; + constructor(private authRequestService: AuthRequestService) {} + /** * Authenticate the user * - * @param {string} email The user's email address + * @param {string} user The user name * @param {string} password The user's password * @returns {Observable} The authenticated user observable. */ - public authenticate(email: string, password: string): Observable { + public authenticate(user: string, password: string): Observable { // Normally you would do an HTTP request to determine to // attempt authenticating the user using the supplied credentials. - - if (email === MOCK_USER.email && password === 'password') { + // const body = `user=${user}&password=${password}`; + // const body = encodeURI('password=test&user=vera.aloe@mailinator.com'); + // const body = [{user}, {password}]; + const formData: FormData = new FormData(); + formData.append('user', user); + formData.append('password', password); + const body = 'password=' + password.toString() + '&user=' + user.toString(); + const options: HttpOptions = Object.create({}); + let headers = new HttpHeaders(); + headers = headers.append('Content-Type', 'application/x-www-form-urlencoded'); + headers = headers.append('Accept', 'application/json'); + options.headers = headers; + options.responseType = 'text'; + this.authRequestService.postToEndpoint('login', body, options) + .subscribe((r) => { + console.log(r); + }) + if (user === 'test' && password === 'password') { this._authenticated = true; return Observable.of(MOCK_USER); } diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts index 3cbecf1215..38e0b5e24d 100644 --- a/src/app/core/auth/authenticated.guard.ts +++ b/src/app/core/auth/authenticated.guard.ts @@ -5,10 +5,8 @@ import { Observable } from 'rxjs/Observable'; import { Store } from '@ngrx/store'; // reducers -import { - isAuthenticated, - State -} from '../app.reducers'; +import { CoreState } from '../core.reducers'; +import { isAuthenticated } from './selectors'; /** * Prevent unauthorized activating and loading of routes @@ -20,7 +18,7 @@ export class AuthenticatedGuard implements CanActivate, CanLoad { /** * @constructor */ - constructor(private router: Router, private store: Store) {} + constructor(private router: Router, private store: Store) {} /** * True when user is authenticated diff --git a/src/app/core/auth/authentication-status.model.ts b/src/app/core/auth/authentication-status.model.ts deleted file mode 100644 index 9ef027d600..0000000000 --- a/src/app/core/auth/authentication-status.model.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { DSpaceObject } from '../shared/dspace-object.model'; - -export class AuthenticationStatus extends DSpaceObject { - - okay: boolean; - - authenticated: boolean; - -} diff --git a/src/app/core/auth/models/auth-info.model.ts b/src/app/core/auth/models/auth-info.model.ts new file mode 100644 index 0000000000..8995f82235 --- /dev/null +++ b/src/app/core/auth/models/auth-info.model.ts @@ -0,0 +1,5 @@ +export interface AuthInfo { + access_token?: string, + expires?: number, + expires_in?: number +} diff --git a/src/app/core/auth/models/auth-status.model.ts b/src/app/core/auth/models/auth-status.model.ts new file mode 100644 index 0000000000..388405e87a --- /dev/null +++ b/src/app/core/auth/models/auth-status.model.ts @@ -0,0 +1,9 @@ +import { DSpaceObject } from '../../shared/dspace-object.model'; + +export class AuthStatus extends DSpaceObject { + + okay: boolean; + + authenticated: boolean; + +} diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts new file mode 100644 index 0000000000..a260f84762 --- /dev/null +++ b/src/app/core/auth/selectors.ts @@ -0,0 +1,84 @@ +import { createSelector } from '@ngrx/store'; + +import { AuthState } from './auth.reducers'; +import { coreSelector, CoreState } from '../core.reducers'; + +/** + * Every reducer module's default export is the reducer function itself. In + * addition, each module should export a type or interface that describes + * the state of the reducer plus any selector functions. The `* as` + * notation packages up all of the exports into a single object. + */ +import * as auth from './auth.reducers'; +import { AppState } from '../../app.reducer'; + +/** + * Returns the user state. + * @function getUserState + * @param {AppState} state Top level state. + * @return {AuthState} + */ +export const getAuthState = (state: any) => state.core.auth; + +/** + * Returns the authenticated user + * @function getAuthenticatedUser + * @param {AuthState} state + * @param {any} props + * @return {User} + */ +export const getAuthenticatedUser = createSelector(getAuthState, auth.getAuthenticatedUser); + +/** + * Returns the authentication error. + * @function getAuthenticationError + * @param {AuthState} state + * @param {any} props + * @return {Error} + */ +export const getAuthenticationError = createSelector(getAuthState, auth.getAuthenticationError); + +/** + * Returns true if the user is authenticated + * @function isAuthenticated + * @param {AuthState} state + * @param {any} props + * @return {boolean} + */ +export const isAuthenticated = createSelector(getAuthState, auth.isAuthenticated); + +/** + * Returns true if the user is authenticated + * @function isAuthenticated + * @param {AuthState} state + * @param {any} props + * @return {boolean} + */ +export const isAuthenticatedLoaded = createSelector(getAuthState, auth.isAuthenticatedLoaded); + +/** + * Returns true if the authentication request is loading. + * @function isAuthenticationLoading + * @param {AuthState} state + * @param {any} props + * @return {boolean} + */ +export const isAuthenticationLoading = createSelector(getAuthState, auth.isLoading); + +/** + * Returns the log out error. + * @function getLogOutError + * @param {AuthState} state + * @param {any} props + * @return {Error} + */ +export const getLogOutError = createSelector(getAuthState, auth.getLogOutError); + +/** + * Returns the registration error. + * @function getRegistrationError + * @param {AuthState} state + * @param {any} props + * @return {Error} + */ +export const getRegistrationError = createSelector(getAuthState, auth.getRegistrationError); diff --git a/src/app/core/cache/response-cache.models.ts b/src/app/core/cache/response-cache.models.ts index 06fc26aa67..0a61a53df7 100644 --- a/src/app/core/cache/response-cache.models.ts +++ b/src/app/core/cache/response-cache.models.ts @@ -62,4 +62,14 @@ export class ConfigSuccessResponse extends RestResponse { super(true, statusCode); } } + +export class AuthSuccessResponse extends RestResponse { + constructor( + public authResponse: any, + public statusCode: string, + public pageInfo?: PageInfo + ) { + super(true, statusCode); + } +} /* tslint:enable:max-classes-per-file */ diff --git a/src/app/core/core.effects.ts b/src/app/core/core.effects.ts index 7cda10b4ae..279b80159f 100644 --- a/src/app/core/core.effects.ts +++ b/src/app/core/core.effects.ts @@ -3,10 +3,12 @@ import { ObjectCacheEffects } from './cache/object-cache.effects'; import { ResponseCacheEffects } from './cache/response-cache.effects'; import { UUIDIndexEffects } from './index/index.effects'; import { RequestEffects } from './data/request.effects'; +import { AuthEffects } from './auth/auth.effects'; export const coreEffects = [ ResponseCacheEffects, RequestEffects, ObjectCacheEffects, UUIDIndexEffects, + AuthEffects, ]; diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 768f05f24b..7ea4ef45d4 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -38,6 +38,9 @@ import { SubmissionDefinitionsConfigService } from './config/submission-definiti import { SubmissionFormsConfigService } from './config/submission-forms-config.service'; import { SubmissionSectionsConfigService } from './config/submission-sections-config.service'; import { UUIDService } from './shared/uuid.service'; +import { AuthService } from './auth/auth.service'; +import { AuthenticatedGuard } from './auth/authenticated.guard'; +import { AuthRequestService } from './auth/auth-request.service'; const IMPORTS = [ CommonModule, @@ -55,6 +58,9 @@ const EXPORTS = [ const PROVIDERS = [ ApiService, + AuthenticatedGuard, + AuthRequestService, + AuthService, CommunityDataService, CollectionDataService, DSOResponseParsingService, diff --git a/src/app/core/core.reducers.ts b/src/app/core/core.reducers.ts index d2898eb3c3..37027465b4 100644 --- a/src/app/core/core.reducers.ts +++ b/src/app/core/core.reducers.ts @@ -4,19 +4,22 @@ import { responseCacheReducer, ResponseCacheState } from './cache/response-cache import { objectCacheReducer, ObjectCacheState } from './cache/object-cache.reducer'; import { indexReducer, IndexState } from './index/index.reducer'; import { requestReducer, RequestState } from './data/request.reducer'; +import { authReducer, AuthState } from './auth/auth.reducers'; export interface CoreState { 'data/object': ObjectCacheState, 'data/response': ResponseCacheState, 'data/request': RequestState, - 'index': IndexState + 'index': IndexState, + 'auth': AuthState, } export const coreReducers: ActionReducerMap = { 'data/object': objectCacheReducer, 'data/response': responseCacheReducer, 'data/request': requestReducer, - 'index': indexReducer + 'index': indexReducer, + 'auth': authReducer }; export const coreSelector = createFeatureSelector('core'); diff --git a/src/app/core/data/request.effects.ts b/src/app/core/data/request.effects.ts index 379540c779..2f9d168f74 100644 --- a/src/app/core/data/request.effects.ts +++ b/src/app/core/data/request.effects.ts @@ -33,9 +33,9 @@ export class RequestEffects { let body; if (isNotEmpty(request.body)) { const serializer = new DSpaceRESTv2Serializer(NormalizedObjectFactory.getConstructor(request.body.type)); - body = JSON.stringify(serializer.serialize(request.body)); + body = serializer.serialize(request.body); } - return this.restApi.request(request.method, request.href, body) + return this.restApi.request(request.method, request.href, body, request.options) .map((data: DSpaceRESTV2Response) => this.injector.get(request.getResponseParser()).parse(request, data)) .do((response: RestResponse) => this.responseCache.add(request.href, response, this.EnvConfig.cache.msToLive)) diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts index ee37f9c3d4..b7c81eaa8e 100644 --- a/src/app/core/data/request.models.ts +++ b/src/app/core/data/request.models.ts @@ -7,6 +7,9 @@ import { ResponseParsingService } from './parsing.service'; import { RootResponseParsingService } from './root-response-parsing.service'; import { BrowseResponseParsingService } from './browse-response-parsing.service'; import { ConfigResponseParsingService } from './config-response-parsing.service'; +import { AuthResponseParsingService } from '../auth/auth-response-parsing.service'; +import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; +import { HttpHeaders } from '@angular/common/http'; /* tslint:disable:max-classes-per-file */ @@ -34,7 +37,8 @@ export abstract class RestRequest { public uuid: string, public href: string, public method: RestRequestMethod = RestRequestMethod.Get, - public body?: any + public body?: any, + public options?: HttpOptions ) { } @@ -47,7 +51,8 @@ export class GetRequest extends RestRequest { constructor( public uuid: string, public href: string, - public body?: any + public body?: any, + public options?: HttpOptions ) { super(uuid, href, RestRequestMethod.Get, body) } @@ -57,7 +62,8 @@ export class PostRequest extends RestRequest { constructor( public uuid: string, public href: string, - public body?: any + public body?: any, + public options?: HttpOptions ) { super(uuid, href, RestRequestMethod.Post, body) } @@ -67,7 +73,8 @@ export class PutRequest extends RestRequest { constructor( public uuid: string, public href: string, - public body?: any + public body?: any, + public options?: HttpOptions ) { super(uuid, href, RestRequestMethod.Put, body) } @@ -77,7 +84,8 @@ export class DeleteRequest extends RestRequest { constructor( public uuid: string, public href: string, - public body?: any + public body?: any, + public options?: HttpOptions ) { super(uuid, href, RestRequestMethod.Delete, body) } @@ -87,7 +95,8 @@ export class OptionsRequest extends RestRequest { constructor( public uuid: string, public href: string, - public body?: any + public body?: any, + public options?: HttpOptions ) { super(uuid, href, RestRequestMethod.Options, body) } @@ -97,7 +106,8 @@ export class HeadRequest extends RestRequest { constructor( public uuid: string, public href: string, - public body?: any + public body?: any, + public options?: HttpOptions ) { super(uuid, href, RestRequestMethod.Head, body) } @@ -107,7 +117,8 @@ export class PatchRequest extends RestRequest { constructor( public uuid: string, public href: string, - public body?: any + public body?: any, + public options?: HttpOptions ) { super(uuid, href, RestRequestMethod.Patch, body) } @@ -134,7 +145,7 @@ export class FindAllRequest extends GetRequest { constructor( uuid: string, href: string, - public options?: FindAllOptions, + public body?: FindAllOptions, ) { super(uuid, href); } @@ -171,6 +182,26 @@ export class ConfigRequest extends GetRequest { } } +export class AuthPostRequest extends PostRequest { + constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) { + super(uuid, href, body, options); + } + + getResponseParser(): GenericConstructor { + return AuthResponseParsingService; + } +} + +export class AuthGetRequest extends GetRequest { + constructor(uuid: string, href: string) { + super(uuid, href); + } + + getResponseParser(): GenericConstructor { + return AuthResponseParsingService; + } +} + export class RequestError extends Error { statusText: string; } diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts index b2d3197723..1a5287d4b0 100644 --- a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts +++ b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts @@ -1,10 +1,21 @@ import { Injectable } from '@angular/core'; import { Request } from '@angular/http'; -import { HttpClient, HttpResponse } from '@angular/common/http' +import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http' import { Observable } from 'rxjs/Observable'; import { RestRequestMethod } from '../data/request.models'; import { DSpaceRESTV2Response } from './dspace-rest-v2-response.model'; +import { HttpObserve } from '@angular/common/http/src/client'; + +export interface HttpOptions { + body?: any; + headers?: HttpHeaders; + params?: HttpParams; + observe?: HttpObserve; + reportProgress?: boolean; + responseType?: 'arraybuffer' | 'blob' | 'json' | 'text'; + withCredentials?: boolean; +} /** * Service to access DSpace's REST API @@ -45,8 +56,25 @@ export class DSpaceRESTv2Service { * @return {Observable} * An Observable containing the response from the server */ - request(method: RestRequestMethod, url: string, body?: any): Observable { - return this.http.request(method, url, { body, observe: 'response' }) + request(method: RestRequestMethod, url: string, body?: any, options?: HttpOptions): Observable { + const requestOptions: HttpOptions = {}; + requestOptions.body = body; + requestOptions.observe = 'response'; + if (options && options.headers) { + let headers = new HttpHeaders(); + headers = headers.append('Accept', 'application/json'); + headers = headers.append('Content-Type', 'application/x-www-form-urlencoded'); + // requestOptions.headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded'); + requestOptions.headers = headers; + /* const keys = options.headers.getAll(''); + keys.forEach((key) => { + requestOptions.headers.append(key, options.headers.get(key)); + })*/ + } + if (options && options.responseType) { + // requestOptions.responseType = options.responseType; + } + return this.http.request(method, url, requestOptions) .map((res) => ({ payload: res.body, statusCode: res.statusText })) .catch((err) => { console.log('Error: ', err); diff --git a/src/app/core/shared/hal-endpoint.service.ts b/src/app/core/shared/hal-endpoint.service.ts index 84587f1eea..109d4e84b3 100644 --- a/src/app/core/shared/hal-endpoint.service.ts +++ b/src/app/core/shared/hal-endpoint.service.ts @@ -23,9 +23,10 @@ export abstract class HALEndpointService { .distinctUntilChanged(); } - public getEndpoint(): Observable { + public getEndpoint(linkName?: string): Observable { + const mapLinkName = isNotEmpty(linkName) ? linkName : this.linkName; return this.getEndpointMap() - .map((map: EndpointMap) => map[this.linkName]) + .map((map: EndpointMap) => map[mapLinkName]) .distinctUntilChanged(); } diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index ac76ea1dab..2edfa8a796 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -12,19 +12,7 @@ {{ 'nav.home' | translate }}(current) - + diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 4be64221dc..93cb329f4f 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from '@angular/core'; import { createSelector, Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; +import { RouterReducerState } from '@ngrx/router-store'; import { HeaderState } from './header.reducer'; import { HeaderToggleAction } from './header.actions'; import { AppState } from '../app.reducer'; import { HostWindowService } from '../shared/host-window.service'; -import { fadeInOut } from '../shared/animations/fade'; const headerStateSelector = (state: AppState) => state.header; const navCollapsedSelector = createSelector(headerStateSelector, (header: HeaderState) => header.navCollapsed); @@ -15,12 +15,15 @@ const navCollapsedSelector = createSelector(headerStateSelector, (header: Header selector: 'ds-header', styleUrls: ['header.component.scss'], templateUrl: 'header.component.html', - animations: [ - fadeInOut - ] }) export class HeaderComponent implements OnInit { + /** + * Whether user is authenticated. + * @type {Observable} + */ + public isAuthenticated: Observable; public isNavBarCollapsed: Observable; + public showAuth = false; constructor( private store: Store, @@ -29,6 +32,7 @@ export class HeaderComponent implements OnInit { } ngOnInit(): void { + // set loading this.isNavBarCollapsed = this.store.select(navCollapsedSelector); } diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html new file mode 100644 index 0000000000..34db6a2130 --- /dev/null +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html @@ -0,0 +1,26 @@ + + + diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts new file mode 100644 index 0000000000..e188498b0a --- /dev/null +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts @@ -0,0 +1,61 @@ + +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { RouterReducerState } from '@ngrx/router-store'; +import { Store } from '@ngrx/store'; + +import { fadeInOut, fadeOut } from '../animations/fade'; +import { CoreState } from '../../core/core.reducers'; +import { HostWindowService } from '../host-window.service'; +import { AppState } from '../../app.reducer'; +import { hasValue, isNotUndefined } from '../empty.util'; +import { getAuthenticatedUser, isAuthenticated } from '../../core/auth/selectors'; +import { Subscription } from 'rxjs/Subscription'; +import { Eperson } from '../../core/eperson/models/eperson.model'; + +const routerStateSelector = (state: AppState) => state.router; + +@Component({ + selector: 'ds-auth-nav-menu', + templateUrl: './auth-nav-menu.component.html', + styleUrls: ['./auth-nav-menu.component.scss'], + animations: [fadeInOut, fadeOut] +}) +export class AuthNavMenuComponent implements OnDestroy, OnInit { + /** + * Whether user is authenticated. + * @type {Observable} + */ + public isAuthenticated: Observable; + + public showAuth = false; + + public user: Observable; + + protected subs: Subscription[] = []; + + constructor( + private appStore: Store, + private coreStore: Store, + private windowService: HostWindowService) { + } + + ngOnInit(): void { + // set loading + this.isAuthenticated = this.coreStore.select(isAuthenticated); + + this.user = this.appStore.select(getAuthenticatedUser); + + this.subs.push(this.appStore.select(routerStateSelector) + .filter((router: RouterReducerState) => isNotUndefined(router)) + .subscribe((router: RouterReducerState) => { + this.showAuth = router.state.url !== '/login'; + })); + } + + ngOnDestroy() { + this.subs + .filter((sub) => hasValue(sub)) + .forEach((sub) => sub.unsubscribe()); + } +} diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html new file mode 100644 index 0000000000..92b7cb08bb --- /dev/null +++ b/src/app/shared/log-in/log-in.component.html @@ -0,0 +1,29 @@ + + + + diff --git a/src/app/shared/login-form/login-form.component.scss b/src/app/shared/log-in/log-in.component.scss similarity index 100% rename from src/app/shared/login-form/login-form.component.scss rename to src/app/shared/log-in/log-in.component.scss diff --git a/src/app/shared/log-in/log-in.component.spec.ts b/src/app/shared/log-in/log-in.component.spec.ts new file mode 100644 index 0000000000..76fd631c5b --- /dev/null +++ b/src/app/shared/log-in/log-in.component.spec.ts @@ -0,0 +1,116 @@ +/* tslint:disable:no-unused-variable */ +import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from "@angular/core"; +import { ComponentFixture, TestBed, async } from "@angular/core/testing"; +import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule } from "@angular/forms"; +import { MaterialModule } from "@angular/material"; +import { By } from "@angular/platform-browser"; +import { Store, StoreModule } from "@ngrx/store"; +import { go } from "@ngrx/router-store"; + +// reducers +import { reducer } from "../../app.reducers"; + +// models +import { User } from "../../core/models/user"; + +// services +import { MOCK_USER } from "../../core/services/user.service"; + +// this component to test +import { LogInComponent } from "./log-in.component"; + +describe("LogInComponent", () => { + + let component: LogInComponent; + let fixture: ComponentFixture; + let page: Page; + let user: User = new User(); + + beforeEach(() => { + user = MOCK_USER; + }); + + beforeEach(async(() => { + // refine the test module by declaring the test component + TestBed.configureTestingModule({ + imports: [ + FormsModule, + MaterialModule, + ReactiveFormsModule, + StoreModule.provideStore(reducer) + ], + declarations: [ + LogInComponent + ], + schemas: [ + CUSTOM_ELEMENTS_SCHEMA + ] + }) + .compileComponents(); + + // create component and test fixture + fixture = TestBed.createComponent(LogInComponent); + + // get test component from the fixture + component = fixture.componentInstance; + })); + + beforeEach(() => { + // create page + page = new Page(component, fixture); + + // verify the fixture is stable (no pending tasks) + fixture.whenStable().then(() => { + page.addPageElements(); + }); + }); + + it("should create a FormGroup comprised of FormControls", () => { + fixture.detectChanges(); + expect(component.form instanceof FormGroup).toBe(true); + }); + + it("should authenticate", () => { + fixture.detectChanges(); + + // set FormControl values + component.form.controls["email"].setValue(user.email); + component.form.controls["password"].setValue(user.password); + + // submit form + component.submit(); + + // verify Store.dispatch() is invoked + expect(page.navigateSpy.calls.any()).toBe(true, "Store.dispatch not invoked"); + }); +}); + +/** + * I represent the DOM elements and attach spies. + * + * @class Page + */ +class Page { + + public emailInput: HTMLInputElement; + public navigateSpy: jasmine.Spy; + public passwordInput: HTMLInputElement; + + constructor(private component: LogInComponent, private fixture: ComponentFixture) { + // use injector to get services + const injector = fixture.debugElement.injector; + const store = injector.get(Store); + + // add spies + this.navigateSpy = spyOn(store, "dispatch"); + } + + public addPageElements() { + const emailInputSelector = "input[formcontrolname=\"email\"]"; + // console.log(this.fixture.debugElement.query(By.css(emailInputSelector))); + this.emailInput = this.fixture.debugElement.query(By.css(emailInputSelector)).nativeElement; + + const passwordInputSelector = "input[formcontrolname=\"password\"]"; + this.passwordInput = this.fixture.debugElement.query(By.css(passwordInputSelector)).nativeElement; + } +} diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts new file mode 100644 index 0000000000..faf17eedd5 --- /dev/null +++ b/src/app/shared/log-in/log-in.component.ts @@ -0,0 +1,163 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; + +// @ngrx +import { Store } from '@ngrx/store'; + +// rxjs +import { Observable } from 'rxjs/Observable'; +import 'rxjs/add/operator/filter'; +import 'rxjs/add/operator/takeWhile'; + +// actions +import { AuthenticateAction, ResetAuthenticationErrorAction } from '../../core/auth/auth.actions'; + +// reducers +import { + getAuthenticationError, + isAuthenticated, + isAuthenticationLoading, +} from '../../core/auth/selectors'; +import { Router } from '@angular/router'; +import { CoreState } from '../../core/core.reducers'; + +import { isNotEmpty, isNotNull } from '../empty.util'; +import { fadeOut } from '../animations/fade'; + +/** + * /users/sign-in + * @class LogInComponent + */ +@Component({ + selector: 'ds-log-in', + templateUrl: './log-in.component.html', + styleUrls: ['./log-in.component.scss'], + animations: [fadeOut] +}) +export class LogInComponent implements OnDestroy, OnInit { + + /** + * The error if authentication fails. + * @type {Observable} + */ + public error: Observable; + + /** + * Has authentication error. + * @type {boolean} + */ + public hasError = false; + + /** + * True if the authentication is loading. + * @type {boolean} + */ + public loading: Observable; + + /** + * The authentication form. + * @type {FormGroup} + */ + public form: FormGroup; + + /** + * Component state. + * @type {boolean} + */ + private alive = true; + + /** + * @constructor + * @param {FormBuilder} formBuilder + * @param {Store} store + */ + constructor( + private formBuilder: FormBuilder, + private router: Router, + private store: Store + ) { } + + /** + * Lifecycle hook that is called after data-bound properties of a directive are initialized. + * @method ngOnInit + */ + public ngOnInit() { + // set formGroup + this.form = this.formBuilder.group({ + email: ['', Validators.required], + password: ['', Validators.required] + }); + + // set error + this.error = this.store.select(getAuthenticationError) + .map((error) => { + this.hasError = (isNotEmpty(error)); + return error; + }); + + // set loading + this.loading = this.store.select(isAuthenticationLoading); + + // subscribe to success + this.store.select(isAuthenticated) + .takeWhile(() => this.alive) + .filter((authenticated) => authenticated) + .subscribe(() => { + this.router.navigate(['/']); + }); + } + + /** + * Lifecycle hook that is called when a directive, pipe or service is destroyed. + * @method ngOnDestroy + */ + public ngOnDestroy() { + this.alive = false; + } + + /** + * Go to the home page. + * @method home + */ + public home() { + this.router.navigate(['/home']); + } + + /** + * Reset error. + */ + public resetError() { + if (this.hasError) { + this.store.dispatch(new ResetAuthenticationErrorAction()); + this.hasError = false; + } + } + + /** + * To to the registration page. + * @method register + */ + public register() { + this.router.navigate(['/register']); + } + + /** + * Submit the authentication form. + * @method submit + */ + public submit() { + // get email and password values + const email: string = this.form.get('email').value; + const password: string = this.form.get('password').value; + + // trim values + email.trim(); + password.trim(); + + // dispatch AuthenticationAction + this.store.dispatch(new AuthenticateAction(email, password)); + + // clear form + this.form.reset(); + } +} diff --git a/src/app/shared/log-out/log-out.component.html b/src/app/shared/log-out/log-out.component.html new file mode 100644 index 0000000000..6e4ee32f6f --- /dev/null +++ b/src/app/shared/log-out/log-out.component.html @@ -0,0 +1,9 @@ + + diff --git a/src/app/shared/log-out/log-out.component.scss b/src/app/shared/log-out/log-out.component.scss new file mode 100644 index 0000000000..dcd67e092f --- /dev/null +++ b/src/app/shared/log-out/log-out.component.scss @@ -0,0 +1 @@ +@import '../log-in/log-in.component.scss'; diff --git a/src/app/shared/log-out/log-out.component.spec.ts b/src/app/shared/log-out/log-out.component.spec.ts new file mode 100644 index 0000000000..4beb53aadc --- /dev/null +++ b/src/app/shared/log-out/log-out.component.spec.ts @@ -0,0 +1,45 @@ +/* tslint:disable:no-unused-variable */ +import { DebugElement, CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; +import { async, ComponentFixture, TestBed } from "@angular/core/testing"; +import { By } from "@angular/platform-browser"; +import { Router } from "@angular/router"; + +// import ngrx +import { Store, StoreModule } from "@ngrx/store"; + +// reducers +import { reducer } from "../../app.reducers"; + +// test this component +import { SignOutComponent } from "./log-out.component"; + +describe("Component: Signout", () => { + let component: SignOutComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + // refine the test module by declaring the test component + TestBed.configureTestingModule({ + imports: [ + StoreModule.provideStore(reducer) + ], + declarations: [ + SignOutComponent + ], + schemas: [ + CUSTOM_ELEMENTS_SCHEMA + ] + }) + .compileComponents(); + + // create component and test fixture + fixture = TestBed.createComponent(SignOutComponent); + + // get test component from the fixture + component = fixture.componentInstance; + })); + + it("should create an instance", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/log-out/log-out.component.ts b/src/app/shared/log-out/log-out.component.ts new file mode 100644 index 0000000000..36c5914347 --- /dev/null +++ b/src/app/shared/log-out/log-out.component.ts @@ -0,0 +1,89 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; + +// @ngrx +import { Store } from '@ngrx/store'; + +// actions +import { LogOutAction } from '../../core/auth/auth.actions'; + +// reducers +import { + getLogOutError, + isAuthenticated, + isAuthenticationLoading, +} from '../../core/auth/selectors'; + +import { AppState } from '../../app.reducer'; +import { Observable } from 'rxjs/Observable'; +import { fadeOut } from '../animations/fade'; + +@Component({ + selector: 'ds-log-out', + templateUrl: './log-out.component.html', + styleUrls: ['./log-out.component.scss'], + animations: [fadeOut] +}) +export class LogOutComponent implements OnDestroy, OnInit { + /** + * The error if authentication fails. + * @type {Observable} + */ + public error: Observable; + + /** + * True if the logout is loading. + * @type {boolean} + */ + public loading: Observable; + + /** + * Component state. + * @type {boolean} + */ + private alive = true; + + /** + * @constructor + * @param {Store} store + */ + constructor(private router: Router, + private store: Store) { } + + /** + * Lifecycle hook that is called when a directive, pipe or service is destroyed. + */ + public ngOnDestroy() { + this.alive = false; + } + + /** + * Lifecycle hook that is called after data-bound properties of a directive are initialized. + */ + ngOnInit() { + // set error + this.error = this.store.select(getLogOutError); + + // set loading + this.loading = this.store.select(isAuthenticationLoading); + } + + /** + * Go to the home page. + */ + public home() { + this.router.navigate(['/home']); + } + + /** + * To to the log in page. + */ + public logIn() { + this.router.navigate(['/login']); + } + + public logOut() { + this.store.dispatch(new LogOutAction()); + } + +} diff --git a/src/app/shared/login-form/login-form.component.html b/src/app/shared/login-form/login-form.component.html deleted file mode 100644 index 6dcc4d1a5c..0000000000 --- a/src/app/shared/login-form/login-form.component.html +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/src/app/shared/login-form/login-form.component.ts b/src/app/shared/login-form/login-form.component.ts deleted file mode 100644 index 39fb3a8936..0000000000 --- a/src/app/shared/login-form/login-form.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'ds-login-form', - styleUrls: ['./login-form.component.scss'], - templateUrl: './login-form.component.html' -}) -export class LoginFormComponent { - -} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2f5a266d9f..0eb2696614 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -41,7 +41,9 @@ import { SearchResultGridElementComponent } from './object-grid/search-result-gr import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component'; import { GridThumbnailComponent } from './object-grid/grid-thumbnail/grid-thumbnail.component'; import { VarDirective } from './utils/var.directive'; -import { LoginFormComponent } from './login-form/login-form.component'; +import { LogInComponent } from './log-in/log-in.component'; +import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component'; +import { LogOutComponent } from './log-out/log-out.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -64,12 +66,14 @@ const PIPES = [ const COMPONENTS = [ // put shared components here + AuthNavMenuComponent, ComcolPageContentComponent, ComcolPageHeaderComponent, ComcolPageLogoComponent, ErrorComponent, LoadingComponent, - LoginFormComponent, + LogInComponent, + LogOutComponent, ObjectListComponent, AbstractListableElementComponent, WrapperListElementComponent, From ae584915cf91b9b0271897a4985807cfae6de2da Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 6 Feb 2018 15:55:04 +0100 Subject: [PATCH 05/80] Fix error with AOT compilation --- src/app/shared/auth-nav-menu/auth-nav-menu.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts index e188498b0a..453f68ea86 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts @@ -37,7 +37,7 @@ export class AuthNavMenuComponent implements OnDestroy, OnInit { constructor( private appStore: Store, private coreStore: Store, - private windowService: HostWindowService) { + public windowService: HostWindowService) { } ngOnInit(): void { From 2f19f32d91b118abf0083d358960b5c0245d5491 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 9 Feb 2018 09:55:55 +0100 Subject: [PATCH 06/80] Improvement for authentication module --- src/app/+home-page/home-page.component.ts | 4 +- src/app/core/auth/auth-object-factory.ts | 14 ++- src/app/core/auth/auth-request.service.ts | 23 +++- .../auth/auth-response-parsing.service.ts | 28 ++--- src/app/core/auth/auth-storage.service.ts | 34 ++++++ src/app/core/auth/auth-type.ts | 1 + src/app/core/auth/auth.actions.ts | 11 +- src/app/core/auth/auth.effects.ts | 37 +++--- src/app/core/auth/auth.interceptor.ts | 97 ++++++++++++++++ src/app/core/auth/auth.reducers.ts | 31 ++++-- src/app/core/auth/auth.service.ts | 105 ++++++++++++++---- src/app/core/auth/authenticated.guard.ts | 32 ++++-- src/app/core/auth/models/auth-error.model.ts | 7 ++ src/app/core/auth/models/auth-info.model.ts | 5 - src/app/core/auth/models/auth-status.model.ts | 8 ++ .../core/auth/models/auth-token-info.model.ts | 11 ++ .../models/normalized-auth-status.model.ts | 26 +++++ src/app/core/cache/response-cache.models.ts | 32 +++++- src/app/core/core.module.ts | 14 ++- src/app/core/data/request.models.ts | 4 +- src/app/core/data/request.service.ts | 11 +- .../dspace-rest-v2-response.model.ts | 3 + .../dspace-rest-v2/dspace-rest-v2.service.ts | 17 +-- 23 files changed, 431 insertions(+), 124 deletions(-) create mode 100644 src/app/core/auth/auth-storage.service.ts create mode 100644 src/app/core/auth/auth.interceptor.ts create mode 100644 src/app/core/auth/models/auth-error.model.ts delete mode 100644 src/app/core/auth/models/auth-info.model.ts create mode 100644 src/app/core/auth/models/auth-token-info.model.ts create mode 100644 src/app/core/auth/models/normalized-auth-status.model.ts diff --git a/src/app/+home-page/home-page.component.ts b/src/app/+home-page/home-page.component.ts index 7736d874d9..edaa032d42 100644 --- a/src/app/+home-page/home-page.component.ts +++ b/src/app/+home-page/home-page.component.ts @@ -12,7 +12,9 @@ import { Store } from '@ngrx/store'; export class HomePageComponent implements OnInit { public isAuthenticated: Observable; - constructor(private store: Store) {} + constructor(private store: Store) { + } + ngOnInit() { // set loading this.isAuthenticated = this.store.select(isAuthenticated); diff --git a/src/app/core/auth/auth-object-factory.ts b/src/app/core/auth/auth-object-factory.ts index e1960e8111..c3e70eaaac 100644 --- a/src/app/core/auth/auth-object-factory.ts +++ b/src/app/core/auth/auth-object-factory.ts @@ -1,14 +1,18 @@ - import { AuthType } from './auth-type'; -import { AuthStatus } from './models/auth-status.model'; import { GenericConstructor } from '../shared/generic-constructor'; -import { DSpaceObject } from '../shared/dspace-object.model'; +import { NormalizedAuthStatus } from './models/normalized-auth-status.model'; +import { NormalizedDSpaceObject } from '../cache/models/normalized-dspace-object.model'; +import { NormalizedEpersonModel } from '../eperson/models/NormalizedEperson.model'; export class AuthObjectFactory { - public static getConstructor(type): GenericConstructor { + public static getConstructor(type): GenericConstructor { switch (type) { + case AuthType.Eperson: { + return NormalizedEpersonModel + } + case AuthType.Status: { - return AuthStatus + return NormalizedAuthStatus } default: { diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts index 24bdc16135..6202b6784d 100644 --- a/src/app/core/auth/auth-request.service.ts +++ b/src/app/core/auth/auth-request.service.ts @@ -6,7 +6,7 @@ import { GLOBAL_CONFIG } from '../../../config'; import { GlobalConfig } from '../../../config/global-config.interface'; import { Observable } from 'rxjs/Observable'; import { isNotEmpty } from '../../shared/empty.util'; -import { AuthPostRequest, PostRequest, RestRequest } from '../data/request.models'; +import { AuthGetRequest, AuthPostRequest, PostRequest, RestRequest } from '../data/request.models'; import { ResponseCacheEntry } from '../cache/response-cache.reducer'; import { AuthSuccessResponse, ErrorResponse, RestResponse } from '../cache/response-cache.models'; import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; @@ -28,16 +28,16 @@ export class AuthRequestService extends HALEndpointService { super(); } - protected submitRequest(request: RestRequest): Observable { + protected fetchRequest(request: RestRequest): Observable { const [successResponse, errorResponse] = this.responseCache.get(request.href) .map((entry: ResponseCacheEntry) => entry.response) .partition((response: RestResponse) => response.isSuccessful); return Observable.merge( errorResponse.flatMap((response: ErrorResponse) => - Observable.throw(new Error(`Couldn't send data to server`))), + Observable.throw(new Error(response.errorMessage))), successResponse .filter((response: AuthSuccessResponse) => isNotEmpty(response)) - .map((response: AuthSuccessResponse) => response.authResponse) + .map((response: AuthSuccessResponse) => response.response) .distinctUntilChanged()); } @@ -51,8 +51,19 @@ export class AuthRequestService extends HALEndpointService { .map((endpointURL) => this.getEndpointByMethod(endpointURL, method)) .distinctUntilChanged() .map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)) - .do((request: PostRequest) => this.requestService.configure(request)) - .flatMap((request: PostRequest) => this.submitRequest(request)) + .do((request: PostRequest) => this.requestService.configure(request, true)) + .flatMap((request: PostRequest) => this.fetchRequest(request)) + .distinctUntilChanged(); + } + + public getRequest(method: string, options?: HttpOptions): Observable { + return this.getEndpoint() + .filter((href: string) => isNotEmpty(href)) + .map((endpointURL) => this.getEndpointByMethod(endpointURL, method)) + .distinctUntilChanged() + .map((endpointURL: string) => new AuthGetRequest(this.requestService.generateRequestId(), endpointURL, options)) + .do((request: PostRequest) => this.requestService.configure(request, true)) + .flatMap((request: PostRequest) => this.fetchRequest(request)) .distinctUntilChanged(); } } diff --git a/src/app/core/auth/auth-response-parsing.service.ts b/src/app/core/auth/auth-response-parsing.service.ts index 21a4ae94eb..1075cfe059 100644 --- a/src/app/core/auth/auth-response-parsing.service.ts +++ b/src/app/core/auth/auth-response-parsing.service.ts @@ -3,6 +3,8 @@ import { Inject, Injectable } from '@angular/core'; import { AuthObjectFactory } from './auth-object-factory'; import { BaseResponseParsingService } from '../data/base-response-parsing.service'; import { + AuthErrorResponse, + AuthStatusResponse, AuthSuccessResponse, ConfigSuccessResponse, ErrorResponse, RestResponse } from '../cache/response-cache.models'; @@ -11,10 +13,15 @@ import { ConfigObject } from '../shared/config/config.model'; import { ConfigType } from '../shared/config/config-type'; import { GLOBAL_CONFIG } from '../../../config'; import { GlobalConfig } from '../../../config/global-config.interface'; -import { isNotEmpty } from '../../shared/empty.util'; +import { isEmpty, isNotEmpty } from '../../shared/empty.util'; import { ObjectCacheService } from '../cache/object-cache.service'; import { ResponseParsingService } from '../data/parsing.service'; import { RestRequest } from '../data/request.models'; +import { AuthType } from './auth-type'; +import { NormalizedObject } from '../cache/models/normalized-object.model'; +import { AuthTokenInfo } from './models/auth-token-info.model'; +import { NormalizedAuthStatus } from './models/normalized-auth-status.model'; +import { AuthStatus } from './models/auth-status.model'; @Injectable() export class AuthResponseParsingService extends BaseResponseParsingService implements ResponseParsingService { @@ -29,19 +36,14 @@ export class AuthResponseParsingService extends BaseResponseParsingService imple } parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse { - /*if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && data.statusCode === '200') { - const configDefinition = this.process(data.payload, request.href); - return new ConfigSuccessResponse(configDefinition[Object.keys(configDefinition)[0]], data.statusCode, this.processPageInfo(data.payload.page)); + if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && data.statusCode === '200') { + const response = this.process(data.payload, request.href); + return new AuthStatusResponse(response[Object.keys(response)[0]][0], data.statusCode); + } else if (isEmpty(data.payload) && isNotEmpty(data.headers.get('authorization')) && data.statusCode === '200') { + return new AuthSuccessResponse(new AuthTokenInfo(data.headers.get('authorization')), data.statusCode); } else { - return new ErrorResponse( - Object.assign( - new Error('Unexpected response from config endpoint'), - {statusText: data.statusCode} - ) - ); - }*/ - console.log(data); - return new AuthSuccessResponse(data.payload, data.statusCode) + return new AuthStatusResponse(data.payload as AuthStatus, data.statusCode); + } } } diff --git a/src/app/core/auth/auth-storage.service.ts b/src/app/core/auth/auth-storage.service.ts new file mode 100644 index 0000000000..01e41d850b --- /dev/null +++ b/src/app/core/auth/auth-storage.service.ts @@ -0,0 +1,34 @@ +import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; +import { isPlatformBrowser } from '@angular/common'; + +/** + * The auth service. + */ +@Injectable() +export class AuthStorageService { + + constructor(@Inject(PLATFORM_ID) private platformId: string) {} + + public get(key: string): any { + let item = null; + if (isPlatformBrowser(this.platformId)) { + item = JSON.parse(localStorage.getItem(key)); + } + return item; + } + + public store(key: string, item: any) { + if (isPlatformBrowser(this.platformId)) { + localStorage.setItem(key, JSON.stringify(item)); + } + return true; + } + + public remove(key: string) { + if (isPlatformBrowser(this.platformId)) { + localStorage.removeItem(key); + } + return true; + } + +} diff --git a/src/app/core/auth/auth-type.ts b/src/app/core/auth/auth-type.ts index 793c9869a0..b8879ae445 100644 --- a/src/app/core/auth/auth-type.ts +++ b/src/app/core/auth/auth-type.ts @@ -1,3 +1,4 @@ export enum AuthType { + Eperson = 'eperson', Status = 'status' } diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts index 694d59b9ee..cf8ce68bd6 100644 --- a/src/app/core/auth/auth.actions.ts +++ b/src/app/core/auth/auth.actions.ts @@ -6,6 +6,7 @@ import { type } from '../../shared/ngrx/type'; // import models import { Eperson } from '../eperson/models/eperson.model'; +import { AuthTokenInfo } from './models/auth-token-info.model'; export const AuthActionTypes = { AUTHENTICATE: type('dspace/auth/AUTHENTICATE'), @@ -49,9 +50,9 @@ export class AuthenticateAction implements Action { */ export class AuthenticatedAction implements Action { public type: string = AuthActionTypes.AUTHENTICATED; - payload: string; + payload: AuthTokenInfo; - constructor(token: string) { + constructor(token: AuthTokenInfo) { this.payload = token; } } @@ -108,10 +109,10 @@ export class AuthenticationErrorAction implements Action { */ export class AuthenticationSuccessAction implements Action { public type: string = AuthActionTypes.AUTHENTICATE_SUCCESS; - payload: Eperson; + payload: AuthTokenInfo; - constructor(user: Eperson) { - this.payload = user; + constructor(token: AuthTokenInfo) { + this.payload = token; } } diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index 75ca333b5a..aa7503fe4c 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -23,23 +23,7 @@ import { RegistrationSuccessAction } from './auth.actions'; import { Eperson } from '../eperson/models/eperson.model'; - -/** - * Effects offer a way to isolate and easily test side-effects within your - * application. - * The `toPayload` helper function returns just - * the payload of the currently dispatched action, useful in - * instances where the current state is not necessary. - * - * Documentation on `toPayload` can be found here: - * https://github.com/ngrx/effects/blob/master/docs/api.md#topayload - * - * If you are unfamiliar with the operators being used in these examples, please - * check out the sources below: - * - * Official Docs: http://reactivex.io/rxjs/manual/overview.html#categories-of-operators - * RxJS 5 Operators By Example: https://gist.github.com/btroncone/d6cf141d6f2c00dc6b35 - */ +import { AuthStatus } from './models/auth-status.model'; @Injectable() export class AuthEffects { @@ -51,18 +35,29 @@ export class AuthEffects { @Effect() public authenticate: Observable = this.actions$ .ofType(AuthActionTypes.AUTHENTICATE) - .debounceTime(500) .switchMap((action: AuthenticateAction) => { return this.authService.authenticate(action.payload.email, action.payload.password) - .map((user: Eperson) => new AuthenticationSuccessAction(user)) + .map((response: AuthStatus) => new AuthenticationSuccessAction(response.token)) .catch((error) => Observable.of(new AuthenticationErrorAction(error))); }); + // It means "reacts to this action but don't send another" + @Effect() + public authenticateSuccess: Observable = this.actions$ + .ofType(AuthActionTypes.AUTHENTICATE_SUCCESS) + .do((action: AuthenticationSuccessAction) => this.authService.storeToken(action.payload)) + .map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload)) + + @Effect({dispatch: false}) + public logOutSuccess: Observable = this.actions$ + .ofType(AuthActionTypes.LOG_OUT_SUCCESS) + .do((action: LogOutSuccessAction) => this.authService.removeToken()); + @Effect() public authenticated: Observable = this.actions$ .ofType(AuthActionTypes.AUTHENTICATED) .switchMap((action: AuthenticatedAction) => { - return this.authService.authenticatedUser() + return this.authService.authenticatedUser(action.payload) .map((user: Eperson) => new AuthenticatedSuccessAction((user !== null), user)) .catch((error) => Observable.of(new AuthenticatedErrorAction(error))); }); @@ -70,7 +65,7 @@ export class AuthEffects { @Effect() public createUser: Observable = this.actions$ .ofType(AuthActionTypes.REGISTRATION) - .debounceTime(500) + .debounceTime(500) // to remove when functionality is implemented .switchMap((action: RegistrationAction) => { return this.authService.create(action.payload) .map((user: Eperson) => new RegistrationSuccessAction(user)) diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts new file mode 100644 index 0000000000..40fd0d3836 --- /dev/null +++ b/src/app/core/auth/auth.interceptor.ts @@ -0,0 +1,97 @@ +import { Injectable, Injector } from '@angular/core'; +import { Router } from '@angular/router'; +import { + HttpClient, HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpResponse, + HttpErrorResponse +} from '@angular/common/http'; +import { Observable } from 'rxjs/Rx'; +import 'rxjs/add/observable/throw' +import 'rxjs/add/operator/catch'; + +import { AuthService } from './auth.service'; +import { AuthStatus } from './models/auth-status.model'; +import { AuthType } from './auth-type'; +import { ResourceType } from '../shared/resource-type'; +import { AuthTokenInfo } from './models/auth-token-info.model'; +import { isNotEmpty } from '../../shared/empty.util'; + +@Injectable() +export class AuthInterceptor implements HttpInterceptor { + constructor(private inj: Injector, private router: Router) { } + + private isUnauthorized(status: number): boolean { + return status === 401 || status === 403; + } + + private isLoginResponse(url: string): boolean { + return url.endsWith('/authn/login'); + } + + private isLogoutResponse(url: string): boolean { + return url.endsWith('/authn/logout'); + } + + private makeAuthStatusObject(authenticated:boolean, accessToken?: string, error?: string): AuthStatus { + const authStatus = new AuthStatus(); + authStatus.id = null; + authStatus.okay = true; + if (authenticated) { + authStatus.authenticated = true; + authStatus.token = new AuthTokenInfo(accessToken); + } else { + authStatus.authenticated = false; + authStatus.error = JSON.parse(error); + } + return authStatus; + } + + intercept(req: HttpRequest, next: HttpHandler): Observable> { + + const authService = this.inj.get(AuthService); + + // Get the auth header from the service. + const Authorization = authService.getAuthHeader(); + + let authReq; + if (isNotEmpty(Authorization)) { + // Clone the request to add the new header. + authReq = req.clone({headers: req.headers.set('authorization', Authorization)}); + } else { + authReq = req.clone(); + } + + // Pass on the cloned request instead of the original request. + return next.handle(authReq) + .map((response) => { + if (response instanceof HttpResponse && response.status === 200 && (this.isLoginResponse(response.url) || this.isLogoutResponse(response.url))) { + let authRes: HttpResponse; + if (this.isLoginResponse(response.url)) { + const token = response.headers.get('authorization'); + authRes = response.clone({body: this.makeAuthStatusObject(true, token)}); + } else { + authRes = response.clone({body: this.makeAuthStatusObject(false)}); + } + return authRes; + } else { + return response; + } + }) + .catch((error, caught) => { + // Intercept an unauthorized error response + if (error instanceof HttpErrorResponse && this.isUnauthorized(error.status)) { + // Create a new HttpResponse and return it, so it can be handle properly by AuthService. + const authResponse = new HttpResponse({ + body: this.makeAuthStatusObject(false, null, error.error), + headers: error.headers, + status: error.status, + statusText: error.statusText, + url: error.url + }); + return Observable.of(authResponse); + } else { + // Return error response as is. + return Observable.throw(error); + } + }) as any; + } +} diff --git a/src/app/core/auth/auth.reducers.ts b/src/app/core/auth/auth.reducers.ts index 293e7b1527..645541aa8e 100644 --- a/src/app/core/auth/auth.reducers.ts +++ b/src/app/core/auth/auth.reducers.ts @@ -6,6 +6,7 @@ import { // import models import { Eperson } from '../eperson/models/eperson.model'; +import { AuthTokenInfo } from './models/auth-token-info.model'; /** * The auth state. @@ -25,6 +26,9 @@ export interface AuthState { // true when loading loading: boolean; + // access token + token?: AuthTokenInfo; + // the authenticated user user?: Eperson; } @@ -62,8 +66,10 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.AUTHENTICATED_SUCCESS: return Object.assign({}, state, { - authenticated: (action as AuthenticatedSuccessAction).payload.authenticated, + authenticated: true, loaded: true, + error: undefined, + loading: false, user: (action as AuthenticatedSuccessAction).payload.user }); @@ -76,26 +82,26 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut }); case AuthActionTypes.AUTHENTICATE_SUCCESS: - case AuthActionTypes.REGISTRATION_SUCCESS: - const user: Eperson = (action as AuthenticationSuccessAction).payload; + const token: AuthTokenInfo = (action as AuthenticationSuccessAction).payload; - // verify user is not null - if (user === null) { + // verify token is not null + if (token === null) { return state; } return Object.assign({}, state, { - authenticated: true, - error: undefined, - loading: false, - user: user + token: token }); + case AuthActionTypes.REGISTRATION_SUCCESS: + return state; + case AuthActionTypes.RESET_ERROR: return Object.assign({}, state, { authenticated: null, + error: undefined, loaded: false, - loading: false + loading: false, }); case AuthActionTypes.LOG_OUT_ERROR: @@ -109,7 +115,10 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut return Object.assign({}, state, { authenticated: false, error: undefined, - user: undefined + loaded: false, + loading: false, + user: undefined, + token: undefined }); case AuthActionTypes.REGISTRATION: diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index c59c5d069e..a5373e1afd 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -6,6 +6,10 @@ import { Eperson } from '../eperson/models/eperson.model'; import { AuthRequestService } from './auth-request.service'; import { HttpHeaders } from '@angular/common/http'; import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; +import { AuthStatus } from './models/auth-status.model'; +import { AuthTokenInfo } from './models/auth-token-info.model'; +import { isNotEmpty, isNotNull } from '../../shared/empty.util'; +import { AuthStorageService } from './auth-storage.service'; export const MOCK_USER = new Eperson(); MOCK_USER.id = '92a59227-ccf7-46da-9776-86c3fc64147f'; @@ -30,21 +34,28 @@ MOCK_USER.metadata = [ } ]; -export const TOKENITEM = 'ds-token'; +export const TOKENITEM = 'dsAuthInfo'; /** - * The user service. + * The auth service. */ @Injectable() export class AuthService { /** * True if authenticated - * @type + * @type boolean */ private _authenticated = false; - constructor(private authRequestService: AuthRequestService) {} + /** + * The url to redirect after login + * @type string + */ + private _redirectUrl: string; + + constructor(private authRequestService: AuthRequestService, private storage: AuthStorageService) { + } /** * Authenticate the user @@ -53,32 +64,28 @@ export class AuthService { * @param {string} password The user's password * @returns {Observable} The authenticated user observable. */ - public authenticate(user: string, password: string): Observable { + public authenticate(user: string, password: string): Observable { // Normally you would do an HTTP request to determine to // attempt authenticating the user using the supplied credentials. // const body = `user=${user}&password=${password}`; // const body = encodeURI('password=test&user=vera.aloe@mailinator.com'); // const body = [{user}, {password}]; - const formData: FormData = new FormData(); - formData.append('user', user); - formData.append('password', password); - const body = 'password=' + password.toString() + '&user=' + user.toString(); + // const body = encodeURI('password=' + password.toString() + '&user=' + user.toString()); + const body = encodeURI(`password=${password}&user=${user}`); const options: HttpOptions = Object.create({}); let headers = new HttpHeaders(); headers = headers.append('Content-Type', 'application/x-www-form-urlencoded'); - headers = headers.append('Accept', 'application/json'); options.headers = headers; options.responseType = 'text'; - this.authRequestService.postToEndpoint('login', body, options) - .subscribe((r) => { - console.log(r); + return this.authRequestService.postToEndpoint('login', body, options) + .map((status: AuthStatus) => { + if (status.authenticated) { + return status; + } else { + throw(new Error('Invalid email or password')); + } }) - if (user === 'test' && password === 'password') { - this._authenticated = true; - return Observable.of(MOCK_USER); - } - return Observable.throw(new Error('Invalid email or password')); } /** @@ -93,11 +100,25 @@ export class AuthService { * Returns the authenticated user * @returns {User} */ - public authenticatedUser(): Observable { + public authenticatedUser(token: AuthTokenInfo): Observable { // Normally you would do an HTTP request to determine if // the user has an existing auth session on the server // but, let's just return the mock user for this example. - return Observable.of(MOCK_USER); + const options: HttpOptions = Object.create({}); + let headers = new HttpHeaders(); + headers = headers.append('Accept', 'application/json'); + headers = headers.append('Authorization', `Bearer ${token.accessToken}`); + options.headers = headers; + return this.authRequestService.getRequest('status', options) + .map((status: AuthStatus) => { + if (status.authenticated) { + this._authenticated = true; + return status.eperson[0]; + } else { + this._authenticated = false; + throw(new Error('Not authenticated')); + } + }); } /** @@ -119,7 +140,47 @@ export class AuthService { public signout(): Observable { // Normally you would do an HTTP request sign end the session // but, let's just return an observable of true. - this._authenticated = false; - return Observable.of(true); + let headers = new HttpHeaders(); + headers = headers.append('Content-Type', 'application/x-www-form-urlencoded'); + const options: HttpOptions = Object.create({headers, responseType: 'text'}); + return this.authRequestService.getRequest('logout', options) + .map((status: AuthStatus) => { + if (!status.authenticated) { + this._authenticated = false; + return true; + } else { + throw(new Error('Invalid email or password')); + } + }) + + } + + public getAuthHeader(): string { + // Retrieve authentication token info + const token = this.storage.get(TOKENITEM); + return (isNotNull(token) && this._authenticated) ? `Bearer ${token.accessToken}` : ''; + } + + public getToken(): AuthTokenInfo { + // Retrieve authentication token info + return this.storage.get(TOKENITEM); + } + + public storeToken(token: AuthTokenInfo) { + // Save authentication token info + return this.storage.store(TOKENITEM, JSON.stringify(token)); + } + + public removeToken() { + // Remove authentication token info + return this.storage.remove(TOKENITEM); + } + + get redirectUrl(): string { + return this._redirectUrl; + } + + set redirectUrl(value: string) { + this._redirectUrl = value; } } diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts index 38e0b5e24d..cd39981a1f 100644 --- a/src/app/core/auth/authenticated.guard.ts +++ b/src/app/core/auth/authenticated.guard.ts @@ -7,6 +7,7 @@ import { Store } from '@ngrx/store'; // reducers import { CoreState } from '../core.reducers'; import { isAuthenticated } from './selectors'; +import { AuthService } from './auth.service'; /** * Prevent unauthorized activating and loading of routes @@ -18,37 +19,44 @@ export class AuthenticatedGuard implements CanActivate, CanLoad { /** * @constructor */ - constructor(private router: Router, private store: Store) {} + constructor(private authService: AuthService, private router: Router, private store: Store) {} /** * True when user is authenticated * @method canActivate */ - canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | boolean { - // get observable - const observable = this.store.select(isAuthenticated); + canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + const url = state.url; - // redirect to sign in page if user is not authenticated - observable.subscribe((authenticated) => { - if (!authenticated) { - this.router.navigate(['/login']); - } - }); + return this.handleAuth(url); + } - return observable; + /** + * True when user is authenticated + * @method canActivateChild + */ + canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + return this.canActivate(route, state); } /** * True when user is authenticated * @method canLoad */ - canLoad(route: Route): Observable | Promise | boolean { + canLoad(route: Route): Observable { + const url = `/${route.path}`; + + return this.handleAuth(url); + } + + private handleAuth(url: string): Observable { // get observable const observable = this.store.select(isAuthenticated); // redirect to sign in page if user is not authenticated observable.subscribe((authenticated) => { if (!authenticated) { + this.authService.redirectUrl = url; this.router.navigate(['/login']); } }); diff --git a/src/app/core/auth/models/auth-error.model.ts b/src/app/core/auth/models/auth-error.model.ts new file mode 100644 index 0000000000..d68d04748e --- /dev/null +++ b/src/app/core/auth/models/auth-error.model.ts @@ -0,0 +1,7 @@ +export interface AuthError { + error: string, + message: string, + path: string, + status: number + timestamp: number +} diff --git a/src/app/core/auth/models/auth-info.model.ts b/src/app/core/auth/models/auth-info.model.ts deleted file mode 100644 index 8995f82235..0000000000 --- a/src/app/core/auth/models/auth-info.model.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface AuthInfo { - access_token?: string, - expires?: number, - expires_in?: number -} diff --git a/src/app/core/auth/models/auth-status.model.ts b/src/app/core/auth/models/auth-status.model.ts index 388405e87a..98a07c0e9d 100644 --- a/src/app/core/auth/models/auth-status.model.ts +++ b/src/app/core/auth/models/auth-status.model.ts @@ -1,4 +1,7 @@ +import { AuthError } from './auth-error.model'; +import { AuthTokenInfo } from './auth-token-info.model'; import { DSpaceObject } from '../../shared/dspace-object.model'; +import { Eperson } from '../../eperson/models/eperson.model'; export class AuthStatus extends DSpaceObject { @@ -6,4 +9,9 @@ export class AuthStatus extends DSpaceObject { authenticated: boolean; + error?: AuthError; + + eperson: Eperson[]; + + token?: AuthTokenInfo } diff --git a/src/app/core/auth/models/auth-token-info.model.ts b/src/app/core/auth/models/auth-token-info.model.ts new file mode 100644 index 0000000000..1e798f1630 --- /dev/null +++ b/src/app/core/auth/models/auth-token-info.model.ts @@ -0,0 +1,11 @@ +export class AuthTokenInfo { + public accessToken: string; + public expires?: number; + + constructor(token: string, expiresIn?: number) { + this.accessToken = token.replace('Bearer ', ''); + if (expiresIn) { + this.expires = expiresIn * 1000 + Date.now(); + } + } +} diff --git a/src/app/core/auth/models/normalized-auth-status.model.ts b/src/app/core/auth/models/normalized-auth-status.model.ts new file mode 100644 index 0000000000..19952f7c70 --- /dev/null +++ b/src/app/core/auth/models/normalized-auth-status.model.ts @@ -0,0 +1,26 @@ +import { AuthStatus } from './auth-status.model'; +import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize'; +import { mapsTo } from '../../cache/builders/build-decorators'; +import { NormalizedDSpaceObject } from '../../cache/models/normalized-dspace-object.model'; +import { Eperson } from '../../eperson/models/eperson.model'; + +@mapsTo(AuthStatus) +@inheritSerialization(NormalizedDSpaceObject) +export class NormalizedAuthStatus extends NormalizedDSpaceObject { + + /** + * True if REST API is up and running, should never return false + */ + @autoserialize + okay: boolean; + + /** + * True if the token is valid, false if there was no token or the token wasn't valid + */ + @autoserialize + authenticated: boolean; + + @autoserializeAs(Eperson) + eperson: Eperson[]; + +} diff --git a/src/app/core/cache/response-cache.models.ts b/src/app/core/cache/response-cache.models.ts index 0a61a53df7..fd41c2258b 100644 --- a/src/app/core/cache/response-cache.models.ts +++ b/src/app/core/cache/response-cache.models.ts @@ -2,12 +2,16 @@ import { RequestError } from '../data/request.models'; import { PageInfo } from '../shared/page-info.model'; import { BrowseDefinition } from '../shared/browse-definition.model'; import { ConfigObject } from '../shared/config/config.model'; +import { AuthTokenInfo } from '../auth/models/auth-token-info.model'; +import { NormalizedAuthStatus } from '../auth/models/normalized-auth-status.model'; +import { AuthStatus } from '../auth/models/auth-status.model'; /* tslint:disable:max-classes-per-file */ export class RestResponse { + public toCache = true; constructor( public isSuccessful: boolean, - public statusCode: string + public statusCode: string, ) { } } @@ -63,11 +67,31 @@ export class ConfigSuccessResponse extends RestResponse { } } -export class AuthSuccessResponse extends RestResponse { +export class AuthStatusResponse extends RestResponse { + public toCache = false; constructor( - public authResponse: any, + public response: AuthStatus, + public statusCode: string + ) { + super(true, statusCode); + } +} + +export class AuthSuccessResponse extends RestResponse { + public toCache = false; + constructor( + public response: AuthTokenInfo, + public statusCode: string + ) { + super(true, statusCode); + } +} + +export class AuthErrorResponse extends RestResponse { + public toCache = false; + constructor( + public response: any, public statusCode: string, - public pageInfo?: PageInfo ) { super(true, statusCode); } diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 7ea4ef45d4..63f0165b06 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -41,6 +41,10 @@ import { UUIDService } from './shared/uuid.service'; import { AuthService } from './auth/auth.service'; import { AuthenticatedGuard } from './auth/authenticated.guard'; import { AuthRequestService } from './auth/auth-request.service'; +import { AuthResponseParsingService } from './auth/auth-response-parsing.service'; +import { HTTP_INTERCEPTORS } from '@angular/common/http'; +import { AuthInterceptor } from './auth/auth.interceptor'; +import { AuthStorageService } from './auth/auth-storage.service'; const IMPORTS = [ CommonModule, @@ -60,7 +64,9 @@ const PROVIDERS = [ ApiService, AuthenticatedGuard, AuthRequestService, + AuthResponseParsingService, AuthService, + AuthStorageService, CommunityDataService, CollectionDataService, DSOResponseParsingService, @@ -83,7 +89,13 @@ const PROVIDERS = [ SubmissionFormsConfigService, SubmissionSectionsConfigService, UUIDService, - { provide: NativeWindowService, useFactory: NativeWindowFactory } + { provide: NativeWindowService, useFactory: NativeWindowFactory }, + // register TokenInterceptor as HttpInterceptor + { + provide: HTTP_INTERCEPTORS, + useClass: AuthInterceptor, + multi: true + } ]; @NgModule({ diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts index b7c81eaa8e..c986c4b653 100644 --- a/src/app/core/data/request.models.ts +++ b/src/app/core/data/request.models.ts @@ -193,8 +193,8 @@ export class AuthPostRequest extends PostRequest { } export class AuthGetRequest extends GetRequest { - constructor(uuid: string, href: string) { - super(uuid, href); + constructor(uuid: string, href: string, public options?: HttpOptions) { + super(uuid, href, null, options); } getResponseParser(): GenericConstructor { diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts index f589221e63..6d4393bade 100644 --- a/src/app/core/data/request.service.ts +++ b/src/app/core/data/request.service.ts @@ -17,6 +17,7 @@ import { RequestConfigureAction, RequestExecuteAction } from './request.actions' import { GetRequest, RestRequest, RestRequestMethod } from './request.models'; import { RequestEntry, RequestState } from './request.reducer'; +import { ResponseCacheRemoveAction } from '../cache/response-cache.actions'; @Injectable() export class RequestService { @@ -66,9 +67,9 @@ export class RequestService { .flatMap((uuid: string) => this.getByUUID(uuid)); } - configure(request: RestRequest): void { - if (request.method !== RestRequestMethod.Get || !this.isCachedOrPending(request)) { - this.dispatchRequest(request); + configure(request: RestRequest, overrideRequest: boolean = false): void { + if (request.method !== RestRequestMethod.Get || !this.isCachedOrPending(request) || overrideRequest) { + this.dispatchRequest(request, overrideRequest); } } @@ -101,10 +102,10 @@ export class RequestService { return isCached || isPending; } - private dispatchRequest(request: RestRequest) { + private dispatchRequest(request: RestRequest, overrideRequest: boolean) { this.store.dispatch(new RequestConfigureAction(request)); this.store.dispatch(new RequestExecuteAction(request.uuid)); - if (request.method === RestRequestMethod.Get) { + if (request.method === RestRequestMethod.Get && !overrideRequest) { this.trackRequestsOnTheirWayToTheStore(request); } } diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts index d225eadcc4..fe911e5635 100644 --- a/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts +++ b/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts @@ -1,3 +1,5 @@ +import { HttpHeaders } from '@angular/common/http'; + export interface DSpaceRESTV2Response { payload: { [name: string]: any; @@ -5,5 +7,6 @@ export interface DSpaceRESTV2Response { _links?: any; page?: any; }, + headers: HttpHeaders, statusCode: string } diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts index 1a5287d4b0..51efecf625 100644 --- a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts +++ b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts @@ -61,21 +61,16 @@ export class DSpaceRESTv2Service { requestOptions.body = body; requestOptions.observe = 'response'; if (options && options.headers) { - let headers = new HttpHeaders(); - headers = headers.append('Accept', 'application/json'); - headers = headers.append('Content-Type', 'application/x-www-form-urlencoded'); - // requestOptions.headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded'); - requestOptions.headers = headers; - /* const keys = options.headers.getAll(''); - keys.forEach((key) => { - requestOptions.headers.append(key, options.headers.get(key)); - })*/ + requestOptions.headers = Object.assign(new HttpHeaders(), options.headers); } if (options && options.responseType) { - // requestOptions.responseType = options.responseType; + requestOptions.responseType = options.responseType; } return this.http.request(method, url, requestOptions) - .map((res) => ({ payload: res.body, statusCode: res.statusText })) + .map((res) => { + console.log(res); + return ({ payload: res.body, headers: res.headers, statusCode: res.statusText }) + }) .catch((err) => { console.log('Error: ', err); return Observable.throw(err); From f91828a29a05c7bad4557633bfd2dc755c7450f9 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 9 Feb 2018 11:39:26 +0100 Subject: [PATCH 07/80] Add platform service --- src/app/shared/platform.service.spec.ts | 59 +++++++++++++++++++++++++ src/app/shared/platform.service.ts | 20 +++++++++ 2 files changed, 79 insertions(+) create mode 100644 src/app/shared/platform.service.spec.ts create mode 100644 src/app/shared/platform.service.ts diff --git a/src/app/shared/platform.service.spec.ts b/src/app/shared/platform.service.spec.ts new file mode 100644 index 0000000000..ddc4d13334 --- /dev/null +++ b/src/app/shared/platform.service.spec.ts @@ -0,0 +1,59 @@ +import { IPlatformService, PlatformService } from './platform.service' +import { async, TestBed } from '@angular/core/testing' +import { PLATFORM_ID } from '@angular/core' + +describe('PlatformService', () => { + let service: IPlatformService; + + describe('PlatformService browser', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + providers: [ + PlatformService, + { provide: PLATFORM_ID, useValue: 'browser' } + ] + }) + })); + + beforeEach(async(() => { + service = TestBed.get(PlatformService) + })); + + afterEach(async(() => { + TestBed.resetTestingModule() + })); + + it('should construct', async(() => { + expect(service).not.toBeNull() + })); + + it('should be browser', async(() => { + expect(service.isBrowser).toEqual(true); + expect(service.isServer).toEqual(false) + })); + }); + + describe('PlatformService server', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + providers: [ + PlatformService, + { provide: PLATFORM_ID, useValue: 'server' } + ] + }) + })); + + beforeEach(async(() => { + service = TestBed.get(PlatformService) + })); + + afterEach(async(() => { + TestBed.resetTestingModule() + })); + + it('should be server', async(() => { + expect(service.isServer).toEqual(true); + expect(service.isBrowser).toEqual(false) + })) + }) +}); diff --git a/src/app/shared/platform.service.ts b/src/app/shared/platform.service.ts new file mode 100644 index 0000000000..59c3830cce --- /dev/null +++ b/src/app/shared/platform.service.ts @@ -0,0 +1,20 @@ +import { Inject, Injectable, PLATFORM_ID } from '@angular/core' +import { isPlatformBrowser, isPlatformServer } from '@angular/common' + +export interface IPlatformService { + readonly isBrowser: boolean + readonly isServer: boolean +} + +@Injectable() +export class PlatformService implements IPlatformService { + constructor( @Inject(PLATFORM_ID) private platformId: any) { } + + public get isBrowser(): boolean { + return isPlatformBrowser(this.platformId) + } + + public get isServer(): boolean { + return isPlatformServer(this.platformId) + } +} From c9ab2cee2fbb651e57f9b283ef3d0713eba0f7ac Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 9 Feb 2018 12:26:36 +0100 Subject: [PATCH 08/80] Grouped shared services into a directory --- .../search-filter/search-filter.component.ts | 2 +- .../search-filters/search-filter/search-filter.service.ts | 2 +- .../+search-page/search-service/search.service.spec.ts | 2 +- src/app/+search-page/search-service/search.service.ts | 2 +- src/app/app.component.spec.ts | 2 +- src/app/app.component.ts | 2 +- src/app/core/core.module.ts | 8 ++++---- src/app/pagenotfound/pagenotfound.component.ts | 2 +- src/app/shared/{ => services}/api.service.ts | 0 src/app/shared/{ => services}/platform.service.spec.ts | 0 src/app/shared/{ => services}/platform.service.ts | 0 src/app/shared/{ => services}/route.service.spec.ts | 0 src/app/shared/{ => services}/route.service.ts | 2 +- src/app/shared/{ => services}/server-response.service.ts | 0 src/app/shared/{ => services}/window.service.ts | 0 .../view-mode-switch/view-mode-switch.component.spec.ts | 2 +- 16 files changed, 13 insertions(+), 13 deletions(-) rename src/app/shared/{ => services}/api.service.ts (100%) rename src/app/shared/{ => services}/platform.service.spec.ts (100%) rename src/app/shared/{ => services}/platform.service.ts (100%) rename src/app/shared/{ => services}/route.service.spec.ts (100%) rename src/app/shared/{ => services}/route.service.ts (97%) rename src/app/shared/{ => services}/server-response.service.ts (100%) rename src/app/shared/{ => services}/window.service.ts (100%) diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts b/src/app/+search-page/search-filters/search-filter/search-filter.component.ts index 08d72da984..c1f8e96c29 100644 --- a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts +++ b/src/app/+search-page/search-filters/search-filter/search-filter.component.ts @@ -6,7 +6,7 @@ import { FacetValue } from '../../search-service/facet-value.model'; import { SearchFilterService } from './search-filter.service'; import { Observable } from 'rxjs/Observable'; import { slide } from '../../../shared/animations/slide'; -import { RouteService } from '../../../shared/route.service'; +import { RouteService } from '../../../shared/services/route.service'; import { first } from 'rxjs/operator/first'; /** diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.service.ts b/src/app/+search-page/search-filters/search-filter/search-filter.service.ts index f3efc19b86..81ed2ba324 100644 --- a/src/app/+search-page/search-filters/search-filter/search-filter.service.ts +++ b/src/app/+search-page/search-filters/search-filter/search-filter.service.ts @@ -13,7 +13,7 @@ import { import { hasValue, } from '../../../shared/empty.util'; import { SearchFilterConfig } from '../../search-service/search-filter-config.model'; import { SearchService } from '../../search-service/search.service'; -import { RouteService } from '../../../shared/route.service'; +import { RouteService } from '../../../shared/services/route.service'; const filterStateSelector = (state: SearchFiltersState) => state.searchFilter; diff --git a/src/app/+search-page/search-service/search.service.spec.ts b/src/app/+search-page/search-service/search.service.spec.ts index 65af3231f9..6620c1234c 100644 --- a/src/app/+search-page/search-service/search.service.spec.ts +++ b/src/app/+search-page/search-service/search.service.spec.ts @@ -7,7 +7,7 @@ import { Component } from '@angular/core'; import { SearchService } from './search.service'; import { ItemDataService } from './../../core/data/item-data.service'; import { ViewMode } from '../../+search-page/search-options.model'; -import { RouteService } from '../../shared/route.service'; +import { RouteService } from '../../shared/services/route.service'; @Component({ template: '' }) class DummyComponent { } diff --git a/src/app/+search-page/search-service/search.service.ts b/src/app/+search-page/search-service/search.service.ts index c70fe22ce0..216e171dd0 100644 --- a/src/app/+search-page/search-service/search.service.ts +++ b/src/app/+search-page/search-service/search.service.ts @@ -13,7 +13,7 @@ import { PageInfo } from '../../core/shared/page-info.model'; import { hasValue, isNotEmpty } from '../../shared/empty.util'; import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; -import { RouteService } from '../../shared/route.service'; +import { RouteService } from '../../shared/services/route.service'; import { SearchOptions } from '../search-options.model'; import { SearchResult } from '../search-result.model'; import { FacetValue } from './facet-value.model'; diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 5c77b34549..327da7d9f6 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -26,7 +26,7 @@ import { HostWindowResizeAction } from './shared/host-window.actions'; import { MetadataService } from './core/metadata/metadata.service'; import { GLOBAL_CONFIG, ENV_CONFIG } from '../config'; -import { NativeWindowRef, NativeWindowService } from './shared/window.service'; +import { NativeWindowRef, NativeWindowService } from './shared/services/window.service'; import { MockTranslateLoader } from './shared/mocks/mock-translate-loader'; import { MockMetadataService } from './shared/mocks/mock-metadata-service'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 25bdde2d23..9098f7ca51 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -16,7 +16,7 @@ import { GLOBAL_CONFIG, GlobalConfig } from '../config'; import { MetadataService } from './core/metadata/metadata.service'; import { HostWindowResizeAction } from './shared/host-window.actions'; import { HostWindowState } from './shared/host-window.reducer'; -import { NativeWindowRef, NativeWindowService } from './shared/window.service'; +import { NativeWindowRef, NativeWindowService } from './shared/services/window.service'; @Component({ selector: 'ds-app', diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 63f0165b06..638aa4c4a5 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -14,7 +14,7 @@ import { coreReducers } from './core.reducers'; import { isNotEmpty } from '../shared/empty.util'; -import { ApiService } from '../shared/api.service'; +import { ApiService } from '../shared/services/api.service'; import { CollectionDataService } from './data/collection-data.service'; import { CommunityDataService } from './data/community-data.service'; import { DSOResponseParsingService } from './data/dso-response-parsing.service'; @@ -28,12 +28,12 @@ import { RemoteDataBuildService } from './cache/builders/remote-data-build.servi import { RequestService } from './data/request.service'; import { ResponseCacheService } from './cache/response-cache.service'; import { RootResponseParsingService } from './data/root-response-parsing.service'; -import { ServerResponseService } from '../shared/server-response.service'; -import { NativeWindowFactory, NativeWindowService } from '../shared/window.service'; +import { ServerResponseService } from '../shared/services/server-response.service'; +import { NativeWindowFactory, NativeWindowService } from '../shared/services/window.service'; import { BrowseService } from './browse/browse.service'; import { BrowseResponseParsingService } from './data/browse-response-parsing.service'; import { ConfigResponseParsingService } from './data/config-response-parsing.service'; -import { RouteService } from '../shared/route.service'; +import { RouteService } from '../shared/services/route.service'; import { SubmissionDefinitionsConfigService } from './config/submission-definitions-config.service'; import { SubmissionFormsConfigService } from './config/submission-forms-config.service'; import { SubmissionSectionsConfigService } from './config/submission-sections-config.service'; diff --git a/src/app/pagenotfound/pagenotfound.component.ts b/src/app/pagenotfound/pagenotfound.component.ts index bd119a4de9..e7923b3466 100644 --- a/src/app/pagenotfound/pagenotfound.component.ts +++ b/src/app/pagenotfound/pagenotfound.component.ts @@ -1,4 +1,4 @@ -import { ServerResponseService } from '../shared/server-response.service'; +import { ServerResponseService } from '../shared/services/server-response.service'; import { Component, ChangeDetectionStrategy } from '@angular/core'; @Component({ diff --git a/src/app/shared/api.service.ts b/src/app/shared/services/api.service.ts similarity index 100% rename from src/app/shared/api.service.ts rename to src/app/shared/services/api.service.ts diff --git a/src/app/shared/platform.service.spec.ts b/src/app/shared/services/platform.service.spec.ts similarity index 100% rename from src/app/shared/platform.service.spec.ts rename to src/app/shared/services/platform.service.spec.ts diff --git a/src/app/shared/platform.service.ts b/src/app/shared/services/platform.service.ts similarity index 100% rename from src/app/shared/platform.service.ts rename to src/app/shared/services/platform.service.ts diff --git a/src/app/shared/route.service.spec.ts b/src/app/shared/services/route.service.spec.ts similarity index 100% rename from src/app/shared/route.service.spec.ts rename to src/app/shared/services/route.service.spec.ts diff --git a/src/app/shared/route.service.ts b/src/app/shared/services/route.service.ts similarity index 97% rename from src/app/shared/route.service.ts rename to src/app/shared/services/route.service.ts index f24fa0d00d..e7e701255e 100644 --- a/src/app/shared/route.service.ts +++ b/src/app/shared/services/route.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { ActivatedRoute, convertToParamMap, Params, } from '@angular/router'; -import { isNotEmpty } from './empty.util'; +import { isNotEmpty } from '../empty.util'; @Injectable() export class RouteService { diff --git a/src/app/shared/server-response.service.ts b/src/app/shared/services/server-response.service.ts similarity index 100% rename from src/app/shared/server-response.service.ts rename to src/app/shared/services/server-response.service.ts diff --git a/src/app/shared/window.service.ts b/src/app/shared/services/window.service.ts similarity index 100% rename from src/app/shared/window.service.ts rename to src/app/shared/services/window.service.ts diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts index 541b1ed4c3..61ab3de634 100644 --- a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts +++ b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts @@ -10,7 +10,7 @@ import { SearchService } from '../../+search-page/search-service/search.service' import { ItemDataService } from './../../core/data/item-data.service'; import { ViewModeSwitchComponent } from './view-mode-switch.component'; import { ViewMode } from '../../+search-page/search-options.model'; -import { RouteService } from '../route.service'; +import { RouteService } from '../services/route.service'; @Component({ template: '' }) class DummyComponent { } From 64ad40b67639d192eec74d2bff317149b4e49296 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 9 Feb 2018 12:27:20 +0100 Subject: [PATCH 09/80] Added cookie service --- package.json | 2 + .../shared/services/cookie.service.spec.ts | 30 +++++++++ src/app/shared/services/cookie.service.ts | 62 +++++++++++++++++++ yarn.lock | 8 +++ 4 files changed, 102 insertions(+) create mode 100644 src/app/shared/services/cookie.service.spec.ts create mode 100644 src/app/shared/services/cookie.service.ts diff --git a/package.json b/package.json index b211892de9..dc62aff03d 100644 --- a/package.json +++ b/package.json @@ -86,6 +86,7 @@ "@nguniversal/express-engine": "5.0.0-beta.5", "@ngx-translate/core": "9.1.1", "@ngx-translate/http-loader": "2.0.1", + "@types/js-cookie": "^2.1.0", "angular-idle-preload": "2.0.4", "body-parser": "1.18.2", "bootstrap": "4.0.0-beta", @@ -98,6 +99,7 @@ "font-awesome": "4.7.0", "http-server": "0.11.1", "https": "1.0.0", + "js-cookie": "2.2.0", "js.clone": "0.0.3", "jsonschema": "1.2.2", "methods": "1.1.2", diff --git a/src/app/shared/services/cookie.service.spec.ts b/src/app/shared/services/cookie.service.spec.ts new file mode 100644 index 0000000000..1bfddba99d --- /dev/null +++ b/src/app/shared/services/cookie.service.spec.ts @@ -0,0 +1,30 @@ +import { PlatformService } from './platform.service' +import { CookieService, ICookieService } from './cookie.service' +import { async, TestBed } from '@angular/core/testing' +import { REQUEST } from '@nguniversal/express-engine/tokens' + +describe(CookieService.name, () => { + let service: ICookieService; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + providers: [ + CookieService, + PlatformService, + { provide: REQUEST, useValue: {} } + ] + }) + })); + + beforeEach(() => { + service = TestBed.get(CookieService) + }); + + afterEach(() => { + TestBed.resetTestingModule() + }); + + it('should construct', async(() => { + expect(service).toBeDefined() + })) +}); diff --git a/src/app/shared/services/cookie.service.ts b/src/app/shared/services/cookie.service.ts new file mode 100644 index 0000000000..61762f7cd9 --- /dev/null +++ b/src/app/shared/services/cookie.service.ts @@ -0,0 +1,62 @@ +import { REQUEST } from '@nguniversal/express-engine/tokens' +import { PlatformService } from './platform.service' +import { Inject, Injectable } from '@angular/core' +import { Subject } from 'rxjs/Subject' +import { Observable } from 'rxjs/Observable' +import { CookieAttributes, getJSON, remove, set } from 'js-cookie' + +export interface ICookieService { + readonly cookies$: Observable<{ readonly [key: string]: any }> + getAll(): any + get(name: string): any + set(name: string, value: any, options?: CookieAttributes): void + remove(name: string, options?: CookieAttributes): void +} + +@Injectable() +export class CookieService implements ICookieService { + private readonly cookieSource = new Subject<{ readonly [key: string]: any }>(); + public readonly cookies$ = this.cookieSource.asObservable(); + + constructor(private platformService: PlatformService, @Inject(REQUEST) private req: any) { } + + public set(name: string, value: any, options?: CookieAttributes): void { + if (this.platformService.isBrowser) { + set(name, value, options); + this.updateSource() + } + } + + public remove(name: string, options?: CookieAttributes): void { + if (this.platformService.isBrowser) { + remove(name, options); + this.updateSource() + } + } + + public get(name: string): any { + if (this.platformService.isBrowser) { + return getJSON(name) + } else { + try { + return JSON.parse(this.req.cookies[name]) + } catch (err) { + return this.req ? this.req.cookies[name] : undefined + } + } + } + + public getAll(): any { + if (this.platformService.isBrowser) { + return getJSON() + } else { + if (this.req) { + return this.req.cookies + } + } + } + + private updateSource() { + this.cookieSource.next(this.getAll()) + } +} diff --git a/yarn.lock b/yarn.lock index 39ba0f596f..e51009776d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -193,6 +193,10 @@ version "2.8.4" resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.4.tgz#5528fb5e53f1b27594f81f18debb7eab8dc532cb" +"@types/js-cookie@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.1.0.tgz#a8916246aa994db646c66d54c854916213300a51" + "@types/lodash@4.14.74": version "4.14.74" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.74.tgz#ac3bd8db988e7f7038e5d22bd76a7ba13f876168" @@ -4376,6 +4380,10 @@ js-base64@^2.1.8, js-base64@^2.1.9: version "2.3.2" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf" +js-cookie@2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz#1b2c279a6eece380a12168b92485265b35b1effb" + js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" From b7cff01dab39948bda8dffb454f6739855d65ab3 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Sat, 10 Feb 2018 13:01:58 +0100 Subject: [PATCH 10/80] fixed auth module --- src/app/app.component.ts | 12 +++- src/app/core/auth/auth-request.service.ts | 1 + .../auth/auth-response-parsing.service.ts | 4 +- src/app/core/auth/auth-storage.service.ts | 34 ----------- src/app/core/auth/auth.actions.ts | 22 +++++++ src/app/core/auth/auth.effects.ts | 57 +++++++++++++++---- src/app/core/auth/auth.interceptor.ts | 11 +++- src/app/core/auth/auth.reducers.ts | 25 ++++---- src/app/core/auth/auth.service.ts | 50 ++++++---------- .../core/auth/models/auth-token-info.model.ts | 2 + src/app/core/cache/response-cache.service.ts | 5 ++ src/app/core/core.module.ts | 8 ++- .../auth-nav-menu/auth-nav-menu.component.ts | 9 ++- src/modules/app/browser-app.module.ts | 16 +++++- 14 files changed, 147 insertions(+), 109 deletions(-) delete mode 100644 src/app/core/auth/auth-storage.service.ts diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 9098f7ca51..4ce1df54b0 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -17,6 +17,9 @@ import { MetadataService } from './core/metadata/metadata.service'; import { HostWindowResizeAction } from './shared/host-window.actions'; import { HostWindowState } from './shared/host-window.reducer'; import { NativeWindowRef, NativeWindowService } from './shared/services/window.service'; +import { CheckAuthenticationTokenAction } from './core/auth/auth.actions'; +import { isAuthenticated } from './core/auth/selectors'; +import { PlatformService } from './shared/services/platform.service'; @Component({ selector: 'ds-app', @@ -32,7 +35,8 @@ export class AppComponent implements OnInit { @Inject(NativeWindowService) private _window: NativeWindowRef, private translate: TranslateService, private store: Store, - private metadata: MetadataService + private metadata: MetadataService, + private platformService: PlatformService ) { // this language will be used as a fallback when a translation isn't found in the current language translate.setDefaultLang('en'); @@ -51,6 +55,12 @@ export class AppComponent implements OnInit { const color: string = this.config.production ? 'red' : 'green'; console.info(`Environment: %c${env}`, `color: ${color}; font-weight: bold;`); this.dispatchWindowSize(this._window.nativeWindow.innerWidth, this._window.nativeWindow.innerHeight); + if (this.platformService.isServer) { + this.store.select(isAuthenticated) + .take(1) + .filter((authenticated) => !authenticated) + .subscribe((authenticated) => this.store.dispatch(new CheckAuthenticationTokenAction())); + } } @HostListener('window:resize', ['$event']) diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts index 6202b6784d..f54aa9f0be 100644 --- a/src/app/core/auth/auth-request.service.ts +++ b/src/app/core/auth/auth-request.service.ts @@ -31,6 +31,7 @@ export class AuthRequestService extends HALEndpointService { protected fetchRequest(request: RestRequest): Observable { const [successResponse, errorResponse] = this.responseCache.get(request.href) .map((entry: ResponseCacheEntry) => entry.response) + .do(() => this.responseCache.remove(request.href)) .partition((response: RestResponse) => response.isSuccessful); return Observable.merge( errorResponse.flatMap((response: ErrorResponse) => diff --git a/src/app/core/auth/auth-response-parsing.service.ts b/src/app/core/auth/auth-response-parsing.service.ts index 1075cfe059..0215335f03 100644 --- a/src/app/core/auth/auth-response-parsing.service.ts +++ b/src/app/core/auth/auth-response-parsing.service.ts @@ -36,10 +36,10 @@ export class AuthResponseParsingService extends BaseResponseParsingService imple } parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse { - if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && data.statusCode === '200') { + if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && (data.statusCode === '200' || data.statusCode === 'OK')) { const response = this.process(data.payload, request.href); return new AuthStatusResponse(response[Object.keys(response)[0]][0], data.statusCode); - } else if (isEmpty(data.payload) && isNotEmpty(data.headers.get('authorization')) && data.statusCode === '200') { + } else if (isEmpty(data.payload) && isNotEmpty(data.headers.get('authorization')) && (data.statusCode === '200' || data.statusCode === 'OK')) { return new AuthSuccessResponse(new AuthTokenInfo(data.headers.get('authorization')), data.statusCode); } else { return new AuthStatusResponse(data.payload as AuthStatus, data.statusCode); diff --git a/src/app/core/auth/auth-storage.service.ts b/src/app/core/auth/auth-storage.service.ts deleted file mode 100644 index 01e41d850b..0000000000 --- a/src/app/core/auth/auth-storage.service.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; -import { isPlatformBrowser } from '@angular/common'; - -/** - * The auth service. - */ -@Injectable() -export class AuthStorageService { - - constructor(@Inject(PLATFORM_ID) private platformId: string) {} - - public get(key: string): any { - let item = null; - if (isPlatformBrowser(this.platformId)) { - item = JSON.parse(localStorage.getItem(key)); - } - return item; - } - - public store(key: string, item: any) { - if (isPlatformBrowser(this.platformId)) { - localStorage.setItem(key, JSON.stringify(item)); - } - return true; - } - - public remove(key: string) { - if (isPlatformBrowser(this.platformId)) { - localStorage.removeItem(key); - } - return true; - } - -} diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts index cf8ce68bd6..0528607d55 100644 --- a/src/app/core/auth/auth.actions.ts +++ b/src/app/core/auth/auth.actions.ts @@ -15,6 +15,8 @@ export const AuthActionTypes = { AUTHENTICATED: type('dspace/auth/AUTHENTICATED'), AUTHENTICATED_ERROR: type('dspace/auth/AUTHENTICATED_ERROR'), AUTHENTICATED_SUCCESS: type('dspace/auth/AUTHENTICATED_SUCCESS'), + CHECK_AUTHENTICATION_TOKEN: type('dspace/auth/CHECK_AUTHENTICATION_TOKEN'), + CHECK_AUTHENTICATION_TOKEN_ERROR: type('dspace/auth/CHECK_AUTHENTICATION_TOKEN_ERROR'), RESET_ERROR: type('dspace/auth/RESET_ERROR'), LOG_OUT: type('dspace/auth/LOG_OUT'), LOG_OUT_ERROR: type('dspace/auth/LOG_OUT_ERROR'), @@ -116,6 +118,24 @@ export class AuthenticationSuccessAction implements Action { } } +/** + * Check if token is already present upon initial load. + * @class CheckAuthenticationTokenAction + * @implements {Action} + */ +export class CheckAuthenticationTokenAction implements Action { + public type: string = AuthActionTypes.CHECK_AUTHENTICATION_TOKEN; +} + +/** + * Check Authentication Token Error. + * @class CheckAuthenticationTokenErrorAction + * @implements {Action} + */ +export class CheckAuthenticationTokenErrorAction implements Action { + public type: string = AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_ERROR; +} + /** * Reset error. * @class ResetAuthenticationErrorAction @@ -215,6 +235,8 @@ export type AuthActions | AuthenticatedSuccessAction | AuthenticationErrorAction | AuthenticationSuccessAction + | CheckAuthenticationTokenAction + | CheckAuthenticationTokenErrorAction | RegistrationAction | RegistrationErrorAction | RegistrationSuccessAction; diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index aa7503fe4c..3d1bd43854 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; // import @ngrx import { Effect, Actions } from '@ngrx/effects'; -import { Action } from '@ngrx/store'; +import { Action, Store } from '@ngrx/store'; // import rxjs import { Observable } from 'rxjs/Observable'; @@ -16,7 +16,7 @@ import { AuthenticatedErrorAction, AuthenticatedSuccessAction, AuthenticationErrorAction, - AuthenticationSuccessAction, LogOutAction, + AuthenticationSuccessAction, CheckAuthenticationTokenAction, CheckAuthenticationTokenErrorAction, LogOutAction, LogOutErrorAction, LogOutSuccessAction, RegistrationAction, RegistrationErrorAction, @@ -24,6 +24,10 @@ import { } from './auth.actions'; import { Eperson } from '../eperson/models/eperson.model'; import { AuthStatus } from './models/auth-status.model'; +import { AuthTokenInfo } from './models/auth-token-info.model'; +import { AppState } from '../../app.reducer'; +import { isAuthenticated } from './selectors'; +import { StoreActionTypes } from '../../store.actions'; @Injectable() export class AuthEffects { @@ -46,12 +50,7 @@ export class AuthEffects { public authenticateSuccess: Observable = this.actions$ .ofType(AuthActionTypes.AUTHENTICATE_SUCCESS) .do((action: AuthenticationSuccessAction) => this.authService.storeToken(action.payload)) - .map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload)) - - @Effect({dispatch: false}) - public logOutSuccess: Observable = this.actions$ - .ofType(AuthActionTypes.LOG_OUT_SUCCESS) - .do((action: LogOutSuccessAction) => this.authService.removeToken()); + .map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload)); @Effect() public authenticated: Observable = this.actions$ @@ -62,6 +61,20 @@ export class AuthEffects { .catch((error) => Observable.of(new AuthenticatedErrorAction(error))); }); + @Effect({dispatch: false}) + public authenticatedError: Observable = this.actions$ + .ofType(AuthActionTypes.AUTHENTICATED_ERROR) + .do((action: LogOutSuccessAction) => this.authService.removeToken()); + + @Effect() + public checkToken: Observable = this.actions$ + .ofType(AuthActionTypes.CHECK_AUTHENTICATION_TOKEN) + .switchMap(() => { + return this.authService.checkAuthenticationToken() + .map((token: AuthTokenInfo) => new AuthenticatedAction(token)) + .catch((error) => Observable.of(new CheckAuthenticationTokenErrorAction())); + }); + @Effect() public createUser: Observable = this.actions$ .ofType(AuthActionTypes.REGISTRATION) @@ -72,21 +85,41 @@ export class AuthEffects { .catch((error) => Observable.of(new RegistrationErrorAction(error))); }); + /** + * When the store is rehydrated in the browser, + * clear a possible invalid token + */ + @Effect({dispatch: false}) + public clearInvalidTokenOnRehydrate = this.actions$ + .ofType(StoreActionTypes.REHYDRATE) + .switchMap(() => { + return this.store.select(isAuthenticated) + .take(1) + .filter((authenticated) => !authenticated) + .do(() => this.authService.removeToken()); + }); + @Effect() - public signOut: Observable = this.actions$ + public logOut: Observable = this.actions$ .ofType(AuthActionTypes.LOG_OUT) - .switchMap((action: LogOutAction) => { - return this.authService.signout() + .switchMap(() => { + return this.authService.logout() .map((value) => new LogOutSuccessAction()) .catch((error) => Observable.of(new LogOutErrorAction(error))); }); + @Effect({dispatch: false}) + public logOutSuccess: Observable = this.actions$ + .ofType(AuthActionTypes.LOG_OUT_SUCCESS) + .do((action: LogOutSuccessAction) => this.authService.removeToken()); + /** * @constructor * @param {Actions} actions$ * @param {AuthService} authService */ constructor(private actions$: Actions, - private authService: AuthService) { + private authService: AuthService, + private store: Store) { } } diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts index 40fd0d3836..e8406566bc 100644 --- a/src/app/core/auth/auth.interceptor.ts +++ b/src/app/core/auth/auth.interceptor.ts @@ -23,6 +23,10 @@ export class AuthInterceptor implements HttpInterceptor { return status === 401 || status === 403; } + private isAuthRequest(url: string): boolean { + return url.endsWith('/authn/login') || url.endsWith('/authn/logout') || url.endsWith('/authn/status'); + } + private isLoginResponse(url: string): boolean { return url.endsWith('/authn/login'); } @@ -40,7 +44,7 @@ export class AuthInterceptor implements HttpInterceptor { authStatus.token = new AuthTokenInfo(accessToken); } else { authStatus.authenticated = false; - authStatus.error = JSON.parse(error); + authStatus.error = isNotEmpty(error) ? JSON.parse(error) : null; } return authStatus; } @@ -53,11 +57,11 @@ export class AuthInterceptor implements HttpInterceptor { const Authorization = authService.getAuthHeader(); let authReq; - if (isNotEmpty(Authorization)) { + if (!this.isAuthRequest(req.url) && isNotEmpty(Authorization)) { // Clone the request to add the new header. authReq = req.clone({headers: req.headers.set('authorization', Authorization)}); } else { - authReq = req.clone(); + authReq = req; } // Pass on the cloned request instead of the original request. @@ -67,6 +71,7 @@ export class AuthInterceptor implements HttpInterceptor { let authRes: HttpResponse; if (this.isLoginResponse(response.url)) { const token = response.headers.get('authorization'); + const expires = response.headers.get('expires'); authRes = response.clone({body: this.makeAuthStatusObject(true, token)}); } else { authRes = response.clone({body: this.makeAuthStatusObject(false)}); diff --git a/src/app/core/auth/auth.reducers.ts b/src/app/core/auth/auth.reducers.ts index 645541aa8e..31079767e5 100644 --- a/src/app/core/auth/auth.reducers.ts +++ b/src/app/core/auth/auth.reducers.ts @@ -6,7 +6,6 @@ import { // import models import { Eperson } from '../eperson/models/eperson.model'; -import { AuthTokenInfo } from './models/auth-token-info.model'; /** * The auth state. @@ -26,9 +25,6 @@ export interface AuthState { // true when loading loading: boolean; - // access token - token?: AuthTokenInfo; - // the authenticated user user?: Eperson; } @@ -61,7 +57,8 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut return Object.assign({}, state, { authenticated: false, error: (action as AuthenticationErrorAction).payload.message, - loaded: true + loaded: true, + loading: false }); case AuthActionTypes.AUTHENTICATED_SUCCESS: @@ -82,15 +79,16 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut }); case AuthActionTypes.AUTHENTICATE_SUCCESS: - const token: AuthTokenInfo = (action as AuthenticationSuccessAction).payload; - - // verify token is not null - if (token === null) { - return state; - } + return state; + case AuthActionTypes.CHECK_AUTHENTICATION_TOKEN: return Object.assign({}, state, { - token: token + loading: true + }); + + case AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_ERROR: + return Object.assign({}, state, { + loading: false }); case AuthActionTypes.REGISTRATION_SUCCESS: @@ -117,8 +115,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut error: undefined, loaded: false, loading: false, - user: undefined, - token: undefined + user: undefined }); case AuthActionTypes.REGISTRATION: diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index a5373e1afd..62f5aa5ba7 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -7,34 +7,9 @@ import { AuthRequestService } from './auth-request.service'; import { HttpHeaders } from '@angular/common/http'; import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; import { AuthStatus } from './models/auth-status.model'; -import { AuthTokenInfo } from './models/auth-token-info.model'; +import { AuthTokenInfo, TOKENITEM } from './models/auth-token-info.model'; import { isNotEmpty, isNotNull } from '../../shared/empty.util'; -import { AuthStorageService } from './auth-storage.service'; - -export const MOCK_USER = new Eperson(); -MOCK_USER.id = '92a59227-ccf7-46da-9776-86c3fc64147f'; -MOCK_USER.uuid = '92a59227-ccf7-46da-9776-86c3fc64147f'; -MOCK_USER.name = 'andrea.bollini@4science.it'; -MOCK_USER.email = 'andrea.bollini@4science.it'; -MOCK_USER.metadata = [ - { - key: 'eperson.firstname', - value: 'Andrea', - language: null - }, - { - key: 'eperson.lastname', - value: 'Bollini', - language: null - }, - { - key: 'eperson.language', - value: 'en', - language: null - } -]; - -export const TOKENITEM = 'dsAuthInfo'; +import { CookieService } from '../../shared/services/cookie.service'; /** * The auth service. @@ -54,7 +29,7 @@ export class AuthService { */ private _redirectUrl: string; - constructor(private authRequestService: AuthRequestService, private storage: AuthStorageService) { + constructor(private authRequestService: AuthRequestService, private storage: CookieService) { } /** @@ -76,7 +51,7 @@ export class AuthService { let headers = new HttpHeaders(); headers = headers.append('Content-Type', 'application/x-www-form-urlencoded'); options.headers = headers; - options.responseType = 'text'; + // options.responseType = 'text'; return this.authRequestService.postToEndpoint('login', body, options) .map((status: AuthStatus) => { if (status.authenticated) { @@ -101,9 +76,7 @@ export class AuthService { * @returns {User} */ public authenticatedUser(token: AuthTokenInfo): Observable { - // Normally you would do an HTTP request to determine if - // the user has an existing auth session on the server - // but, let's just return the mock user for this example. + // Determine if the user has an existing auth session on the server const options: HttpOptions = Object.create({}); let headers = new HttpHeaders(); headers = headers.append('Accept', 'application/json'); @@ -121,6 +94,14 @@ export class AuthService { }); } + /** + * Checks if token is present into storage + */ + public checkAuthenticationToken(): Observable { + const token = this.getToken(); + return isNotEmpty(token) ? Observable.of(token) : Observable.throw(false); + } + /** * Create a new user * @returns {User} @@ -137,7 +118,7 @@ export class AuthService { * End session * @returns {Observable} */ - public signout(): Observable { + public logout(): Observable { // Normally you would do an HTTP request sign end the session // but, let's just return an observable of true. let headers = new HttpHeaders(); @@ -168,11 +149,12 @@ export class AuthService { public storeToken(token: AuthTokenInfo) { // Save authentication token info - return this.storage.store(TOKENITEM, JSON.stringify(token)); + return this.storage.set(TOKENITEM, token); } public removeToken() { // Remove authentication token info + console.log('REMOVE!!!!'); return this.storage.remove(TOKENITEM); } diff --git a/src/app/core/auth/models/auth-token-info.model.ts b/src/app/core/auth/models/auth-token-info.model.ts index 1e798f1630..e6f6afc872 100644 --- a/src/app/core/auth/models/auth-token-info.model.ts +++ b/src/app/core/auth/models/auth-token-info.model.ts @@ -1,3 +1,5 @@ +export const TOKENITEM = 'dsAuthInfo'; + export class AuthTokenInfo { public accessToken: string; public expires?: number; diff --git a/src/app/core/cache/response-cache.service.ts b/src/app/core/cache/response-cache.service.ts index 77a2402043..a0e3740094 100644 --- a/src/app/core/cache/response-cache.service.ts +++ b/src/app/core/cache/response-cache.service.ts @@ -65,6 +65,11 @@ export class ResponseCacheService { return result; } + remove(key: string): void { + if (this.has(key)) { + this.store.dispatch(new ResponseCacheRemoveAction(key)); + } + } /** * Check whether a ResponseCacheEntry should still be cached * diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 638aa4c4a5..9c57026975 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -44,7 +44,8 @@ import { AuthRequestService } from './auth/auth-request.service'; import { AuthResponseParsingService } from './auth/auth-response-parsing.service'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { AuthInterceptor } from './auth/auth.interceptor'; -import { AuthStorageService } from './auth/auth-storage.service'; +import { CookieService } from '../shared/services/cookie.service'; +import { PlatformService } from '../shared/services/platform.service'; const IMPORTS = [ CommonModule, @@ -66,9 +67,9 @@ const PROVIDERS = [ AuthRequestService, AuthResponseParsingService, AuthService, - AuthStorageService, CommunityDataService, CollectionDataService, + CookieService, DSOResponseParsingService, DSpaceRESTv2Service, HostWindowService, @@ -76,6 +77,7 @@ const PROVIDERS = [ MetadataService, ObjectCacheService, PaginationComponentOptions, + PlatformService, RemoteDataBuildService, RequestService, ResponseCacheService, @@ -90,7 +92,7 @@ const PROVIDERS = [ SubmissionSectionsConfigService, UUIDService, { provide: NativeWindowService, useFactory: NativeWindowFactory }, - // register TokenInterceptor as HttpInterceptor + // register AuthInterceptor as HttpInterceptor { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts index 453f68ea86..b9e46c6159 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts @@ -35,18 +35,17 @@ export class AuthNavMenuComponent implements OnDestroy, OnInit { protected subs: Subscription[] = []; constructor( - private appStore: Store, - private coreStore: Store, + private store: Store, public windowService: HostWindowService) { } ngOnInit(): void { // set loading - this.isAuthenticated = this.coreStore.select(isAuthenticated); + this.isAuthenticated = this.store.select(isAuthenticated); - this.user = this.appStore.select(getAuthenticatedUser); + this.user = this.store.select(getAuthenticatedUser); - this.subs.push(this.appStore.select(routerStateSelector) + this.subs.push(this.store.select(routerStateSelector) .filter((router: RouterReducerState) => isNotUndefined(router)) .subscribe((router: RouterReducerState) => { this.showAuth = router.state.url !== '/login'; diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts index df77dad74f..ffaa30e29e 100644 --- a/src/modules/app/browser-app.module.ts +++ b/src/modules/app/browser-app.module.ts @@ -1,8 +1,9 @@ import { HttpClient, HttpClientModule } from '@angular/common/http'; import { NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; +import { BrowserModule, makeStateKey, TransferState } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterModule } from '@angular/router'; +import { REQUEST } from '@nguniversal/express-engine/tokens'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; @@ -15,10 +16,16 @@ import { AppModule } from '../../app/app.module'; import { DSpaceBrowserTransferStateModule } from '../transfer-state/dspace-browser-transfer-state.module'; import { DSpaceTransferState } from '../transfer-state/dspace-transfer-state.service'; +export const REQ_KEY = makeStateKey('req'); + export function createTranslateLoader(http: HttpClient) { return new TranslateHttpLoader(http, 'assets/i18n/', '.json'); } +export function getRequest(transferState: TransferState): any { + return transferState.get(REQ_KEY, {}) +} + @NgModule({ bootstrap: [AppComponent], imports: [ @@ -45,6 +52,13 @@ export function createTranslateLoader(http: HttpClient) { }), AppModule ], + providers: [ + { + provide: REQUEST, + useFactory: getRequest, + deps: [TransferState] + } + ] }) export class BrowserAppModule { constructor( From 8df514f39c1b68cd2ebdeee28cd40b20a4847114 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Mon, 12 Feb 2018 19:13:42 +0100 Subject: [PATCH 11/80] Auth module improvement --- src/app/app.reducer.ts | 2 + src/app/core/auth/auth.actions.ts | 34 +++-- src/app/core/auth/auth.effects.ts | 13 +- src/app/core/auth/auth.interceptor.ts | 29 +++-- src/app/core/auth/auth.reducers.ts | 37 +++++- src/app/core/auth/auth.service.ts | 119 ++++++++++++++---- src/app/core/auth/authenticated.guard.ts | 5 +- src/app/core/auth/selectors.ts | 9 ++ .../auth-nav-menu.component.html | 4 +- .../auth-nav-menu.component.scss | 7 ++ .../auth-nav-menu/auth-nav-menu.component.ts | 4 +- src/app/shared/log-in/log-in.component.html | 5 +- src/app/shared/log-in/log-in.component.ts | 48 ++++--- src/app/shared/log-out/log-out.component.html | 4 +- src/app/shared/log-out/log-out.component.ts | 7 -- 15 files changed, 238 insertions(+), 89 deletions(-) diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts index e69f29ae52..2b37ea6a79 100644 --- a/src/app/app.reducer.ts +++ b/src/app/app.reducer.ts @@ -28,3 +28,5 @@ export const appReducers: ActionReducerMap = { searchSidebar: sidebarReducer, searchFilter: filterReducer }; + +export const routerStateSelector = (state: AppState) => state.router; diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts index 0528607d55..b9a71b71a1 100644 --- a/src/app/core/auth/auth.actions.ts +++ b/src/app/core/auth/auth.actions.ts @@ -17,6 +17,7 @@ export const AuthActionTypes = { AUTHENTICATED_SUCCESS: type('dspace/auth/AUTHENTICATED_SUCCESS'), CHECK_AUTHENTICATION_TOKEN: type('dspace/auth/CHECK_AUTHENTICATION_TOKEN'), CHECK_AUTHENTICATION_TOKEN_ERROR: type('dspace/auth/CHECK_AUTHENTICATION_TOKEN_ERROR'), + REDIRECT: type('dspace/auth/REDIRECT'), RESET_ERROR: type('dspace/auth/RESET_ERROR'), LOG_OUT: type('dspace/auth/LOG_OUT'), LOG_OUT_ERROR: type('dspace/auth/LOG_OUT_ERROR'), @@ -136,15 +137,6 @@ export class CheckAuthenticationTokenErrorAction implements Action { public type: string = AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_ERROR; } -/** - * Reset error. - * @class ResetAuthenticationErrorAction - * @implements {Action} - */ -export class ResetAuthenticationErrorAction implements Action { - public type: string = AuthActionTypes.RESET_ERROR; -} - /** * Sign out. * @class LogOutAction @@ -179,6 +171,20 @@ export class LogOutSuccessAction implements Action { constructor(public payload?: any) {} } +/** + * Redirect to login page when token is expired. + * @class RedirectWhenTokenExpiredAction + * @implements {Action} + */ +export class RedirectWhenTokenExpiredAction implements Action { + public type: string = AuthActionTypes.REDIRECT; + payload: string; + + constructor(message: string) { + this.payload = message ; + } +} + /** * Sign up. * @class RegistrationAction @@ -221,6 +227,15 @@ export class RegistrationSuccessAction implements Action { } } +/** + * Reset error. + * @class ResetAuthenticationErrorAction + * @implements {Action} + */ +export class ResetAuthenticationErrorAction implements Action { + public type: string = AuthActionTypes.RESET_ERROR; +} + /* tslint:enable:max-classes-per-file */ /** @@ -237,6 +252,7 @@ export type AuthActions | AuthenticationSuccessAction | CheckAuthenticationTokenAction | CheckAuthenticationTokenErrorAction + | RedirectWhenTokenExpiredAction | RegistrationAction | RegistrationErrorAction | RegistrationSuccessAction; diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index 3d1bd43854..2343862cbb 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -16,7 +16,7 @@ import { AuthenticatedErrorAction, AuthenticatedSuccessAction, AuthenticationErrorAction, - AuthenticationSuccessAction, CheckAuthenticationTokenAction, CheckAuthenticationTokenErrorAction, LogOutAction, + AuthenticationSuccessAction, CheckAuthenticationTokenErrorAction, LogOutErrorAction, LogOutSuccessAction, RegistrationAction, RegistrationErrorAction, @@ -87,7 +87,7 @@ export class AuthEffects { /** * When the store is rehydrated in the browser, - * clear a possible invalid token + * clear a possible invalid token or authentication errors */ @Effect({dispatch: false}) public clearInvalidTokenOnRehydrate = this.actions$ @@ -96,7 +96,8 @@ export class AuthEffects { return this.store.select(isAuthenticated) .take(1) .filter((authenticated) => !authenticated) - .do(() => this.authService.removeToken()); + .do(() => this.authService.removeToken()) + .do(() => this.authService.resetAuthenticationError()); }); @Effect() @@ -113,10 +114,16 @@ export class AuthEffects { .ofType(AuthActionTypes.LOG_OUT_SUCCESS) .do((action: LogOutSuccessAction) => this.authService.removeToken()); + @Effect({dispatch: false}) + public redirectToLogin: Observable = this.actions$ + .ofType(AuthActionTypes.REDIRECT) + .do(() => this.authService.redirectToLogin()); + /** * @constructor * @param {Actions} actions$ * @param {AuthService} authService + * @param {Store} store */ constructor(private actions$: Actions, private authService: AuthService, diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts index e8406566bc..49a1213636 100644 --- a/src/app/core/auth/auth.interceptor.ts +++ b/src/app/core/auth/auth.interceptor.ts @@ -14,10 +14,13 @@ import { AuthType } from './auth-type'; import { ResourceType } from '../shared/resource-type'; import { AuthTokenInfo } from './models/auth-token-info.model'; import { isNotEmpty } from '../../shared/empty.util'; +import { AppState } from '../../app.reducer'; +import { RedirectWhenTokenExpiredAction } from './auth.actions'; +import { Store } from '@ngrx/store'; @Injectable() export class AuthInterceptor implements HttpInterceptor { - constructor(private inj: Injector, private router: Router) { } + constructor(private inj: Injector, private store: Store) { } private isUnauthorized(status: number): boolean { return status === 401 || status === 403; @@ -84,15 +87,21 @@ export class AuthInterceptor implements HttpInterceptor { .catch((error, caught) => { // Intercept an unauthorized error response if (error instanceof HttpErrorResponse && this.isUnauthorized(error.status)) { - // Create a new HttpResponse and return it, so it can be handle properly by AuthService. - const authResponse = new HttpResponse({ - body: this.makeAuthStatusObject(false, null, error.error), - headers: error.headers, - status: error.status, - statusText: error.statusText, - url: error.url - }); - return Observable.of(authResponse); + // Checks if is a response from a request to an authentication endpoint + if (this.isAuthRequest(error.url)) { + // Create a new HttpResponse and return it, so it can be handle properly by AuthService. + const authResponse = new HttpResponse({ + body: this.makeAuthStatusObject(false, null, error.error), + headers: error.headers, + status: error.status, + statusText: error.statusText, + url: error.url + }); + return Observable.of(authResponse); + } else { + // Redirect to the login route + this.store.dispatch(new RedirectWhenTokenExpiredAction('Your session has expired. Please log in again.')); + } } else { // Return error response as is. return Observable.throw(error); diff --git a/src/app/core/auth/auth.reducers.ts b/src/app/core/auth/auth.reducers.ts index 31079767e5..1aa800daed 100644 --- a/src/app/core/auth/auth.reducers.ts +++ b/src/app/core/auth/auth.reducers.ts @@ -1,7 +1,7 @@ // import actions import { AuthActions, AuthActionTypes, AuthenticatedSuccessAction, AuthenticationErrorAction, - AuthenticationSuccessAction, LogOutErrorAction + AuthenticationSuccessAction, LogOutErrorAction, RedirectWhenTokenExpiredAction } from './auth.actions'; // import models @@ -25,6 +25,9 @@ export interface AuthState { // true when loading loading: boolean; + // info message + message?: string; + // the authenticated user user?: Eperson; } @@ -33,7 +36,7 @@ export interface AuthState { * The initial state. */ const initialState: AuthState = { - authenticated: null, + authenticated: false, loaded: false, loading: false }; @@ -50,7 +53,8 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.AUTHENTICATE: return Object.assign({}, state, { error: undefined, - loading: true + loading: true, + message: undefined }); case AuthActionTypes.AUTHENTICATED_ERROR: @@ -67,6 +71,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut loaded: true, error: undefined, loading: false, + message: undefined, user: (action as AuthenticatedSuccessAction).payload.user }); @@ -96,10 +101,11 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.RESET_ERROR: return Object.assign({}, state, { - authenticated: null, + authenticated: false, error: undefined, loaded: false, loading: false, + message: undefined, }); case AuthActionTypes.LOG_OUT_ERROR: @@ -115,6 +121,16 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut error: undefined, loaded: false, loading: false, + message: undefined, + user: undefined + }); + + case AuthActionTypes.REDIRECT: + return Object.assign({}, state, { + authenticated: false, + loaded: false, + loading: false, + message: (action as RedirectWhenTokenExpiredAction).payload, user: undefined }); @@ -122,7 +138,8 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut return Object.assign({}, state, { authenticated: false, error: undefined, - loading: true + loading: true, + message: undefined }); default: @@ -158,10 +175,18 @@ export const getAuthenticatedUser = (state: AuthState) => state.user; * Returns the authentication error. * @function getAuthenticationError * @param {State} state - * @returns {Error} + * @returns {String} */ export const getAuthenticationError = (state: AuthState) => state.error; +/** + * Returns the authentication info message. + * @function getAuthenticationError + * @param {State} state + * @returns {String} + */ +export const getAuthenticationMessage = (state: AuthState) => state.message; + /** * Returns true if request is in progress. * @function isLoading diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 62f5aa5ba7..3b76c0c1a6 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -8,9 +8,16 @@ import { HttpHeaders } from '@angular/common/http'; import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; import { AuthStatus } from './models/auth-status.model'; import { AuthTokenInfo, TOKENITEM } from './models/auth-token-info.model'; -import { isNotEmpty, isNotNull } from '../../shared/empty.util'; +import { isNotEmpty, isNotNull, isNotUndefined } from '../../shared/empty.util'; import { CookieService } from '../../shared/services/cookie.service'; +import { ActivatedRoute, Router } from '@angular/router'; +import { isAuthenticated } from './selectors'; +import { AppState, routerStateSelector } from '../../app.reducer'; +import { Store } from '@ngrx/store'; +import { ResetAuthenticationErrorAction } from './auth.actions'; +import { RouterReducerState } from '@ngrx/router-store'; +export const LOGIN_ROUTE = '/login'; /** * The auth service. */ @@ -21,7 +28,7 @@ export class AuthService { * True if authenticated * @type boolean */ - private _authenticated = false; + private _authenticated: boolean; /** * The url to redirect after login @@ -29,7 +36,27 @@ export class AuthService { */ private _redirectUrl: string; - constructor(private authRequestService: AuthRequestService, private storage: CookieService) { + constructor(private route: ActivatedRoute, + private authRequestService: AuthRequestService, + private router: Router, + private storage: CookieService, + private store: Store) { + this.store.select(isAuthenticated) + .startWith(false) + .subscribe((authenticated: boolean) => this._authenticated = authenticated); + + // If current route is different from the one setted in authentication guard + // and is not the login route, clear it + this.store.select(routerStateSelector) + .filter((routerState: RouterReducerState) => isNotUndefined(routerState)) + .filter((routerState: RouterReducerState) => + (routerState.state.url !== LOGIN_ROUTE) + && isNotEmpty(this._redirectUrl) + && (routerState.state.url !== this._redirectUrl)) + .distinctUntilChanged() + .subscribe((routerState: RouterReducerState) => { + this._redirectUrl = ''; + }) } /** @@ -40,18 +67,12 @@ export class AuthService { * @returns {Observable} The authenticated user observable. */ public authenticate(user: string, password: string): Observable { - // Normally you would do an HTTP request to determine to - // attempt authenticating the user using the supplied credentials. - // const body = `user=${user}&password=${password}`; - // const body = encodeURI('password=test&user=vera.aloe@mailinator.com'); - // const body = [{user}, {password}]; - // const body = encodeURI('password=' + password.toString() + '&user=' + user.toString()); + // Attempt authenticating the user using the supplied credentials. const body = encodeURI(`password=${password}&user=${user}`); const options: HttpOptions = Object.create({}); let headers = new HttpHeaders(); headers = headers.append('Content-Type', 'application/x-www-form-urlencoded'); options.headers = headers; - // options.responseType = 'text'; return this.authRequestService.postToEndpoint('login', body, options) .map((status: AuthStatus) => { if (status.authenticated) { @@ -67,8 +88,8 @@ export class AuthService { * Determines if the user is authenticated * @returns {Observable} */ - public authenticated(): Observable { - return Observable.of(this._authenticated); + public isAuthenticated(): Observable { + return this.store.select(isAuthenticated); } /** @@ -85,10 +106,8 @@ export class AuthService { return this.authRequestService.getRequest('status', options) .map((status: AuthStatus) => { if (status.authenticated) { - this._authenticated = true; return status.eperson[0]; } else { - this._authenticated = false; throw(new Error('Not authenticated')); } }); @@ -102,6 +121,13 @@ export class AuthService { return isNotEmpty(token) ? Observable.of(token) : Observable.throw(false); } + /** + * Clear authentication errors + */ + public resetAuthenticationError(): void { + this.store.dispatch(new ResetAuthenticationErrorAction()); + } + /** * Create a new user * @returns {User} @@ -119,15 +145,13 @@ export class AuthService { * @returns {Observable} */ public logout(): Observable { - // Normally you would do an HTTP request sign end the session - // but, let's just return an observable of true. + // Send a request that sign end the session let headers = new HttpHeaders(); headers = headers.append('Content-Type', 'application/x-www-form-urlencoded'); const options: HttpOptions = Object.create({headers, responseType: 'text'}); return this.authRequestService.getRequest('logout', options) .map((status: AuthStatus) => { if (!status.authenticated) { - this._authenticated = false; return true; } else { throw(new Error('Invalid email or password')); @@ -136,32 +160,77 @@ export class AuthService { } + /** + * Retrieve authentication token info and make authorization header + * @returns {string} + */ public getAuthHeader(): string { - // Retrieve authentication token info - const token = this.storage.get(TOKENITEM); - return (isNotNull(token) && this._authenticated) ? `Bearer ${token.accessToken}` : ''; + const token = this.getToken(); + return (this._authenticated && isNotNull(token)) ? `Bearer ${token.accessToken}` : ''; } + /** + * Get authentication token info + * @returns {AuthTokenInfo} + */ public getToken(): AuthTokenInfo { - // Retrieve authentication token info - return this.storage.get(TOKENITEM); + // Retrieve authentication token info and check if is valid + const token = this.storage.get(TOKENITEM); + if (isNotEmpty(token) && token.hasOwnProperty('accessToken') && isNotEmpty(token.accessToken)) { + return token; + } else { + return null; + } } + /** + * Save authentication token info + * + * @param {AuthTokenInfo} token The token to save + * @returns {AuthTokenInfo} + */ public storeToken(token: AuthTokenInfo) { - // Save authentication token info return this.storage.set(TOKENITEM, token); } + /** + * Remove authentication token info + */ public removeToken() { - // Remove authentication token info - console.log('REMOVE!!!!'); return this.storage.remove(TOKENITEM); } + /** + * Redirect to the login route + */ + public redirectToLogin() { + this.router.navigate(['/login']); + } + + /** + * Redirect to the route navigated before the login + */ + public redirectToPreviousUrl() { + if (isNotEmpty(this._redirectUrl)) { + const url = this._redirectUrl; + // Clear url + this._redirectUrl = null; + this.router.navigate([url]); + } else { + this.router.navigate(['/']); + } + } + + /** + * Get redirect url + */ get redirectUrl(): string { return this._redirectUrl; } + /** + * Set redirect url + */ set redirectUrl(value: string) { this._redirectUrl = value; } diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts index cd39981a1f..29db8bc46d 100644 --- a/src/app/core/auth/authenticated.guard.ts +++ b/src/app/core/auth/authenticated.guard.ts @@ -6,7 +6,7 @@ import { Store } from '@ngrx/store'; // reducers import { CoreState } from '../core.reducers'; -import { isAuthenticated } from './selectors'; +import { isAuthenticated, isAuthenticationLoading } from './selectors'; import { AuthService } from './auth.service'; /** @@ -50,6 +50,7 @@ export class AuthenticatedGuard implements CanActivate, CanLoad { } private handleAuth(url: string): Observable { + console.log('handleAuth', url) // get observable const observable = this.store.select(isAuthenticated); @@ -57,7 +58,7 @@ export class AuthenticatedGuard implements CanActivate, CanLoad { observable.subscribe((authenticated) => { if (!authenticated) { this.authService.redirectUrl = url; - this.router.navigate(['/login']); + this.authService.redirectToLogin(); } }); diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts index a260f84762..5cf4da58dc 100644 --- a/src/app/core/auth/selectors.ts +++ b/src/app/core/auth/selectors.ts @@ -38,6 +38,15 @@ export const getAuthenticatedUser = createSelector(getAuthState, auth.getAuthent */ export const getAuthenticationError = createSelector(getAuthState, auth.getAuthenticationError); +/** + * Returns the authentication info message. + * @function getAuthenticationError + * @param {AuthState} state + * @param {any} props + * @return {Error} + */ +export const getAuthenticationMessage = createSelector(getAuthState, auth.getAuthenticationMessage); + /** * Returns true if the user is authenticated * @function isAuthenticated diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html index 34db6a2130..e66e75be4c 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html @@ -2,7 +2,7 @@
  • {{ 'nav.login' | translate }} -
    +
    @@ -13,7 +13,7 @@
  • Hello {{(user | async).name}} -
    +
    diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss index e69de29bb2..26de13150f 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss @@ -0,0 +1,7 @@ +#loginDropdownMenu, #logoutDropdownMenu { + min-width: 330px; +} + +#loginDropdownMenu { + min-height: 260px; +} diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts index b9e46c6159..557b1c16e6 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts @@ -7,14 +7,12 @@ import { Store } from '@ngrx/store'; import { fadeInOut, fadeOut } from '../animations/fade'; import { CoreState } from '../../core/core.reducers'; import { HostWindowService } from '../host-window.service'; -import { AppState } from '../../app.reducer'; +import { AppState, routerStateSelector } from '../../app.reducer'; import { hasValue, isNotUndefined } from '../empty.util'; import { getAuthenticatedUser, isAuthenticated } from '../../core/auth/selectors'; import { Subscription } from 'rxjs/Subscription'; import { Eperson } from '../../core/eperson/models/eperson.model'; -const routerStateSelector = (state: AppState) => state.router; - @Component({ selector: 'ds-auth-nav-menu', templateUrl: './auth-nav-menu.component.html', diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index 92b7cb08bb..b9b9877a37 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -9,7 +9,7 @@ placeholder="{{'login.form.email' | translate}}" required type="email" - (input)="resetError($event)"> + (input)="resetErrorOrMessage($event)"> + (input)="resetErrorOrMessage($event)"> +
    {{"login.form.new-user" | translate}} diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts index faf17eedd5..b0521fe7d1 100644 --- a/src/app/shared/log-in/log-in.component.ts +++ b/src/app/shared/log-in/log-in.component.ts @@ -14,15 +14,15 @@ import { AuthenticateAction, ResetAuthenticationErrorAction } from '../../core/a // reducers import { - getAuthenticationError, + getAuthenticationError, getAuthenticationMessage, isAuthenticated, isAuthenticationLoading, } from '../../core/auth/selectors'; -import { Router } from '@angular/router'; import { CoreState } from '../../core/core.reducers'; -import { isNotEmpty, isNotNull } from '../empty.util'; +import { isNotEmpty } from '../empty.util'; import { fadeOut } from '../animations/fade'; +import { AuthService } from '../../core/auth/auth.service'; /** * /users/sign-in @@ -48,6 +48,18 @@ export class LogInComponent implements OnDestroy, OnInit { */ public hasError = false; + /** + * The authentication info message. + * @type {Observable} + */ + public message: Observable; + + /** + * Has authentication message. + * @type {boolean} + */ + public hasMessage = false; + /** * True if the authentication is loading. * @type {boolean} @@ -68,12 +80,13 @@ export class LogInComponent implements OnDestroy, OnInit { /** * @constructor + * @param {AuthService} authService * @param {FormBuilder} formBuilder * @param {Store} store */ constructor( + private authService: AuthService, private formBuilder: FormBuilder, - private router: Router, private store: Store ) { } @@ -95,6 +108,13 @@ export class LogInComponent implements OnDestroy, OnInit { return error; }); + // set error + this.message = this.store.select(getAuthenticationMessage) + .map((message) => { + this.hasMessage = (isNotEmpty(message)); + return message; + }); + // set loading this.loading = this.store.select(isAuthenticationLoading); @@ -103,7 +123,7 @@ export class LogInComponent implements OnDestroy, OnInit { .takeWhile(() => this.alive) .filter((authenticated) => authenticated) .subscribe(() => { - this.router.navigate(['/']); + this.authService.redirectToPreviousUrl(); }); } @@ -116,20 +136,13 @@ export class LogInComponent implements OnDestroy, OnInit { } /** - * Go to the home page. - * @method home + * Reset error or message. */ - public home() { - this.router.navigate(['/home']); - } - - /** - * Reset error. - */ - public resetError() { - if (this.hasError) { + public resetErrorOrMessage() { + if (this.hasError || this.hasMessage) { this.store.dispatch(new ResetAuthenticationErrorAction()); this.hasError = false; + this.hasMessage = false; } } @@ -138,7 +151,8 @@ export class LogInComponent implements OnDestroy, OnInit { * @method register */ public register() { - this.router.navigate(['/register']); + // TODO enable after registration process is done + // this.router.navigate(['/register']); } /** diff --git a/src/app/shared/log-out/log-out.component.html b/src/app/shared/log-out/log-out.component.html index 6e4ee32f6f..a917f0520f 100644 --- a/src/app/shared/log-out/log-out.component.html +++ b/src/app/shared/log-out/log-out.component.html @@ -2,8 +2,6 @@ diff --git a/src/app/shared/log-out/log-out.component.ts b/src/app/shared/log-out/log-out.component.ts index 36c5914347..37d0b142f9 100644 --- a/src/app/shared/log-out/log-out.component.ts +++ b/src/app/shared/log-out/log-out.component.ts @@ -75,13 +75,6 @@ export class LogOutComponent implements OnDestroy, OnInit { this.router.navigate(['/home']); } - /** - * To to the log in page. - */ - public logIn() { - this.router.navigate(['/login']); - } - public logOut() { this.store.dispatch(new LogOutAction()); } From 4488a450c0dbaa7bfb048132a4f1d81c7405c57a Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 13 Feb 2018 12:56:07 +0100 Subject: [PATCH 12/80] Fixed authentication module --- src/app/+login-page/login-page.component.ts | 15 ++++++- src/app/core/auth/auth.actions.ts | 28 ++++++++++--- src/app/core/auth/auth.effects.ts | 5 ++- src/app/core/auth/auth.interceptor.ts | 11 +++-- src/app/core/auth/auth.reducers.ts | 46 +++++++++++---------- src/app/core/auth/auth.service.ts | 26 ++++++++---- src/app/core/auth/authenticated.guard.ts | 18 ++++---- src/app/core/auth/selectors.ts | 6 +-- src/app/shared/log-in/log-in.component.ts | 8 ++-- 9 files changed, 104 insertions(+), 59 deletions(-) diff --git a/src/app/+login-page/login-page.component.ts b/src/app/+login-page/login-page.component.ts index 14bb443a4e..2752973130 100644 --- a/src/app/+login-page/login-page.component.ts +++ b/src/app/+login-page/login-page.component.ts @@ -1,10 +1,21 @@ -import { Component } from '@angular/core'; +import { Component, OnDestroy } from '@angular/core'; + +import { Store } from '@ngrx/store'; + +import { AppState } from '../app.reducer'; +import { ResetAuthenticationMessagesAction } from '../core/auth/auth.actions'; @Component({ selector: 'ds-login-page', styleUrls: ['./login-page.component.scss'], templateUrl: './login-page.component.html' }) -export class LoginPageComponent { +export class LoginPageComponent implements OnDestroy { + constructor(private store: Store) {} + + ngOnDestroy() { + // Clear all authentication messages when leaving login page + this.store.dispatch(new ResetAuthenticationMessagesAction()); + } } diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts index b9a71b71a1..239de2fb24 100644 --- a/src/app/core/auth/auth.actions.ts +++ b/src/app/core/auth/auth.actions.ts @@ -17,8 +17,9 @@ export const AuthActionTypes = { AUTHENTICATED_SUCCESS: type('dspace/auth/AUTHENTICATED_SUCCESS'), CHECK_AUTHENTICATION_TOKEN: type('dspace/auth/CHECK_AUTHENTICATION_TOKEN'), CHECK_AUTHENTICATION_TOKEN_ERROR: type('dspace/auth/CHECK_AUTHENTICATION_TOKEN_ERROR'), - REDIRECT: type('dspace/auth/REDIRECT'), - RESET_ERROR: type('dspace/auth/RESET_ERROR'), + REDIRECT_TOKEN_EXPIRED: type('dspace/auth/REDIRECT_TOKEN_EXPIRED'), + REDIRECT_AUTHENTICATION_REQUIRED: type('dspace/auth/REDIRECT_AUTHENTICATION_REQUIRED'), + RESET_MESSAGES: type('dspace/auth/RESET_MESSAGES'), LOG_OUT: type('dspace/auth/LOG_OUT'), LOG_OUT_ERROR: type('dspace/auth/LOG_OUT_ERROR'), LOG_OUT_SUCCESS: type('dspace/auth/LOG_OUT_SUCCESS'), @@ -171,13 +172,27 @@ export class LogOutSuccessAction implements Action { constructor(public payload?: any) {} } +/** + * Redirect to login page when authentication is required. + * @class RedirectWhenAuthenticationIsRequiredAction + * @implements {Action} + */ +export class RedirectWhenAuthenticationIsRequiredAction implements Action { + public type: string = AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED; + payload: string; + + constructor(message: string) { + this.payload = message ; + } +} + /** * Redirect to login page when token is expired. * @class RedirectWhenTokenExpiredAction * @implements {Action} */ export class RedirectWhenTokenExpiredAction implements Action { - public type: string = AuthActionTypes.REDIRECT; + public type: string = AuthActionTypes.REDIRECT_TOKEN_EXPIRED; payload: string; constructor(message: string) { @@ -229,11 +244,11 @@ export class RegistrationSuccessAction implements Action { /** * Reset error. - * @class ResetAuthenticationErrorAction + * @class ResetAuthenticationMessagesAction * @implements {Action} */ -export class ResetAuthenticationErrorAction implements Action { - public type: string = AuthActionTypes.RESET_ERROR; +export class ResetAuthenticationMessagesAction implements Action { + public type: string = AuthActionTypes.RESET_MESSAGES; } /* tslint:enable:max-classes-per-file */ @@ -252,6 +267,7 @@ export type AuthActions | AuthenticationSuccessAction | CheckAuthenticationTokenAction | CheckAuthenticationTokenErrorAction + | RedirectWhenAuthenticationIsRequiredAction | RedirectWhenTokenExpiredAction | RegistrationAction | RegistrationErrorAction diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index 2343862cbb..b066d5ca92 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -112,11 +112,12 @@ export class AuthEffects { @Effect({dispatch: false}) public logOutSuccess: Observable = this.actions$ .ofType(AuthActionTypes.LOG_OUT_SUCCESS) - .do((action: LogOutSuccessAction) => this.authService.removeToken()); + .do(() => this.authService.removeToken()) + .do(() => this.authService.refreshPage()); @Effect({dispatch: false}) public redirectToLogin: Observable = this.actions$ - .ofType(AuthActionTypes.REDIRECT) + .ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED, AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED) .do(() => this.authService.redirectToLogin()); /** diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts index 49a1213636..a45e5ef694 100644 --- a/src/app/core/auth/auth.interceptor.ts +++ b/src/app/core/auth/auth.interceptor.ts @@ -1,20 +1,19 @@ import { Injectable, Injector } from '@angular/core'; -import { Router } from '@angular/router'; import { - HttpClient, HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpResponse, + HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpResponse, HttpErrorResponse } from '@angular/common/http'; + import { Observable } from 'rxjs/Rx'; import 'rxjs/add/observable/throw' import 'rxjs/add/operator/catch'; +import { AppState } from '../../app.reducer'; +import { AuthError } from './models/auth-error.model'; import { AuthService } from './auth.service'; import { AuthStatus } from './models/auth-status.model'; -import { AuthType } from './auth-type'; -import { ResourceType } from '../shared/resource-type'; import { AuthTokenInfo } from './models/auth-token-info.model'; import { isNotEmpty } from '../../shared/empty.util'; -import { AppState } from '../../app.reducer'; import { RedirectWhenTokenExpiredAction } from './auth.actions'; import { Store } from '@ngrx/store'; @@ -47,7 +46,7 @@ export class AuthInterceptor implements HttpInterceptor { authStatus.token = new AuthTokenInfo(accessToken); } else { authStatus.authenticated = false; - authStatus.error = isNotEmpty(error) ? JSON.parse(error) : null; + authStatus.error = isNotEmpty(error) ? ((typeof error === 'string') ? JSON.parse(error) : error) : null; } return authStatus; } diff --git a/src/app/core/auth/auth.reducers.ts b/src/app/core/auth/auth.reducers.ts index 1aa800daed..07a1fe3e7e 100644 --- a/src/app/core/auth/auth.reducers.ts +++ b/src/app/core/auth/auth.reducers.ts @@ -1,7 +1,8 @@ // import actions import { AuthActions, AuthActionTypes, AuthenticatedSuccessAction, AuthenticationErrorAction, - AuthenticationSuccessAction, LogOutErrorAction, RedirectWhenTokenExpiredAction + AuthenticationSuccessAction, LogOutErrorAction, RedirectWhenAuthenticationIsRequiredAction, + RedirectWhenTokenExpiredAction } from './auth.actions'; // import models @@ -26,7 +27,7 @@ export interface AuthState { loading: boolean; // info message - message?: string; + info?: string; // the authenticated user user?: Eperson; @@ -54,7 +55,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut return Object.assign({}, state, { error: undefined, loading: true, - message: undefined + info: undefined }); case AuthActionTypes.AUTHENTICATED_ERROR: @@ -71,7 +72,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut loaded: true, error: undefined, loading: false, - message: undefined, + info: undefined, user: (action as AuthenticatedSuccessAction).payload.user }); @@ -96,18 +97,6 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut loading: false }); - case AuthActionTypes.REGISTRATION_SUCCESS: - return state; - - case AuthActionTypes.RESET_ERROR: - return Object.assign({}, state, { - authenticated: false, - error: undefined, - loaded: false, - loading: false, - message: undefined, - }); - case AuthActionTypes.LOG_OUT_ERROR: return Object.assign({}, state, { authenticated: true, @@ -121,16 +110,17 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut error: undefined, loaded: false, loading: false, - message: undefined, + info: undefined, user: undefined }); - case AuthActionTypes.REDIRECT: + case AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED: + case AuthActionTypes.REDIRECT_TOKEN_EXPIRED: return Object.assign({}, state, { authenticated: false, loaded: false, loading: false, - message: (action as RedirectWhenTokenExpiredAction).payload, + info: (action as RedirectWhenTokenExpiredAction as RedirectWhenAuthenticationIsRequiredAction).payload, user: undefined }); @@ -139,7 +129,19 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut authenticated: false, error: undefined, loading: true, - message: undefined + info: undefined + }); + + case AuthActionTypes.REGISTRATION_SUCCESS: + return state; + + case AuthActionTypes.RESET_MESSAGES: + return Object.assign({}, state, { + authenticated: false, + error: undefined, + loaded: false, + loading: false, + info: undefined, }); default: @@ -181,11 +183,11 @@ export const getAuthenticationError = (state: AuthState) => state.error; /** * Returns the authentication info message. - * @function getAuthenticationError + * @function getAuthenticationInfo * @param {State} state * @returns {String} */ -export const getAuthenticationMessage = (state: AuthState) => state.message; +export const getAuthenticationInfo = (state: AuthState) => state.info; /** * Returns true if request is in progress. diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 3b76c0c1a6..69732e9ee0 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -10,12 +10,12 @@ import { AuthStatus } from './models/auth-status.model'; import { AuthTokenInfo, TOKENITEM } from './models/auth-token-info.model'; import { isNotEmpty, isNotNull, isNotUndefined } from '../../shared/empty.util'; import { CookieService } from '../../shared/services/cookie.service'; -import { ActivatedRoute, Router } from '@angular/router'; import { isAuthenticated } from './selectors'; import { AppState, routerStateSelector } from '../../app.reducer'; import { Store } from '@ngrx/store'; -import { ResetAuthenticationErrorAction } from './auth.actions'; +import { ResetAuthenticationMessagesAction } from './auth.actions'; import { RouterReducerState } from '@ngrx/router-store'; +import { Router } from '@angular/router'; export const LOGIN_ROUTE = '/login'; /** @@ -36,8 +36,7 @@ export class AuthService { */ private _redirectUrl: string; - constructor(private route: ActivatedRoute, - private authRequestService: AuthRequestService, + constructor(private authRequestService: AuthRequestService, private router: Router, private storage: CookieService, private store: Store) { @@ -46,7 +45,7 @@ export class AuthService { .subscribe((authenticated: boolean) => this._authenticated = authenticated); // If current route is different from the one setted in authentication guard - // and is not the login route, clear it + // and is not the login route, clear redirect url and messages this.store.select(routerStateSelector) .filter((routerState: RouterReducerState) => isNotUndefined(routerState)) .filter((routerState: RouterReducerState) => @@ -54,7 +53,7 @@ export class AuthService { && isNotEmpty(this._redirectUrl) && (routerState.state.url !== this._redirectUrl)) .distinctUntilChanged() - .subscribe((routerState: RouterReducerState) => { + .subscribe(() => { this._redirectUrl = ''; }) } @@ -125,7 +124,7 @@ export class AuthService { * Clear authentication errors */ public resetAuthenticationError(): void { - this.store.dispatch(new ResetAuthenticationErrorAction()); + this.store.dispatch(new ResetAuthenticationMessagesAction()); } /** @@ -221,6 +220,19 @@ export class AuthService { } } + /** + * Refresh route navigated + */ + public refreshPage() { + this.store.select(routerStateSelector) + .take(1) + .subscribe((router) => { + // TODO Chack a way to hard refresh the same route + // this.router.navigate([router.state.url], { replaceUrl: true }); + this.router.navigate(['/']); + }) + } + /** * Get redirect url */ diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts index 29db8bc46d..1f74feb0f7 100644 --- a/src/app/core/auth/authenticated.guard.ts +++ b/src/app/core/auth/authenticated.guard.ts @@ -8,6 +8,8 @@ import { Store } from '@ngrx/store'; import { CoreState } from '../core.reducers'; import { isAuthenticated, isAuthenticationLoading } from './selectors'; import { AuthService } from './auth.service'; +import { RedirectWhenAuthenticationIsRequiredAction } from './auth.actions'; +import { isEmpty } from '../../shared/empty.util'; /** * Prevent unauthorized activating and loading of routes @@ -27,7 +29,6 @@ export class AuthenticatedGuard implements CanActivate, CanLoad { */ canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { const url = state.url; - return this.handleAuth(url); } @@ -50,16 +51,19 @@ export class AuthenticatedGuard implements CanActivate, CanLoad { } private handleAuth(url: string): Observable { - console.log('handleAuth', url) // get observable const observable = this.store.select(isAuthenticated); // redirect to sign in page if user is not authenticated - observable.subscribe((authenticated) => { - if (!authenticated) { - this.authService.redirectUrl = url; - this.authService.redirectToLogin(); - } + observable + // .filter(() => isEmpty(this.router.routerState.snapshot.url) || this.router.routerState.snapshot.url === url) + .take(1) + .subscribe((authenticated) => { + console.log('handleAuth', url, this.router.routerState.snapshot.url); + if (!authenticated) { + this.authService.redirectUrl = url; + this.store.dispatch(new RedirectWhenAuthenticationIsRequiredAction('Login required')); + } }); return observable; diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts index 5cf4da58dc..1a918fa41a 100644 --- a/src/app/core/auth/selectors.ts +++ b/src/app/core/auth/selectors.ts @@ -40,12 +40,12 @@ export const getAuthenticationError = createSelector(getAuthState, auth.getAuthe /** * Returns the authentication info message. - * @function getAuthenticationError + * @function getAuthenticationInfo * @param {AuthState} state * @param {any} props - * @return {Error} + * @return {string} */ -export const getAuthenticationMessage = createSelector(getAuthState, auth.getAuthenticationMessage); +export const getAuthenticationInfo = createSelector(getAuthState, auth.getAuthenticationInfo); /** * Returns true if the user is authenticated diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts index b0521fe7d1..ee988a3a14 100644 --- a/src/app/shared/log-in/log-in.component.ts +++ b/src/app/shared/log-in/log-in.component.ts @@ -10,11 +10,11 @@ import 'rxjs/add/operator/filter'; import 'rxjs/add/operator/takeWhile'; // actions -import { AuthenticateAction, ResetAuthenticationErrorAction } from '../../core/auth/auth.actions'; +import { AuthenticateAction, ResetAuthenticationMessagesAction } from '../../core/auth/auth.actions'; // reducers import { - getAuthenticationError, getAuthenticationMessage, + getAuthenticationError, getAuthenticationInfo, isAuthenticated, isAuthenticationLoading, } from '../../core/auth/selectors'; @@ -109,7 +109,7 @@ export class LogInComponent implements OnDestroy, OnInit { }); // set error - this.message = this.store.select(getAuthenticationMessage) + this.message = this.store.select(getAuthenticationInfo) .map((message) => { this.hasMessage = (isNotEmpty(message)); return message; @@ -140,7 +140,7 @@ export class LogInComponent implements OnDestroy, OnInit { */ public resetErrorOrMessage() { if (this.hasError || this.hasMessage) { - this.store.dispatch(new ResetAuthenticationErrorAction()); + this.store.dispatch(new ResetAuthenticationMessagesAction()); this.hasError = false; this.hasMessage = false; } From 2637f1c28ede5f0cf21dbd1c69972f1a81526d21 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 22 Feb 2018 15:47:15 +0100 Subject: [PATCH 13/80] Finalized auth module --- src/app/+login-page/login-page.component.scss | 15 ----- src/app/core/auth/auth.actions.ts | 17 ++++- src/app/core/auth/auth.reducers.ts | 50 ++++++++++----- src/app/core/auth/auth.service.ts | 63 ++++++++++--------- src/app/core/auth/authenticated.guard.ts | 4 +- src/app/core/auth/selectors.ts | 25 +++++--- .../auth-nav-menu/auth-nav-menu.component.ts | 9 +-- src/app/shared/log-in/log-in.component.html | 8 +-- .../shared/log-in/log-in.component.spec.ts | 42 +++++++------ src/app/shared/log-in/log-in.component.ts | 3 + .../shared/log-out/log-out.component.spec.ts | 19 +++--- src/routes.ts | 2 + 12 files changed, 143 insertions(+), 114 deletions(-) diff --git a/src/app/+login-page/login-page.component.scss b/src/app/+login-page/login-page.component.scss index b71eee7ee1..e69de29bb2 100644 --- a/src/app/+login-page/login-page.component.scss +++ b/src/app/+login-page/login-page.component.scss @@ -1,15 +0,0 @@ -.login-container { - height: 100%; - display: -ms-flexbox; - display: -webkit-box; - display: flex; - -ms-flex-align: center; - -ms-flex-pack: center; - -webkit-box-align: center; - align-items: center; - -webkit-box-pack: center; - justify-content: center; - padding-top: 40px; - padding-bottom: 40px; - background-color: #f5f5f5; -} diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts index 239de2fb24..aedda593c4 100644 --- a/src/app/core/auth/auth.actions.ts +++ b/src/app/core/auth/auth.actions.ts @@ -25,7 +25,8 @@ export const AuthActionTypes = { LOG_OUT_SUCCESS: type('dspace/auth/LOG_OUT_SUCCESS'), REGISTRATION: type('dspace/auth/REGISTRATION'), REGISTRATION_ERROR: type('dspace/auth/REGISTRATION_ERROR'), - REGISTRATION_SUCCESS: type('dspace/auth/REGISTRATION_SUCCESS') + REGISTRATION_SUCCESS: type('dspace/auth/REGISTRATION_SUCCESS'), + SET_REDIRECT_URL: type('dspace/auth/SET_REDIRECT_URL'), }; /* tslint:disable:max-classes-per-file */ @@ -251,6 +252,20 @@ export class ResetAuthenticationMessagesAction implements Action { public type: string = AuthActionTypes.RESET_MESSAGES; } +/** + * Change the redirect url. + * @class SetRedirectUrlAction + * @implements {Action} + */ +export class SetRedirectUrlAction implements Action { + public type: string = AuthActionTypes.SET_REDIRECT_URL; + payload: string; + + constructor(url: string) { + this.payload = url ; + } +} + /* tslint:enable:max-classes-per-file */ /** diff --git a/src/app/core/auth/auth.reducers.ts b/src/app/core/auth/auth.reducers.ts index 07a1fe3e7e..d56f0888fa 100644 --- a/src/app/core/auth/auth.reducers.ts +++ b/src/app/core/auth/auth.reducers.ts @@ -2,7 +2,7 @@ import { AuthActions, AuthActionTypes, AuthenticatedSuccessAction, AuthenticationErrorAction, AuthenticationSuccessAction, LogOutErrorAction, RedirectWhenAuthenticationIsRequiredAction, - RedirectWhenTokenExpiredAction + RedirectWhenTokenExpiredAction, SetRedirectUrlAction } from './auth.actions'; // import models @@ -29,6 +29,9 @@ export interface AuthState { // info message info?: string; + // redirect url after login + redirectUrl?: string; + // the authenticated user user?: Eperson; } @@ -39,7 +42,7 @@ export interface AuthState { const initialState: AuthState = { authenticated: false, loaded: false, - loading: false + loading: false, }; /** @@ -137,13 +140,18 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.RESET_MESSAGES: return Object.assign({}, state, { - authenticated: false, + authenticated: state.authenticated, error: undefined, - loaded: false, - loading: false, + loaded: state.loaded, + loading: state.loading, info: undefined, }); + case AuthActionTypes.SET_REDIRECT_URL: + return Object.assign({}, state, { + redirectUrl: (action as SetRedirectUrlAction).payload, + }); + default: return state; } @@ -155,7 +163,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut * @param {State} state * @returns {boolean} */ -export const isAuthenticated = (state: AuthState) => state.authenticated; +export const _isAuthenticated = (state: AuthState) => state.authenticated; /** * Returns true if the authenticated has loaded. @@ -163,7 +171,7 @@ export const isAuthenticated = (state: AuthState) => state.authenticated; * @param {State} state * @returns {boolean} */ -export const isAuthenticatedLoaded = (state: AuthState) => state.loaded; +export const _isAuthenticatedLoaded = (state: AuthState) => state.loaded; /** * Return the users state @@ -171,23 +179,23 @@ export const isAuthenticatedLoaded = (state: AuthState) => state.loaded; * @param {State} state * @returns {User} */ -export const getAuthenticatedUser = (state: AuthState) => state.user; +export const _getAuthenticatedUser = (state: AuthState) => state.user; /** * Returns the authentication error. * @function getAuthenticationError * @param {State} state - * @returns {String} + * @returns {string} */ -export const getAuthenticationError = (state: AuthState) => state.error; +export const _getAuthenticationError = (state: AuthState) => state.error; /** * Returns the authentication info message. * @function getAuthenticationInfo * @param {State} state - * @returns {String} + * @returns {string} */ -export const getAuthenticationInfo = (state: AuthState) => state.info; +export const _getAuthenticationInfo = (state: AuthState) => state.info; /** * Returns true if request is in progress. @@ -195,20 +203,28 @@ export const getAuthenticationInfo = (state: AuthState) => state.info; * @param {State} state * @returns {boolean} */ -export const isLoading = (state: AuthState) => state.loading; +export const _isLoading = (state: AuthState) => state.loading; /** * Returns the sign out error. * @function getLogOutError * @param {State} state - * @returns {Error} + * @returns {string} */ -export const getLogOutError = (state: AuthState) => state.error; +export const _getLogOutError = (state: AuthState) => state.error; /** * Returns the sign up error. * @function getRegistrationError * @param {State} state - * @returns {Error} + * @returns {string} */ -export const getRegistrationError = (state: AuthState) => state.error; +export const _getRegistrationError = (state: AuthState) => state.error; + +/** + * Returns the redirect url. + * @function getRedirectUrl + * @param {State} state + * @returns {string} + */ +export const _getRedirectUrl = (state: AuthState) => state.redirectUrl; diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 69732e9ee0..26a7ff290f 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; +import { filter, map, withLatestFrom } from 'rxjs/operators'; import { Eperson } from '../eperson/models/eperson.model'; import { AuthRequestService } from './auth-request.service'; @@ -10,10 +11,10 @@ import { AuthStatus } from './models/auth-status.model'; import { AuthTokenInfo, TOKENITEM } from './models/auth-token-info.model'; import { isNotEmpty, isNotNull, isNotUndefined } from '../../shared/empty.util'; import { CookieService } from '../../shared/services/cookie.service'; -import { isAuthenticated } from './selectors'; +import { getRedirectUrl, isAuthenticated } from './selectors'; import { AppState, routerStateSelector } from '../../app.reducer'; import { Store } from '@ngrx/store'; -import { ResetAuthenticationMessagesAction } from './auth.actions'; +import { ResetAuthenticationMessagesAction, SetRedirectUrlAction } from './auth.actions'; import { RouterReducerState } from '@ngrx/router-store'; import { Router } from '@angular/router'; @@ -30,12 +31,6 @@ export class AuthService { */ private _authenticated: boolean; - /** - * The url to redirect after login - * @type string - */ - private _redirectUrl: string; - constructor(private authRequestService: AuthRequestService, private router: Router, private storage: CookieService, @@ -46,16 +41,18 @@ export class AuthService { // If current route is different from the one setted in authentication guard // and is not the login route, clear redirect url and messages - this.store.select(routerStateSelector) - .filter((routerState: RouterReducerState) => isNotUndefined(routerState)) - .filter((routerState: RouterReducerState) => - (routerState.state.url !== LOGIN_ROUTE) - && isNotEmpty(this._redirectUrl) - && (routerState.state.url !== this._redirectUrl)) - .distinctUntilChanged() + const routeUrlObs = this.store.select(routerStateSelector) + .filter((routerState: RouterReducerState) => isNotUndefined(routerState) && isNotUndefined(routerState.state) ) + .filter((routerState: RouterReducerState) => (routerState.state.url !== LOGIN_ROUTE)) + .map((routerState: RouterReducerState) => routerState.state.url); + const redirectUrlObs = this.getRedirectUrl(); + routeUrlObs.pipe( + withLatestFrom(redirectUrlObs), + map(([routeUrl, redirectUrl]) => [routeUrl, redirectUrl]) + ).filter(([routeUrl, redirectUrl]) => isNotEmpty(redirectUrl) && (routeUrl !== redirectUrl)) .subscribe(() => { - this._redirectUrl = ''; - }) + this.setRedirectUrl(''); + }); } /** @@ -135,7 +132,7 @@ export class AuthService { // Normally you would do an HTTP request to POST the user // details and then return the new user object // but, let's just return the new user for this example. - this._authenticated = true; + // this._authenticated = true; return Observable.of(user); } @@ -210,14 +207,18 @@ export class AuthService { * Redirect to the route navigated before the login */ public redirectToPreviousUrl() { - if (isNotEmpty(this._redirectUrl)) { - const url = this._redirectUrl; - // Clear url - this._redirectUrl = null; - this.router.navigate([url]); - } else { - this.router.navigate(['/']); - } + this.getRedirectUrl() + .first() + .subscribe((redirectUrl) => { + if (isNotEmpty(redirectUrl)) { + // Clear url + this.setRedirectUrl(undefined); + this.router.navigate([decodeURI(redirectUrl)]); + } else { + this.router.navigate(['/']); + } + }) + } /** @@ -227,7 +228,7 @@ export class AuthService { this.store.select(routerStateSelector) .take(1) .subscribe((router) => { - // TODO Chack a way to hard refresh the same route + // TODO Check a way to hard refresh the same route // this.router.navigate([router.state.url], { replaceUrl: true }); this.router.navigate(['/']); }) @@ -236,14 +237,14 @@ export class AuthService { /** * Get redirect url */ - get redirectUrl(): string { - return this._redirectUrl; + getRedirectUrl(): Observable { + return this.store.select(getRedirectUrl); } /** * Set redirect url */ - set redirectUrl(value: string) { - this._redirectUrl = value; + setRedirectUrl(value: string) { + this.store.dispatch(new SetRedirectUrlAction(encodeURI(value))); } } diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts index 1f74feb0f7..2438254582 100644 --- a/src/app/core/auth/authenticated.guard.ts +++ b/src/app/core/auth/authenticated.guard.ts @@ -59,9 +59,9 @@ export class AuthenticatedGuard implements CanActivate, CanLoad { // .filter(() => isEmpty(this.router.routerState.snapshot.url) || this.router.routerState.snapshot.url === url) .take(1) .subscribe((authenticated) => { - console.log('handleAuth', url, this.router.routerState.snapshot.url); if (!authenticated) { - this.authService.redirectUrl = url; + console.log('set redirect ', url); + this.authService.setRedirectUrl(url); this.store.dispatch(new RedirectWhenAuthenticationIsRequiredAction('Login required')); } }); diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts index 1a918fa41a..6853a32b6f 100644 --- a/src/app/core/auth/selectors.ts +++ b/src/app/core/auth/selectors.ts @@ -27,7 +27,7 @@ export const getAuthState = (state: any) => state.core.auth; * @param {any} props * @return {User} */ -export const getAuthenticatedUser = createSelector(getAuthState, auth.getAuthenticatedUser); +export const getAuthenticatedUser = createSelector(getAuthState, auth._getAuthenticatedUser); /** * Returns the authentication error. @@ -36,7 +36,7 @@ export const getAuthenticatedUser = createSelector(getAuthState, auth.getAuthent * @param {any} props * @return {Error} */ -export const getAuthenticationError = createSelector(getAuthState, auth.getAuthenticationError); +export const getAuthenticationError = createSelector(getAuthState, auth._getAuthenticationError); /** * Returns the authentication info message. @@ -45,7 +45,7 @@ export const getAuthenticationError = createSelector(getAuthState, auth.getAuthe * @param {any} props * @return {string} */ -export const getAuthenticationInfo = createSelector(getAuthState, auth.getAuthenticationInfo); +export const getAuthenticationInfo = createSelector(getAuthState, auth._getAuthenticationInfo); /** * Returns true if the user is authenticated @@ -54,7 +54,7 @@ export const getAuthenticationInfo = createSelector(getAuthState, auth.getAuthen * @param {any} props * @return {boolean} */ -export const isAuthenticated = createSelector(getAuthState, auth.isAuthenticated); +export const isAuthenticated = createSelector(getAuthState, auth._isAuthenticated); /** * Returns true if the user is authenticated @@ -63,7 +63,7 @@ export const isAuthenticated = createSelector(getAuthState, auth.isAuthenticated * @param {any} props * @return {boolean} */ -export const isAuthenticatedLoaded = createSelector(getAuthState, auth.isAuthenticatedLoaded); +export const isAuthenticatedLoaded = createSelector(getAuthState, auth._isAuthenticatedLoaded); /** * Returns true if the authentication request is loading. @@ -72,7 +72,7 @@ export const isAuthenticatedLoaded = createSelector(getAuthState, auth.isAuthent * @param {any} props * @return {boolean} */ -export const isAuthenticationLoading = createSelector(getAuthState, auth.isLoading); +export const isAuthenticationLoading = createSelector(getAuthState, auth._isLoading); /** * Returns the log out error. @@ -81,7 +81,7 @@ export const isAuthenticationLoading = createSelector(getAuthState, auth.isLoadi * @param {any} props * @return {Error} */ -export const getLogOutError = createSelector(getAuthState, auth.getLogOutError); +export const getLogOutError = createSelector(getAuthState, auth._getLogOutError); /** * Returns the registration error. @@ -90,4 +90,13 @@ export const getLogOutError = createSelector(getAuthState, auth.getLogOutError); * @param {any} props * @return {Error} */ -export const getRegistrationError = createSelector(getAuthState, auth.getRegistrationError); +export const getRegistrationError = createSelector(getAuthState, auth._getRegistrationError); + +/** + * Returns the redirect url.. + * @function getRedirectUrl + * @param {AuthState} state + * @param {any} props + * @return {string} + */ +export const getRedirectUrl = createSelector(getAuthState, auth._getRedirectUrl); diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts index 557b1c16e6..3becbdbd91 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts @@ -1,11 +1,9 @@ - import { Component, OnDestroy, OnInit } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { RouterReducerState } from '@ngrx/router-store'; import { Store } from '@ngrx/store'; import { fadeInOut, fadeOut } from '../animations/fade'; -import { CoreState } from '../../core/core.reducers'; import { HostWindowService } from '../host-window.service'; import { AppState, routerStateSelector } from '../../app.reducer'; import { hasValue, isNotUndefined } from '../empty.util'; @@ -32,9 +30,8 @@ export class AuthNavMenuComponent implements OnDestroy, OnInit { protected subs: Subscription[] = []; - constructor( - private store: Store, - public windowService: HostWindowService) { + constructor(private store: Store, + public windowService: HostWindowService) { } ngOnInit(): void { @@ -44,7 +41,7 @@ export class AuthNavMenuComponent implements OnDestroy, OnInit { this.user = this.store.select(getAuthenticatedUser); this.subs.push(this.store.select(routerStateSelector) - .filter((router: RouterReducerState) => isNotUndefined(router)) + .filter((router: RouterReducerState) => isNotUndefined(router) && isNotUndefined(router.state)) .subscribe((router: RouterReducerState) => { this.showAuth = router.state.url !== '/login'; })); diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index b9b9877a37..8c7d91a217 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -8,8 +8,7 @@ formControlName="email" placeholder="{{'login.form.email' | translate}}" required - type="email" - (input)="resetErrorOrMessage($event)"> + type="email"> - + type="password"> +
    diff --git a/src/app/shared/log-in/log-in.component.spec.ts b/src/app/shared/log-in/log-in.component.spec.ts index 76fd631c5b..c73a8e481d 100644 --- a/src/app/shared/log-in/log-in.component.spec.ts +++ b/src/app/shared/log-in/log-in.component.spec.ts @@ -1,25 +1,25 @@ /* tslint:disable:no-unused-variable */ -import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from "@angular/core"; -import { ComponentFixture, TestBed, async } from "@angular/core/testing"; -import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule } from "@angular/forms"; -import { MaterialModule } from "@angular/material"; -import { By } from "@angular/platform-browser"; -import { Store, StoreModule } from "@ngrx/store"; -import { go } from "@ngrx/router-store"; +/*import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core'; +import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MaterialModule } from '@angular/material'; +import { By } from '@angular/platform-browser'; +import { Store, StoreModule } from '@ngrx/store'; +import { go } from '@ngrx/router-store'; // reducers -import { reducer } from "../../app.reducers"; +import { reducer } from '../../app.reducers'; // models -import { User } from "../../core/models/user"; +import { User } from '../../core/models/user'; // services -import { MOCK_USER } from "../../core/services/user.service"; +import { MOCK_USER } from '../../core/services/user.service'; // this component to test -import { LogInComponent } from "./log-in.component"; +import { LogInComponent } from './log-in.component'; -describe("LogInComponent", () => { +describe('LogInComponent', () => { let component: LogInComponent; let fixture: ComponentFixture; @@ -65,23 +65,23 @@ describe("LogInComponent", () => { }); }); - it("should create a FormGroup comprised of FormControls", () => { + it('should create a FormGroup comprised of FormControls', () => { fixture.detectChanges(); expect(component.form instanceof FormGroup).toBe(true); }); - it("should authenticate", () => { + it('should authenticate', () => { fixture.detectChanges(); // set FormControl values - component.form.controls["email"].setValue(user.email); - component.form.controls["password"].setValue(user.password); + component.form.controls['email'].setValue(user.email); + component.form.controls['password'].setValue(user.password); // submit form component.submit(); // verify Store.dispatch() is invoked - expect(page.navigateSpy.calls.any()).toBe(true, "Store.dispatch not invoked"); + expect(page.navigateSpy.calls.any()).toBe(true, 'Store.dispatch not invoked'); }); }); @@ -90,6 +90,7 @@ describe("LogInComponent", () => { * * @class Page */ +/* class Page { public emailInput: HTMLInputElement; @@ -102,15 +103,16 @@ class Page { const store = injector.get(Store); // add spies - this.navigateSpy = spyOn(store, "dispatch"); + this.navigateSpy = spyOn(store, 'dispatch'); } public addPageElements() { - const emailInputSelector = "input[formcontrolname=\"email\"]"; + const emailInputSelector = 'input[formcontrolname=\'email\']'; // console.log(this.fixture.debugElement.query(By.css(emailInputSelector))); this.emailInput = this.fixture.debugElement.query(By.css(emailInputSelector)).nativeElement; - const passwordInputSelector = "input[formcontrolname=\"password\"]"; + const passwordInputSelector = 'input[formcontrolname=\'password\']'; this.passwordInput = this.fixture.debugElement.query(By.css(passwordInputSelector)).nativeElement; } } +*/ diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts index ee988a3a14..ba16fe6d45 100644 --- a/src/app/shared/log-in/log-in.component.ts +++ b/src/app/shared/log-in/log-in.component.ts @@ -23,6 +23,7 @@ import { CoreState } from '../../core/core.reducers'; import { isNotEmpty } from '../empty.util'; import { fadeOut } from '../animations/fade'; import { AuthService } from '../../core/auth/auth.service'; +import { PlatformService } from '../services/platform.service'; /** * /users/sign-in @@ -87,6 +88,7 @@ export class LogInComponent implements OnDestroy, OnInit { constructor( private authService: AuthService, private formBuilder: FormBuilder, + private platform: PlatformService, private store: Store ) { } @@ -160,6 +162,7 @@ export class LogInComponent implements OnDestroy, OnInit { * @method submit */ public submit() { + this.resetErrorOrMessage(); // get email and password values const email: string = this.form.get('email').value; const password: string = this.form.get('password').value; diff --git a/src/app/shared/log-out/log-out.component.spec.ts b/src/app/shared/log-out/log-out.component.spec.ts index 4beb53aadc..cb83b96892 100644 --- a/src/app/shared/log-out/log-out.component.spec.ts +++ b/src/app/shared/log-out/log-out.component.spec.ts @@ -1,19 +1,19 @@ /* tslint:disable:no-unused-variable */ -import { DebugElement, CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; -import { async, ComponentFixture, TestBed } from "@angular/core/testing"; -import { By } from "@angular/platform-browser"; -import { Router } from "@angular/router"; +/*import { DebugElement, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; +import { Router } from '@angular/router'; // import ngrx -import { Store, StoreModule } from "@ngrx/store"; +import { Store, StoreModule } from '@ngrx/store'; // reducers -import { reducer } from "../../app.reducers"; +import { reducer } from '../../app.reducers'; // test this component -import { SignOutComponent } from "./log-out.component"; +import { SignOutComponent } from './log-out.component'; -describe("Component: Signout", () => { +describe('Component: Signout', () => { let component: SignOutComponent; let fixture: ComponentFixture; @@ -39,7 +39,8 @@ describe("Component: Signout", () => { component = fixture.componentInstance; })); - it("should create an instance", () => { + it('should create an instance', () => { expect(component).toBeTruthy(); }); }); +*/ diff --git a/src/routes.ts b/src/routes.ts index f051b16198..392d3925a5 100644 --- a/src/routes.ts +++ b/src/routes.ts @@ -3,6 +3,8 @@ export const ROUTES: string[] = [ 'items/:id', 'collections/:id', 'communities/:id', + 'login', + 'logout', 'search', '**' ]; From 696b8b73f5a8a5daa18c7b4f3966fd1002ae4d14 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Mon, 26 Feb 2018 15:41:07 +0100 Subject: [PATCH 14/80] Added refresh token functionality --- package.json | 3 +- src/app/app.component.spec.ts | 3 + src/app/core/auth/auth-request.service.ts | 6 +- .../auth/auth-response-parsing.service.ts | 25 ++--- src/app/core/auth/auth.actions.ts | 40 +++++++ src/app/core/auth/auth.effects.ts | 20 +++- src/app/core/auth/auth.interceptor.ts | 100 ++++++++++++------ src/app/core/auth/auth.reducers.ts | 41 +++++-- src/app/core/auth/auth.service.ts | 66 ++++++++++-- .../core/auth/models/auth-token-info.model.ts | 12 ++- src/app/core/auth/selectors.ts | 9 ++ src/app/core/cache/response-cache.models.ts | 19 ---- src/app/core/data/request.service.spec.ts | 14 +-- src/app/core/data/request.service.ts | 2 +- .../dspace-rest-v2-response.model.ts | 2 +- .../dspace-rest-v2/dspace-rest-v2.service.ts | 1 + src/app/header/header.component.spec.ts | 23 +++- src/app/shared/log-in/log-in.component.html | 2 +- src/app/shared/log-in/log-in.component.ts | 5 - .../testing/host-window-service-stub.ts | 4 + .../shared/testing/platform-service-stub.ts | 12 +++ yarn.lock | 6 +- 22 files changed, 301 insertions(+), 114 deletions(-) create mode 100644 src/app/shared/testing/platform-service-stub.ts diff --git a/package.json b/package.json index dc62aff03d..a2d1bd93c2 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,6 @@ "@nguniversal/express-engine": "5.0.0-beta.5", "@ngx-translate/core": "9.1.1", "@ngx-translate/http-loader": "2.0.1", - "@types/js-cookie": "^2.1.0", "angular-idle-preload": "2.0.4", "body-parser": "1.18.2", "bootstrap": "4.0.0-beta", @@ -102,6 +101,7 @@ "js-cookie": "2.2.0", "js.clone": "0.0.3", "jsonschema": "1.2.2", + "jwt-decode": "^2.2.0", "methods": "1.1.2", "morgan": "1.9.0", "ngx-pagination": "3.0.3", @@ -124,6 +124,7 @@ "@types/express-serve-static-core": "4.11.1", "@types/hammerjs": "2.0.35", "@types/jasmine": "2.8.4", + "@types/js-cookie": "2.1.0", "@types/memory-cache": "0.2.0", "@types/mime": "2.0.0", "@types/node": "^9.3.0", diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 327da7d9f6..de9b121bff 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -30,6 +30,8 @@ import { NativeWindowRef, NativeWindowService } from './shared/services/window.s import { MockTranslateLoader } from './shared/mocks/mock-translate-loader'; import { MockMetadataService } from './shared/mocks/mock-metadata-service'; +import { PlatformServiceStub } from './shared/testing/platform-service-stub'; +import { PlatformService } from './shared/services/platform.service'; let comp: AppComponent; let fixture: ComponentFixture; @@ -56,6 +58,7 @@ describe('App component', () => { { provide: GLOBAL_CONFIG, useValue: ENV_CONFIG }, { provide: NativeWindowService, useValue: new NativeWindowRef() }, { provide: MetadataService, useValue: new MockMetadataService() }, + { provide: PlatformService, useValue: new PlatformServiceStub() }, AppComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts index f54aa9f0be..6791100d40 100644 --- a/src/app/core/auth/auth-request.service.ts +++ b/src/app/core/auth/auth-request.service.ts @@ -8,7 +8,7 @@ import { Observable } from 'rxjs/Observable'; import { isNotEmpty } from '../../shared/empty.util'; import { AuthGetRequest, AuthPostRequest, PostRequest, RestRequest } from '../data/request.models'; import { ResponseCacheEntry } from '../cache/response-cache.reducer'; -import { AuthSuccessResponse, ErrorResponse, RestResponse } from '../cache/response-cache.models'; +import { AuthStatusResponse, ErrorResponse, RestResponse } from '../cache/response-cache.models'; import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; @Injectable() @@ -37,8 +37,8 @@ export class AuthRequestService extends HALEndpointService { errorResponse.flatMap((response: ErrorResponse) => Observable.throw(new Error(response.errorMessage))), successResponse - .filter((response: AuthSuccessResponse) => isNotEmpty(response)) - .map((response: AuthSuccessResponse) => response.response) + .filter((response: AuthStatusResponse) => isNotEmpty(response)) + .map((response: AuthStatusResponse) => response.response) .distinctUntilChanged()); } diff --git a/src/app/core/auth/auth-response-parsing.service.ts b/src/app/core/auth/auth-response-parsing.service.ts index 0215335f03..80c1b2eeca 100644 --- a/src/app/core/auth/auth-response-parsing.service.ts +++ b/src/app/core/auth/auth-response-parsing.service.ts @@ -2,25 +2,15 @@ import { Inject, Injectable } from '@angular/core'; import { AuthObjectFactory } from './auth-object-factory'; import { BaseResponseParsingService } from '../data/base-response-parsing.service'; -import { - AuthErrorResponse, - AuthStatusResponse, - AuthSuccessResponse, ConfigSuccessResponse, ErrorResponse, - RestResponse -} from '../cache/response-cache.models'; +import { AuthStatusResponse, RestResponse } from '../cache/response-cache.models'; import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model'; -import { ConfigObject } from '../shared/config/config.model'; -import { ConfigType } from '../shared/config/config-type'; import { GLOBAL_CONFIG } from '../../../config'; import { GlobalConfig } from '../../../config/global-config.interface'; -import { isEmpty, isNotEmpty } from '../../shared/empty.util'; +import { isNotEmpty } from '../../shared/empty.util'; import { ObjectCacheService } from '../cache/object-cache.service'; import { ResponseParsingService } from '../data/parsing.service'; import { RestRequest } from '../data/request.models'; import { AuthType } from './auth-type'; -import { NormalizedObject } from '../cache/models/normalized-object.model'; -import { AuthTokenInfo } from './models/auth-token-info.model'; -import { NormalizedAuthStatus } from './models/normalized-auth-status.model'; import { AuthStatus } from './models/auth-status.model'; @Injectable() @@ -29,18 +19,15 @@ export class AuthResponseParsingService extends BaseResponseParsingService imple protected objectFactory = AuthObjectFactory; protected toCache = false; - constructor( - @Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig, - protected objectCache: ObjectCacheService, - ) { super(); + constructor(@Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig, + protected objectCache: ObjectCacheService,) { + super(); } parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse { if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && (data.statusCode === '200' || data.statusCode === 'OK')) { - const response = this.process(data.payload, request.href); + const response = this.process(data.payload, request.href); return new AuthStatusResponse(response[Object.keys(response)[0]][0], data.statusCode); - } else if (isEmpty(data.payload) && isNotEmpty(data.headers.get('authorization')) && (data.statusCode === '200' || data.statusCode === 'OK')) { - return new AuthSuccessResponse(new AuthTokenInfo(data.headers.get('authorization')), data.statusCode); } else { return new AuthStatusResponse(data.payload as AuthStatus, data.statusCode); } diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts index aedda593c4..5680c0017b 100644 --- a/src/app/core/auth/auth.actions.ts +++ b/src/app/core/auth/auth.actions.ts @@ -19,6 +19,9 @@ export const AuthActionTypes = { CHECK_AUTHENTICATION_TOKEN_ERROR: type('dspace/auth/CHECK_AUTHENTICATION_TOKEN_ERROR'), REDIRECT_TOKEN_EXPIRED: type('dspace/auth/REDIRECT_TOKEN_EXPIRED'), REDIRECT_AUTHENTICATION_REQUIRED: type('dspace/auth/REDIRECT_AUTHENTICATION_REQUIRED'), + REFRESH_TOKEN: type('dspace/auth/REFRESH_TOKEN'), + REFRESH_TOKEN_SUCCESS: type('dspace/auth/REFRESH_TOKEN_SUCCESS'), + REFRESH_TOKEN_ERROR: type('dspace/auth/REFRESH_TOKEN_ERROR'), RESET_MESSAGES: type('dspace/auth/RESET_MESSAGES'), LOG_OUT: type('dspace/auth/LOG_OUT'), LOG_OUT_ERROR: type('dspace/auth/LOG_OUT_ERROR'), @@ -201,6 +204,43 @@ export class RedirectWhenTokenExpiredAction implements Action { } } +/** + * Refresh authentication token. + * @class RefreshTokenAction + * @implements {Action} + */ +export class RefreshTokenAction implements Action { + public type: string = AuthActionTypes.REFRESH_TOKEN; + payload: AuthTokenInfo; + + constructor(token: AuthTokenInfo) { + this.payload = token; + } +} + +/** + * Refresh authentication token success. + * @class RefreshTokenSuccessAction + * @implements {Action} + */ +export class RefreshTokenSuccessAction implements Action { + public type: string = AuthActionTypes.REFRESH_TOKEN_SUCCESS; + payload: AuthTokenInfo; + + constructor(token: AuthTokenInfo) { + this.payload = token; + } +} + +/** + * Refresh authentication token error. + * @class RefreshTokenErrorAction + * @implements {Action} + */ +export class RefreshTokenErrorAction implements Action { + public type: string = AuthActionTypes.REFRESH_TOKEN_ERROR; +} + /** * Sign up. * @class RegistrationAction diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index b066d5ca92..225e40255b 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -18,7 +18,7 @@ import { AuthenticationErrorAction, AuthenticationSuccessAction, CheckAuthenticationTokenErrorAction, LogOutErrorAction, - LogOutSuccessAction, RegistrationAction, + LogOutSuccessAction, RefreshTokenAction, RefreshTokenErrorAction, RefreshTokenSuccessAction, RegistrationAction, RegistrationErrorAction, RegistrationSuccessAction } from './auth.actions'; @@ -41,11 +41,11 @@ export class AuthEffects { .ofType(AuthActionTypes.AUTHENTICATE) .switchMap((action: AuthenticateAction) => { return this.authService.authenticate(action.payload.email, action.payload.password) + .first() .map((response: AuthStatus) => new AuthenticationSuccessAction(response.token)) .catch((error) => Observable.of(new AuthenticationErrorAction(error))); }); - // It means "reacts to this action but don't send another" @Effect() public authenticateSuccess: Observable = this.actions$ .ofType(AuthActionTypes.AUTHENTICATE_SUCCESS) @@ -61,6 +61,7 @@ export class AuthEffects { .catch((error) => Observable.of(new AuthenticatedErrorAction(error))); }); + // It means "reacts to this action but don't send another" @Effect({dispatch: false}) public authenticatedError: Observable = this.actions$ .ofType(AuthActionTypes.AUTHENTICATED_ERROR) @@ -85,6 +86,21 @@ export class AuthEffects { .catch((error) => Observable.of(new RegistrationErrorAction(error))); }); + @Effect() + public refreshToken: Observable = this.actions$ + .ofType(AuthActionTypes.REFRESH_TOKEN) + .switchMap((action: RefreshTokenAction) => { + return this.authService.refreshAuthenticationToken(action.payload) + .map((token: AuthTokenInfo) => new RefreshTokenSuccessAction(token)) + .catch((error) => Observable.of(new RefreshTokenErrorAction())); + }); + + // It means "reacts to this action but don't send another" + @Effect({dispatch: false}) + public refreshTokenSuccess: Observable = this.actions$ + .ofType(AuthActionTypes.REFRESH_TOKEN_SUCCESS) + .do((action: RefreshTokenSuccessAction) => this.authService.replaceToken(action.payload)); + /** * When the store is rehydrated in the browser, * clear a possible invalid token or authentication errors diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts index a45e5ef694..e5d7afc72d 100644 --- a/src/app/core/auth/auth.interceptor.ts +++ b/src/app/core/auth/auth.interceptor.ts @@ -1,40 +1,55 @@ import { Injectable, Injector } from '@angular/core'; import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpResponse, - HttpErrorResponse + HttpErrorResponse, HttpResponseBase } from '@angular/common/http'; import { Observable } from 'rxjs/Rx'; import 'rxjs/add/observable/throw' import 'rxjs/add/operator/catch'; +import { find } from 'lodash'; + import { AppState } from '../../app.reducer'; -import { AuthError } from './models/auth-error.model'; import { AuthService } from './auth.service'; import { AuthStatus } from './models/auth-status.model'; import { AuthTokenInfo } from './models/auth-token-info.model'; -import { isNotEmpty } from '../../shared/empty.util'; -import { RedirectWhenTokenExpiredAction } from './auth.actions'; +import { isNotEmpty, isUndefined } from '../../shared/empty.util'; +import { RedirectWhenTokenExpiredAction, RefreshTokenAction } from './auth.actions'; import { Store } from '@ngrx/store'; @Injectable() export class AuthInterceptor implements HttpInterceptor { + + // Intercetor is called twice per request, + // so to prevent RefreshTokenAction is dispatched twice + // we're creating a refresh token request list + protected refreshTokenRequestUrls = []; + constructor(private inj: Injector, private store: Store) { } - private isUnauthorized(status: number): boolean { - return status === 401 || status === 403; + private isUnauthorized(response: HttpResponseBase): boolean { + // invalid_token The access token provided is expired, revoked, malformed, or invalid for other reasons + return response.status === 401; } - private isAuthRequest(url: string): boolean { - return url.endsWith('/authn/login') || url.endsWith('/authn/logout') || url.endsWith('/authn/status'); + private isSuccess(response: HttpResponseBase): boolean { + return response.status === 200; } - private isLoginResponse(url: string): boolean { - return url.endsWith('/authn/login'); + private isAuthRequest(http: HttpRequest | HttpResponseBase): boolean { + return http.url + && (http.url.endsWith('/authn/login') + || http.url.endsWith('/authn/logout') + || http.url.endsWith('/authn/status')); } - private isLogoutResponse(url: string): boolean { - return url.endsWith('/authn/logout'); + private isLoginResponse(http: HttpRequest | HttpResponseBase): boolean { + return http.url && http.url.endsWith('/authn/login'); + } + + private isLogoutResponse(http: HttpRequest | HttpResponseBase): boolean { + return http.url && http.url.endsWith('/authn/logout'); } private makeAuthStatusObject(authenticated:boolean, accessToken?: string, error?: string): AuthStatus { @@ -55,27 +70,45 @@ export class AuthInterceptor implements HttpInterceptor { const authService = this.inj.get(AuthService); - // Get the auth header from the service. - const Authorization = authService.getAuthHeader(); + const token = authService.getToken(); - let authReq; - if (!this.isAuthRequest(req.url) && isNotEmpty(Authorization)) { + let newReq; + // Intercept a request that is not to the authentication endpoint + if (!this.isAuthRequest(req) && isNotEmpty(token)) { + authService.isTokenExpiring() + .filter((isExpiring) => isExpiring) + .subscribe(() => { + // If the current request url is already in the refresh token request list, skip it + if (isUndefined(find(this.refreshTokenRequestUrls, req.url))) { + // When a token is about to expire, refresh it + this.store.dispatch(new RefreshTokenAction(token)); + this.refreshTokenRequestUrls.push(req.url); + } + }); + // Get the auth header from the service. + const Authorization = authService.buildAuthHeader(token); // Clone the request to add the new header. - authReq = req.clone({headers: req.headers.set('authorization', Authorization)}); + newReq = req.clone({headers: req.headers.set('authorization', Authorization)}); } else { - authReq = req; + newReq = req; } - // Pass on the cloned request instead of the original request. - return next.handle(authReq) + // Pass on the new request instead of the original request. + return next.handle(newReq) .map((response) => { - if (response instanceof HttpResponse && response.status === 200 && (this.isLoginResponse(response.url) || this.isLogoutResponse(response.url))) { + // Intercept a Login/Logout response + if (response instanceof HttpResponse && this.isSuccess(response) && (this.isLoginResponse(response) || this.isLogoutResponse(response))) { + // It's a success Login/Logout response let authRes: HttpResponse; - if (this.isLoginResponse(response.url)) { - const token = response.headers.get('authorization'); - const expires = response.headers.get('expires'); - authRes = response.clone({body: this.makeAuthStatusObject(true, token)}); + if (this.isLoginResponse(response)) { + // login successfully + const newToken = response.headers.get('authorization'); + authRes = response.clone({body: this.makeAuthStatusObject(true, newToken)}); + + // clean eventually refresh Requests list + this.refreshTokenRequestUrls = []; } else { + // logout successfully authRes = response.clone({body: this.makeAuthStatusObject(false)}); } return authRes; @@ -84,10 +117,12 @@ export class AuthInterceptor implements HttpInterceptor { } }) .catch((error, caught) => { - // Intercept an unauthorized error response - if (error instanceof HttpErrorResponse && this.isUnauthorized(error.status)) { + // Intercept an error response + if (error instanceof HttpErrorResponse) { // Checks if is a response from a request to an authentication endpoint - if (this.isAuthRequest(error.url)) { + if (this.isAuthRequest(error)) { + // clean eventually refresh Requests list + this.refreshTokenRequestUrls = []; // Create a new HttpResponse and return it, so it can be handle properly by AuthService. const authResponse = new HttpResponse({ body: this.makeAuthStatusObject(false, null, error.error), @@ -97,14 +132,15 @@ export class AuthInterceptor implements HttpInterceptor { url: error.url }); return Observable.of(authResponse); - } else { + } else if (this.isUnauthorized(error)) { + // The access token provided is expired, revoked, malformed, or invalid for other reasons // Redirect to the login route this.store.dispatch(new RedirectWhenTokenExpiredAction('Your session has expired. Please log in again.')); } - } else { - // Return error response as is. - return Observable.throw(error); } + // Return error response as is. + return Observable.throw(error); }) as any; + } } diff --git a/src/app/core/auth/auth.reducers.ts b/src/app/core/auth/auth.reducers.ts index d56f0888fa..b752b8f77f 100644 --- a/src/app/core/auth/auth.reducers.ts +++ b/src/app/core/auth/auth.reducers.ts @@ -32,6 +32,9 @@ export interface AuthState { // redirect url after login redirectUrl?: string; + // true when refreshing token + refreshing?: boolean; + // the authenticated user user?: Eperson; } @@ -108,12 +111,14 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut }); case AuthActionTypes.LOG_OUT_SUCCESS: + case AuthActionTypes.REFRESH_TOKEN_ERROR: return Object.assign({}, state, { authenticated: false, error: undefined, loaded: false, loading: false, info: undefined, + refreshing: false, user: undefined }); @@ -138,6 +143,16 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.REGISTRATION_SUCCESS: return state; + case AuthActionTypes.REFRESH_TOKEN: + return Object.assign({}, state, { + refreshing: true, + }); + + case AuthActionTypes.REFRESH_TOKEN_SUCCESS: + return Object.assign({}, state, { + refreshing: false, + }); + case AuthActionTypes.RESET_MESSAGES: return Object.assign({}, state, { authenticated: state.authenticated, @@ -159,7 +174,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut /** * Returns true if the user is authenticated. - * @function isAuthenticated + * @function _isAuthenticated * @param {State} state * @returns {boolean} */ @@ -167,7 +182,7 @@ export const _isAuthenticated = (state: AuthState) => state.authenticated; /** * Returns true if the authenticated has loaded. - * @function isAuthenticatedLoaded + * @function _isAuthenticatedLoaded * @param {State} state * @returns {boolean} */ @@ -175,7 +190,7 @@ export const _isAuthenticatedLoaded = (state: AuthState) => state.loaded; /** * Return the users state - * @function getAuthenticatedUser + * @function _getAuthenticatedUser * @param {State} state * @returns {User} */ @@ -183,7 +198,7 @@ export const _getAuthenticatedUser = (state: AuthState) => state.user; /** * Returns the authentication error. - * @function getAuthenticationError + * @function _getAuthenticationError * @param {State} state * @returns {string} */ @@ -191,7 +206,7 @@ export const _getAuthenticationError = (state: AuthState) => state.error; /** * Returns the authentication info message. - * @function getAuthenticationInfo + * @function _getAuthenticationInfo * @param {State} state * @returns {string} */ @@ -199,15 +214,23 @@ export const _getAuthenticationInfo = (state: AuthState) => state.info; /** * Returns true if request is in progress. - * @function isLoading + * @function _isLoading * @param {State} state * @returns {boolean} */ export const _isLoading = (state: AuthState) => state.loading; +/** + * Returns true if a refresh token request is in progress. + * @function _isRefreshing + * @param {State} state + * @returns {boolean} + */ +export const _isRefreshing = (state: AuthState) => state.refreshing; + /** * Returns the sign out error. - * @function getLogOutError + * @function _getLogOutError * @param {State} state * @returns {string} */ @@ -215,7 +238,7 @@ export const _getLogOutError = (state: AuthState) => state.error; /** * Returns the sign up error. - * @function getRegistrationError + * @function _getRegistrationError * @param {State} state * @returns {string} */ @@ -223,7 +246,7 @@ export const _getRegistrationError = (state: AuthState) => state.error; /** * Returns the redirect url. - * @function getRedirectUrl + * @function _getRedirectUrl * @param {State} state * @returns {string} */ diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 26a7ff290f..4978212005 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -11,12 +11,13 @@ import { AuthStatus } from './models/auth-status.model'; import { AuthTokenInfo, TOKENITEM } from './models/auth-token-info.model'; import { isNotEmpty, isNotNull, isNotUndefined } from '../../shared/empty.util'; import { CookieService } from '../../shared/services/cookie.service'; -import { getRedirectUrl, isAuthenticated } from './selectors'; +import { getRedirectUrl, isAuthenticated, isTokenRefreshing } from './selectors'; import { AppState, routerStateSelector } from '../../app.reducer'; import { Store } from '@ngrx/store'; import { ResetAuthenticationMessagesAction, SetRedirectUrlAction } from './auth.actions'; import { RouterReducerState } from '@ngrx/router-store'; import { Router } from '@angular/router'; +import { CookieAttributes } from 'js-cookie'; export const LOGIN_ROUTE = '/login'; /** @@ -110,11 +111,30 @@ export class AuthService { } /** - * Checks if token is present into storage + * Checks if token is present into storage and is not expired */ public checkAuthenticationToken(): Observable { const token = this.getToken(); - return isNotEmpty(token) ? Observable.of(token) : Observable.throw(false); + return isNotEmpty(token) && !this.isTokenExpired() ? Observable.of(token) : Observable.throw(false); + } + + /** + * Checks if token is present into storage + */ + public refreshAuthenticationToken(token: AuthTokenInfo): Observable { + const options: HttpOptions = Object.create({}); + let headers = new HttpHeaders(); + headers = headers.append('Accept', 'application/json'); + headers = headers.append('Authorization', `Bearer ${token.accessToken}`); + options.headers = headers; + return this.authRequestService.postToEndpoint('login', {}, options) + .map((status: AuthStatus) => { + if (status.authenticated) { + return status.token; + } else { + throw(new Error('Not authenticated')); + } + }); } /** @@ -160,8 +180,7 @@ export class AuthService { * Retrieve authentication token info and make authorization header * @returns {string} */ - public getAuthHeader(): string { - const token = this.getToken(); + public buildAuthHeader(token): string { return (this._authenticated && isNotNull(token)) ? `Bearer ${token.accessToken}` : ''; } @@ -179,6 +198,31 @@ export class AuthService { } } + /** + * Check if a token is about to expire + * @returns {boolean} + */ + public isTokenExpiring(): Observable { + return this.store.select(isTokenRefreshing) + .first() + .map((isRefreshing: boolean) => { + if (this.isTokenExpired() || isRefreshing) { + return false; + } else { + const token = this.getToken(); + return token.expires - (60 * 5 * 1000) < Date.now(); + } + }) + } + + /** + * Check if a token is expired + * @returns {boolean} + */ + public isTokenExpired(): boolean { + const token = this.getToken(); + return token && token.expires < Date.now(); + } /** * Save authentication token info * @@ -186,7 +230,9 @@ export class AuthService { * @returns {AuthTokenInfo} */ public storeToken(token: AuthTokenInfo) { - return this.storage.set(TOKENITEM, token); + const expires = new Date(token.expires); + const options: CookieAttributes = { expires: expires }; + return this.storage.set(TOKENITEM, token, options); } /** @@ -196,6 +242,14 @@ export class AuthService { return this.storage.remove(TOKENITEM); } + /** + * Replace authentication token info with a new one + */ + public replaceToken(token: AuthTokenInfo) { + this.removeToken(); + return this.storeToken(token); + } + /** * Redirect to the login route */ diff --git a/src/app/core/auth/models/auth-token-info.model.ts b/src/app/core/auth/models/auth-token-info.model.ts index e6f6afc872..7eb125a947 100644 --- a/src/app/core/auth/models/auth-token-info.model.ts +++ b/src/app/core/auth/models/auth-token-info.model.ts @@ -1,13 +1,15 @@ +import { default as decode } from 'jwt-decode'; + export const TOKENITEM = 'dsAuthInfo'; export class AuthTokenInfo { public accessToken: string; - public expires?: number; + public expires: number; - constructor(token: string, expiresIn?: number) { + constructor(token: string) { this.accessToken = token.replace('Bearer ', ''); - if (expiresIn) { - this.expires = expiresIn * 1000 + Date.now(); - } + const tokenClaims = decode(this.accessToken); + // exp claim is in seconds, convert it se to milliseconds + this.expires = tokenClaims.exp * 1000; } } diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts index 6853a32b6f..a37f128c88 100644 --- a/src/app/core/auth/selectors.ts +++ b/src/app/core/auth/selectors.ts @@ -74,6 +74,15 @@ export const isAuthenticatedLoaded = createSelector(getAuthState, auth._isAuthen */ export const isAuthenticationLoading = createSelector(getAuthState, auth._isLoading); +/** + * Returns true if the refresh token request is loading. + * @function isTokenRefreshing + * @param {AuthState} state + * @param {any} props + * @return {boolean} + */ +export const isTokenRefreshing = createSelector(getAuthState, auth._isRefreshing); + /** * Returns the log out error. * @function getLogOutError diff --git a/src/app/core/cache/response-cache.models.ts b/src/app/core/cache/response-cache.models.ts index fd41c2258b..f77168c80e 100644 --- a/src/app/core/cache/response-cache.models.ts +++ b/src/app/core/cache/response-cache.models.ts @@ -77,23 +77,4 @@ export class AuthStatusResponse extends RestResponse { } } -export class AuthSuccessResponse extends RestResponse { - public toCache = false; - constructor( - public response: AuthTokenInfo, - public statusCode: string - ) { - super(true, statusCode); - } -} - -export class AuthErrorResponse extends RestResponse { - public toCache = false; - constructor( - public response: any, - public statusCode: string, - ) { - super(true, statusCode); - } -} /* tslint:enable:max-classes-per-file */ diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts index 17d4a89d05..9f82f32c4e 100644 --- a/src/app/core/data/request.service.spec.ts +++ b/src/app/core/data/request.service.spec.ts @@ -236,7 +236,7 @@ describe('RequestService', () => { it('should dispatch the request', () => { service.configure(request); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(request); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(request, false); }); }); describe('and it is already cached or pending', () => { @@ -254,22 +254,22 @@ describe('RequestService', () => { describe('when the request isn\'t a GET request', () => { it('should dispatch the request', () => { service.configure(testPostRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPostRequest); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPostRequest, false); service.configure(testPutRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPutRequest); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPutRequest, false); service.configure(testDeleteRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testDeleteRequest); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testDeleteRequest, false); service.configure(testOptionsRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testOptionsRequest); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testOptionsRequest, false); service.configure(testHeadRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testHeadRequest); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testHeadRequest, false); service.configure(testPatchRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPatchRequest); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPatchRequest, false); }); }); }); diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts index 6d4393bade..7952c736d3 100644 --- a/src/app/core/data/request.service.ts +++ b/src/app/core/data/request.service.ts @@ -102,7 +102,7 @@ export class RequestService { return isCached || isPending; } - private dispatchRequest(request: RestRequest, overrideRequest: boolean) { + private dispatchRequest(request: RestRequest, overrideRequest: boolean = false) { this.store.dispatch(new RequestConfigureAction(request)); this.store.dispatch(new RequestExecuteAction(request.uuid)); if (request.method === RestRequestMethod.Get && !overrideRequest) { diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts index fe911e5635..17fb389707 100644 --- a/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts +++ b/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts @@ -7,6 +7,6 @@ export interface DSpaceRESTV2Response { _links?: any; page?: any; }, - headers: HttpHeaders, + headers?: HttpHeaders, statusCode: string } diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts index 51efecf625..b57f17a76e 100644 --- a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts +++ b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts @@ -71,6 +71,7 @@ export class DSpaceRESTv2Service { console.log(res); return ({ payload: res.body, headers: res.headers, statusCode: res.statusText }) }) + .share() .catch((err) => { console.log('Error: ', err); return Observable.throw(err); diff --git a/src/app/header/header.component.spec.ts b/src/app/header/header.component.spec.ts index 7c1a9601ac..87fa2995d6 100644 --- a/src/app/header/header.component.spec.ts +++ b/src/app/header/header.component.spec.ts @@ -9,6 +9,16 @@ import { Observable } from 'rxjs/Observable'; import { HeaderComponent } from './header.component'; import { HeaderState } from './header.reducer'; import { HeaderToggleAction } from './header.actions'; +import { AuthNavMenuComponent } from '../shared/auth-nav-menu/auth-nav-menu.component'; +import { LogInComponent } from '../shared/log-in/log-in.component'; +import { LogOutComponent } from '../shared/log-out/log-out.component'; +import { LoadingComponent } from '../shared/loading/loading.component'; +import { ReactiveFormsModule } from '@angular/forms'; +import { HostWindowService } from '../shared/host-window.service'; +import { HostWindowServiceStub } from '../shared/testing/host-window-service-stub'; +import { RouterStub } from '../shared/testing/router-stub'; +import { Router } from '@angular/router'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; let comp: HeaderComponent; let fixture: ComponentFixture; @@ -19,8 +29,17 @@ describe('HeaderComponent', () => { // async beforeEach beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [StoreModule.forRoot({}), TranslateModule.forRoot(), NgbCollapseModule.forRoot()], - declarations: [HeaderComponent] + imports: [ + StoreModule.forRoot({}), + TranslateModule.forRoot(), + NgbCollapseModule.forRoot(), + NoopAnimationsModule, + ReactiveFormsModule], + declarations: [HeaderComponent, AuthNavMenuComponent, LoadingComponent, LogInComponent, LogOutComponent], + providers: [ + { provide: HostWindowService, useValue: new HostWindowServiceStub(800) }, + { provide: Router, useClass: RouterStub }, + ] }) .compileComponents(); // compile template and css })); diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index 8c7d91a217..d8d91ca271 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -1,4 +1,4 @@ - +
    diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html index 8e2d04c5cd..b04e93ff71 100644 --- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html +++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html @@ -2,7 +2,7 @@

    {{'community.sub-collection-list.head' | translate}}

      -
    • +

    • {{collection.name}}
      {{collection.shortDescription}} diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts index cb371617c9..fc69719896 100644 --- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts +++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts @@ -1,10 +1,9 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { Observable } from 'rxjs/Observable'; -import { CollectionDataService } from '../../core/data/collection-data.service'; -import { PaginatedList } from '../../core/data/paginated-list'; import { RemoteData } from '../../core/data/remote-data'; import { Collection } from '../../core/shared/collection.model'; +import { Community } from '../../core/shared/community.model'; import { fadeIn } from '../../shared/animations/fade'; @@ -15,13 +14,10 @@ import { fadeIn } from '../../shared/animations/fade'; animations:[fadeIn] }) export class CommunityPageSubCollectionListComponent implements OnInit { - subCollectionsRDObs: Observable>>; - - constructor(private cds: CollectionDataService) { - - } + @Input() community: Community; + subCollectionsRDObs: Observable>; ngOnInit(): void { - this.subCollectionsRDObs = this.cds.findAll(); + this.subCollectionsRDObs = this.community.collections; } } From 008a59f7531943b843287cc16c0d0b2cbdea6e75 Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Thu, 15 Mar 2018 13:34:40 +0100 Subject: [PATCH 24/80] disabled the gecko webdriver, as we're not using it, and downloading it can cause rate limit issues on github --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 710f62a257..35bd2602b6 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "test:headless": "karma start --single-run --browsers ChromeHeadless", "test:watch": "karma start --no-single-run --auto-watch", "webdriver:start": "node node_modules/protractor/bin/webdriver-manager start --seleniumPort 4444", - "webdriver:update": "node node_modules/protractor/bin/webdriver-manager update --standalone", + "webdriver:update": "node node_modules/protractor/bin/webdriver-manager update --standalone --gecko false", "lint": "tslint \"src/**/*.ts\" && tslint \"e2e/**/*.ts\"", "docs": "typedoc --options typedoc.json ./src/", "coverage": "http-server -c-1 -o -p 9875 ./coverage" From 779015d16e585c7073ec71bfc0315dcf1c203c26 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 29 Mar 2018 14:47:59 +0200 Subject: [PATCH 25/80] rebase --- src/app/core/core.module.ts | 2 + src/app/core/metadata/metadatafield.model.ts | 9 + .../core/metadata/metadataregistry.service.ts | 1018 +++++++++++++++++ src/app/core/metadata/metadataschema.model.ts | 5 + 4 files changed, 1034 insertions(+) create mode 100644 src/app/core/metadata/metadatafield.model.ts create mode 100644 src/app/core/metadata/metadataregistry.service.ts create mode 100644 src/app/core/metadata/metadataschema.model.ts diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 764e21efba..7695ff1849 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -42,6 +42,7 @@ import { SubmissionSectionsConfigService } from './config/submission-sections-co import { UUIDService } from './shared/uuid.service'; import { HALEndpointService } from './shared/hal-endpoint.service'; import { FacetResponseParsingService } from './data/facet-response-parsing.service'; +import { MetadataRegistryService } from './metadata/metadataregistry.service'; const IMPORTS = [ CommonModule, @@ -67,6 +68,7 @@ const PROVIDERS = [ HostWindowService, ItemDataService, MetadataService, + MetadataRegistryService, ObjectCacheService, PaginationComponentOptions, RemoteDataBuildService, diff --git a/src/app/core/metadata/metadatafield.model.ts b/src/app/core/metadata/metadatafield.model.ts new file mode 100644 index 0000000000..bf9921a1ce --- /dev/null +++ b/src/app/core/metadata/metadatafield.model.ts @@ -0,0 +1,9 @@ +import { MetadataSchema } from './metadataschema.model'; + +export class MetadataField { + self: string; + element: string; + qualifier: string; + scopenote: string; + schema: MetadataSchema; +} diff --git a/src/app/core/metadata/metadataregistry.service.ts b/src/app/core/metadata/metadataregistry.service.ts new file mode 100644 index 0000000000..8332956c8a --- /dev/null +++ b/src/app/core/metadata/metadataregistry.service.ts @@ -0,0 +1,1018 @@ +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { RemoteData } from '../data/remote-data'; +import { PaginatedList } from '../data/paginated-list'; +import { MetadataSchema } from './metadataschema.model'; +import { MetadataField } from './metadatafield.model'; +import { PageInfo } from '../shared/page-info.model'; + +Injectable() +export class MetadataRegistryService { + + metadataSchemas: Array; + metadataFields: Array; + + public getMetadataSchemas(): Observable>> { + let pageInfo = new PageInfo(); + pageInfo.elementsPerPage = 10; + pageInfo.currentPage = 1; + + let payload = new PaginatedList(pageInfo, this.metadataSchemas); + let remoteData = new RemoteData(false, false, true, undefined, payload); + return Observable.of(remoteData); + } + + public getMetadataFieldsBySchema(schema: MetadataSchema): Observable>> { + let pageInfo = new PageInfo(); + pageInfo.elementsPerPage = 10; + pageInfo.currentPage = 1; + + let payload = new PaginatedList(pageInfo, this.metadataFields.filter((value) => value.schema == schema)); + let remoteData = new RemoteData(false, false, true, undefined, payload); + return Observable.of(remoteData); + } + + constructor() { + this.metadataSchemas = [ + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1", + "prefix": "dc", + "namespace": "http://dublincore.org/documents/dcmi-terms/" + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2", + "prefix": "mock", + "namespace": "http://dspace.org/mockschema" + } + ]; + this.metadataFields = [ + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8", + "element": "contributor", + "qualifier": "advisor", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9", + "element": "contributor", + "qualifier": "author", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10", + "element": "contributor", + "qualifier": "editor", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11", + "element": "contributor", + "qualifier": "illustrator", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/12", + "element": "contributor", + "qualifier": "other", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/7", + "element": "contributor", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/13", + "element": "coverage", + "qualifier": "spatial", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/14", + "element": "coverage", + "qualifier": "temporal", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/15", + "element": "creator", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/17", + "element": "date", + "qualifier": "accessioned", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/18", + "element": "date", + "qualifier": "available", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/19", + "element": "date", + "qualifier": "copyright", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/20", + "element": "date", + "qualifier": "created", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/21", + "element": "date", + "qualifier": "issued", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/22", + "element": "date", + "qualifier": "submitted", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/128", + "element": "date", + "qualifier": "updated", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/16", + "element": "date", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/33", + "element": "description", + "qualifier": "abstract", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/34", + "element": "description", + "qualifier": "provenance", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/35", + "element": "description", + "qualifier": "sponsorship", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/36", + "element": "description", + "qualifier": "statementofresponsibility", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/37", + "element": "description", + "qualifier": "tableofcontents", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/38", + "element": "description", + "qualifier": "uri", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/129", + "element": "description", + "qualifier": "version", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/32", + "element": "description", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/40", + "element": "format", + "qualifier": "extent", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/41", + "element": "format", + "qualifier": "medium", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/42", + "element": "format", + "qualifier": "mimetype", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/39", + "element": "format", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/24", + "element": "identifier", + "qualifier": "citation", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/133", + "element": "identifier", + "qualifier": "doi", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/137", + "element": "identifier", + "qualifier": "eissn", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/134", + "element": "identifier", + "qualifier": "epage", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/25", + "element": "identifier", + "qualifier": "govdoc", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/26", + "element": "identifier", + "qualifier": "isbn", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/29", + "element": "identifier", + "qualifier": "ismn", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/27", + "element": "identifier", + "qualifier": "issn", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/135", + "element": "identifier", + "qualifier": "issue", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/30", + "element": "identifier", + "qualifier": "other", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/141", + "element": "identifier", + "qualifier": "pmcid", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/136", + "element": "identifier", + "qualifier": "pmid", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/28", + "element": "identifier", + "qualifier": "sici", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/130", + "element": "identifier", + "qualifier": "slug", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/139", + "element": "identifier", + "qualifier": "spage", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/31", + "element": "identifier", + "qualifier": "uri", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/138", + "element": "identifier", + "qualifier": "url", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/140", + "element": "identifier", + "qualifier": "volume", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/23", + "element": "identifier", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/44", + "element": "language", + "qualifier": "iso", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/131", + "element": "language", + "qualifier": "rfc3066", + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/43", + "element": "language", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/5", + "element": "provenance", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/45", + "element": "publisher", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/50", + "element": "relation", + "qualifier": "haspart", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/52", + "element": "relation", + "qualifier": "hasversion", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/53", + "element": "relation", + "qualifier": "isbasedon", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/47", + "element": "relation", + "qualifier": "isformatof", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/48", + "element": "relation", + "qualifier": "ispartof", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/142", + "element": "relation", + "qualifier": "ispartofbook", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/49", + "element": "relation", + "qualifier": "ispartofseries", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/54", + "element": "relation", + "qualifier": "isreferencedby", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/57", + "element": "relation", + "qualifier": "isreplacedby", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/51", + "element": "relation", + "qualifier": "isversionof", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/56", + "element": "relation", + "qualifier": "replaces", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/55", + "element": "relation", + "qualifier": "requires", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/58", + "element": "relation", + "qualifier": "uri", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/46", + "element": "relation", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/132", + "element": "rights", + "qualifier": "holder", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/6", + "element": "rights", + "qualifier": "license", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/60", + "element": "rights", + "qualifier": "uri", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/59", + "element": "rights", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/62", + "element": "source", + "qualifier": "uri", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/61", + "element": "source", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/64", + "element": "subject", + "qualifier": "classification", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/65", + "element": "subject", + "qualifier": "ddc", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/66", + "element": "subject", + "qualifier": "lcc", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/67", + "element": "subject", + "qualifier": "lcsh", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/68", + "element": "subject", + "qualifier": "mesh", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/69", + "element": "subject", + "qualifier": "other", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/63", + "element": "subject", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/71", + "element": "title", + "qualifier": "alternative", + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/70", + "element": "title", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/72", + "element": "type", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/73", + "element": "abstract", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/74", + "element": "accessRights", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/75", + "element": "accrualMethod", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/76", + "element": "accrualPeriodicity", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/77", + "element": "accrualPolicy", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/78", + "element": "alternative", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/79", + "element": "audience", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/80", + "element": "available", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/81", + "element": "bibliographicCitation", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/82", + "element": "conformsTo", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/83", + "element": "contributor", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/84", + "element": "coverage", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/85", + "element": "created", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/86", + "element": "creator", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/87", + "element": "date", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/88", + "element": "dateAccepted", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/89", + "element": "dateCopyrighted", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/90", + "element": "dateSubmitted", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/91", + "element": "description", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/92", + "element": "educationLevel", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/93", + "element": "extent", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/94", + "element": "format", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/95", + "element": "hasFormat", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/96", + "element": "hasPart", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/97", + "element": "hasVersion", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/98", + "element": "identifier", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/99", + "element": "instructionalMethod", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/100", + "element": "isFormatOf", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/101", + "element": "isPartOf", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/102", + "element": "isReferencedBy", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/103", + "element": "isReplacedBy", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/104", + "element": "isRequiredBy", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/105", + "element": "issued", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/106", + "element": "isVersionOf", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/107", + "element": "language", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/108", + "element": "license", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/109", + "element": "mediator", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/110", + "element": "medium", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/111", + "element": "modified", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/112", + "element": "provenance", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/113", + "element": "publisher", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/114", + "element": "references", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/115", + "element": "relation", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/116", + "element": "replaces", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/117", + "element": "requires", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/118", + "element": "rights", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/119", + "element": "rightsHolder", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/120", + "element": "source", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/121", + "element": "spatial", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/122", + "element": "subject", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/123", + "element": "tableOfContents", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/124", + "element": "temporal", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/125", + "element": "title", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/126", + "element": "type", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/127", + "element": "valid", + "qualifier": null, + "scopenote": null, + "schema": this.metadataSchemas[1] + } + ] + } + +} diff --git a/src/app/core/metadata/metadataschema.model.ts b/src/app/core/metadata/metadataschema.model.ts new file mode 100644 index 0000000000..1f739534bf --- /dev/null +++ b/src/app/core/metadata/metadataschema.model.ts @@ -0,0 +1,5 @@ +export class MetadataSchema { + self: string; + prefix: string; + namespace: string; +} From 70256c7f8074d353f47e524ce9e2d3986abe4b7b Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 16 Mar 2018 14:51:03 +0100 Subject: [PATCH 26/80] 50434: Metadata Registry read-only --- resources/i18n/en.json | 32 ++++++++++++++++ .../+admin-page/admin-page-routing.module.ts | 13 +++++++ src/app/+admin-page/admin-page.module.ts | 13 +++++++ .../admin-registries-routing.module.ts | 16 ++++++++ .../admin-registries.module.ts | 23 ++++++++++++ .../metadata-registry.component.html | 30 +++++++++++++++ .../metadata-registry.component.ts | 20 ++++++++++ .../metadata-schema.component.html | 34 +++++++++++++++++ .../metadata-schema.component.ts | 37 +++++++++++++++++++ src/app/app-routing.module.ts | 1 + .../core/metadata/metadataregistry.service.ts | 12 ++++-- 11 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 src/app/+admin-page/admin-page-routing.module.ts create mode 100644 src/app/+admin-page/admin-page.module.ts create mode 100644 src/app/+admin-page/admin-registries/admin-registries-routing.module.ts create mode 100644 src/app/+admin-page/admin-registries/admin-registries.module.ts create mode 100644 src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html create mode 100644 src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.ts create mode 100644 src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html create mode 100644 src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.ts diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 07f770825d..a262a5933a 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -124,6 +124,38 @@ } } }, + "admin": { + "registries": { + "metadata": { + "title": "DSpace Angular :: Metadata Registry", + "head": "Metadata Registry", + "description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema. You may extend the Dublin Core schema with additional fields or add new schemas to the registry.", + "schemas": { + "table": { + "namespace": "Namespace", + "name": "Name", + "caption": "List of metadata schemas" + } + } + }, + "schema": { + "title": "DSpace Angular :: Metadata Schema", + "head": "Metadata Schema", + "description": { + "part1": "This is the metadata schema for", + "part2": "You may add new or update existing metadata fields to this schema. Fields may also be selected for deletion or be moved to another schema." + }, + "fields": { + "head": "Schema metadata fields", + "table": { + "field": "Field", + "scopenote": "Scope Note", + "caption": "List of metadata fields" + } + } + } + } + }, "loading": { "default": "Loading...", "top-level-communities": "Loading top level communities...", diff --git a/src/app/+admin-page/admin-page-routing.module.ts b/src/app/+admin-page/admin-page-routing.module.ts new file mode 100644 index 0000000000..db152ed189 --- /dev/null +++ b/src/app/+admin-page/admin-page-routing.module.ts @@ -0,0 +1,13 @@ +import { RouterModule } from '@angular/router'; +import { NgModule } from '@angular/core'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: 'registries', loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule' } + ]) + ] +}) +export class AdminPageRoutingModule { + +} diff --git a/src/app/+admin-page/admin-page.module.ts b/src/app/+admin-page/admin-page.module.ts new file mode 100644 index 0000000000..8943352019 --- /dev/null +++ b/src/app/+admin-page/admin-page.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { AdminRegistriesModule } from './admin-registries/admin-registries.module'; +import { AdminPageRoutingModule } from './admin-page-routing.module'; + +@NgModule({ + imports: [ + AdminRegistriesModule, + AdminPageRoutingModule + ] +}) +export class AdminPageModule { + +} diff --git a/src/app/+admin-page/admin-registries/admin-registries-routing.module.ts b/src/app/+admin-page/admin-registries/admin-registries-routing.module.ts new file mode 100644 index 0000000000..c1b1fa1eba --- /dev/null +++ b/src/app/+admin-page/admin-registries/admin-registries-routing.module.ts @@ -0,0 +1,16 @@ +import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component'; +import { RouterModule } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: 'metadata', component: MetadataRegistryComponent, data: { title: 'admin.registries.metadata.title' } }, + { path: 'metadata/:schemaName', component: MetadataSchemaComponent, data: { title: 'admin.registries.schema.title' } } + ]) + ] +}) +export class AdminRegistriesRoutingModule { + +} diff --git a/src/app/+admin-page/admin-registries/admin-registries.module.ts b/src/app/+admin-page/admin-registries/admin-registries.module.ts new file mode 100644 index 0000000000..6cbcef407b --- /dev/null +++ b/src/app/+admin-page/admin-registries/admin-registries.module.ts @@ -0,0 +1,23 @@ +import { NgModule } from '@angular/core'; +import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component'; +import { AdminRegistriesRoutingModule } from './admin-registries-routing.module'; +import { CommonModule } from '@angular/common'; +import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component'; +import { RouterModule } from '@angular/router'; +import { TranslateModule } from '@ngx-translate/core'; + +@NgModule({ + imports: [ + CommonModule, + RouterModule, + TranslateModule, + AdminRegistriesRoutingModule + ], + declarations: [ + MetadataRegistryComponent, + MetadataSchemaComponent + ] +}) +export class AdminRegistriesModule { + +} diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html new file mode 100644 index 0000000000..b34276d62e --- /dev/null +++ b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html @@ -0,0 +1,30 @@ +

      +
      +
      + +

      {{'admin.registries.metadata.head' | translate}}

      + +

      {{'admin.registries.metadata.description' | translate}}

      + +
      + + + + + + + + + + + + + + + +
      {{'admin.registries.metadata.schemas.table.caption' | translate}}
      {{'admin.registries.metadata.schemas.table.namespace' | translate}}{{'admin.registries.metadata.schemas.table.name' | translate}}
      {{schema.namespace}}{{schema.prefix}}
      +
      + +
      +
      +
      diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.ts new file mode 100644 index 0000000000..c92aae9945 --- /dev/null +++ b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.ts @@ -0,0 +1,20 @@ +import { Component } from '@angular/core'; +import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service'; +import { Observable } from 'rxjs/Observable'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; + +@Component({ + selector: 'ds-metadata-registry', + templateUrl: './metadata-registry.component.html' +}) +export class MetadataRegistryComponent { + + metadataSchemas: Observable>>; + + constructor(private metadataRegistryService: MetadataRegistryService) { + this.metadataSchemas = this.metadataRegistryService.getMetadataSchemas(); + } + +} diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html new file mode 100644 index 0000000000..d791a7d4b8 --- /dev/null +++ b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html @@ -0,0 +1,34 @@ +
      +
      +
      + +

      {{'admin.registries.schema.head' | translate}}: "{{(metadataSchema | async)?.payload?.prefix}}"

      + +

      + {{'admin.registries.schema.description.part1' | translate}} "{{(metadataSchema | async)?.payload?.namespace}}". + {{'admin.registries.schema.description.part2' | translate}} +

      + +

      {{'admin.registries.schema.fields.head' | translate}}

      +
      + + + + + + + + + + + + + + + +
      {{'admin.registries.schema.fields.table.caption' | translate}}
      {{'admin.registries.schema.fields.table.field' | translate}}{{'admin.registries.schema.fields.table.scopenote' | translate}}
      {{(metadataSchema | async)?.payload?.prefix}}.{{field.element}}{{field.qualifier}}{{field.scopenote}}
      +
      + +
      +
      +
      diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.ts new file mode 100644 index 0000000000..f84f1dcb13 --- /dev/null +++ b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.ts @@ -0,0 +1,37 @@ +import { Component, OnInit } from '@angular/core'; +import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service'; +import { ActivatedRoute } from '@angular/router'; +import { Observable } from 'rxjs/Observable'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { MetadataField } from '../../../core/metadata/metadatafield.model'; +import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; + +@Component({ + selector: 'ds-metadata-schema', + templateUrl: './metadata-schema.component.html' +}) +export class MetadataSchemaComponent implements OnInit { + + metadataSchema: Observable>; + metadataFields: Observable>>; + + constructor(private metadataRegistryService: MetadataRegistryService, private route: ActivatedRoute) { + + } + + ngOnInit(): void { + this.route.params.subscribe((params) => { + this.initialize(params); + }); + } + + initialize(params) { + this.metadataSchema = this.metadataRegistryService.getMetadataSchemaByName(params.schemaName); + this.metadataSchema.subscribe((value) => { + let schema = value.payload; + this.metadataFields = this.metadataRegistryService.getMetadataFieldsBySchema(schema); + }); + } + +} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index dc442cd485..d517c41938 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -12,6 +12,7 @@ import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component'; { path: 'collections', loadChildren: './+collection-page/collection-page.module#CollectionPageModule' }, { path: 'items', loadChildren: './+item-page/item-page.module#ItemPageModule' }, { path: 'search', loadChildren: './+search-page/search-page.module#SearchPageModule' }, + { path: 'admin', loadChildren: './+admin-page/admin-page.module#AdminPageModule' }, { path: '**', pathMatch: 'full', component: PageNotFoundComponent }, ]) ], diff --git a/src/app/core/metadata/metadataregistry.service.ts b/src/app/core/metadata/metadataregistry.service.ts index 8332956c8a..1e81af83c0 100644 --- a/src/app/core/metadata/metadataregistry.service.ts +++ b/src/app/core/metadata/metadataregistry.service.ts @@ -32,6 +32,12 @@ export class MetadataRegistryService { return Observable.of(remoteData); } + public getMetadataSchemaByName(schemaName: string): Observable> { + let payload = this.metadataSchemas.filter((value) => value.prefix == schemaName)[0]; + let remoteData = new RemoteData(false, false, true, undefined, payload); + return Observable.of(remoteData); + } + constructor() { this.metadataSchemas = [ { @@ -64,7 +70,7 @@ export class MetadataRegistryService { "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10", "element": "contributor", "qualifier": "editor", - "scopenote": null, + "scopenote": "test scope note", "schema": this.metadataSchemas[0] }, { @@ -435,7 +441,7 @@ export class MetadataRegistryService { "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/53", "element": "relation", "qualifier": "isbasedon", - "scopenote": null, + "scopenote": "a scope note", "schema": this.metadataSchemas[1] }, { @@ -449,7 +455,7 @@ export class MetadataRegistryService { "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/48", "element": "relation", "qualifier": "ispartof", - "scopenote": null, + "scopenote": "another scope note", "schema": this.metadataSchemas[1] }, { From b3b7b900940508d7b914137b194a7747d742a9e8 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 16 Mar 2018 16:34:37 +0100 Subject: [PATCH 27/80] 50434: Metadata registry UI tests --- .../metadata-registry.component.html | 6 +- .../metadata-registry.component.spec.ts | 66 ++++++++++ .../metadata-schema.component.html | 6 +- .../metadata-schema.component.spec.ts | 115 ++++++++++++++++++ 4 files changed, 187 insertions(+), 6 deletions(-) create mode 100644 src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts create mode 100644 src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html index b34276d62e..9afc671e13 100644 --- a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html @@ -2,12 +2,12 @@
      -

      {{'admin.registries.metadata.head' | translate}}

      + -

      {{'admin.registries.metadata.description' | translate}}

      +

      {{'admin.registries.metadata.description' | translate}}

      - +
      diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts new file mode 100644 index 0000000000..15dc91ccf4 --- /dev/null +++ b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -0,0 +1,66 @@ +import { MetadataRegistryComponent } from './metadata-registry.component'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service'; +import { Observable } from 'rxjs/Observable'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { TranslateModule } from '@ngx-translate/core'; +import { By } from '@angular/platform-browser'; +import { CommonModule } from '@angular/common'; +import { RouterTestingModule } from '@angular/router/testing'; + +describe('MetadataRegistryComponent', () => { + let comp: MetadataRegistryComponent; + let fixture: ComponentFixture; + let metadataRegistryService: MetadataRegistryService; + const mockSchemasList = [ + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1", + "prefix": "dc", + "namespace": "http://dublincore.org/documents/dcmi-terms/" + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2", + "prefix": "mock", + "namespace": "http://dspace.org/mockschema" + } + ]; + const mockSchemas = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList))); + const metadataRegistryServiceStub = { + getMetadataSchemas: () => mockSchemas + }; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot()], + declarations: [MetadataRegistryComponent], + providers: [ + { provide: MetadataRegistryService, useValue: metadataRegistryServiceStub } + ] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MetadataRegistryComponent); + comp = fixture.componentInstance; // SearchPageComponent test instance + fixture.detectChanges(); + metadataRegistryService = (comp as any).service; + }); + + it('should contain two schemas', () => { + let tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas>tbody')).nativeElement; + // Expecting 3 rows, because one row is invisible + expect(tbody.children.length).toBe(3); + }); + + it('should contain the correct schemas', () => { + // Second row, because one row is invisible + let dcName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(2)')).nativeElement; + expect(dcName.textContent).toBe('dc'); + + // Third row, because one row is invisible + let mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(3) td:nth-child(2)')).nativeElement; + expect(mockName.textContent).toBe('mock'); + }); + +}); diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html index d791a7d4b8..597b39f34f 100644 --- a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html +++ b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html @@ -2,16 +2,16 @@
      -

      {{'admin.registries.schema.head' | translate}}: "{{(metadataSchema | async)?.payload?.prefix}}"

      + -

      +

      {{'admin.registries.schema.description.part1' | translate}} "{{(metadataSchema | async)?.payload?.namespace}}". {{'admin.registries.schema.description.part2' | translate}}

      {{'admin.registries.schema.fields.head' | translate}}

      -
      {{'admin.registries.metadata.schemas.table.caption' | translate}}
      +
      diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts new file mode 100644 index 0000000000..13896bd53d --- /dev/null +++ b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts @@ -0,0 +1,115 @@ +import { MetadataSchemaComponent } from './metadata-schema.component'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service'; +import { Observable } from 'rxjs/Observable'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; +import { TranslateModule } from '@ngx-translate/core'; +import { CommonModule } from '@angular/common'; +import { ActivatedRoute } from '@angular/router'; +import { By } from '@angular/platform-browser'; + +describe('MetadataSchemaComponent', () => { + let comp: MetadataSchemaComponent; + let fixture: ComponentFixture; + let metadataRegistryService: MetadataRegistryService; + const mockSchemasList = [ + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1", + "prefix": "dc", + "namespace": "http://dublincore.org/documents/dcmi-terms/" + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2", + "prefix": "mock", + "namespace": "http://dspace.org/mockschema" + } + ]; + const mockFieldsList = [ + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8", + "element": "contributor", + "qualifier": "advisor", + "scopenote": null, + "schema": mockSchemasList[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9", + "element": "contributor", + "qualifier": "author", + "scopenote": null, + "schema": mockSchemasList[0] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10", + "element": "contributor", + "qualifier": "editor", + "scopenote": "test scope note", + "schema": mockSchemasList[1] + }, + { + "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11", + "element": "contributor", + "qualifier": "illustrator", + "scopenote": null, + "schema": mockSchemasList[1] + } + ]; + const mockSchemas = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList))); + const metadataRegistryServiceStub = { + getMetadataSchemas: () => mockSchemas, + getMetadataFieldsBySchema: (schema: MetadataSchema) => Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFieldsList.filter((value) => value.schema == schema)))), + getMetadataSchemaByName: (schemaName: string) => Observable.of(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix == schemaName)[0])) + }; + const schemaNameParam = 'mock'; + const activatedRouteStub = { + params: Observable.of({ + schemaName: schemaNameParam + }) + }; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [CommonModule, TranslateModule.forRoot()], + declarations: [MetadataSchemaComponent], + providers: [ + { provide: MetadataRegistryService, useValue: metadataRegistryServiceStub }, + { provide: ActivatedRoute, useValue: activatedRouteStub } + ] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MetadataSchemaComponent); + comp = fixture.componentInstance; // SearchPageComponent test instance + fixture.detectChanges(); + metadataRegistryService = (comp as any).service; + }); + + it('should contain the schema prefix in the header', () => { + let header: HTMLElement = fixture.debugElement.query(By.css('.metadata-schema #header')).nativeElement; + expect(header.textContent).toContain('mock'); + }); + + it('should contain the schema namespace in the description', () => { + let description: HTMLElement = fixture.debugElement.query(By.css('.metadata-schema #description')).nativeElement; + expect(description.textContent).toContain('http://dspace.org/mockschema'); + }); + + it('should contain two fields', () => { + let tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields>tbody')).nativeElement; + // Expecting 3 rows, because one row is invisible + expect(tbody.children.length).toBe(3); + }); + + it('should contain the correct fields', () => { + // Second row, because one row is invisible + let editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(1)')).nativeElement; + expect(editorField.textContent).toBe('mock.contributor.editor'); + + // Third row, because one row is invisible + let illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(3) td:nth-child(1)')).nativeElement; + expect(illustratorField.textContent).toBe('mock.contributor.illustrator'); + }); +}); From dd402506cc6710ae8f63300dbd89025d1bd37f26 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 16 Mar 2018 16:57:54 +0100 Subject: [PATCH 28/80] 50434: table striped layout change --- .../metadata-registry/metadata-registry.component.html | 3 +-- .../metadata-registry.component.spec.ts | 9 +++------ .../metadata-schema/metadata-schema.component.html | 3 +-- .../metadata-schema/metadata-schema.component.spec.ts | 9 +++------ 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html index 9afc671e13..29888d7e0f 100644 --- a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html @@ -9,14 +9,13 @@
      {{'admin.registries.schema.fields.table.caption' | translate}}
      - + - diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts index 15dc91ccf4..e243e806a2 100644 --- a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts +++ b/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -49,17 +49,14 @@ describe('MetadataRegistryComponent', () => { it('should contain two schemas', () => { let tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas>tbody')).nativeElement; - // Expecting 3 rows, because one row is invisible - expect(tbody.children.length).toBe(3); + expect(tbody.children.length).toBe(2); }); it('should contain the correct schemas', () => { - // Second row, because one row is invisible - let dcName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(2)')).nativeElement; + let dcName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(1) td:nth-child(2)')).nativeElement; expect(dcName.textContent).toBe('dc'); - // Third row, because one row is invisible - let mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(3) td:nth-child(2)')).nativeElement; + let mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(2)')).nativeElement; expect(mockName.textContent).toBe('mock'); }); diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html index 597b39f34f..b782562333 100644 --- a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html +++ b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html @@ -13,14 +13,13 @@
      {{'admin.registries.metadata.schemas.table.caption' | translate}}
      {{'admin.registries.metadata.schemas.table.namespace' | translate}} {{'admin.registries.metadata.schemas.table.name' | translate}}
      {{schema.namespace}} {{schema.prefix}}
      - + - diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts index 13896bd53d..1d7e1cfff1 100644 --- a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts +++ b/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts @@ -99,17 +99,14 @@ describe('MetadataSchemaComponent', () => { it('should contain two fields', () => { let tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields>tbody')).nativeElement; - // Expecting 3 rows, because one row is invisible - expect(tbody.children.length).toBe(3); + expect(tbody.children.length).toBe(2); }); it('should contain the correct fields', () => { - // Second row, because one row is invisible - let editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(1)')).nativeElement; + let editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(1) td:nth-child(1)')).nativeElement; expect(editorField.textContent).toBe('mock.contributor.editor'); - // Third row, because one row is invisible - let illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(3) td:nth-child(1)')).nativeElement; + let illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(1)')).nativeElement; expect(illustratorField.textContent).toBe('mock.contributor.illustrator'); }); }); From c40cefbef668be17cb10d378dc374d9d46449f82 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 19 Mar 2018 14:13:02 +0100 Subject: [PATCH 29/80] 50434: Feedback 2018/03/16 --- resources/i18n/en.json | 13 +- .../admin-registries-routing.module.ts | 0 .../admin-registries.module.ts | 0 .../metadata-registry.component.html | 1 - .../metadata-registry.component.spec.ts | 18 +- .../metadata-registry.component.ts | 0 .../metadata-schema.component.html | 6 +- .../metadata-schema.component.spec.ts | 72 +- .../metadata-schema.component.ts | 5 +- .../admin-routing.module.ts} | 2 +- .../admin.module.ts} | 6 +- src/app/app-routing.module.ts | 2 +- .../core/metadata/metadataregistry.service.ts | 1412 ++++++++--------- 13 files changed, 763 insertions(+), 774 deletions(-) rename src/app/{+admin-page => +admin}/admin-registries/admin-registries-routing.module.ts (100%) rename src/app/{+admin-page => +admin}/admin-registries/admin-registries.module.ts (100%) rename src/app/{+admin-page => +admin}/admin-registries/metadata-registry/metadata-registry.component.html (91%) rename src/app/{+admin-page => +admin}/admin-registries/metadata-registry/metadata-registry.component.spec.ts (73%) rename src/app/{+admin-page => +admin}/admin-registries/metadata-registry/metadata-registry.component.ts (100%) rename src/app/{+admin-page => +admin}/admin-registries/metadata-schema/metadata-schema.component.html (76%) rename src/app/{+admin-page => +admin}/admin-registries/metadata-schema/metadata-schema.component.spec.ts (54%) rename src/app/{+admin-page => +admin}/admin-registries/metadata-schema/metadata-schema.component.ts (92%) rename src/app/{+admin-page/admin-page-routing.module.ts => +admin/admin-routing.module.ts} (87%) rename src/app/{+admin-page/admin-page.module.ts => +admin/admin.module.ts} (59%) diff --git a/resources/i18n/en.json b/resources/i18n/en.json index a262a5933a..51079f94c0 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -129,28 +129,23 @@ "metadata": { "title": "DSpace Angular :: Metadata Registry", "head": "Metadata Registry", - "description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema. You may extend the Dublin Core schema with additional fields or add new schemas to the registry.", + "description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.", "schemas": { "table": { "namespace": "Namespace", - "name": "Name", - "caption": "List of metadata schemas" + "name": "Name" } } }, "schema": { "title": "DSpace Angular :: Metadata Schema", "head": "Metadata Schema", - "description": { - "part1": "This is the metadata schema for", - "part2": "You may add new or update existing metadata fields to this schema. Fields may also be selected for deletion or be moved to another schema." - }, + "description": "This is the metadata schema for \"{{namespace}}\".", "fields": { "head": "Schema metadata fields", "table": { "field": "Field", - "scopenote": "Scope Note", - "caption": "List of metadata fields" + "scopenote": "Scope Note" } } } diff --git a/src/app/+admin-page/admin-registries/admin-registries-routing.module.ts b/src/app/+admin/admin-registries/admin-registries-routing.module.ts similarity index 100% rename from src/app/+admin-page/admin-registries/admin-registries-routing.module.ts rename to src/app/+admin/admin-registries/admin-registries-routing.module.ts diff --git a/src/app/+admin-page/admin-registries/admin-registries.module.ts b/src/app/+admin/admin-registries/admin-registries.module.ts similarity index 100% rename from src/app/+admin-page/admin-registries/admin-registries.module.ts rename to src/app/+admin/admin-registries/admin-registries.module.ts diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html similarity index 91% rename from src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html rename to src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html index 29888d7e0f..d0c2bb5675 100644 --- a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html @@ -8,7 +8,6 @@
      {{'admin.registries.schema.fields.table.caption' | translate}}
      {{'admin.registries.schema.fields.table.field' | translate}} {{'admin.registries.schema.fields.table.scopenote' | translate}}
      {{(metadataSchema | async)?.payload?.prefix}}.{{field.element}}{{field.qualifier}} {{field.scopenote}}
      - diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts similarity index 73% rename from src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts rename to src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts index e243e806a2..981c253c3a 100644 --- a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -15,14 +15,14 @@ describe('MetadataRegistryComponent', () => { let metadataRegistryService: MetadataRegistryService; const mockSchemasList = [ { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1", - "prefix": "dc", - "namespace": "http://dublincore.org/documents/dcmi-terms/" + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1', + prefix: 'dc', + namespace: 'http://dublincore.org/documents/dcmi-terms/' }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2", - "prefix": "mock", - "namespace": "http://dspace.org/mockschema" + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2', + prefix: 'mock', + namespace: 'http://dspace.org/mockschema' } ]; const mockSchemas = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList))); @@ -48,15 +48,15 @@ describe('MetadataRegistryComponent', () => { }); it('should contain two schemas', () => { - let tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas>tbody')).nativeElement; + const tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas>tbody')).nativeElement; expect(tbody.children.length).toBe(2); }); it('should contain the correct schemas', () => { - let dcName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(1) td:nth-child(2)')).nativeElement; + const dcName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(1) td:nth-child(2)')).nativeElement; expect(dcName.textContent).toBe('dc'); - let mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(2)')).nativeElement; + const mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(2)')).nativeElement; expect(mockName.textContent).toBe('mock'); }); diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts similarity index 100% rename from src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.ts rename to src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html similarity index 76% rename from src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html rename to src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html index b782562333..f07a6cc670 100644 --- a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html @@ -4,15 +4,11 @@ -

      - {{'admin.registries.schema.description.part1' | translate}} "{{(metadataSchema | async)?.payload?.namespace}}". - {{'admin.registries.schema.description.part2' | translate}} -

      +

      {{'admin.registries.schema.description' | translate:namespace }}

      {{'admin.registries.schema.fields.head' | translate}}

      {{'admin.registries.metadata.schemas.table.caption' | translate}}
      {{'admin.registries.metadata.schemas.table.namespace' | translate}}
      - diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts similarity index 54% rename from src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts rename to src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts index 1d7e1cfff1..507684276e 100644 --- a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts @@ -5,10 +5,11 @@ import { Observable } from 'rxjs/Observable'; import { RemoteData } from '../../../core/data/remote-data'; import { PaginatedList } from '../../../core/data/paginated-list'; import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { By } from '@angular/platform-browser'; +import { MockTranslateLoader } from '../../../shared/testing/mock-translate-loader'; describe('MetadataSchemaComponent', () => { let comp: MetadataSchemaComponent; @@ -16,51 +17,51 @@ describe('MetadataSchemaComponent', () => { let metadataRegistryService: MetadataRegistryService; const mockSchemasList = [ { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1", - "prefix": "dc", - "namespace": "http://dublincore.org/documents/dcmi-terms/" + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1', + prefix: 'dc', + namespace: 'http://dublincore.org/documents/dcmi-terms/' }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2", - "prefix": "mock", - "namespace": "http://dspace.org/mockschema" + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2', + prefix: 'mock', + namespace: 'http://dspace.org/mockschema' } ]; const mockFieldsList = [ { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8", - "element": "contributor", - "qualifier": "advisor", - "scopenote": null, - "schema": mockSchemasList[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8', + element: 'contributor', + qualifier: 'advisor', + scopenote: null, + schema: mockSchemasList[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9", - "element": "contributor", - "qualifier": "author", - "scopenote": null, - "schema": mockSchemasList[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9', + element: 'contributor', + qualifier: 'author', + scopenote: null, + schema: mockSchemasList[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10", - "element": "contributor", - "qualifier": "editor", - "scopenote": "test scope note", - "schema": mockSchemasList[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10', + element: 'contributor', + qualifier: 'editor', + scopenote: 'test scope note', + schema: mockSchemasList[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11", - "element": "contributor", - "qualifier": "illustrator", - "scopenote": null, - "schema": mockSchemasList[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11', + element: 'contributor', + qualifier: 'illustrator', + scopenote: null, + schema: mockSchemasList[1] } ]; const mockSchemas = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList))); const metadataRegistryServiceStub = { getMetadataSchemas: () => mockSchemas, - getMetadataFieldsBySchema: (schema: MetadataSchema) => Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFieldsList.filter((value) => value.schema == schema)))), - getMetadataSchemaByName: (schemaName: string) => Observable.of(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix == schemaName)[0])) + getMetadataFieldsBySchema: (schema: MetadataSchema) => Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFieldsList.filter((value) => value.schema === schema)))), + getMetadataSchemaByName: (schemaName: string) => Observable.of(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix === schemaName)[0])) }; const schemaNameParam = 'mock'; const activatedRouteStub = { @@ -88,25 +89,20 @@ describe('MetadataSchemaComponent', () => { }); it('should contain the schema prefix in the header', () => { - let header: HTMLElement = fixture.debugElement.query(By.css('.metadata-schema #header')).nativeElement; + const header: HTMLElement = fixture.debugElement.query(By.css('.metadata-schema #header')).nativeElement; expect(header.textContent).toContain('mock'); }); - it('should contain the schema namespace in the description', () => { - let description: HTMLElement = fixture.debugElement.query(By.css('.metadata-schema #description')).nativeElement; - expect(description.textContent).toContain('http://dspace.org/mockschema'); - }); - it('should contain two fields', () => { - let tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields>tbody')).nativeElement; + const tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields>tbody')).nativeElement; expect(tbody.children.length).toBe(2); }); it('should contain the correct fields', () => { - let editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(1) td:nth-child(1)')).nativeElement; + const editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(1) td:nth-child(1)')).nativeElement; expect(editorField.textContent).toBe('mock.contributor.editor'); - let illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(1)')).nativeElement; + const illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(1)')).nativeElement; expect(illustratorField.textContent).toBe('mock.contributor.illustrator'); }); }); diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts similarity index 92% rename from src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.ts rename to src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts index f84f1dcb13..bcb725d4ac 100644 --- a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts @@ -13,6 +13,8 @@ import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; }) export class MetadataSchemaComponent implements OnInit { + namespace; + metadataSchema: Observable>; metadataFields: Observable>>; @@ -29,8 +31,9 @@ export class MetadataSchemaComponent implements OnInit { initialize(params) { this.metadataSchema = this.metadataRegistryService.getMetadataSchemaByName(params.schemaName); this.metadataSchema.subscribe((value) => { - let schema = value.payload; + const schema = value.payload; this.metadataFields = this.metadataRegistryService.getMetadataFieldsBySchema(schema); + this.namespace = { namespace: value.payload.namespace }; }); } diff --git a/src/app/+admin-page/admin-page-routing.module.ts b/src/app/+admin/admin-routing.module.ts similarity index 87% rename from src/app/+admin-page/admin-page-routing.module.ts rename to src/app/+admin/admin-routing.module.ts index db152ed189..e7c96bb9c4 100644 --- a/src/app/+admin-page/admin-page-routing.module.ts +++ b/src/app/+admin/admin-routing.module.ts @@ -8,6 +8,6 @@ import { NgModule } from '@angular/core'; ]) ] }) -export class AdminPageRoutingModule { +export class AdminRoutingModule { } diff --git a/src/app/+admin-page/admin-page.module.ts b/src/app/+admin/admin.module.ts similarity index 59% rename from src/app/+admin-page/admin-page.module.ts rename to src/app/+admin/admin.module.ts index 8943352019..b979813376 100644 --- a/src/app/+admin-page/admin-page.module.ts +++ b/src/app/+admin/admin.module.ts @@ -1,13 +1,13 @@ import { NgModule } from '@angular/core'; import { AdminRegistriesModule } from './admin-registries/admin-registries.module'; -import { AdminPageRoutingModule } from './admin-page-routing.module'; +import { AdminRoutingModule } from './admin-routing.module'; @NgModule({ imports: [ AdminRegistriesModule, - AdminPageRoutingModule + AdminRoutingModule ] }) -export class AdminPageModule { +export class AdminModule { } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d517c41938..70619a1b56 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -12,7 +12,7 @@ import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component'; { path: 'collections', loadChildren: './+collection-page/collection-page.module#CollectionPageModule' }, { path: 'items', loadChildren: './+item-page/item-page.module#ItemPageModule' }, { path: 'search', loadChildren: './+search-page/search-page.module#SearchPageModule' }, - { path: 'admin', loadChildren: './+admin-page/admin-page.module#AdminPageModule' }, + { path: 'admin', loadChildren: './+admin/admin.module#AdminModule' }, { path: '**', pathMatch: 'full', component: PageNotFoundComponent }, ]) ], diff --git a/src/app/core/metadata/metadataregistry.service.ts b/src/app/core/metadata/metadataregistry.service.ts index 1e81af83c0..bb3e4154bc 100644 --- a/src/app/core/metadata/metadataregistry.service.ts +++ b/src/app/core/metadata/metadataregistry.service.ts @@ -9,1014 +9,1014 @@ import { PageInfo } from '../shared/page-info.model'; Injectable() export class MetadataRegistryService { - metadataSchemas: Array; - metadataFields: Array; + metadataSchemas: MetadataSchema[]; + metadataFields: MetadataField[]; public getMetadataSchemas(): Observable>> { - let pageInfo = new PageInfo(); + const pageInfo = new PageInfo(); pageInfo.elementsPerPage = 10; pageInfo.currentPage = 1; - let payload = new PaginatedList(pageInfo, this.metadataSchemas); - let remoteData = new RemoteData(false, false, true, undefined, payload); + const payload = new PaginatedList(pageInfo, this.metadataSchemas); + const remoteData = new RemoteData(false, false, true, undefined, payload); return Observable.of(remoteData); } public getMetadataFieldsBySchema(schema: MetadataSchema): Observable>> { - let pageInfo = new PageInfo(); + const pageInfo = new PageInfo(); pageInfo.elementsPerPage = 10; pageInfo.currentPage = 1; - let payload = new PaginatedList(pageInfo, this.metadataFields.filter((value) => value.schema == schema)); - let remoteData = new RemoteData(false, false, true, undefined, payload); + const payload = new PaginatedList(pageInfo, this.metadataFields.filter((value) => value.schema === schema)); + const remoteData = new RemoteData(false, false, true, undefined, payload); return Observable.of(remoteData); } public getMetadataSchemaByName(schemaName: string): Observable> { - let payload = this.metadataSchemas.filter((value) => value.prefix == schemaName)[0]; - let remoteData = new RemoteData(false, false, true, undefined, payload); + const payload = this.metadataSchemas.filter((value) => value.prefix === schemaName)[0]; + const remoteData = new RemoteData(false, false, true, undefined, payload); return Observable.of(remoteData); } constructor() { this.metadataSchemas = [ { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1", - "prefix": "dc", - "namespace": "http://dublincore.org/documents/dcmi-terms/" + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1', + prefix: 'dc', + namespace: 'http://dublincore.org/documents/dcmi-terms/' }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2", - "prefix": "mock", - "namespace": "http://dspace.org/mockschema" + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2', + prefix: 'mock', + namespace: 'http://dspace.org/mockschema' } ]; this.metadataFields = [ { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8", - "element": "contributor", - "qualifier": "advisor", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8', + element: 'contributor', + qualifier: 'advisor', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9", - "element": "contributor", - "qualifier": "author", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9', + element: 'contributor', + qualifier: 'author', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10", - "element": "contributor", - "qualifier": "editor", - "scopenote": "test scope note", - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10', + element: 'contributor', + qualifier: 'editor', + scopenote: 'test scope note', + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11", - "element": "contributor", - "qualifier": "illustrator", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11', + element: 'contributor', + qualifier: 'illustrator', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/12", - "element": "contributor", - "qualifier": "other", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/12', + element: 'contributor', + qualifier: 'other', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/7", - "element": "contributor", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/7', + element: 'contributor', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/13", - "element": "coverage", - "qualifier": "spatial", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/13', + element: 'coverage', + qualifier: 'spatial', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/14", - "element": "coverage", - "qualifier": "temporal", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/14', + element: 'coverage', + qualifier: 'temporal', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/15", - "element": "creator", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/15', + element: 'creator', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/17", - "element": "date", - "qualifier": "accessioned", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/17', + element: 'date', + qualifier: 'accessioned', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/18", - "element": "date", - "qualifier": "available", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/18', + element: 'date', + qualifier: 'available', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/19", - "element": "date", - "qualifier": "copyright", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/19', + element: 'date', + qualifier: 'copyright', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/20", - "element": "date", - "qualifier": "created", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/20', + element: 'date', + qualifier: 'created', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/21", - "element": "date", - "qualifier": "issued", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/21', + element: 'date', + qualifier: 'issued', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/22", - "element": "date", - "qualifier": "submitted", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/22', + element: 'date', + qualifier: 'submitted', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/128", - "element": "date", - "qualifier": "updated", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/128', + element: 'date', + qualifier: 'updated', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/16", - "element": "date", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/16', + element: 'date', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/33", - "element": "description", - "qualifier": "abstract", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/33', + element: 'description', + qualifier: 'abstract', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/34", - "element": "description", - "qualifier": "provenance", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/34', + element: 'description', + qualifier: 'provenance', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/35", - "element": "description", - "qualifier": "sponsorship", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/35', + element: 'description', + qualifier: 'sponsorship', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/36", - "element": "description", - "qualifier": "statementofresponsibility", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/36', + element: 'description', + qualifier: 'statementofresponsibility', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/37", - "element": "description", - "qualifier": "tableofcontents", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/37', + element: 'description', + qualifier: 'tableofcontents', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/38", - "element": "description", - "qualifier": "uri", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/38', + element: 'description', + qualifier: 'uri', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/129", - "element": "description", - "qualifier": "version", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/129', + element: 'description', + qualifier: 'version', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/32", - "element": "description", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/32', + element: 'description', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/40", - "element": "format", - "qualifier": "extent", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/40', + element: 'format', + qualifier: 'extent', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/41", - "element": "format", - "qualifier": "medium", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/41', + element: 'format', + qualifier: 'medium', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/42", - "element": "format", - "qualifier": "mimetype", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/42', + element: 'format', + qualifier: 'mimetype', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/39", - "element": "format", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/39', + element: 'format', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/24", - "element": "identifier", - "qualifier": "citation", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/24', + element: 'identifier', + qualifier: 'citation', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/133", - "element": "identifier", - "qualifier": "doi", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/133', + element: 'identifier', + qualifier: 'doi', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/137", - "element": "identifier", - "qualifier": "eissn", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/137', + element: 'identifier', + qualifier: 'eissn', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/134", - "element": "identifier", - "qualifier": "epage", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/134', + element: 'identifier', + qualifier: 'epage', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/25", - "element": "identifier", - "qualifier": "govdoc", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/25', + element: 'identifier', + qualifier: 'govdoc', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/26", - "element": "identifier", - "qualifier": "isbn", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/26', + element: 'identifier', + qualifier: 'isbn', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/29", - "element": "identifier", - "qualifier": "ismn", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/29', + element: 'identifier', + qualifier: 'ismn', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/27", - "element": "identifier", - "qualifier": "issn", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/27', + element: 'identifier', + qualifier: 'issn', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/135", - "element": "identifier", - "qualifier": "issue", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/135', + element: 'identifier', + qualifier: 'issue', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/30", - "element": "identifier", - "qualifier": "other", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/30', + element: 'identifier', + qualifier: 'other', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/141", - "element": "identifier", - "qualifier": "pmcid", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/141', + element: 'identifier', + qualifier: 'pmcid', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/136", - "element": "identifier", - "qualifier": "pmid", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/136', + element: 'identifier', + qualifier: 'pmid', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/28", - "element": "identifier", - "qualifier": "sici", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/28', + element: 'identifier', + qualifier: 'sici', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/130", - "element": "identifier", - "qualifier": "slug", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/130', + element: 'identifier', + qualifier: 'slug', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/139", - "element": "identifier", - "qualifier": "spage", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/139', + element: 'identifier', + qualifier: 'spage', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/31", - "element": "identifier", - "qualifier": "uri", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/31', + element: 'identifier', + qualifier: 'uri', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/138", - "element": "identifier", - "qualifier": "url", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/138', + element: 'identifier', + qualifier: 'url', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/140", - "element": "identifier", - "qualifier": "volume", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/140', + element: 'identifier', + qualifier: 'volume', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/23", - "element": "identifier", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/23', + element: 'identifier', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/44", - "element": "language", - "qualifier": "iso", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/44', + element: 'language', + qualifier: 'iso', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/131", - "element": "language", - "qualifier": "rfc3066", - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/131', + element: 'language', + qualifier: 'rfc3066', + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/43", - "element": "language", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/43', + element: 'language', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/5", - "element": "provenance", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/5', + element: 'provenance', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/45", - "element": "publisher", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/45', + element: 'publisher', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/50", - "element": "relation", - "qualifier": "haspart", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/50', + element: 'relation', + qualifier: 'haspart', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/52", - "element": "relation", - "qualifier": "hasversion", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/52', + element: 'relation', + qualifier: 'hasversion', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/53", - "element": "relation", - "qualifier": "isbasedon", - "scopenote": "a scope note", - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/53', + element: 'relation', + qualifier: 'isbasedon', + scopenote: 'a scope note', + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/47", - "element": "relation", - "qualifier": "isformatof", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/47', + element: 'relation', + qualifier: 'isformatof', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/48", - "element": "relation", - "qualifier": "ispartof", - "scopenote": "another scope note", - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/48', + element: 'relation', + qualifier: 'ispartof', + scopenote: 'another scope note', + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/142", - "element": "relation", - "qualifier": "ispartofbook", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/142', + element: 'relation', + qualifier: 'ispartofbook', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/49", - "element": "relation", - "qualifier": "ispartofseries", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/49', + element: 'relation', + qualifier: 'ispartofseries', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/54", - "element": "relation", - "qualifier": "isreferencedby", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/54', + element: 'relation', + qualifier: 'isreferencedby', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/57", - "element": "relation", - "qualifier": "isreplacedby", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/57', + element: 'relation', + qualifier: 'isreplacedby', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/51", - "element": "relation", - "qualifier": "isversionof", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/51', + element: 'relation', + qualifier: 'isversionof', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/56", - "element": "relation", - "qualifier": "replaces", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/56', + element: 'relation', + qualifier: 'replaces', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/55", - "element": "relation", - "qualifier": "requires", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/55', + element: 'relation', + qualifier: 'requires', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/58", - "element": "relation", - "qualifier": "uri", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/58', + element: 'relation', + qualifier: 'uri', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/46", - "element": "relation", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/46', + element: 'relation', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/132", - "element": "rights", - "qualifier": "holder", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/132', + element: 'rights', + qualifier: 'holder', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/6", - "element": "rights", - "qualifier": "license", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/6', + element: 'rights', + qualifier: 'license', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/60", - "element": "rights", - "qualifier": "uri", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/60', + element: 'rights', + qualifier: 'uri', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/59", - "element": "rights", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/59', + element: 'rights', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/62", - "element": "source", - "qualifier": "uri", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/62', + element: 'source', + qualifier: 'uri', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/61", - "element": "source", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/61', + element: 'source', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/64", - "element": "subject", - "qualifier": "classification", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/64', + element: 'subject', + qualifier: 'classification', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/65", - "element": "subject", - "qualifier": "ddc", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/65', + element: 'subject', + qualifier: 'ddc', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/66", - "element": "subject", - "qualifier": "lcc", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/66', + element: 'subject', + qualifier: 'lcc', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/67", - "element": "subject", - "qualifier": "lcsh", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/67', + element: 'subject', + qualifier: 'lcsh', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/68", - "element": "subject", - "qualifier": "mesh", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/68', + element: 'subject', + qualifier: 'mesh', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/69", - "element": "subject", - "qualifier": "other", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/69', + element: 'subject', + qualifier: 'other', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/63", - "element": "subject", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/63', + element: 'subject', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/71", - "element": "title", - "qualifier": "alternative", - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/71', + element: 'title', + qualifier: 'alternative', + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/70", - "element": "title", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/70', + element: 'title', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/72", - "element": "type", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/72', + element: 'type', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/73", - "element": "abstract", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/73', + element: 'abstract', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/74", - "element": "accessRights", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/74', + element: 'accessRights', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/75", - "element": "accrualMethod", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/75', + element: 'accrualMethod', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/76", - "element": "accrualPeriodicity", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/76', + element: 'accrualPeriodicity', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/77", - "element": "accrualPolicy", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/77', + element: 'accrualPolicy', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/78", - "element": "alternative", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/78', + element: 'alternative', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/79", - "element": "audience", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/79', + element: 'audience', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/80", - "element": "available", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/80', + element: 'available', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/81", - "element": "bibliographicCitation", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/81', + element: 'bibliographicCitation', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/82", - "element": "conformsTo", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/82', + element: 'conformsTo', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/83", - "element": "contributor", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/83', + element: 'contributor', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/84", - "element": "coverage", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/84', + element: 'coverage', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/85", - "element": "created", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/85', + element: 'created', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/86", - "element": "creator", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/86', + element: 'creator', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/87", - "element": "date", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/87', + element: 'date', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/88", - "element": "dateAccepted", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/88', + element: 'dateAccepted', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/89", - "element": "dateCopyrighted", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/89', + element: 'dateCopyrighted', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/90", - "element": "dateSubmitted", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/90', + element: 'dateSubmitted', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/91", - "element": "description", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/91', + element: 'description', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/92", - "element": "educationLevel", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/92', + element: 'educationLevel', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/93", - "element": "extent", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/93', + element: 'extent', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/94", - "element": "format", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/94', + element: 'format', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/95", - "element": "hasFormat", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/95', + element: 'hasFormat', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/96", - "element": "hasPart", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/96', + element: 'hasPart', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/97", - "element": "hasVersion", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/97', + element: 'hasVersion', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/98", - "element": "identifier", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/98', + element: 'identifier', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/99", - "element": "instructionalMethod", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/99', + element: 'instructionalMethod', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/100", - "element": "isFormatOf", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/100', + element: 'isFormatOf', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/101", - "element": "isPartOf", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/101', + element: 'isPartOf', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/102", - "element": "isReferencedBy", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/102', + element: 'isReferencedBy', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/103", - "element": "isReplacedBy", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/103', + element: 'isReplacedBy', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/104", - "element": "isRequiredBy", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/104', + element: 'isRequiredBy', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/105", - "element": "issued", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/105', + element: 'issued', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/106", - "element": "isVersionOf", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/106', + element: 'isVersionOf', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/107", - "element": "language", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/107', + element: 'language', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/108", - "element": "license", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/108', + element: 'license', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/109", - "element": "mediator", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/109', + element: 'mediator', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/110", - "element": "medium", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/110', + element: 'medium', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/111", - "element": "modified", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/111', + element: 'modified', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/112", - "element": "provenance", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/112', + element: 'provenance', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/113", - "element": "publisher", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/113', + element: 'publisher', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/114", - "element": "references", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/114', + element: 'references', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/115", - "element": "relation", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/115', + element: 'relation', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/116", - "element": "replaces", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/116', + element: 'replaces', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/117", - "element": "requires", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/117', + element: 'requires', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/118", - "element": "rights", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/118', + element: 'rights', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/119", - "element": "rightsHolder", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/119', + element: 'rightsHolder', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/120", - "element": "source", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/120', + element: 'source', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/121", - "element": "spatial", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/121', + element: 'spatial', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/122", - "element": "subject", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/122', + element: 'subject', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/123", - "element": "tableOfContents", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/123', + element: 'tableOfContents', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/124", - "element": "temporal", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/124', + element: 'temporal', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/125", - "element": "title", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/125', + element: 'title', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/126", - "element": "type", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/126', + element: 'type', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/127", - "element": "valid", - "qualifier": null, - "scopenote": null, - "schema": this.metadataSchemas[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/127', + element: 'valid', + qualifier: null, + scopenote: null, + schema: this.metadataSchemas[1] } ] } From 70c36f7fef68a4408c7529ad4213df11f49766df Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 29 Mar 2018 15:39:59 +0200 Subject: [PATCH 30/80] rebase --- .../metadata-registry/metadata-registry.component.ts | 6 +++--- .../metadata-schema/metadata-schema.component.ts | 8 ++++---- .../registry.service.ts} | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) rename src/app/core/{metadata/metadataregistry.service.ts => registry/registry.service.ts} (99%) diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts index c92aae9945..3158c4bb46 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service'; +import { RegistryService } from '../../../core/registry/registry.service'; import { Observable } from 'rxjs/Observable'; import { RemoteData } from '../../../core/data/remote-data'; import { PaginatedList } from '../../../core/data/paginated-list'; @@ -13,8 +13,8 @@ export class MetadataRegistryComponent { metadataSchemas: Observable>>; - constructor(private metadataRegistryService: MetadataRegistryService) { - this.metadataSchemas = this.metadataRegistryService.getMetadataSchemas(); + constructor(private registryService: RegistryService) { + this.metadataSchemas = this.registryService.getMetadataSchemas(); } } diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts index bcb725d4ac..15d0ee18a2 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service'; +import { RegistryService } from '../../../core/registry/registry.service'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; import { RemoteData } from '../../../core/data/remote-data'; @@ -18,7 +18,7 @@ export class MetadataSchemaComponent implements OnInit { metadataSchema: Observable>; metadataFields: Observable>>; - constructor(private metadataRegistryService: MetadataRegistryService, private route: ActivatedRoute) { + constructor(private registryService: RegistryService, private route: ActivatedRoute) { } @@ -29,10 +29,10 @@ export class MetadataSchemaComponent implements OnInit { } initialize(params) { - this.metadataSchema = this.metadataRegistryService.getMetadataSchemaByName(params.schemaName); + this.metadataSchema = this.registryService.getMetadataSchemaByName(params.schemaName); this.metadataSchema.subscribe((value) => { const schema = value.payload; - this.metadataFields = this.metadataRegistryService.getMetadataFieldsBySchema(schema); + this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema); this.namespace = { namespace: value.payload.namespace }; }); } diff --git a/src/app/core/metadata/metadataregistry.service.ts b/src/app/core/registry/registry.service.ts similarity index 99% rename from src/app/core/metadata/metadataregistry.service.ts rename to src/app/core/registry/registry.service.ts index bb3e4154bc..362478a054 100644 --- a/src/app/core/metadata/metadataregistry.service.ts +++ b/src/app/core/registry/registry.service.ts @@ -2,12 +2,12 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { RemoteData } from '../data/remote-data'; import { PaginatedList } from '../data/paginated-list'; -import { MetadataSchema } from './metadataschema.model'; -import { MetadataField } from './metadatafield.model'; import { PageInfo } from '../shared/page-info.model'; +import { MetadataSchema } from '../metadata/metadataschema.model'; +import { MetadataField } from '../metadata/metadatafield.model'; Injectable() -export class MetadataRegistryService { +export class RegistryService { metadataSchemas: MetadataSchema[]; metadataFields: MetadataField[]; From f80abb9f43030279e77cbe9c538b2114c6adfafe Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 19 Mar 2018 16:38:02 +0100 Subject: [PATCH 31/80] 50452: Bitstream format registry --- resources/i18n/en.json | 20 +- .../admin-registries-routing.module.ts | 4 +- .../admin-registries.module.ts | 4 +- .../bitstream-formats.component.html | 30 +++ .../bitstream-formats.component.spec.ts | 91 +++++++++ .../bitstream-formats.component.ts | 19 ++ .../metadata-registry.component.spec.ts | 11 +- .../metadata-schema.component.spec.ts | 11 +- .../registry/mock-bitstream-format.model.ts | 8 + src/app/core/registry/registry.service.ts | 176 +++++++++++++++++- 10 files changed, 360 insertions(+), 14 deletions(-) create mode 100644 src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html create mode 100644 src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts create mode 100644 src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts create mode 100644 src/app/core/registry/mock-bitstream-format.model.ts diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 51079f94c0..5e97d81d8e 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -138,7 +138,7 @@ } }, "schema": { - "title": "DSpace Angular :: Metadata Schema", + "title": "DSpace Angular :: Metadata Schema Registry", "head": "Metadata Schema", "description": "This is the metadata schema for \"{{namespace}}\".", "fields": { @@ -148,6 +148,24 @@ "scopenote": "Scope Note" } } + }, + "bitstream-formats": { + "title": "DSpace Angular :: Bitstream Format Registry", + "head": "Bitstream Format Registry", + "description": "This list of bitstream formats provides information about known formats and their support level.", + "formats": { + "table": { + "name": "Name", + "mimetype": "MIME Type", + "supportLevel": { + "head": "Support Level", + "0": "Unknown", + "1": "Known", + "2": "Support" + }, + "internal": "internal" + } + } } } }, diff --git a/src/app/+admin/admin-registries/admin-registries-routing.module.ts b/src/app/+admin/admin-registries/admin-registries-routing.module.ts index c1b1fa1eba..8e3c322bc8 100644 --- a/src/app/+admin/admin-registries/admin-registries-routing.module.ts +++ b/src/app/+admin/admin-registries/admin-registries-routing.module.ts @@ -2,12 +2,14 @@ import { MetadataRegistryComponent } from './metadata-registry/metadata-registry import { RouterModule } from '@angular/router'; import { NgModule } from '@angular/core'; import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component'; +import { BitstreamFormatsComponent } from './bitstream-formats/bitstream-formats.component'; @NgModule({ imports: [ RouterModule.forChild([ { path: 'metadata', component: MetadataRegistryComponent, data: { title: 'admin.registries.metadata.title' } }, - { path: 'metadata/:schemaName', component: MetadataSchemaComponent, data: { title: 'admin.registries.schema.title' } } + { path: 'metadata/:schemaName', component: MetadataSchemaComponent, data: { title: 'admin.registries.schema.title' } }, + { path: 'bitstream-formats', component: BitstreamFormatsComponent, data: { title: 'admin.registries.bitstream-formats.title' } }, ]) ] }) diff --git a/src/app/+admin/admin-registries/admin-registries.module.ts b/src/app/+admin/admin-registries/admin-registries.module.ts index 6cbcef407b..fb9dcdaa63 100644 --- a/src/app/+admin/admin-registries/admin-registries.module.ts +++ b/src/app/+admin/admin-registries/admin-registries.module.ts @@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common'; import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component'; import { RouterModule } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; +import { BitstreamFormatsComponent } from './bitstream-formats/bitstream-formats.component'; @NgModule({ imports: [ @@ -15,7 +16,8 @@ import { TranslateModule } from '@ngx-translate/core'; ], declarations: [ MetadataRegistryComponent, - MetadataSchemaComponent + MetadataSchemaComponent, + BitstreamFormatsComponent ] }) export class AdminRegistriesModule { diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html new file mode 100644 index 0000000000..87b3ba85eb --- /dev/null +++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html @@ -0,0 +1,30 @@ +
      +
      +
      + + + +

      {{'admin.registries.bitstream-formats.description' | translate}}

      + +
      +
      {{'admin.registries.schema.fields.table.caption' | translate}}
      {{'admin.registries.schema.fields.table.field' | translate}}
      + + + + + + + + + + + + + + +
      {{'admin.registries.bitstream-formats.formats.table.name' | translate}}{{'admin.registries.bitstream-formats.formats.table.mimetype' | translate}}{{'admin.registries.bitstream-formats.formats.table.supportLevel.head' | translate}}
      {{bitstreamFormat.shortDescription}}{{bitstreamFormat.mimetype}} ({{'admin.registries.bitstream-formats.formats.table.internal' | translate}}){{'admin.registries.bitstream-formats.formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}
      +
      + +
      +
      +
    diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts new file mode 100644 index 0000000000..f83f96127f --- /dev/null +++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts @@ -0,0 +1,91 @@ +import { BitstreamFormatsComponent } from './bitstream-formats.component'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { RegistryService } from '../../../core/registry/registry.service'; +import { Observable } from 'rxjs/Observable'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { CommonModule } from '@angular/common'; +import { RouterTestingModule } from '@angular/router/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { By } from '@angular/platform-browser'; + +describe('BitstreamFormatsComponent', () => { + let comp: BitstreamFormatsComponent; + let fixture: ComponentFixture; + let registryService: RegistryService; + const mockFormatsList = [ + { + shortDescription: 'Unknown', + description: 'Unknown data format', + mimetype: 'application/octet-stream', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'License', + description: 'Item-specific license agreed upon to submission', + mimetype: 'text/plain; charset=utf-8', + supportLevel: 1, + internal: true, + extensions: null + }, + { + shortDescription: 'CC License', + description: 'Item-specific Creative Commons license agreed upon to submission', + mimetype: 'text/html; charset=utf-8', + supportLevel: 2, + internal: true, + extensions: null + }, + { + shortDescription: 'Adobe PDF', + description: 'Adobe Portable Document Format', + mimetype: 'application/pdf', + supportLevel: 0, + internal: false, + extensions: null + } + ]; + const mockFormats = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFormatsList))); + const registryServiceStub = { + getBitstreamFormats: () => mockFormats + }; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot()], + declarations: [BitstreamFormatsComponent], + providers: [ + { provide: RegistryService, useValue: registryServiceStub } + ] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(BitstreamFormatsComponent); + comp = fixture.componentInstance; + fixture.detectChanges(); + registryService = (comp as any).service; + }); + + it('should contain four formats', () => { + const tbody: HTMLElement = fixture.debugElement.query(By.css('#formats>tbody')).nativeElement; + expect(tbody.children.length).toBe(4); + }); + + it('should contain the correct formats', () => { + const unknownName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(1) td:nth-child(1)')).nativeElement; + expect(unknownName.textContent).toBe('Unknown'); + + const licenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(2) td:nth-child(1)')).nativeElement; + expect(licenseName.textContent).toBe('License'); + + const ccLicenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(3) td:nth-child(1)')).nativeElement; + expect(ccLicenseName.textContent).toBe('CC License'); + + const adobeName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(4) td:nth-child(1)')).nativeElement; + expect(adobeName.textContent).toBe('Adobe PDF'); + }); + +}); diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts new file mode 100644 index 0000000000..d64b48d4c5 --- /dev/null +++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -0,0 +1,19 @@ +import { Component } from '@angular/core'; +import { RegistryService } from '../../../core/registry/registry.service'; +import { Observable } from 'rxjs/Observable'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { BitstreamFormat } from '../../../core/registry/mock-bitstream-format.model'; + +@Component({ + selector: 'ds-bitstream-formats', + templateUrl: './bitstream-formats.component.html' +}) +export class BitstreamFormatsComponent { + + bitstreamFormats: Observable>>; + + constructor(registryService: RegistryService) { + this.bitstreamFormats = registryService.getBitstreamFormats(); + } +} diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts index 981c253c3a..fff4b7ee48 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -8,11 +8,12 @@ import { TranslateModule } from '@ngx-translate/core'; import { By } from '@angular/platform-browser'; import { CommonModule } from '@angular/common'; import { RouterTestingModule } from '@angular/router/testing'; +import { RegistryService } from '../../../core/registry/registry.service'; describe('MetadataRegistryComponent', () => { let comp: MetadataRegistryComponent; let fixture: ComponentFixture; - let metadataRegistryService: MetadataRegistryService; + let registryService: RegistryService; const mockSchemasList = [ { self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1', @@ -26,7 +27,7 @@ describe('MetadataRegistryComponent', () => { } ]; const mockSchemas = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList))); - const metadataRegistryServiceStub = { + const registryServiceStub = { getMetadataSchemas: () => mockSchemas }; @@ -35,16 +36,16 @@ describe('MetadataRegistryComponent', () => { imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot()], declarations: [MetadataRegistryComponent], providers: [ - { provide: MetadataRegistryService, useValue: metadataRegistryServiceStub } + { provide: RegistryService, useValue: registryServiceStub } ] }).compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(MetadataRegistryComponent); - comp = fixture.componentInstance; // SearchPageComponent test instance + comp = fixture.componentInstance; fixture.detectChanges(); - metadataRegistryService = (comp as any).service; + registryService = (comp as any).service; }); it('should contain two schemas', () => { diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts index 507684276e..2099bac7da 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts @@ -10,11 +10,12 @@ import { CommonModule } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { By } from '@angular/platform-browser'; import { MockTranslateLoader } from '../../../shared/testing/mock-translate-loader'; +import { RegistryService } from '../../../core/registry/registry.service'; describe('MetadataSchemaComponent', () => { let comp: MetadataSchemaComponent; let fixture: ComponentFixture; - let metadataRegistryService: MetadataRegistryService; + let registryService: RegistryService; const mockSchemasList = [ { self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1', @@ -58,7 +59,7 @@ describe('MetadataSchemaComponent', () => { } ]; const mockSchemas = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList))); - const metadataRegistryServiceStub = { + const registryServiceStub = { getMetadataSchemas: () => mockSchemas, getMetadataFieldsBySchema: (schema: MetadataSchema) => Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFieldsList.filter((value) => value.schema === schema)))), getMetadataSchemaByName: (schemaName: string) => Observable.of(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix === schemaName)[0])) @@ -75,7 +76,7 @@ describe('MetadataSchemaComponent', () => { imports: [CommonModule, TranslateModule.forRoot()], declarations: [MetadataSchemaComponent], providers: [ - { provide: MetadataRegistryService, useValue: metadataRegistryServiceStub }, + { provide: RegistryService, useValue: registryServiceStub }, { provide: ActivatedRoute, useValue: activatedRouteStub } ] }).compileComponents(); @@ -83,9 +84,9 @@ describe('MetadataSchemaComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(MetadataSchemaComponent); - comp = fixture.componentInstance; // SearchPageComponent test instance + comp = fixture.componentInstance; fixture.detectChanges(); - metadataRegistryService = (comp as any).service; + registryService = (comp as any).service; }); it('should contain the schema prefix in the header', () => { diff --git a/src/app/core/registry/mock-bitstream-format.model.ts b/src/app/core/registry/mock-bitstream-format.model.ts new file mode 100644 index 0000000000..f5811e367c --- /dev/null +++ b/src/app/core/registry/mock-bitstream-format.model.ts @@ -0,0 +1,8 @@ +export class BitstreamFormat { + shortDescription: string; + description: string; + mimetype: string; + supportLevel: number; + internal: boolean; + extensions: string; +} diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts index 362478a054..7e79f45af5 100644 --- a/src/app/core/registry/registry.service.ts +++ b/src/app/core/registry/registry.service.ts @@ -5,12 +5,14 @@ import { PaginatedList } from '../data/paginated-list'; import { PageInfo } from '../shared/page-info.model'; import { MetadataSchema } from '../metadata/metadataschema.model'; import { MetadataField } from '../metadata/metadatafield.model'; +import { BitstreamFormat } from './mock-bitstream-format.model'; Injectable() export class RegistryService { metadataSchemas: MetadataSchema[]; metadataFields: MetadataField[]; + bitstreamFormats: BitstreamFormat[]; public getMetadataSchemas(): Observable>> { const pageInfo = new PageInfo(); @@ -38,6 +40,16 @@ export class RegistryService { return Observable.of(remoteData); } + public getBitstreamFormats(): Observable>> { + const pageInfo = new PageInfo(); + pageInfo.elementsPerPage = 10; + pageInfo.currentPage = 1; + + const payload = new PaginatedList(pageInfo, this.bitstreamFormats); + const remoteData = new RemoteData(false, false, true, undefined, payload); + return Observable.of(remoteData); + } + constructor() { this.metadataSchemas = [ { @@ -1018,7 +1030,169 @@ export class RegistryService { scopenote: null, schema: this.metadataSchemas[1] } - ] + ]; + this.bitstreamFormats = [ + { + shortDescription: 'Unknown', + description: 'Unknown data format', + mimetype: 'application/octet-stream', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'License', + description: 'Item-specific license agreed upon to submission', + mimetype: 'text/plain; charset=utf-8', + supportLevel: 1, + internal: true, + extensions: null + }, + { + shortDescription: 'CC License', + description: 'Item-specific Creative Commons license agreed upon to submission', + mimetype: 'text/html; charset=utf-8', + supportLevel: 2, + internal: true, + extensions: null + }, + { + shortDescription: 'Adobe PDF', + description: 'Adobe Portable Document Format', + mimetype: 'application/pdf', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'XML', + description: 'Extensible Markup Language', + mimetype: 'text/xml', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'Text', + description: 'Plain Text', + mimetype: 'text/plain', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'HTML', + description: 'Hypertext Markup Language', + mimetype: 'text/html', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'CSS', + description: 'Cascading Style Sheets', + mimetype: 'text/css', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'Microsoft Word', + description: 'Microsoft Word', + mimetype: 'application/msword', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'Microsoft Word XML', + description: 'Microsoft Word XML', + mimetype: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'Microsoft Powerpoint', + description: 'Microsoft Powerpoint', + mimetype: 'application/vnd.ms-powerpoint', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'Microsoft Powerpoint XML', + description: 'Microsoft Powerpoint XML', + mimetype: 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'Microsoft Excel', + description: 'Microsoft Excel', + mimetype: 'application/vnd.ms-excel', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'Microsoft Excel XML', + description: 'Microsoft Excel XML', + mimetype: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'MARC', + description: 'Machine-Readable Cataloging records', + mimetype: 'application/marc', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'JPEG', + description: 'Joint Photographic Experts Group/JPEG File Interchange Format (JFIF)', + mimetype: 'image/jpeg', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'GIF', + description: 'Graphics Interchange Format', + mimetype: 'image/gif', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'image/png', + description: 'Portable Network Graphics', + mimetype: 'image/png', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'TIFF', + description: 'Tag Image File Format', + mimetype: 'image/tiff', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'AIFF', + description: 'Audio Interchange File Format', + mimetype: 'audio/x-aiff', + supportLevel: 0, + internal: false, + extensions: null + } + ]; } } From 9ac8e2b18a7b3d8eefe18631afb281eb26596aae Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 28 Mar 2018 16:36:43 +0200 Subject: [PATCH 32/80] 50452: Compile error fixes --- .../metadata-registry/metadata-registry.component.spec.ts | 1 - .../metadata-schema/metadata-schema.component.spec.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts index fff4b7ee48..154a96dc81 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -1,6 +1,5 @@ import { MetadataRegistryComponent } from './metadata-registry.component'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service'; import { Observable } from 'rxjs/Observable'; import { RemoteData } from '../../../core/data/remote-data'; import { PaginatedList } from '../../../core/data/paginated-list'; diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts index 2099bac7da..e639e2bf2a 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts @@ -1,6 +1,5 @@ import { MetadataSchemaComponent } from './metadata-schema.component'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service'; import { Observable } from 'rxjs/Observable'; import { RemoteData } from '../../../core/data/remote-data'; import { PaginatedList } from '../../../core/data/paginated-list'; From d78aea63ec8bc337258953df8612f07eadc5bad8 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 29 Mar 2018 16:01:26 +0200 Subject: [PATCH 33/80] conflict fix --- src/app/core/core.module.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 7695ff1849..4e902f6b35 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -42,7 +42,7 @@ import { SubmissionSectionsConfigService } from './config/submission-sections-co import { UUIDService } from './shared/uuid.service'; import { HALEndpointService } from './shared/hal-endpoint.service'; import { FacetResponseParsingService } from './data/facet-response-parsing.service'; -import { MetadataRegistryService } from './metadata/metadataregistry.service'; +import { RegistryService } from './registry/registry.service'; const IMPORTS = [ CommonModule, @@ -68,9 +68,9 @@ const PROVIDERS = [ HostWindowService, ItemDataService, MetadataService, - MetadataRegistryService, ObjectCacheService, PaginationComponentOptions, + RegistryService, RemoteDataBuildService, RequestService, ResponseCacheService, From 683b58eaafb85abe00ff0c123dde9605ea303a99 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 30 Mar 2018 17:18:44 +0200 Subject: [PATCH 34/80] 50632: Working metadataschema registry service --- resources/i18n/en.json | 1 + .../metadata-registry.component.html | 2 + .../metadata-schema.component.ts | 2 +- src/app/core/cache/response-cache.models.ts | 21 + src/app/core/core.module.ts | 4 + .../data/metadataschema-parsing.service.ts | 19 + ...etadataschemas-response-parsing.service.ts | 25 + src/app/core/metadata/metadataschema.model.ts | 13 +- ...registry-metadataschemas-response.model.ts | 14 + src/app/core/registry/registry.service.ts | 1255 ++--------------- 10 files changed, 195 insertions(+), 1161 deletions(-) create mode 100644 src/app/core/data/metadataschema-parsing.service.ts create mode 100644 src/app/core/data/registry-metadataschemas-response-parsing.service.ts create mode 100644 src/app/core/registry/registry-metadataschemas-response.model.ts diff --git a/resources/i18n/en.json b/resources/i18n/en.json index b2044b2005..b2367c3d85 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -136,6 +136,7 @@ "description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.", "schemas": { "table": { + "id": "ID", "namespace": "Namespace", "name": "Name" } diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html index d0c2bb5675..27f761581c 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html @@ -10,12 +10,14 @@ + + diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts index 15d0ee18a2..7e6085a091 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts @@ -32,7 +32,7 @@ export class MetadataSchemaComponent implements OnInit { this.metadataSchema = this.registryService.getMetadataSchemaByName(params.schemaName); this.metadataSchema.subscribe((value) => { const schema = value.payload; - this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema); + // this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema); this.namespace = { namespace: value.payload.namespace }; }); } diff --git a/src/app/core/cache/response-cache.models.ts b/src/app/core/cache/response-cache.models.ts index f061e78e6c..94c0ccc58c 100644 --- a/src/app/core/cache/response-cache.models.ts +++ b/src/app/core/cache/response-cache.models.ts @@ -5,6 +5,8 @@ import { BrowseDefinition } from '../shared/browse-definition.model'; import { ConfigObject } from '../shared/config/config.model'; import { FacetValue } from '../../+search-page/search-service/facet-value.model'; import { SearchFilterConfig } from '../../+search-page/search-service/search-filter-config.model'; +import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model'; +import { MetadataSchema } from '../metadata/metadataschema.model'; /* tslint:disable:max-classes-per-file */ export class RestResponse { @@ -24,6 +26,25 @@ export class DSOSuccessResponse extends RestResponse { } } +export class RegistryMetadataschemasSuccessResponse extends RestResponse { + constructor( + public metadataschemasResponse: RegistryMetadataschemasResponse, + public statusCode: string, + public pageInfo?: PageInfo + ) { + super(true, statusCode); + } +} + +export class MetadataschemaSuccessResponse extends RestResponse { + constructor( + public metadataschema: MetadataSchema, + public statusCode: string + ) { + super(true, statusCode); + } +} + export class SearchSuccessResponse extends RestResponse { constructor( public results: SearchQueryResponse, diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index cc6c569130..82307921ef 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -45,6 +45,8 @@ import { FacetValueResponseParsingService } from './data/facet-value-response-pa import { FacetValueMapResponseParsingService } from './data/facet-value-map-response-parsing.service'; import { FacetConfigResponseParsingService } from './data/facet-config-response-parsing.service'; import { RegistryService } from './registry/registry.service'; +import { RegistryMetadataschemasResponseParsingService } from './data/registry-metadataschemas-response-parsing.service'; +import { MetadataschemaParsingService } from './data/metadataschema-parsing.service'; const IMPORTS = [ CommonModule, @@ -80,6 +82,8 @@ const PROVIDERS = [ FacetValueResponseParsingService, FacetValueMapResponseParsingService, FacetConfigResponseParsingService, + RegistryMetadataschemasResponseParsingService, + MetadataschemaParsingService, DebugResponseParsingService, SearchResponseParsingService, ServerResponseService, diff --git a/src/app/core/data/metadataschema-parsing.service.ts b/src/app/core/data/metadataschema-parsing.service.ts new file mode 100644 index 0000000000..cdd87c19d4 --- /dev/null +++ b/src/app/core/data/metadataschema-parsing.service.ts @@ -0,0 +1,19 @@ +import { MetadataSchema } from '../metadata/metadataschema.model'; +import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer'; +import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model'; +import { RestRequest } from './request.models'; +import { ResponseParsingService } from './parsing.service'; +import { Injectable } from '@angular/core'; +import { MetadataschemaSuccessResponse, RestResponse } from '../cache/response-cache.models'; + +@Injectable() +export class MetadataschemaParsingService implements ResponseParsingService { + + parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse { + const payload = data.payload; + + const deserialized = new DSpaceRESTv2Serializer(MetadataSchema).deserialize(payload); + return new MetadataschemaSuccessResponse(deserialized, data.statusCode); + } + +} diff --git a/src/app/core/data/registry-metadataschemas-response-parsing.service.ts b/src/app/core/data/registry-metadataschemas-response-parsing.service.ts new file mode 100644 index 0000000000..2bb1302450 --- /dev/null +++ b/src/app/core/data/registry-metadataschemas-response-parsing.service.ts @@ -0,0 +1,25 @@ +import { RegistryMetadataschemasSuccessResponse, RestResponse } from '../cache/response-cache.models'; +import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model'; +import { RestRequest } from './request.models'; +import { ResponseParsingService } from './parsing.service'; +import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model'; +import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer'; +import { DSOResponseParsingService } from './dso-response-parsing.service'; +import { Injectable } from '@angular/core'; + +@Injectable() +export class RegistryMetadataschemasResponseParsingService implements ResponseParsingService { + constructor(private dsoParser: DSOResponseParsingService) { + } + + parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse { + const payload = data.payload; + + const metadataschemas = payload._embedded.metadataschemas; + payload.metadataschemas = metadataschemas; + + const deserialized = new DSpaceRESTv2Serializer(RegistryMetadataschemasResponse).deserialize(payload); + return new RegistryMetadataschemasSuccessResponse(deserialized, data.statusCode, this.dsoParser.processPageInfo(data.payload.page)); + } + +} diff --git a/src/app/core/metadata/metadataschema.model.ts b/src/app/core/metadata/metadataschema.model.ts index 1f739534bf..13fb8e8b4e 100644 --- a/src/app/core/metadata/metadataschema.model.ts +++ b/src/app/core/metadata/metadataschema.model.ts @@ -1,5 +1,16 @@ -export class MetadataSchema { +import { autoserialize } from 'cerialize'; +import { ListableObject } from '../../shared/object-collection/shared/listable-object.model'; + +export class MetadataSchema implements ListableObject { + @autoserialize + id: number; + + @autoserialize self: string; + + @autoserialize prefix: string; + + @autoserialize namespace: string; } diff --git a/src/app/core/registry/registry-metadataschemas-response.model.ts b/src/app/core/registry/registry-metadataschemas-response.model.ts new file mode 100644 index 0000000000..5f4799abd7 --- /dev/null +++ b/src/app/core/registry/registry-metadataschemas-response.model.ts @@ -0,0 +1,14 @@ +import { MetadataSchema } from '../metadata/metadataschema.model'; +import { PageInfo } from '../shared/page-info.model'; +import { autoserialize, autoserializeAs } from 'cerialize'; + +export class RegistryMetadataschemasResponse { + @autoserializeAs(MetadataSchema) + metadataschemas: MetadataSchema[]; + + @autoserialize + page: PageInfo; + + @autoserialize + self: string; +} diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts index 7e79f45af5..0c9ece4a71 100644 --- a/src/app/core/registry/registry.service.ts +++ b/src/app/core/registry/registry.service.ts @@ -6,22 +6,110 @@ import { PageInfo } from '../shared/page-info.model'; import { MetadataSchema } from '../metadata/metadataschema.model'; import { MetadataField } from '../metadata/metadatafield.model'; import { BitstreamFormat } from './mock-bitstream-format.model'; +import { flatMap, map, tap } from 'rxjs/operators'; +import { GetRequest, RestRequest } from '../data/request.models'; +import { GenericConstructor } from '../shared/generic-constructor'; +import { ResponseParsingService } from '../data/parsing.service'; +import { RegistryMetadataschemasResponseParsingService } from '../data/registry-metadataschemas-response-parsing.service'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { RequestService } from '../data/request.service'; +import { ResponseCacheService } from '../cache/response-cache.service'; +import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model'; +import { ResponseCacheEntry } from '../cache/response-cache.reducer'; +import { MetadataschemaSuccessResponse, RegistryMetadataschemasSuccessResponse } from '../cache/response-cache.models'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { MetadataschemaParsingService } from '../data/metadataschema-parsing.service'; -Injectable() +@Injectable() export class RegistryService { + private metadataSchemasPath = 'metadataschemas'; + metadataSchemas: MetadataSchema[]; metadataFields: MetadataField[]; bitstreamFormats: BitstreamFormat[]; - public getMetadataSchemas(): Observable>> { - const pageInfo = new PageInfo(); - pageInfo.elementsPerPage = 10; - pageInfo.currentPage = 1; + constructor(protected responseCache: ResponseCacheService, + protected requestService: RequestService, + private rdb: RemoteDataBuildService, + private halService: HALEndpointService) { - const payload = new PaginatedList(pageInfo, this.metadataSchemas); - const remoteData = new RemoteData(false, false, true, undefined, payload); - return Observable.of(remoteData); + } + + public getMetadataSchemas(): Observable>> { + const requestObs = this.halService.getEndpoint(this.metadataSchemasPath).pipe( + map((url: string) => { + const request = new GetRequest(this.requestService.generateRequestId(), url); + return Object.assign(request, { + getResponseParser(): GenericConstructor { + return RegistryMetadataschemasResponseParsingService; + } + }); + }), + tap((request: RestRequest) => this.requestService.configure(request)), + ); + + const requestEntryObs = requestObs.pipe( + flatMap((request: RestRequest) => this.requestService.getByHref(request.href)) + ); + + const responseCacheObs = requestObs.pipe( + flatMap((request: RestRequest) => this.responseCache.get(request.href)) + ); + + const rmrObs: Observable = responseCacheObs.pipe( + map((entry: ResponseCacheEntry) => entry.response), + map((response: RegistryMetadataschemasSuccessResponse) => response.metadataschemasResponse) + ); + + const metadataschemasObs: Observable = rmrObs.pipe( + map((rmr: RegistryMetadataschemasResponse) => rmr.metadataschemas) + ); + + const pageInfoObs: Observable = responseCacheObs.pipe( + map((entry: ResponseCacheEntry) => entry.response), + map((response: RegistryMetadataschemasSuccessResponse) => response.pageInfo) + ); + + const payloadObs = Observable.combineLatest(metadataschemasObs, pageInfoObs, (metadataschemas, pageInfo) => { + return new PaginatedList(pageInfo, metadataschemas); + }); + + return this.rdb.toRemoteDataObservable(requestEntryObs, responseCacheObs, payloadObs); + } + + public getMetadataSchemaByName(schemaName: string): Observable> { + const requestObs = this.halService.getEndpoint(this.metadataSchemasPath).pipe( + map((url: string) => { + const request = new GetRequest(this.requestService.generateRequestId(), url); + return Object.assign(request, { + getResponseParser(): GenericConstructor { + return RegistryMetadataschemasResponseParsingService; + } + }); + }), + tap((request: RestRequest) => this.requestService.configure(request)), + ); + + const requestEntryObs = requestObs.pipe( + flatMap((request: RestRequest) => this.requestService.getByHref(request.href)) + ); + + const responseCacheObs = requestObs.pipe( + flatMap((request: RestRequest) => this.responseCache.get(request.href)) + ); + + const rmrObs: Observable = responseCacheObs.pipe( + map((entry: ResponseCacheEntry) => entry.response), + map((response: RegistryMetadataschemasSuccessResponse) => response.metadataschemasResponse) + ); + + const metadataschemaObs: Observable = rmrObs.pipe( + map((rmr: RegistryMetadataschemasResponse) => rmr.metadataschemas), + map((metadataSchemas: MetadataSchema[]) => metadataSchemas.filter((value) => value.prefix === schemaName)[0]) + ); + + return this.rdb.toRemoteDataObservable(requestEntryObs, responseCacheObs, metadataschemaObs); } public getMetadataFieldsBySchema(schema: MetadataSchema): Observable>> { @@ -34,12 +122,6 @@ export class RegistryService { return Observable.of(remoteData); } - public getMetadataSchemaByName(schemaName: string): Observable> { - const payload = this.metadataSchemas.filter((value) => value.prefix === schemaName)[0]; - const remoteData = new RemoteData(false, false, true, undefined, payload); - return Observable.of(remoteData); - } - public getBitstreamFormats(): Observable>> { const pageInfo = new PageInfo(); pageInfo.elementsPerPage = 10; @@ -50,1149 +132,4 @@ export class RegistryService { return Observable.of(remoteData); } - constructor() { - this.metadataSchemas = [ - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1', - prefix: 'dc', - namespace: 'http://dublincore.org/documents/dcmi-terms/' - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2', - prefix: 'mock', - namespace: 'http://dspace.org/mockschema' - } - ]; - this.metadataFields = [ - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8', - element: 'contributor', - qualifier: 'advisor', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9', - element: 'contributor', - qualifier: 'author', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10', - element: 'contributor', - qualifier: 'editor', - scopenote: 'test scope note', - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11', - element: 'contributor', - qualifier: 'illustrator', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/12', - element: 'contributor', - qualifier: 'other', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/7', - element: 'contributor', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/13', - element: 'coverage', - qualifier: 'spatial', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/14', - element: 'coverage', - qualifier: 'temporal', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/15', - element: 'creator', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/17', - element: 'date', - qualifier: 'accessioned', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/18', - element: 'date', - qualifier: 'available', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/19', - element: 'date', - qualifier: 'copyright', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/20', - element: 'date', - qualifier: 'created', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/21', - element: 'date', - qualifier: 'issued', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/22', - element: 'date', - qualifier: 'submitted', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/128', - element: 'date', - qualifier: 'updated', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/16', - element: 'date', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/33', - element: 'description', - qualifier: 'abstract', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/34', - element: 'description', - qualifier: 'provenance', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/35', - element: 'description', - qualifier: 'sponsorship', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/36', - element: 'description', - qualifier: 'statementofresponsibility', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/37', - element: 'description', - qualifier: 'tableofcontents', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/38', - element: 'description', - qualifier: 'uri', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/129', - element: 'description', - qualifier: 'version', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/32', - element: 'description', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/40', - element: 'format', - qualifier: 'extent', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/41', - element: 'format', - qualifier: 'medium', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/42', - element: 'format', - qualifier: 'mimetype', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/39', - element: 'format', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/24', - element: 'identifier', - qualifier: 'citation', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/133', - element: 'identifier', - qualifier: 'doi', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/137', - element: 'identifier', - qualifier: 'eissn', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/134', - element: 'identifier', - qualifier: 'epage', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/25', - element: 'identifier', - qualifier: 'govdoc', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/26', - element: 'identifier', - qualifier: 'isbn', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/29', - element: 'identifier', - qualifier: 'ismn', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/27', - element: 'identifier', - qualifier: 'issn', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/135', - element: 'identifier', - qualifier: 'issue', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/30', - element: 'identifier', - qualifier: 'other', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/141', - element: 'identifier', - qualifier: 'pmcid', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/136', - element: 'identifier', - qualifier: 'pmid', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/28', - element: 'identifier', - qualifier: 'sici', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/130', - element: 'identifier', - qualifier: 'slug', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/139', - element: 'identifier', - qualifier: 'spage', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/31', - element: 'identifier', - qualifier: 'uri', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/138', - element: 'identifier', - qualifier: 'url', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/140', - element: 'identifier', - qualifier: 'volume', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/23', - element: 'identifier', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/44', - element: 'language', - qualifier: 'iso', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/131', - element: 'language', - qualifier: 'rfc3066', - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/43', - element: 'language', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/5', - element: 'provenance', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[0] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/45', - element: 'publisher', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/50', - element: 'relation', - qualifier: 'haspart', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/52', - element: 'relation', - qualifier: 'hasversion', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/53', - element: 'relation', - qualifier: 'isbasedon', - scopenote: 'a scope note', - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/47', - element: 'relation', - qualifier: 'isformatof', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/48', - element: 'relation', - qualifier: 'ispartof', - scopenote: 'another scope note', - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/142', - element: 'relation', - qualifier: 'ispartofbook', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/49', - element: 'relation', - qualifier: 'ispartofseries', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/54', - element: 'relation', - qualifier: 'isreferencedby', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/57', - element: 'relation', - qualifier: 'isreplacedby', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/51', - element: 'relation', - qualifier: 'isversionof', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/56', - element: 'relation', - qualifier: 'replaces', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/55', - element: 'relation', - qualifier: 'requires', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/58', - element: 'relation', - qualifier: 'uri', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/46', - element: 'relation', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/132', - element: 'rights', - qualifier: 'holder', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/6', - element: 'rights', - qualifier: 'license', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/60', - element: 'rights', - qualifier: 'uri', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/59', - element: 'rights', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/62', - element: 'source', - qualifier: 'uri', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/61', - element: 'source', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/64', - element: 'subject', - qualifier: 'classification', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/65', - element: 'subject', - qualifier: 'ddc', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/66', - element: 'subject', - qualifier: 'lcc', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/67', - element: 'subject', - qualifier: 'lcsh', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/68', - element: 'subject', - qualifier: 'mesh', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/69', - element: 'subject', - qualifier: 'other', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/63', - element: 'subject', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/71', - element: 'title', - qualifier: 'alternative', - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/70', - element: 'title', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/72', - element: 'type', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/73', - element: 'abstract', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/74', - element: 'accessRights', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/75', - element: 'accrualMethod', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/76', - element: 'accrualPeriodicity', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/77', - element: 'accrualPolicy', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/78', - element: 'alternative', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/79', - element: 'audience', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/80', - element: 'available', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/81', - element: 'bibliographicCitation', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/82', - element: 'conformsTo', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/83', - element: 'contributor', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/84', - element: 'coverage', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/85', - element: 'created', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/86', - element: 'creator', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/87', - element: 'date', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/88', - element: 'dateAccepted', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/89', - element: 'dateCopyrighted', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/90', - element: 'dateSubmitted', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/91', - element: 'description', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/92', - element: 'educationLevel', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/93', - element: 'extent', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/94', - element: 'format', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/95', - element: 'hasFormat', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/96', - element: 'hasPart', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/97', - element: 'hasVersion', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/98', - element: 'identifier', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/99', - element: 'instructionalMethod', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/100', - element: 'isFormatOf', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/101', - element: 'isPartOf', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/102', - element: 'isReferencedBy', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/103', - element: 'isReplacedBy', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/104', - element: 'isRequiredBy', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/105', - element: 'issued', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/106', - element: 'isVersionOf', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/107', - element: 'language', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/108', - element: 'license', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/109', - element: 'mediator', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/110', - element: 'medium', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/111', - element: 'modified', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/112', - element: 'provenance', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/113', - element: 'publisher', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/114', - element: 'references', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/115', - element: 'relation', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/116', - element: 'replaces', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/117', - element: 'requires', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/118', - element: 'rights', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/119', - element: 'rightsHolder', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/120', - element: 'source', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/121', - element: 'spatial', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/122', - element: 'subject', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/123', - element: 'tableOfContents', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/124', - element: 'temporal', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/125', - element: 'title', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/126', - element: 'type', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - }, - { - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/127', - element: 'valid', - qualifier: null, - scopenote: null, - schema: this.metadataSchemas[1] - } - ]; - this.bitstreamFormats = [ - { - shortDescription: 'Unknown', - description: 'Unknown data format', - mimetype: 'application/octet-stream', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'License', - description: 'Item-specific license agreed upon to submission', - mimetype: 'text/plain; charset=utf-8', - supportLevel: 1, - internal: true, - extensions: null - }, - { - shortDescription: 'CC License', - description: 'Item-specific Creative Commons license agreed upon to submission', - mimetype: 'text/html; charset=utf-8', - supportLevel: 2, - internal: true, - extensions: null - }, - { - shortDescription: 'Adobe PDF', - description: 'Adobe Portable Document Format', - mimetype: 'application/pdf', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'XML', - description: 'Extensible Markup Language', - mimetype: 'text/xml', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'Text', - description: 'Plain Text', - mimetype: 'text/plain', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'HTML', - description: 'Hypertext Markup Language', - mimetype: 'text/html', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'CSS', - description: 'Cascading Style Sheets', - mimetype: 'text/css', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'Microsoft Word', - description: 'Microsoft Word', - mimetype: 'application/msword', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'Microsoft Word XML', - description: 'Microsoft Word XML', - mimetype: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'Microsoft Powerpoint', - description: 'Microsoft Powerpoint', - mimetype: 'application/vnd.ms-powerpoint', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'Microsoft Powerpoint XML', - description: 'Microsoft Powerpoint XML', - mimetype: 'application/vnd.openxmlformats-officedocument.presentationml.presentation', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'Microsoft Excel', - description: 'Microsoft Excel', - mimetype: 'application/vnd.ms-excel', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'Microsoft Excel XML', - description: 'Microsoft Excel XML', - mimetype: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'MARC', - description: 'Machine-Readable Cataloging records', - mimetype: 'application/marc', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'JPEG', - description: 'Joint Photographic Experts Group/JPEG File Interchange Format (JFIF)', - mimetype: 'image/jpeg', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'GIF', - description: 'Graphics Interchange Format', - mimetype: 'image/gif', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'image/png', - description: 'Portable Network Graphics', - mimetype: 'image/png', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'TIFF', - description: 'Tag Image File Format', - mimetype: 'image/tiff', - supportLevel: 0, - internal: false, - extensions: null - }, - { - shortDescription: 'AIFF', - description: 'Audio Interchange File Format', - mimetype: 'audio/x-aiff', - supportLevel: 0, - internal: false, - extensions: null - } - ]; - } - } From 5fc6d4ead80f468ed526cb62cc794e145c91b79d Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 4 Apr 2018 10:59:08 +0200 Subject: [PATCH 35/80] Added redirect after logout --- src/app/core/auth/auth.effects.ts | 2 +- src/app/core/auth/auth.service.ts | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index 225e40255b..ee0e8bf0c3 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -129,7 +129,7 @@ export class AuthEffects { public logOutSuccess: Observable = this.actions$ .ofType(AuthActionTypes.LOG_OUT_SUCCESS) .do(() => this.authService.removeToken()) - .do(() => this.authService.refreshPage()); + .do(() => this.authService.refreshAfterLogout()); @Effect({dispatch: false}) public redirectToLogin: Observable = this.actions$ diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index e6534a03ff..92e3aa3fb5 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Inject, Injectable } from '@angular/core'; import { NavigationExtras, PRIMARY_OUTLET, Router, UrlSegmentGroup, UrlTree } from '@angular/router'; import { Observable } from 'rxjs/Observable'; @@ -18,6 +18,7 @@ import { Store } from '@ngrx/store'; import { ResetAuthenticationMessagesAction, SetRedirectUrlAction } from './auth.actions'; import { RouterReducerState } from '@ngrx/router-store'; import { CookieAttributes } from 'js-cookie'; +import { NativeWindowRef, NativeWindowService } from '../../shared/services/window.service'; export const LOGIN_ROUTE = '/login'; @@ -33,7 +34,8 @@ export class AuthService { */ private _authenticated: boolean; - constructor(private authRequestService: AuthRequestService, + constructor(@Inject(NativeWindowService) private _window: NativeWindowRef, + private authRequestService: AuthRequestService, private router: Router, private storage: CookieService, private store: Store) { @@ -290,14 +292,9 @@ export class AuthService { /** * Refresh route navigated */ - public refreshPage() { - this.store.select(routerStateSelector) - .take(1) - .subscribe((router) => { - // TODO Check a way to hard refresh the same route - // this.router.navigate([router.state.url], { replaceUrl: true }); - this.router.navigate(['/']); - }) + public refreshAfterLogout() { + // Hard redirect to home page, so that all state is definitely lost + this._window.nativeWindow.location.href = '/home'; } /** From 0d70faffaed8fde881bc0874ad0c00eecd297e0a Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 4 Apr 2018 13:03:15 +0200 Subject: [PATCH 36/80] 50632: Replaced mock registry service with implementation and added pagination --- .../admin-registries.module.ts | 2 + .../bitstream-formats.component.html | 45 +++-- .../bitstream-formats.component.ts | 18 +- .../metadata-registry.component.html | 45 +++-- .../metadata-registry.component.ts | 16 +- .../metadata-schema.component.html | 41 ++-- .../metadata-schema.component.ts | 23 ++- src/app/core/cache/response-cache.models.ts | 22 +++ src/app/core/core.module.ts | 4 + ...tstreamformats-response-parsing.service.ts | 25 +++ ...metadatafields-response-parsing.service.ts | 34 ++++ src/app/core/metadata/metadatafield.model.ts | 15 +- ...egistry-bitstreamformats-response.model.ts | 14 ++ .../registry-metadatafields-response.model.ts | 14 ++ src/app/core/registry/registry.service.ts | 183 ++++++++++++++---- .../shared/pagination/pagination.component.ts | 6 +- 16 files changed, 402 insertions(+), 105 deletions(-) create mode 100644 src/app/core/data/registry-bitstreamformats-response-parsing.service.ts create mode 100644 src/app/core/data/registry-metadatafields-response-parsing.service.ts create mode 100644 src/app/core/registry/registry-bitstreamformats-response.model.ts create mode 100644 src/app/core/registry/registry-metadatafields-response.model.ts diff --git a/src/app/+admin/admin-registries/admin-registries.module.ts b/src/app/+admin/admin-registries/admin-registries.module.ts index fb9dcdaa63..8ff42646ac 100644 --- a/src/app/+admin/admin-registries/admin-registries.module.ts +++ b/src/app/+admin/admin-registries/admin-registries.module.ts @@ -6,10 +6,12 @@ import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.compo import { RouterModule } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { BitstreamFormatsComponent } from './bitstream-formats/bitstream-formats.component'; +import { SharedModule } from '../../shared/shared.module'; @NgModule({ imports: [ CommonModule, + SharedModule, RouterModule, TranslateModule, AdminRegistriesRoutingModule diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html index 87b3ba85eb..f3d6e47331 100644 --- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html +++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html @@ -6,24 +6,33 @@

    {{'admin.registries.bitstream-formats.description' | translate}}

    -
    -
    {{'admin.registries.metadata.schemas.table.id' | translate}} {{'admin.registries.metadata.schemas.table.namespace' | translate}} {{'admin.registries.metadata.schemas.table.name' | translate}}
    {{schema.id}} {{schema.namespace}} {{schema.prefix}}
    - - - - - - - - - - - - - - -
    {{'admin.registries.bitstream-formats.formats.table.name' | translate}}{{'admin.registries.bitstream-formats.formats.table.mimetype' | translate}}{{'admin.registries.bitstream-formats.formats.table.supportLevel.head' | translate}}
    {{bitstreamFormat.shortDescription}}{{bitstreamFormat.mimetype}} ({{'admin.registries.bitstream-formats.formats.table.internal' | translate}}){{'admin.registries.bitstream-formats.formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}
    - + +
    + + + + + + + + + + + + + + + +
    {{'admin.registries.bitstream-formats.formats.table.name' | translate}}{{'admin.registries.bitstream-formats.formats.table.mimetype' | translate}}{{'admin.registries.bitstream-formats.formats.table.supportLevel.head' | translate}}
    {{bitstreamFormat.shortDescription}}{{bitstreamFormat.mimetype}} ({{'admin.registries.bitstream-formats.formats.table.internal' | translate}}){{'admin.registries.bitstream-formats.formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}
    +
    +     diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index d64b48d4c5..d54d2c5e96 100644 --- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs/Observable'; import { RemoteData } from '../../../core/data/remote-data'; import { PaginatedList } from '../../../core/data/paginated-list'; import { BitstreamFormat } from '../../../core/registry/mock-bitstream-format.model'; +import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; @Component({ selector: 'ds-bitstream-formats', @@ -12,8 +13,21 @@ import { BitstreamFormat } from '../../../core/registry/mock-bitstream-format.mo export class BitstreamFormatsComponent { bitstreamFormats: Observable>>; + config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { + id: 'registry-bitstreamformats-pagination', + pageSize: 20 + }); - constructor(registryService: RegistryService) { - this.bitstreamFormats = registryService.getBitstreamFormats(); + constructor(private registryService: RegistryService) { + this.updateFormats(); + } + + onPageChange(event) { + this.config.currentPage = event; + this.updateFormats(); + } + + private updateFormats() { + this.bitstreamFormats = this.registryService.getBitstreamFormats(this.config); } } diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html index 27f761581c..67cfa52601 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html @@ -6,24 +6,33 @@

    {{'admin.registries.metadata.description' | translate}}

    -
    - - - - - - - - - - - - - - - -
    {{'admin.registries.metadata.schemas.table.id' | translate}}{{'admin.registries.metadata.schemas.table.namespace' | translate}}{{'admin.registries.metadata.schemas.table.name' | translate}}
    {{schema.id}}{{schema.namespace}}{{schema.prefix}}
    -
    + +
    + + + + + + + + + + + + + + + +
    {{'admin.registries.metadata.schemas.table.id' | translate}}{{'admin.registries.metadata.schemas.table.namespace' | translate}}{{'admin.registries.metadata.schemas.table.name' | translate}}
    {{schema.id}}{{schema.namespace}}{{schema.prefix}}
    +
    +     diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts index 3158c4bb46..2baed2ef6e 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs/Observable'; import { RemoteData } from '../../../core/data/remote-data'; import { PaginatedList } from '../../../core/data/paginated-list'; import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; +import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; @Component({ selector: 'ds-metadata-registry', @@ -12,9 +13,22 @@ import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; export class MetadataRegistryComponent { metadataSchemas: Observable>>; + config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { + id: 'registry-metadataschemas-pagination', + pageSize: 10 + }); constructor(private registryService: RegistryService) { - this.metadataSchemas = this.registryService.getMetadataSchemas(); + this.updateSchemas(); + } + + onPageChange(event) { + this.config.currentPage = event; + this.updateSchemas(); + } + + private updateSchemas() { + this.metadataSchemas = this.registryService.getMetadataSchemas(this.config); } } diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html index f07a6cc670..f9e460e717 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html @@ -7,22 +7,31 @@

    {{'admin.registries.schema.description' | translate:namespace }}

    {{'admin.registries.schema.fields.head' | translate}}

    -
    - - - - - - - - - - - - - -
    {{'admin.registries.schema.fields.table.field' | translate}}{{'admin.registries.schema.fields.table.scopenote' | translate}}
    {{(metadataSchema | async)?.payload?.prefix}}.{{field.element}}{{field.qualifier}}{{field.scopenote}}
    -
    + +
    + + + + + + + + + + + + + +
    {{'admin.registries.schema.fields.table.field' | translate}}{{'admin.registries.schema.fields.table.scopenote' | translate}}
    {{(metadataSchema | async)?.payload?.prefix}}.{{field.element}}{{field.qualifier}}{{field.scopeNote}}
    +
    +     diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts index 7e6085a091..6b0e4b16c6 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts @@ -6,6 +6,8 @@ import { RemoteData } from '../../../core/data/remote-data'; import { PaginatedList } from '../../../core/data/paginated-list'; import { MetadataField } from '../../../core/metadata/metadatafield.model'; import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; +import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; +import { SortOptions } from '../../../core/cache/models/sort-options.model'; @Component({ selector: 'ds-metadata-schema', @@ -17,6 +19,10 @@ export class MetadataSchemaComponent implements OnInit { metadataSchema: Observable>; metadataFields: Observable>>; + config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { + id: 'registry-metadatafields-pagination', + pageSize: 20 + }); constructor(private registryService: RegistryService, private route: ActivatedRoute) { @@ -30,10 +36,19 @@ export class MetadataSchemaComponent implements OnInit { initialize(params) { this.metadataSchema = this.registryService.getMetadataSchemaByName(params.schemaName); - this.metadataSchema.subscribe((value) => { - const schema = value.payload; - // this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema); - this.namespace = { namespace: value.payload.namespace }; + this.updateFields(); + } + + onPageChange(event) { + this.config.currentPage = event; + this.updateFields(); + } + + private updateFields() { + this.metadataSchema.subscribe((schemaData) => { + const schema = schemaData.payload; + this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema, this.config); + this.namespace = { namespace: schemaData.payload.namespace }; }); } diff --git a/src/app/core/cache/response-cache.models.ts b/src/app/core/cache/response-cache.models.ts index 94c0ccc58c..13987cdf4a 100644 --- a/src/app/core/cache/response-cache.models.ts +++ b/src/app/core/cache/response-cache.models.ts @@ -7,6 +7,8 @@ import { FacetValue } from '../../+search-page/search-service/facet-value.model' import { SearchFilterConfig } from '../../+search-page/search-service/search-filter-config.model'; import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model'; import { MetadataSchema } from '../metadata/metadataschema.model'; +import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model'; +import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model'; /* tslint:disable:max-classes-per-file */ export class RestResponse { @@ -36,6 +38,26 @@ export class RegistryMetadataschemasSuccessResponse extends RestResponse { } } +export class RegistryMetadatafieldsSuccessResponse extends RestResponse { + constructor( + public metadatafieldsResponse: RegistryMetadatafieldsResponse, + public statusCode: string, + public pageInfo?: PageInfo + ) { + super(true, statusCode); + } +} + +export class RegistryBitstreamformatsSuccessResponse extends RestResponse { + constructor( + public bitstreamformatsResponse: RegistryBitstreamformatsResponse, + public statusCode: string, + public pageInfo?: PageInfo + ) { + super(true, statusCode); + } +} + export class MetadataschemaSuccessResponse extends RestResponse { constructor( public metadataschema: MetadataSchema, diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 82307921ef..4e99bcdeeb 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -47,6 +47,8 @@ import { FacetConfigResponseParsingService } from './data/facet-config-response- import { RegistryService } from './registry/registry.service'; import { RegistryMetadataschemasResponseParsingService } from './data/registry-metadataschemas-response-parsing.service'; import { MetadataschemaParsingService } from './data/metadataschema-parsing.service'; +import { RegistryMetadatafieldsResponseParsingService } from './data/registry-metadatafields-response-parsing.service'; +import { RegistryBitstreamformatsResponseParsingService } from './data/registry-bitstreamformats-response-parsing.service'; const IMPORTS = [ CommonModule, @@ -83,6 +85,8 @@ const PROVIDERS = [ FacetValueMapResponseParsingService, FacetConfigResponseParsingService, RegistryMetadataschemasResponseParsingService, + RegistryMetadatafieldsResponseParsingService, + RegistryBitstreamformatsResponseParsingService, MetadataschemaParsingService, DebugResponseParsingService, SearchResponseParsingService, diff --git a/src/app/core/data/registry-bitstreamformats-response-parsing.service.ts b/src/app/core/data/registry-bitstreamformats-response-parsing.service.ts new file mode 100644 index 0000000000..d981a12719 --- /dev/null +++ b/src/app/core/data/registry-bitstreamformats-response-parsing.service.ts @@ -0,0 +1,25 @@ +import { RegistryBitstreamformatsSuccessResponse, RestResponse } from '../cache/response-cache.models'; +import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model'; +import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer'; +import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model'; +import { RestRequest } from './request.models'; +import { DSOResponseParsingService } from './dso-response-parsing.service'; +import { ResponseParsingService } from './parsing.service'; +import { Injectable } from '@angular/core'; + +@Injectable() +export class RegistryBitstreamformatsResponseParsingService implements ResponseParsingService { + constructor(private dsoParser: DSOResponseParsingService) { + } + + parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse { + const payload = data.payload; + + const bitstreamformats = payload._embedded.bitstreamformats; + payload.bitstreamformats = bitstreamformats; + + const deserialized = new DSpaceRESTv2Serializer(RegistryBitstreamformatsResponse).deserialize(payload); + return new RegistryBitstreamformatsSuccessResponse(deserialized, data.statusCode, this.dsoParser.processPageInfo(data.payload.page)); + } + +} diff --git a/src/app/core/data/registry-metadatafields-response-parsing.service.ts b/src/app/core/data/registry-metadatafields-response-parsing.service.ts new file mode 100644 index 0000000000..2620916070 --- /dev/null +++ b/src/app/core/data/registry-metadatafields-response-parsing.service.ts @@ -0,0 +1,34 @@ +import { + RegistryMetadatafieldsSuccessResponse, RegistryMetadataschemasSuccessResponse, + RestResponse +} from '../cache/response-cache.models'; +import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model'; +import { RestRequest } from './request.models'; +import { ResponseParsingService } from './parsing.service'; +import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model'; +import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer'; +import { DSOResponseParsingService } from './dso-response-parsing.service'; +import { Injectable } from '@angular/core'; +import { forEach } from '@angular/router/src/utils/collection'; +import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model'; + +@Injectable() +export class RegistryMetadatafieldsResponseParsingService implements ResponseParsingService { + constructor(private dsoParser: DSOResponseParsingService) { + } + + parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse { + const payload = data.payload; + + const metadatafields = payload._embedded.metadatafields; + metadatafields.forEach((field) => { + field.schema = field._embedded.schema; + }); + + payload.metadatafields = metadatafields; + + const deserialized = new DSpaceRESTv2Serializer(RegistryMetadatafieldsResponse).deserialize(payload); + return new RegistryMetadatafieldsSuccessResponse(deserialized, data.statusCode, this.dsoParser.processPageInfo(data.payload.page)); + } + +} diff --git a/src/app/core/metadata/metadatafield.model.ts b/src/app/core/metadata/metadatafield.model.ts index bf9921a1ce..77cecb927e 100644 --- a/src/app/core/metadata/metadatafield.model.ts +++ b/src/app/core/metadata/metadatafield.model.ts @@ -1,9 +1,20 @@ import { MetadataSchema } from './metadataschema.model'; +import { autoserialize } from 'cerialize'; +import { ListableObject } from '../../shared/object-collection/shared/listable-object.model'; -export class MetadataField { +export class MetadataField implements ListableObject { + @autoserialize self: string; + + @autoserialize element: string; + + @autoserialize qualifier: string; - scopenote: string; + + @autoserialize + scopeNote: string; + + @autoserialize schema: MetadataSchema; } diff --git a/src/app/core/registry/registry-bitstreamformats-response.model.ts b/src/app/core/registry/registry-bitstreamformats-response.model.ts new file mode 100644 index 0000000000..81de379e9e --- /dev/null +++ b/src/app/core/registry/registry-bitstreamformats-response.model.ts @@ -0,0 +1,14 @@ +import { autoserialize, autoserializeAs } from 'cerialize'; +import { PageInfo } from '../shared/page-info.model'; +import { BitstreamFormat } from '../shared/bitstream-format.model'; + +export class RegistryBitstreamformatsResponse { + @autoserializeAs(BitstreamFormat) + bitstreamformats: BitstreamFormat[]; + + @autoserialize + page: PageInfo; + + @autoserialize + self: string; +} diff --git a/src/app/core/registry/registry-metadatafields-response.model.ts b/src/app/core/registry/registry-metadatafields-response.model.ts new file mode 100644 index 0000000000..19ec537dfb --- /dev/null +++ b/src/app/core/registry/registry-metadatafields-response.model.ts @@ -0,0 +1,14 @@ +import { PageInfo } from '../shared/page-info.model'; +import { autoserialize, autoserializeAs } from 'cerialize'; +import { MetadataField } from '../metadata/metadatafield.model'; + +export class RegistryMetadatafieldsResponse { + @autoserializeAs(MetadataField) + metadatafields: MetadataField[]; + + @autoserialize + page: PageInfo; + + @autoserialize + self: string; +} diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts index 0c9ece4a71..4359284158 100644 --- a/src/app/core/registry/registry.service.ts +++ b/src/app/core/registry/registry.service.ts @@ -16,18 +16,27 @@ import { RequestService } from '../data/request.service'; import { ResponseCacheService } from '../cache/response-cache.service'; import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model'; import { ResponseCacheEntry } from '../cache/response-cache.reducer'; -import { MetadataschemaSuccessResponse, RegistryMetadataschemasSuccessResponse } from '../cache/response-cache.models'; +import { + MetadataschemaSuccessResponse, RegistryBitstreamformatsSuccessResponse, RegistryMetadatafieldsSuccessResponse, + RegistryMetadataschemasSuccessResponse +} from '../cache/response-cache.models'; import { HALEndpointService } from '../shared/hal-endpoint.service'; import { MetadataschemaParsingService } from '../data/metadataschema-parsing.service'; +import { Res } from 'awesome-typescript-loader/dist/checker/protocol'; +import { RegistryMetadatafieldsResponseParsingService } from '../data/registry-metadatafields-response-parsing.service'; +import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model'; +import { isNotEmpty } from '../../shared/empty.util'; +import { URLCombiner } from '../url-combiner/url-combiner'; +import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; +import { RegistryBitstreamformatsResponseParsingService } from '../data/registry-bitstreamformats-response-parsing.service'; +import { RegistryBitstreamformatsResponse } from './registry-bitstreamformats-response.model'; @Injectable() export class RegistryService { private metadataSchemasPath = 'metadataschemas'; - - metadataSchemas: MetadataSchema[]; - metadataFields: MetadataField[]; - bitstreamFormats: BitstreamFormat[]; + private metadataFieldsPath = 'metadatafields'; + private bitstreamFormatsPath = 'bitstreamformats'; constructor(protected responseCache: ResponseCacheService, protected requestService: RequestService, @@ -36,18 +45,8 @@ export class RegistryService { } - public getMetadataSchemas(): Observable>> { - const requestObs = this.halService.getEndpoint(this.metadataSchemasPath).pipe( - map((url: string) => { - const request = new GetRequest(this.requestService.generateRequestId(), url); - return Object.assign(request, { - getResponseParser(): GenericConstructor { - return RegistryMetadataschemasResponseParsingService; - } - }); - }), - tap((request: RestRequest) => this.requestService.configure(request)), - ); + public getMetadataSchemas(pagination: PaginationComponentOptions): Observable>> { + const requestObs = this.getMetadataSchemasRequestObs(pagination); const requestEntryObs = requestObs.pipe( flatMap((request: RestRequest) => this.requestService.getByHref(request.href)) @@ -79,17 +78,12 @@ export class RegistryService { } public getMetadataSchemaByName(schemaName: string): Observable> { - const requestObs = this.halService.getEndpoint(this.metadataSchemasPath).pipe( - map((url: string) => { - const request = new GetRequest(this.requestService.generateRequestId(), url); - return Object.assign(request, { - getResponseParser(): GenericConstructor { - return RegistryMetadataschemasResponseParsingService; - } - }); - }), - tap((request: RestRequest) => this.requestService.configure(request)), - ); + // Temporary pagination to get ALL metadataschemas until there's a rest api endpoint for fetching a specific schema + const pagination: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { + id: 'all-metadatafields-pagination', + pageSize: 10000 + }); + const requestObs = this.getMetadataSchemasRequestObs(pagination); const requestEntryObs = requestObs.pipe( flatMap((request: RestRequest) => this.requestService.getByHref(request.href)) @@ -112,24 +106,129 @@ export class RegistryService { return this.rdb.toRemoteDataObservable(requestEntryObs, responseCacheObs, metadataschemaObs); } - public getMetadataFieldsBySchema(schema: MetadataSchema): Observable>> { - const pageInfo = new PageInfo(); - pageInfo.elementsPerPage = 10; - pageInfo.currentPage = 1; + public getMetadataFieldsBySchema(schema: MetadataSchema, pagination: PaginationComponentOptions): Observable>> { + const requestObs = this.getMetadataFieldsRequestObs(pagination); - const payload = new PaginatedList(pageInfo, this.metadataFields.filter((value) => value.schema === schema)); - const remoteData = new RemoteData(false, false, true, undefined, payload); - return Observable.of(remoteData); + const requestEntryObs = requestObs.pipe( + flatMap((request: RestRequest) => this.requestService.getByHref(request.href)) + ); + + const responseCacheObs = requestObs.pipe( + flatMap((request: RestRequest) => this.responseCache.get(request.href)) + ); + + const rmrObs: Observable = responseCacheObs.pipe( + map((entry: ResponseCacheEntry) => entry.response), + map((response: RegistryMetadatafieldsSuccessResponse) => response.metadatafieldsResponse) + ); + + const metadatafieldsObs: Observable = rmrObs.pipe( + map((rmr: RegistryMetadatafieldsResponse) => rmr.metadatafields), + map((metadataFields: MetadataField[]) => metadataFields.filter((field) => field.schema.id === schema.id)) + ); + + const pageInfoObs: Observable = responseCacheObs.pipe( + map((entry: ResponseCacheEntry) => entry.response), + map((response: RegistryMetadatafieldsSuccessResponse) => response.pageInfo) + ); + + const payloadObs = Observable.combineLatest(metadatafieldsObs, pageInfoObs, (metadatafields, pageInfo) => { + return new PaginatedList(pageInfo, metadatafields); + }); + + return this.rdb.toRemoteDataObservable(requestEntryObs, responseCacheObs, payloadObs); } - public getBitstreamFormats(): Observable>> { - const pageInfo = new PageInfo(); - pageInfo.elementsPerPage = 10; - pageInfo.currentPage = 1; + public getBitstreamFormats(pagination: PaginationComponentOptions): Observable>> { + const requestObs = this.getBitstreamFormatsRequestObs(pagination); - const payload = new PaginatedList(pageInfo, this.bitstreamFormats); - const remoteData = new RemoteData(false, false, true, undefined, payload); - return Observable.of(remoteData); + const requestEntryObs = requestObs.pipe( + flatMap((request: RestRequest) => this.requestService.getByHref(request.href)) + ); + + const responseCacheObs = requestObs.pipe( + flatMap((request: RestRequest) => this.responseCache.get(request.href)) + ); + + const rbrObs: Observable = responseCacheObs.pipe( + map((entry: ResponseCacheEntry) => entry.response), + map((response: RegistryBitstreamformatsSuccessResponse) => response.bitstreamformatsResponse) + ); + + const bitstreamformatsObs: Observable = rbrObs.pipe( + map((rbr: RegistryBitstreamformatsResponse) => rbr.bitstreamformats) + ); + + const pageInfoObs: Observable = responseCacheObs.pipe( + map((entry: ResponseCacheEntry) => entry.response), + map((response: RegistryBitstreamformatsSuccessResponse) => response.pageInfo) + ); + + const payloadObs = Observable.combineLatest(bitstreamformatsObs, pageInfoObs, (bitstreamformats, pageInfo) => { + return new PaginatedList(pageInfo, bitstreamformats); + }); + + return this.rdb.toRemoteDataObservable(requestEntryObs, responseCacheObs, payloadObs); + } + + private getMetadataSchemasRequestObs(pagination: PaginationComponentOptions): Observable { + return this.halService.getEndpoint(this.metadataSchemasPath).pipe( + map((url: string) => { + const args: string[] = []; + args.push(`size=${pagination.pageSize}`); + args.push(`page=${pagination.currentPage - 1}`); + if (isNotEmpty(args)) { + url = new URLCombiner(url, `?${args.join('&')}`).toString(); + } + const request = new GetRequest(this.requestService.generateRequestId(), url); + return Object.assign(request, { + getResponseParser(): GenericConstructor { + return RegistryMetadataschemasResponseParsingService; + } + }); + }), + tap((request: RestRequest) => this.requestService.configure(request)), + ); + } + + private getMetadataFieldsRequestObs(pagination: PaginationComponentOptions): Observable { + return this.halService.getEndpoint(this.metadataFieldsPath).pipe( + map((url: string) => { + const args: string[] = []; + args.push(`size=${pagination.pageSize}`); + args.push(`page=${pagination.currentPage - 1}`); + if (isNotEmpty(args)) { + url = new URLCombiner(url, `?${args.join('&')}`).toString(); + } + const request = new GetRequest(this.requestService.generateRequestId(), url); + return Object.assign(request, { + getResponseParser(): GenericConstructor { + return RegistryMetadatafieldsResponseParsingService; + } + }); + }), + tap((request: RestRequest) => this.requestService.configure(request)), + ); + } + + private getBitstreamFormatsRequestObs(pagination: PaginationComponentOptions): Observable { + return this.halService.getEndpoint(this.bitstreamFormatsPath).pipe( + map((url: string) => { + const args: string[] = []; + args.push(`size=${pagination.pageSize}`); + args.push(`page=${pagination.currentPage - 1}`); + if (isNotEmpty(args)) { + url = new URLCombiner(url, `?${args.join('&')}`).toString(); + } + const request = new GetRequest(this.requestService.generateRequestId(), url); + return Object.assign(request, { + getResponseParser(): GenericConstructor { + return RegistryBitstreamformatsResponseParsingService; + } + }); + }), + tap((request: RestRequest) => this.requestService.configure(request)), + ); } } diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts index 2fa70ddd18..7c7cf69bc7 100644 --- a/src/app/shared/pagination/pagination.component.ts +++ b/src/app/shared/pagination/pagination.component.ts @@ -207,8 +207,10 @@ export class PaginationComponent implements OnDestroy, OnInit { this.pageSizeOptions = this.paginationOptions.pageSizeOptions; this.currentPage = this.paginationOptions.currentPage; this.pageSize = this.paginationOptions.pageSize; - this.sortDirection = this.sortOptions.direction; - this.sortField = this.sortOptions.field; + if (this.sortOptions) { + this.sortDirection = this.sortOptions.direction; + this.sortField = this.sortOptions.field; + } this.currentQueryParams = { pageId: this.id, page: this.currentPage, From f841612e1c990b655c040cb96fab888992860bf8 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 4 Apr 2018 13:32:02 +0200 Subject: [PATCH 37/80] Added redirect to login whether token is expired --- src/app/core/auth/auth.effects.ts | 1 + src/app/core/auth/auth.interceptor.ts | 17 +++++++++++----- src/app/core/auth/auth.service.ts | 25 ++++++++++++++++++++---- src/app/core/auth/authenticated.guard.ts | 1 - 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index ee0e8bf0c3..dcedbe0aec 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -134,6 +134,7 @@ export class AuthEffects { @Effect({dispatch: false}) public redirectToLogin: Observable = this.actions$ .ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED, AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED) + .do(() => this.authService.removeToken()) .do(() => this.authService.redirectToLogin()); /** diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts index e5d7afc72d..45c41312a1 100644 --- a/src/app/core/auth/auth.interceptor.ts +++ b/src/app/core/auth/auth.interceptor.ts @@ -17,6 +17,7 @@ import { AuthTokenInfo } from './models/auth-token-info.model'; import { isNotEmpty, isUndefined } from '../../shared/empty.util'; import { RedirectWhenTokenExpiredAction, RefreshTokenAction } from './auth.actions'; import { Store } from '@ngrx/store'; +import { Router } from '@angular/router'; @Injectable() export class AuthInterceptor implements HttpInterceptor { @@ -26,7 +27,7 @@ export class AuthInterceptor implements HttpInterceptor { // we're creating a refresh token request list protected refreshTokenRequestUrls = []; - constructor(private inj: Injector, private store: Store) { } + constructor(private inj: Injector, private router: Router, private store: Store) { } private isUnauthorized(response: HttpResponseBase): boolean { // invalid_token The access token provided is expired, revoked, malformed, or invalid for other reasons @@ -38,7 +39,7 @@ export class AuthInterceptor implements HttpInterceptor { } private isAuthRequest(http: HttpRequest | HttpResponseBase): boolean { - return http.url + return http && http.url && (http.url.endsWith('/authn/login') || http.url.endsWith('/authn/logout') || http.url.endsWith('/authn/status')); @@ -71,10 +72,16 @@ export class AuthInterceptor implements HttpInterceptor { const authService = this.inj.get(AuthService); const token = authService.getToken(); - let newReq; - // Intercept a request that is not to the authentication endpoint - if (!this.isAuthRequest(req) && isNotEmpty(token)) { + + if (authService.isTokenExpired()) { + authService.setRedirectUrl(this.router.url); + // The access token is expired + // Redirect to the login route + this.store.dispatch(new RedirectWhenTokenExpiredAction('Your session has expired. Please log in again.')); + return Observable.of(null); + } else if (!this.isAuthRequest(req) && isNotEmpty(token)) { + // Intercept a request that is not to the authentication endpoint authService.isTokenExpiring() .filter((isExpiring) => isExpiring) .subscribe(() => { diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 92e3aa3fb5..8d9605782a 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -22,6 +22,8 @@ import { NativeWindowRef, NativeWindowService } from '../../shared/services/wind export const LOGIN_ROUTE = '/login'; +export const REDIRECT_COOKIE = 'dsRedirectUrl'; + /** * The auth service. */ @@ -261,7 +263,8 @@ export class AuthService { * Redirect to the login route */ public redirectToLogin() { - this.router.navigate(['/login']); + // Hard redirect to login page, so that all state is definitely lost + this._window.nativeWindow.location.href = LOGIN_ROUTE; } /** @@ -272,8 +275,10 @@ export class AuthService { .first() .subscribe((redirectUrl) => { if (isNotEmpty(redirectUrl)) { - // Clear url + // Clear redirect url this.setRedirectUrl(undefined); + this.storage.remove(REDIRECT_COOKIE); + const urlTree: UrlTree = this.router.parseUrl(redirectUrl); const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET]; const segment = '/' + g.toString(); @@ -283,7 +288,13 @@ export class AuthService { }; this.router.navigate([segment], navigationExtras); } else { - this.router.navigate(['/']); + // override the route reuse strategy + this.router.routeReuseStrategy.shouldReuseRoute = () => { + return false; + }; + this.router.navigated = false; + const url = decodeURIComponent(this.router.url); + this.router.navigateByUrl(url); } }) @@ -301,13 +312,19 @@ export class AuthService { * Get redirect url */ getRedirectUrl(): Observable { - return this.store.select(getRedirectUrl); + const redirectUrl = this.storage.get(REDIRECT_COOKIE); + if (isNotEmpty(redirectUrl)) { + return Observable.of(redirectUrl); + } else { + return this.store.select(getRedirectUrl); + } } /** * Set redirect url */ setRedirectUrl(url: string) { + this.storage.set(REDIRECT_COOKIE, url); this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(url) ? url : '')); } } diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts index 2438254582..42c39b403c 100644 --- a/src/app/core/auth/authenticated.guard.ts +++ b/src/app/core/auth/authenticated.guard.ts @@ -60,7 +60,6 @@ export class AuthenticatedGuard implements CanActivate, CanLoad { .take(1) .subscribe((authenticated) => { if (!authenticated) { - console.log('set redirect ', url); this.authService.setRedirectUrl(url); this.store.dispatch(new RedirectWhenAuthenticationIsRequiredAction('Login required')); } From 934bb603f50d8e18061bfc1fdf8791597ec8f99f Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 4 Apr 2018 14:49:04 +0200 Subject: [PATCH 38/80] Added action to insert authentication message --- src/app/core/auth/auth.actions.ts | 19 ++++++++++++++++++- src/app/core/auth/auth.reducers.ts | 6 ++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts index 5680c0017b..0c0d3309b1 100644 --- a/src/app/core/auth/auth.actions.ts +++ b/src/app/core/auth/auth.actions.ts @@ -22,6 +22,7 @@ export const AuthActionTypes = { REFRESH_TOKEN: type('dspace/auth/REFRESH_TOKEN'), REFRESH_TOKEN_SUCCESS: type('dspace/auth/REFRESH_TOKEN_SUCCESS'), REFRESH_TOKEN_ERROR: type('dspace/auth/REFRESH_TOKEN_ERROR'), + ADD_MESSAGE: type('dspace/auth/ADD_MESSAGE'), RESET_MESSAGES: type('dspace/auth/RESET_MESSAGES'), LOG_OUT: type('dspace/auth/LOG_OUT'), LOG_OUT_ERROR: type('dspace/auth/LOG_OUT_ERROR'), @@ -283,6 +284,20 @@ export class RegistrationSuccessAction implements Action { } } +/** + * Add uthentication message. + * @class AddAuthenticationMessageAction + * @implements {Action} + */ +export class AddAuthenticationMessageAction implements Action { + public type: string = AuthActionTypes.ADD_MESSAGE; + payload: string; + + constructor(message: string) { + this.payload = message; + } +} + /** * Reset error. * @class ResetAuthenticationMessagesAction @@ -326,4 +341,6 @@ export type AuthActions | RedirectWhenTokenExpiredAction | RegistrationAction | RegistrationErrorAction - | RegistrationSuccessAction; + | RegistrationSuccessAction + | AddAuthenticationMessageAction + | ResetAuthenticationMessagesAction; diff --git a/src/app/core/auth/auth.reducers.ts b/src/app/core/auth/auth.reducers.ts index b752b8f77f..d45b637f07 100644 --- a/src/app/core/auth/auth.reducers.ts +++ b/src/app/core/auth/auth.reducers.ts @@ -1,5 +1,6 @@ // import actions import { + AddAuthenticationMessageAction, AuthActions, AuthActionTypes, AuthenticatedSuccessAction, AuthenticationErrorAction, AuthenticationSuccessAction, LogOutErrorAction, RedirectWhenAuthenticationIsRequiredAction, RedirectWhenTokenExpiredAction, SetRedirectUrlAction @@ -153,6 +154,11 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut refreshing: false, }); + case AuthActionTypes.ADD_MESSAGE: + return Object.assign({}, state, { + info: (action as AddAuthenticationMessageAction).payload, + }); + case AuthActionTypes.RESET_MESSAGES: return Object.assign({}, state, { authenticated: state.authenticated, From 26a743322e3294a5c090ab15a9a1308302b8f36d Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 4 Apr 2018 17:01:49 +0200 Subject: [PATCH 39/80] Added i18n label and fixes --- resources/i18n/en.json | 8 +++++ src/app/core/auth/auth.interceptor.ts | 2 +- src/app/core/auth/auth.service.ts | 33 ++++++++++++++++----- src/app/shared/log-in/log-in.component.html | 4 +-- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/resources/i18n/en.json b/resources/i18n/en.json index c148b06565..6a08009f8a 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -165,5 +165,13 @@ "header": "Log out from DSpace", "submit": "Log out" } + }, + "auth": { + "messages": { + "expired": "Your session has expired. Please log in again." + }, + "errors": { + "invalid-user": "Invalid email or password." + } } } diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts index 45c41312a1..ab105d825d 100644 --- a/src/app/core/auth/auth.interceptor.ts +++ b/src/app/core/auth/auth.interceptor.ts @@ -142,7 +142,7 @@ export class AuthInterceptor implements HttpInterceptor { } else if (this.isUnauthorized(error)) { // The access token provided is expired, revoked, malformed, or invalid for other reasons // Redirect to the login route - this.store.dispatch(new RedirectWhenTokenExpiredAction('Your session has expired. Please log in again.')); + this.store.dispatch(new RedirectWhenTokenExpiredAction('auth.messages.expired')); } } // Return error response as is. diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 8d9605782a..cb827b1101 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -49,7 +49,7 @@ export class AuthService { // and is not the login route, clear redirect url and messages const routeUrlObs = this.store.select(routerStateSelector) .filter((routerState: RouterReducerState) => isNotUndefined(routerState) && isNotUndefined(routerState.state)) - .filter((routerState: RouterReducerState) => (routerState.state.url !== LOGIN_ROUTE)) + .filter((routerState: RouterReducerState) => !this.isLoginRoute(routerState.state.url)) .map((routerState: RouterReducerState) => routerState.state.url); const redirectUrlObs = this.getRedirectUrl(); routeUrlObs.pipe( @@ -57,10 +57,23 @@ export class AuthService { map(([routeUrl, redirectUrl]) => [routeUrl, redirectUrl]) ).filter(([routeUrl, redirectUrl]) => isNotEmpty(redirectUrl) && (routeUrl !== redirectUrl)) .subscribe(() => { - this.setRedirectUrl(undefined); + this.clearRedirectUrl(); }); } + /** + * Check if is a login page route + * + * @param {string} url + * @returns {Boolean}. + */ + protected isLoginRoute(url: string) { + const urlTree: UrlTree = this.router.parseUrl(url); + const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET]; + const segment = '/' + g.toString(); + return segment === LOGIN_ROUTE; + } + /** * Authenticate the user * @@ -175,7 +188,7 @@ export class AuthService { if (!status.authenticated) { return true; } else { - throw(new Error('Invalid email or password')); + throw(new Error('auth.errors.invalid-user')); } }) @@ -264,7 +277,7 @@ export class AuthService { */ public redirectToLogin() { // Hard redirect to login page, so that all state is definitely lost - this._window.nativeWindow.location.href = LOGIN_ROUTE; + this._window.nativeWindow.location.href = LOGIN_ROUTE + '?expired=true'; } /** @@ -275,9 +288,7 @@ export class AuthService { .first() .subscribe((redirectUrl) => { if (isNotEmpty(redirectUrl)) { - // Clear redirect url - this.setRedirectUrl(undefined); - this.storage.remove(REDIRECT_COOKIE); + this.clearRedirectUrl(); const urlTree: UrlTree = this.router.parseUrl(redirectUrl); const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET]; @@ -327,4 +338,12 @@ export class AuthService { this.storage.set(REDIRECT_COOKIE, url); this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(url) ? url : '')); } + + /** + * Clear redirect url + */ + clearRedirectUrl() { + this.store.dispatch(new SetRedirectUrlAction('')); + this.storage.remove(REDIRECT_COOKIE); + } } diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index d8d91ca271..0fe6c280de 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -17,8 +17,8 @@ formControlName="password" required type="password"> - - + +
    {{"login.form.new-user" | translate}} From 48c2390515e170e9aa91b468cf724e610a09e7b9 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 4 Apr 2018 17:17:57 +0200 Subject: [PATCH 40/80] 50632: Added tests for registry service and updated component tests --- .../bitstream-formats.component.spec.ts | 15 +- .../metadata-registry.component.spec.ts | 21 +- .../metadata-schema.component.spec.ts | 27 ++- .../core/registry/registry.service.spec.ts | 200 ++++++++++++++++++ src/tsconfig.test.json | 2 +- 5 files changed, 247 insertions(+), 18 deletions(-) create mode 100644 src/app/core/registry/registry.service.spec.ts diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts index f83f96127f..18a28c16fb 100644 --- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts +++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts @@ -8,8 +8,14 @@ import { CommonModule } from '@angular/common'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { By } from '@angular/platform-browser'; +import { SharedModule } from '../../../shared/shared.module'; +import { PaginationComponent } from '../../../shared/pagination/pagination.component'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe'; +import { HostWindowService } from '../../../shared/host-window.service'; +import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub'; -describe('BitstreamFormatsComponent', () => { +fdescribe('BitstreamFormatsComponent', () => { let comp: BitstreamFormatsComponent; let fixture: ComponentFixture; let registryService: RegistryService; @@ -54,10 +60,11 @@ describe('BitstreamFormatsComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot()], - declarations: [BitstreamFormatsComponent], + imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()], + declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe], providers: [ - { provide: RegistryService, useValue: registryServiceStub } + { provide: RegistryService, useValue: registryServiceStub }, + { provide: HostWindowService, useValue: new HostWindowServiceStub(0) } ] }).compileComponents(); })); diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts index 154a96dc81..f05110b45a 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -8,18 +8,26 @@ import { By } from '@angular/platform-browser'; import { CommonModule } from '@angular/common'; import { RouterTestingModule } from '@angular/router/testing'; import { RegistryService } from '../../../core/registry/registry.service'; +import { SharedModule } from '../../../shared/shared.module'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe'; +import { PaginationComponent } from '../../../shared/pagination/pagination.component'; +import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub'; +import { HostWindowService } from '../../../shared/host-window.service'; -describe('MetadataRegistryComponent', () => { +fdescribe('MetadataRegistryComponent', () => { let comp: MetadataRegistryComponent; let fixture: ComponentFixture; let registryService: RegistryService; const mockSchemasList = [ { + id: 1, self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1', prefix: 'dc', namespace: 'http://dublincore.org/documents/dcmi-terms/' }, { + id: 2, self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2', prefix: 'mock', namespace: 'http://dspace.org/mockschema' @@ -32,10 +40,11 @@ describe('MetadataRegistryComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot()], - declarations: [MetadataRegistryComponent], + imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()], + declarations: [MetadataRegistryComponent, PaginationComponent, EnumKeysPipe], providers: [ - { provide: RegistryService, useValue: registryServiceStub } + { provide: RegistryService, useValue: registryServiceStub }, + { provide: HostWindowService, useValue: new HostWindowServiceStub(0) } ] }).compileComponents(); })); @@ -53,10 +62,10 @@ describe('MetadataRegistryComponent', () => { }); it('should contain the correct schemas', () => { - const dcName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(1) td:nth-child(2)')).nativeElement; + const dcName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(1) td:nth-child(3)')).nativeElement; expect(dcName.textContent).toBe('dc'); - const mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(2)')).nativeElement; + const mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(3)')).nativeElement; expect(mockName.textContent).toBe('mock'); }); diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts index e639e2bf2a..bd606bf1fe 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts @@ -6,22 +6,33 @@ import { PaginatedList } from '../../../core/data/paginated-list'; import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { By } from '@angular/platform-browser'; import { MockTranslateLoader } from '../../../shared/testing/mock-translate-loader'; import { RegistryService } from '../../../core/registry/registry.service'; +import { SharedModule } from '../../../shared/shared.module'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe'; +import { PaginationComponent } from '../../../shared/pagination/pagination.component'; +import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub'; +import { HostWindowService } from '../../../shared/host-window.service'; +import { RouterStub } from '../../../shared/testing/router-stub'; +import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub'; -describe('MetadataSchemaComponent', () => { +fdescribe('MetadataSchemaComponent', () => { let comp: MetadataSchemaComponent; let fixture: ComponentFixture; let registryService: RegistryService; const mockSchemasList = [ { + id: 1, self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1', prefix: 'dc', namespace: 'http://dublincore.org/documents/dcmi-terms/' }, { + id: 2, self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2', prefix: 'mock', namespace: 'http://dspace.org/mockschema' @@ -64,19 +75,21 @@ describe('MetadataSchemaComponent', () => { getMetadataSchemaByName: (schemaName: string) => Observable.of(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix === schemaName)[0])) }; const schemaNameParam = 'mock'; - const activatedRouteStub = { + const activatedRouteStub = Object.assign(new ActivatedRouteStub(), { params: Observable.of({ schemaName: schemaNameParam }) - }; + }); beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CommonModule, TranslateModule.forRoot()], - declarations: [MetadataSchemaComponent], + imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()], + declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe], providers: [ { provide: RegistryService, useValue: registryServiceStub }, - { provide: ActivatedRoute, useValue: activatedRouteStub } + { provide: ActivatedRoute, useValue: activatedRouteStub }, + { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, + { provide: Router, useValue: new RouterStub() } ] }).compileComponents(); })); diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts new file mode 100644 index 0000000000..0255576137 --- /dev/null +++ b/src/app/core/registry/registry.service.spec.ts @@ -0,0 +1,200 @@ +import { async, TestBed } from '@angular/core/testing'; +import { RegistryService } from './registry.service'; +import { CommonModule } from '@angular/common'; +import { ResponseCacheService } from '../cache/response-cache.service'; +import { RequestService } from '../data/request.service'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; +import { Observable } from 'rxjs/Observable'; +import { ResponseCacheEntry } from '../cache/response-cache.reducer'; +import { RequestEntry } from '../data/request.reducer'; +import { RemoteData } from '../data/remote-data'; +import { PaginatedList } from '../data/paginated-list'; +import { PageInfo } from '../shared/page-info.model'; + +fdescribe('RegistryService', () => { + let registryService: RegistryService; + const pagination: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { + id: 'registry-service-spec-pagination', + pageSize: 20 + }); + + const mockSchemasList = [ + { + id: 1, + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1', + prefix: 'dc', + namespace: 'http://dublincore.org/documents/dcmi-terms/' + }, + { + id: 2, + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2', + prefix: 'mock', + namespace: 'http://dspace.org/mockschema' + } + ]; + const mockFieldsList = [ + { + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8', + element: 'contributor', + qualifier: 'advisor', + scopenote: null, + schema: mockSchemasList[0] + }, + { + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9', + element: 'contributor', + qualifier: 'author', + scopenote: null, + schema: mockSchemasList[0] + }, + { + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10', + element: 'contributor', + qualifier: 'editor', + scopenote: 'test scope note', + schema: mockSchemasList[1] + }, + { + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11', + element: 'contributor', + qualifier: 'illustrator', + scopenote: null, + schema: mockSchemasList[1] + } + ]; + const mockFormatsList = [ + { + shortDescription: 'Unknown', + description: 'Unknown data format', + mimetype: 'application/octet-stream', + supportLevel: 0, + internal: false, + extensions: null + }, + { + shortDescription: 'License', + description: 'Item-specific license agreed upon to submission', + mimetype: 'text/plain; charset=utf-8', + supportLevel: 1, + internal: true, + extensions: null + }, + { + shortDescription: 'CC License', + description: 'Item-specific Creative Commons license agreed upon to submission', + mimetype: 'text/html; charset=utf-8', + supportLevel: 2, + internal: true, + extensions: null + }, + { + shortDescription: 'Adobe PDF', + description: 'Adobe Portable Document Format', + mimetype: 'application/pdf', + supportLevel: 0, + internal: false, + extensions: null + } + ]; + + const pageInfo = new PageInfo(); + pageInfo.elementsPerPage = 10; + pageInfo.currentPage = 1; + + const halServiceStub = { + getEndpoint: () => Observable.of('path') + }; + + const rdbMetadataschemasStub = { + toRemoteDataObservable: () => { + const payload = new PaginatedList(pageInfo, mockSchemasList); + const remoteData = new RemoteData(false, false, true, undefined, payload); + return Observable.of(remoteData); + } + }; + const rdbMetadatafieldsStub = { + toRemoteDataObservable: () => { + const payload = new PaginatedList(pageInfo, mockFieldsList); + const remoteData = new RemoteData(false, false, true, undefined, payload); + return Observable.of(remoteData); + } + }; + const rdbBitstreamformatsStub = { + toRemoteDataObservable: () => { + const payload = new PaginatedList(pageInfo, mockFormatsList); + const remoteData = new RemoteData(false, false, true, undefined, payload); + return Observable.of(remoteData); + } + }; + + describe('when requesting metadataschemas', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ CommonModule ], + providers: [ + { provide: ResponseCacheService, useValue: {} }, + { provide: RequestService, useValue: {} }, + { provide: RemoteDataBuildService, useValue: rdbMetadataschemasStub }, + { provide: HALEndpointService, useValue: halServiceStub }, + RegistryService + ] + }); + + registryService = TestBed.get(RegistryService); + }); + + it('should recieve the correct data', () => { + registryService.getMetadataSchemas(pagination).subscribe((value) => { + expect(value.payload.page[0].prefix).toEqual('dc'); + }); + }); + }); + + describe('when requesting metadatafields', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ CommonModule ], + providers: [ + { provide: ResponseCacheService, useValue: {} }, + { provide: RequestService, useValue: {} }, + { provide: RemoteDataBuildService, useValue: rdbMetadatafieldsStub }, + { provide: HALEndpointService, useValue: halServiceStub }, + RegistryService + ] + }); + + registryService = TestBed.get(RegistryService); + }); + + it('should recieve the correct data', () => { + registryService.getMetadataFieldsBySchema(mockSchemasList[0], pagination).subscribe((value) => { + expect(value.payload.page[0].element).toEqual('contributor'); + }); + }); + }); + + describe('when requesting bitstreamformats', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ CommonModule ], + providers: [ + { provide: ResponseCacheService, useValue: {} }, + { provide: RequestService, useValue: {} }, + { provide: RemoteDataBuildService, useValue: rdbBitstreamformatsStub }, + { provide: HALEndpointService, useValue: halServiceStub }, + RegistryService + ] + }); + + registryService = TestBed.get(RegistryService); + }); + + it('should recieve the correct data', () => { + registryService.getBitstreamFormats(pagination).subscribe((value) => { + expect(value.payload.page[0].shortDescription).toEqual('Unknown'); + }); + }); + }); +}); diff --git a/src/tsconfig.test.json b/src/tsconfig.test.json index 079eabc561..712ad1ab1c 100644 --- a/src/tsconfig.test.json +++ b/src/tsconfig.test.json @@ -1,4 +1,4 @@ -yarn add{ +{ "extends": "../tsconfig.json", "compilerOptions": { "sourceMap": true From b2e46f7bd393b011ef0e98bbf5132c707f83f6e9 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 4 Apr 2018 17:35:45 +0200 Subject: [PATCH 41/80] Splitted redirect to login page method --- src/app/core/auth/auth.effects.ts | 8 +++++++- src/app/core/auth/auth.service.ts | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index dcedbe0aec..3606434420 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -133,10 +133,16 @@ export class AuthEffects { @Effect({dispatch: false}) public redirectToLogin: Observable = this.actions$ - .ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED, AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED) + .ofType(AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED) .do(() => this.authService.removeToken()) .do(() => this.authService.redirectToLogin()); + @Effect({dispatch: false}) + public redirectToLogin: Observable = this.actions$ + .ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED) + .do(() => this.authService.removeToken()) + .do(() => this.authService.redirectToLoginWhenTokenExpired()); + /** * @constructor * @param {Actions} actions$ diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index cb827b1101..557dde73c0 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -276,6 +276,13 @@ export class AuthService { * Redirect to the login route */ public redirectToLogin() { + this.router.navigate(LOGIN_ROUTE); + } + + /** + * Redirect to the login route when token has expired + */ + public redirectToLoginWhenTokenExpired() { // Hard redirect to login page, so that all state is definitely lost this._window.nativeWindow.location.href = LOGIN_ROUTE + '?expired=true'; } From ebdb17d083ae6a1d639f4b7b7cafb5e49d9a4e36 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 4 Apr 2018 17:40:55 +0200 Subject: [PATCH 42/80] Fixes --- src/app/core/auth/auth.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 557dde73c0..6b9f31ee91 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -276,7 +276,7 @@ export class AuthService { * Redirect to the login route */ public redirectToLogin() { - this.router.navigate(LOGIN_ROUTE); + this.router.navigate([LOGIN_ROUTE]); } /** From 034ca02f381f876ed79a429b546ae8f29899d303 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 4 Apr 2018 17:42:44 +0200 Subject: [PATCH 43/80] Fixes --- src/app/core/auth/auth.effects.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index 3606434420..64bf311ff3 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -138,7 +138,7 @@ export class AuthEffects { .do(() => this.authService.redirectToLogin()); @Effect({dispatch: false}) - public redirectToLogin: Observable = this.actions$ + public redirectToLoginTokenExpired: Observable = this.actions$ .ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED) .do(() => this.authService.removeToken()) .do(() => this.authService.redirectToLoginWhenTokenExpired()); From 21ace2b68f05560b548975e81ecf33d32320b561 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 5 Apr 2018 12:52:05 +0200 Subject: [PATCH 44/80] Added i18n labels --- src/app/core/auth/auth.interceptor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts index ab105d825d..651e2fd096 100644 --- a/src/app/core/auth/auth.interceptor.ts +++ b/src/app/core/auth/auth.interceptor.ts @@ -78,7 +78,7 @@ export class AuthInterceptor implements HttpInterceptor { authService.setRedirectUrl(this.router.url); // The access token is expired // Redirect to the login route - this.store.dispatch(new RedirectWhenTokenExpiredAction('Your session has expired. Please log in again.')); + this.store.dispatch(new RedirectWhenTokenExpiredAction('auth.messages.expired')); return Observable.of(null); } else if (!this.isAuthRequest(req) && isNotEmpty(token)) { // Intercept a request that is not to the authentication endpoint From 0ed1f7778e22a9ab126ec86c713465cbeb7edbfe Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 5 Apr 2018 14:35:30 +0200 Subject: [PATCH 45/80] Set the expire date of the cookie's token to one date --- src/app/core/auth/auth.service.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 6b9f31ee91..747d168533 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -252,8 +252,14 @@ export class AuthService { * @returns {AuthTokenInfo} */ public storeToken(token: AuthTokenInfo) { - const expires = new Date(token.expires); + // Add 1 day to the current date + const expireDate = Date.now() + (1000 * 60 * 60 * 24 * 1); + + // Set the cookie expire date + const expires = new Date(expireDate); const options: CookieAttributes = {expires: expires}; + + // Save cookie with the token return this.storage.set(TOKENITEM, token, options); } From 8dd8f88fcf7f2131cc36d892b5063f1ae04e29d7 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 5 Apr 2018 16:23:54 +0200 Subject: [PATCH 46/80] 50632: hidden pagination for metadata-schema component --- .../bitstream-formats/bitstream-formats.component.html | 2 +- .../metadata-registry/metadata-registry.component.html | 2 +- .../metadata-schema/metadata-schema.component.html | 2 +- .../metadata-schema/metadata-schema.component.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html index f3d6e47331..1ee9c37013 100644 --- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html +++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html @@ -12,7 +12,7 @@ [pageInfoState]="(bitstreamFormats | async)?.payload" [collectionSize]="(bitstreamFormats | async)?.payload?.totalElements" [hideGear]="true" - [hidePagerWhenSinglePage]="false" + [hidePagerWhenSinglePage]="true" (pageChange)="onPageChange($event)">
    diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html index 67cfa52601..b422e73919 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html @@ -12,7 +12,7 @@ [pageInfoState]="(metadataSchemas | async)?.payload" [collectionSize]="(metadataSchemas | async)?.payload?.totalElements" [hideGear]="true" - [hidePagerWhenSinglePage]="false" + [hidePagerWhenSinglePage]="true" (pageChange)="onPageChange($event)">
    diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html index f9e460e717..b321a78f57 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html @@ -13,7 +13,7 @@ [pageInfoState]="(metadataFields | async)?.payload" [collectionSize]="(metadataFields | async)?.payload?.totalElements" [hideGear]="true" - [hidePagerWhenSinglePage]="false" + [hidePagerWhenSinglePage]="true" (pageChange)="onPageChange($event)">
    diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts index 6b0e4b16c6..2f0bfdeddb 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts @@ -21,7 +21,7 @@ export class MetadataSchemaComponent implements OnInit { metadataFields: Observable>>; config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { id: 'registry-metadatafields-pagination', - pageSize: 20 + pageSize: 10000 }); constructor(private registryService: RegistryService, private route: ActivatedRoute) { From 1f953b6b9d58a574c31e589877cac6a6fbe0f144 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 10 Apr 2018 14:27:32 +0200 Subject: [PATCH 47/80] Fixes --- src/app/core/auth/auth.service.ts | 38 ++++++++++++------- .../core/auth/models/auth-token-info.model.ts | 10 +++-- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 747d168533..4539aa3532 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -19,6 +19,7 @@ import { ResetAuthenticationMessagesAction, SetRedirectUrlAction } from './auth. import { RouterReducerState } from '@ngrx/router-store'; import { CookieAttributes } from 'js-cookie'; import { NativeWindowRef, NativeWindowService } from '../../shared/services/window.service'; +import { PlatformService } from '../../shared/services/platform.service'; export const LOGIN_ROUTE = '/login'; @@ -38,6 +39,7 @@ export class AuthService { constructor(@Inject(NativeWindowService) private _window: NativeWindowRef, private authRequestService: AuthRequestService, + private platform: PlatformService, private router: Router, private storage: CookieService, private store: Store) { @@ -289,8 +291,13 @@ export class AuthService { * Redirect to the login route when token has expired */ public redirectToLoginWhenTokenExpired() { - // Hard redirect to login page, so that all state is definitely lost - this._window.nativeWindow.location.href = LOGIN_ROUTE + '?expired=true'; + const redirectUrl = LOGIN_ROUTE + '?expired=true'; + if (this._window.nativeWindow.location) { + // Hard redirect to login page, so that all state is definitely lost + this._window.nativeWindow.location.href = redirectUrl; + } else { + this.router.navigateByUrl(redirectUrl); + } } /** @@ -301,24 +308,20 @@ export class AuthService { .first() .subscribe((redirectUrl) => { if (isNotEmpty(redirectUrl)) { - this.clearRedirectUrl(); + if (this.platform.isBrowser) { + console.log('CLEAR REDIRECT!!!!') + this.clearRedirectUrl(); + } - const urlTree: UrlTree = this.router.parseUrl(redirectUrl); - const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET]; - const segment = '/' + g.toString(); - const navigationExtras: NavigationExtras = { - queryParams: urlTree.queryParams, - queryParamsHandling: 'merge' - }; - this.router.navigate([segment], navigationExtras); - } else { // override the route reuse strategy this.router.routeReuseStrategy.shouldReuseRoute = () => { return false; }; this.router.navigated = false; - const url = decodeURIComponent(this.router.url); + const url = decodeURIComponent(redirectUrl); this.router.navigateByUrl(url); + } else { + this.router.navigate(['/']); } }) @@ -328,6 +331,7 @@ export class AuthService { * Refresh route navigated */ public refreshAfterLogout() { + this.router.navigate(['/home']); // Hard redirect to home page, so that all state is definitely lost this._window.nativeWindow.location.href = '/home'; } @@ -348,7 +352,13 @@ export class AuthService { * Set redirect url */ setRedirectUrl(url: string) { - this.storage.set(REDIRECT_COOKIE, url); + // Add 1 day to the current date + const expireDate = Date.now() + (1000 * 60 * 60 * 24 * 1); + + // Set the cookie expire date + const expires = new Date(expireDate); + const options: CookieAttributes = {expires: expires}; + this.storage.set(REDIRECT_COOKIE, url, options); this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(url) ? url : '')); } diff --git a/src/app/core/auth/models/auth-token-info.model.ts b/src/app/core/auth/models/auth-token-info.model.ts index 7eb125a947..dc7c71b660 100644 --- a/src/app/core/auth/models/auth-token-info.model.ts +++ b/src/app/core/auth/models/auth-token-info.model.ts @@ -8,8 +8,12 @@ export class AuthTokenInfo { constructor(token: string) { this.accessToken = token.replace('Bearer ', ''); - const tokenClaims = decode(this.accessToken); - // exp claim is in seconds, convert it se to milliseconds - this.expires = tokenClaims.exp * 1000; + try { + const tokenClaims = decode(this.accessToken); + // exp claim is in seconds, convert it se to milliseconds + this.expires = tokenClaims.exp * 1000; + } catch (err) { + this.expires = 0; + } } } From 04be7170c3e6eb61c89e1990608df984abebb2b2 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 10 Apr 2018 15:20:28 +0200 Subject: [PATCH 48/80] Added auth token to auth state --- src/app/core/auth/auth.actions.ts | 5 +++-- src/app/core/auth/auth.effects.ts | 2 +- src/app/core/auth/auth.reducers.ts | 24 ++++++++++++++++++++---- src/app/core/auth/auth.service.ts | 21 ++++++++++++--------- src/app/core/auth/selectors.ts | 8 ++++++++ 5 files changed, 44 insertions(+), 16 deletions(-) diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts index 0c0d3309b1..0aed7bca36 100644 --- a/src/app/core/auth/auth.actions.ts +++ b/src/app/core/auth/auth.actions.ts @@ -75,11 +75,12 @@ export class AuthenticatedSuccessAction implements Action { public type: string = AuthActionTypes.AUTHENTICATED_SUCCESS; payload: { authenticated: boolean; + authToken: AuthTokenInfo; user: Eperson }; - constructor(authenticated: boolean, user: Eperson) { - this.payload = { authenticated, user }; + constructor(authenticated: boolean, authToken: AuthTokenInfo, user: Eperson) { + this.payload = { authenticated, authToken, user }; } } diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index 64bf311ff3..122975bd96 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -57,7 +57,7 @@ export class AuthEffects { .ofType(AuthActionTypes.AUTHENTICATED) .switchMap((action: AuthenticatedAction) => { return this.authService.authenticatedUser(action.payload) - .map((user: Eperson) => new AuthenticatedSuccessAction((user !== null), user)) + .map((user: Eperson) => new AuthenticatedSuccessAction((user !== null), action.payload, user)) .catch((error) => Observable.of(new AuthenticatedErrorAction(error))); }); diff --git a/src/app/core/auth/auth.reducers.ts b/src/app/core/auth/auth.reducers.ts index d45b637f07..9664773ac5 100644 --- a/src/app/core/auth/auth.reducers.ts +++ b/src/app/core/auth/auth.reducers.ts @@ -3,11 +3,12 @@ import { AddAuthenticationMessageAction, AuthActions, AuthActionTypes, AuthenticatedSuccessAction, AuthenticationErrorAction, AuthenticationSuccessAction, LogOutErrorAction, RedirectWhenAuthenticationIsRequiredAction, - RedirectWhenTokenExpiredAction, SetRedirectUrlAction + RedirectWhenTokenExpiredAction, RefreshTokenSuccessAction, SetRedirectUrlAction } from './auth.actions'; // import models import { Eperson } from '../eperson/models/eperson.model'; +import { AuthTokenInfo } from './models/auth-token-info.model'; /** * The auth state. @@ -18,6 +19,9 @@ export interface AuthState { // boolean if user is authenticated authenticated: boolean; + // the authentication token + authToken?: AuthTokenInfo; + // error message error?: string; @@ -68,6 +72,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.AUTHENTICATED_ERROR: return Object.assign({}, state, { authenticated: false, + authToken: undefined, error: (action as AuthenticationErrorAction).payload.message, loaded: true, loading: false @@ -76,6 +81,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.AUTHENTICATED_SUCCESS: return Object.assign({}, state, { authenticated: true, + authToken: (action as AuthenticatedSuccessAction).payload.authToken, loaded: true, error: undefined, loading: false, @@ -87,6 +93,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.REGISTRATION_ERROR: return Object.assign({}, state, { authenticated: false, + authToken: undefined, error: (action as AuthenticationErrorAction).payload.message, loading: false }); @@ -115,6 +122,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.REFRESH_TOKEN_ERROR: return Object.assign({}, state, { authenticated: false, + authToken: undefined, error: undefined, loaded: false, loading: false, @@ -127,6 +135,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.REDIRECT_TOKEN_EXPIRED: return Object.assign({}, state, { authenticated: false, + authToken: undefined, loaded: false, loading: false, info: (action as RedirectWhenTokenExpiredAction as RedirectWhenAuthenticationIsRequiredAction).payload, @@ -136,6 +145,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.REGISTRATION: return Object.assign({}, state, { authenticated: false, + authToken: undefined, error: undefined, loading: true, info: undefined @@ -151,6 +161,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.REFRESH_TOKEN_SUCCESS: return Object.assign({}, state, { + authToken: (action as RefreshTokenSuccessAction).payload, refreshing: false, }); @@ -161,10 +172,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.RESET_MESSAGES: return Object.assign({}, state, { - authenticated: state.authenticated, error: undefined, - loaded: state.loaded, - loading: state.loading, info: undefined, }); @@ -234,6 +242,14 @@ export const _isLoading = (state: AuthState) => state.loading; */ export const _isRefreshing = (state: AuthState) => state.refreshing; +/** + * Returns the authentication token. + * @function _getAuthenticationToken + * @param {State} state + * @returns {AuthToken} + */ +export const _getAuthenticationToken = (state: AuthState) => state.authToken; + /** * Returns the sign out error. * @function _getLogOutError diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 4539aa3532..68bb3f2843 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -1,5 +1,5 @@ import { Inject, Injectable } from '@angular/core'; -import { NavigationExtras, PRIMARY_OUTLET, Router, UrlSegmentGroup, UrlTree } from '@angular/router'; +import { PRIMARY_OUTLET, Router, UrlSegmentGroup, UrlTree } from '@angular/router'; import { Observable } from 'rxjs/Observable'; import { map, withLatestFrom } from 'rxjs/operators'; @@ -12,7 +12,7 @@ import { AuthStatus } from './models/auth-status.model'; import { AuthTokenInfo, TOKENITEM } from './models/auth-token-info.model'; import { isEmpty, isNotEmpty, isNotNull, isNotUndefined } from '../../shared/empty.util'; import { CookieService } from '../../shared/services/cookie.service'; -import { getRedirectUrl, isAuthenticated, isTokenRefreshing } from './selectors'; +import { getAuthenticationToken, getRedirectUrl, isAuthenticated, isTokenRefreshing } from './selectors'; import { AppState, routerStateSelector } from '../../app.reducer'; import { Store } from '@ngrx/store'; import { ResetAuthenticationMessagesAction, SetRedirectUrlAction } from './auth.actions'; @@ -212,13 +212,16 @@ export class AuthService { * @returns {AuthTokenInfo} */ public getToken(): AuthTokenInfo { - // Retrieve authentication token info and check if is valid - const token = this.storage.get(TOKENITEM); - if (isNotEmpty(token) && token.hasOwnProperty('accessToken') && isNotEmpty(token.accessToken)) { - return token; - } else { - return null; - } + let token: AuthTokenInfo; + this.store.select(getAuthenticationToken) + .subscribe((authTokenInfo: AuthTokenInfo) => { + // Retrieve authentication token info and check if is valid + token = isNotEmpty(authTokenInfo) ? authTokenInfo : this.storage.get(TOKENITEM); + if (isEmpty(token) || !token.hasOwnProperty('accessToken') || isEmpty(token.accessToken)) { + token = null; + } + }); + return token; } /** diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts index a37f128c88..9d592eba0c 100644 --- a/src/app/core/auth/selectors.ts +++ b/src/app/core/auth/selectors.ts @@ -83,6 +83,14 @@ export const isAuthenticationLoading = createSelector(getAuthState, auth._isLoad */ export const isTokenRefreshing = createSelector(getAuthState, auth._isRefreshing); +/** + * Returns the authentication token. + * @function getAuthenticationToken + * @param {State} state + * @returns {AuthToken} + */ +export const getAuthenticationToken = createSelector(getAuthState, auth._getAuthenticationToken); + /** * Returns the log out error. * @function getLogOutError From 34e3e4bd2b5e3a689edcdb3d3b0aaf62c5cb5114 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 10 Apr 2018 19:14:42 +0200 Subject: [PATCH 49/80] Fixed issue when reload protected page with expired token --- src/app/core/auth/auth.service.ts | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 68bb3f2843..cd48d67ee8 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -134,8 +134,17 @@ export class AuthService { * Checks if token is present into storage and is not expired */ public checkAuthenticationToken(): Observable { - const token = this.getToken(); - return isNotEmpty(token) && !this.isTokenExpired() ? Observable.of(token) : Observable.throw(false); + return this.store.select(getAuthenticationToken) + .map((authTokenInfo: AuthTokenInfo) => { + let token: AuthTokenInfo; + // Retrieve authentication token info and check if is valid + token = isNotEmpty(authTokenInfo) ? authTokenInfo : this.storage.get(TOKENITEM); + if (isNotEmpty(token) && token.hasOwnProperty('accessToken') && isNotEmpty(token.accessToken) && !this.isTokenExpired(token)) { + return token; + } else { + throw false; + } + }); } /** @@ -216,10 +225,7 @@ export class AuthService { this.store.select(getAuthenticationToken) .subscribe((authTokenInfo: AuthTokenInfo) => { // Retrieve authentication token info and check if is valid - token = isNotEmpty(authTokenInfo) ? authTokenInfo : this.storage.get(TOKENITEM); - if (isEmpty(token) || !token.hasOwnProperty('accessToken') || isEmpty(token.accessToken)) { - token = null; - } + token = authTokenInfo || null; }); return token; } @@ -245,8 +251,8 @@ export class AuthService { * Check if a token is expired * @returns {boolean} */ - public isTokenExpired(): boolean { - const token = this.getToken(); + public isTokenExpired(token?: AuthTokenInfo): boolean { + token = token || this.getToken(); return token && token.expires < Date.now(); } @@ -312,7 +318,6 @@ export class AuthService { .subscribe((redirectUrl) => { if (isNotEmpty(redirectUrl)) { if (this.platform.isBrowser) { - console.log('CLEAR REDIRECT!!!!') this.clearRedirectUrl(); } From 9f003cf751cfb72afd4843828e23564d221aeab6 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 18 Apr 2018 15:33:19 +0200 Subject: [PATCH 50/80] 50632: Empty table info message --- resources/i18n/en.json | 9 ++++++--- .../bitstream-formats/bitstream-formats.component.html | 5 ++++- .../metadata-registry/metadata-registry.component.html | 5 ++++- .../metadata-schema/metadata-schema.component.html | 5 ++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 357dac1adf..311df2a66b 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -140,7 +140,8 @@ "id": "ID", "namespace": "Namespace", "name": "Name" - } + }, + "no-items": "No metadata schemas to show." } }, "schema": { @@ -152,7 +153,8 @@ "table": { "field": "Field", "scopenote": "Scope Note" - } + }, + "no-items": "No metadata fields to show." } }, "bitstream-formats": { @@ -170,7 +172,8 @@ "2": "Support" }, "internal": "internal" - } + }, + "no-items": "No bitstream formats to show." } } } diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html index 1ee9c37013..4dc0906989 100644 --- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html +++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html @@ -7,7 +7,7 @@

    {{'admin.registries.bitstream-formats.description' | translate}}

    + diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html index b422e73919..06ec58d72a 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html @@ -7,7 +7,7 @@

    {{'admin.registries.metadata.description' | translate}}

    + diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html index b321a78f57..e9734888ae 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html @@ -8,7 +8,7 @@

    {{'admin.registries.schema.fields.head' | translate}}

    + From 3d79db4dba6f922925f706835661f34040b8230a Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 19 Apr 2018 11:52:46 +0200 Subject: [PATCH 51/80] 50632: AoT build small fixes --- .../bitstream-formats/bitstream-formats.component.html | 2 +- .../metadata-registry/metadata-registry.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html index 4dc0906989..1ac547653f 100644 --- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html +++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html @@ -33,7 +33,7 @@
    - -
  • {{ 'nav.login' | translate }} -
    +
    diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts index 3becbdbd91..c3246438c8 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts @@ -7,7 +7,7 @@ import { fadeInOut, fadeOut } from '../animations/fade'; import { HostWindowService } from '../host-window.service'; import { AppState, routerStateSelector } from '../../app.reducer'; import { hasValue, isNotUndefined } from '../empty.util'; -import { getAuthenticatedUser, isAuthenticated } from '../../core/auth/selectors'; +import { getAuthenticatedUser, isAuthenticated, isAuthenticationLoading } from '../../core/auth/selectors'; import { Subscription } from 'rxjs/Subscription'; import { Eperson } from '../../core/eperson/models/eperson.model'; @@ -24,6 +24,12 @@ export class AuthNavMenuComponent implements OnDestroy, OnInit { */ public isAuthenticated: Observable; + /** + * True if the authentication is loading. + * @type {boolean} + */ + public loading: Observable; + public showAuth = false; public user: Observable; @@ -35,9 +41,12 @@ export class AuthNavMenuComponent implements OnDestroy, OnInit { } ngOnInit(): void { - // set loading + // set isAuthenticated this.isAuthenticated = this.store.select(isAuthenticated); + // set loading + this.loading = this.store.select(isAuthenticationLoading); + this.user = this.store.select(getAuthenticatedUser); this.subs.push(this.store.select(routerStateSelector) diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index 0fe6c280de..bcb6b49c9e 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -4,7 +4,7 @@ {{"login.form.password" | translate}} Date: Thu, 3 May 2018 19:08:07 +0200 Subject: [PATCH 55/80] Removed use of platform service and created different service for SSR and CSR --- src/app/app.component.spec.ts | 26 ++----- src/app/app.component.ts | 27 +++---- src/app/core/auth/auth.effects.ts | 2 +- src/app/core/auth/auth.service.ts | 36 +++++---- src/app/core/auth/server-auth.service.ts | 77 +++++++++++++++++++ src/app/core/core.module.ts | 4 - src/app/shared/log-in/log-in.component.html | 8 +- src/app/shared/log-in/log-in.component.ts | 19 +++-- .../shared/services/client-cookie.service.ts | 25 ++++++ .../shared/services/cookie.service.spec.ts | 4 +- src/app/shared/services/cookie.service.ts | 58 +++++--------- .../shared/services/server-cookie.service.ts | 30 ++++++++ src/modules/app/browser-app.module.ts | 12 +++ src/modules/app/server-app.module.ts | 12 +++ 14 files changed, 234 insertions(+), 106 deletions(-) create mode 100644 src/app/core/auth/server-auth.service.ts create mode 100644 src/app/shared/services/client-cookie.service.ts create mode 100644 src/app/shared/services/server-cookie.service.ts diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index de9b121bff..af58295479 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,22 +1,13 @@ -import { - async, - ComponentFixture, - inject, - TestBed -} from '@angular/core/testing'; +import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; -import { - CUSTOM_ELEMENTS_SCHEMA, - DebugElement -} from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core'; import { CommonModule } from '@angular/common'; import { By } from '@angular/platform-browser'; -import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { Store, StoreModule } from '@ngrx/store'; - // Load the implementations that should be tested import { AppComponent } from './app.component'; @@ -25,13 +16,11 @@ import { HostWindowResizeAction } from './shared/host-window.actions'; import { MetadataService } from './core/metadata/metadata.service'; -import { GLOBAL_CONFIG, ENV_CONFIG } from '../config'; +import { ENV_CONFIG, GLOBAL_CONFIG } from '../config'; import { NativeWindowRef, NativeWindowService } from './shared/services/window.service'; import { MockTranslateLoader } from './shared/mocks/mock-translate-loader'; import { MockMetadataService } from './shared/mocks/mock-metadata-service'; -import { PlatformServiceStub } from './shared/testing/platform-service-stub'; -import { PlatformService } from './shared/services/platform.service'; let comp: AppComponent; let fixture: ComponentFixture; @@ -55,10 +44,9 @@ describe('App component', () => { ], declarations: [AppComponent], // declare the test component providers: [ - { provide: GLOBAL_CONFIG, useValue: ENV_CONFIG }, - { provide: NativeWindowService, useValue: new NativeWindowRef() }, - { provide: MetadataService, useValue: new MockMetadataService() }, - { provide: PlatformService, useValue: new PlatformServiceStub() }, + {provide: GLOBAL_CONFIG, useValue: ENV_CONFIG}, + {provide: NativeWindowService, useValue: new NativeWindowRef()}, + {provide: MetadataService, useValue: new MockMetadataService()}, AppComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 4ce1df54b0..7a0dc59d23 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,11 +1,4 @@ -import { - ChangeDetectionStrategy, - Component, - HostListener, - Inject, - OnInit, - ViewEncapsulation -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, HostListener, Inject, OnInit, ViewEncapsulation } from '@angular/core'; import { Store } from '@ngrx/store'; @@ -17,9 +10,8 @@ import { MetadataService } from './core/metadata/metadata.service'; import { HostWindowResizeAction } from './shared/host-window.actions'; import { HostWindowState } from './shared/host-window.reducer'; import { NativeWindowRef, NativeWindowService } from './shared/services/window.service'; -import { CheckAuthenticationTokenAction } from './core/auth/auth.actions'; import { isAuthenticated } from './core/auth/selectors'; -import { PlatformService } from './shared/services/platform.service'; +import { AuthService } from './core/auth/auth.service'; @Component({ selector: 'ds-app', @@ -36,7 +28,7 @@ export class AppComponent implements OnInit { private translate: TranslateService, private store: Store, private metadata: MetadataService, - private platformService: PlatformService + private authService: AuthService ) { // this language will be used as a fallback when a translation isn't found in the current language translate.setDefaultLang('en'); @@ -55,12 +47,13 @@ export class AppComponent implements OnInit { const color: string = this.config.production ? 'red' : 'green'; console.info(`Environment: %c${env}`, `color: ${color}; font-weight: bold;`); this.dispatchWindowSize(this._window.nativeWindow.innerWidth, this._window.nativeWindow.innerHeight); - if (this.platformService.isServer) { - this.store.select(isAuthenticated) - .take(1) - .filter((authenticated) => !authenticated) - .subscribe((authenticated) => this.store.dispatch(new CheckAuthenticationTokenAction())); - } + + // Whether is not authenticathed try to retrieve a possible stored auth token + this.store.select(isAuthenticated) + .take(1) + .filter((authenticated) => !authenticated) + .subscribe((authenticated) => this.authService.checksAuthenticationToken()); + } @HostListener('window:resize', ['$event']) diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index 122975bd96..f3bebebbcd 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -71,7 +71,7 @@ export class AuthEffects { public checkToken: Observable = this.actions$ .ofType(AuthActionTypes.CHECK_AUTHENTICATION_TOKEN) .switchMap(() => { - return this.authService.checkAuthenticationToken() + return this.authService.hasValidAuthenticationToken() .map((token: AuthTokenInfo) => new AuthenticatedAction(token)) .catch((error) => Observable.of(new CheckAuthenticationTokenErrorAction())); }); diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 58e80713e2..cbd532b467 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -15,11 +15,15 @@ import { CookieService } from '../../shared/services/cookie.service'; import { getAuthenticationToken, getRedirectUrl, isAuthenticated, isTokenRefreshing } from './selectors'; import { AppState, routerStateSelector } from '../../app.reducer'; import { Store } from '@ngrx/store'; -import { ResetAuthenticationMessagesAction, SetRedirectUrlAction } from './auth.actions'; +import { + CheckAuthenticationTokenAction, + ResetAuthenticationMessagesAction, + SetRedirectUrlAction +} from './auth.actions'; import { RouterReducerState } from '@ngrx/router-store'; import { CookieAttributes } from 'js-cookie'; import { NativeWindowRef, NativeWindowService } from '../../shared/services/window.service'; -import { PlatformService } from '../../shared/services/platform.service'; +import { REQUEST } from '@nguniversal/express-engine/tokens'; export const LOGIN_ROUTE = '/login'; @@ -35,14 +39,14 @@ export class AuthService { * True if authenticated * @type boolean */ - private _authenticated: boolean; + protected _authenticated: boolean; - constructor(@Inject(NativeWindowService) private _window: NativeWindowRef, - private authRequestService: AuthRequestService, - private platform: PlatformService, - private router: Router, - private storage: CookieService, - private store: Store) { + constructor(@Inject(REQUEST) protected req: any, + @Inject(NativeWindowService) protected _window: NativeWindowRef, + protected authRequestService: AuthRequestService, + protected router: Router, + protected storage: CookieService, + protected store: Store) { this.store.select(isAuthenticated) .startWith(false) .subscribe((authenticated: boolean) => this._authenticated = authenticated); @@ -130,10 +134,17 @@ export class AuthService { }); } + /** + * Checks if token is present into browser storage and is valid. (NB Check is done only on SSR) + */ + public checksAuthenticationToken() { + return + } + /** * Checks if token is present into storage and is not expired */ - public checkAuthenticationToken(): Observable { + public hasValidAuthenticationToken(): Observable { return this.store.select(getAuthenticationToken) .take(1) .map((authTokenInfo: AuthTokenInfo) => { @@ -317,10 +328,9 @@ export class AuthService { this.getRedirectUrl() .first() .subscribe((redirectUrl) => { + console.log('Browser'); if (isNotEmpty(redirectUrl)) { - if (this.platform.isBrowser) { - this.clearRedirectUrl(); - } + this.clearRedirectUrl(); // override the route reuse strategy this.router.routeReuseStrategy.shouldReuseRoute = () => { diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts new file mode 100644 index 0000000000..1d240455f3 --- /dev/null +++ b/src/app/core/auth/server-auth.service.ts @@ -0,0 +1,77 @@ +import { Injectable } from '@angular/core'; + +import { Observable } from 'rxjs/Observable'; +import { HttpHeaders } from '@angular/common/http'; +import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; +import { AuthStatus } from './models/auth-status.model'; +import { isNotEmpty } from '../../shared/empty.util'; +import { AuthService } from './auth.service'; +import { AuthTokenInfo } from './models/auth-token-info.model'; +import { CheckAuthenticationTokenAction } from './auth.actions'; + +/** + * The auth service. + */ +@Injectable() +export class ServerAuthService extends AuthService { + + /** + * Authenticate the user + * + * @param {string} user The user name + * @param {string} password The user's password + * @returns {Observable} The authenticated user observable. + */ + public authenticate(user: string, password: string): Observable { + // Attempt authenticating the user using the supplied credentials. + const body = encodeURI(`password=${password}&user=${user}`); + const options: HttpOptions = Object.create({}); + let headers = new HttpHeaders(); + + // NB this could be use to avoid the problem with the authentication is case the UI is rendered by Angular Universal. + const clientIp = this.req.connection.remoteAddress; + + headers = headers.append('Content-Type', 'application/x-www-form-urlencoded'); + options.headers = headers; + return this.authRequestService.postToEndpoint('login', body, options) + .map((status: AuthStatus) => { + if (status.authenticated) { + return status; + } else { + throw(new Error('Invalid email or password')); + } + }) + + } + + /** + * Checks if token is present into browser storage and is valid. (NB Check is done only on SSR) + */ + public checksAuthenticationToken() { + this.store.dispatch(new CheckAuthenticationTokenAction()) + } + + /** + * Redirect to the route navigated before the login + */ + public redirectToPreviousUrl() { + this.getRedirectUrl() + .first() + .subscribe((redirectUrl) => { + console.log('server side'); + if (isNotEmpty(redirectUrl)) { + // override the route reuse strategy + this.router.routeReuseStrategy.shouldReuseRoute = () => { + return false; + }; + this.router.navigated = false; + const url = decodeURIComponent(redirectUrl); + this.router.navigateByUrl(url); + } else { + this.router.navigate(['/']); + } + }) + + } + +} diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 9c57026975..068a698565 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -38,13 +38,11 @@ import { SubmissionDefinitionsConfigService } from './config/submission-definiti import { SubmissionFormsConfigService } from './config/submission-forms-config.service'; import { SubmissionSectionsConfigService } from './config/submission-sections-config.service'; import { UUIDService } from './shared/uuid.service'; -import { AuthService } from './auth/auth.service'; import { AuthenticatedGuard } from './auth/authenticated.guard'; import { AuthRequestService } from './auth/auth-request.service'; import { AuthResponseParsingService } from './auth/auth-response-parsing.service'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { AuthInterceptor } from './auth/auth.interceptor'; -import { CookieService } from '../shared/services/cookie.service'; import { PlatformService } from '../shared/services/platform.service'; const IMPORTS = [ @@ -66,10 +64,8 @@ const PROVIDERS = [ AuthenticatedGuard, AuthRequestService, AuthResponseParsingService, - AuthService, CommunityDataService, CollectionDataService, - CookieService, DSOResponseParsingService, DSpaceRESTv2Service, HostWindowService, diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index bcb6b49c9e..fe9a506e71 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -1,5 +1,5 @@ - - + + {{"login.form.password" | translate}} - +
    diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts index bc5c098d82..3364b1067d 100644 --- a/src/app/shared/log-in/log-in.component.ts +++ b/src/app/shared/log-in/log-in.component.ts @@ -9,7 +9,8 @@ import 'rxjs/add/operator/takeWhile'; import { AuthenticateAction, ResetAuthenticationMessagesAction } from '../../core/auth/auth.actions'; import { - getAuthenticationError, getAuthenticationInfo, + getAuthenticationError, + getAuthenticationInfo, isAuthenticated, isAuthenticationLoading, } from '../../core/auth/selectors'; @@ -18,7 +19,6 @@ import { CoreState } from '../../core/core.reducers'; import { isNotEmpty } from '../empty.util'; import { fadeOut } from '../animations/fade'; import { AuthService } from '../../core/auth/auth.service'; -import { PlatformService } from '../services/platform.service'; /** * /users/sign-in @@ -56,6 +56,12 @@ export class LogInComponent implements OnDestroy, OnInit { */ public hasMessage = false; + /** + * Whether user is authenticated. + * @type {Observable} + */ + public isAuthenticated: Observable; + /** * True if the authentication is loading. * @type {boolean} @@ -83,15 +89,18 @@ export class LogInComponent implements OnDestroy, OnInit { constructor( private authService: AuthService, private formBuilder: FormBuilder, - private platform: PlatformService, private store: Store - ) { } + ) { + } /** * Lifecycle hook that is called after data-bound properties of a directive are initialized. * @method ngOnInit */ public ngOnInit() { + // set isAuthenticated + this.isAuthenticated = this.store.select(isAuthenticated); + // set formGroup this.form = this.formBuilder.group({ email: ['', Validators.required], @@ -144,7 +153,7 @@ export class LogInComponent implements OnDestroy, OnInit { } /** - * To to the registration page. + * To the registration page. * @method register */ public register() { diff --git a/src/app/shared/services/client-cookie.service.ts b/src/app/shared/services/client-cookie.service.ts new file mode 100644 index 0000000000..4aa670ca78 --- /dev/null +++ b/src/app/shared/services/client-cookie.service.ts @@ -0,0 +1,25 @@ +import { Injectable } from '@angular/core' +import { CookieAttributes, getJSON, remove, set } from 'js-cookie' +import { CookieService, ICookieService } from './cookie.service'; + +@Injectable() +export class ClientCookieService extends CookieService implements ICookieService { + + public set(name: string, value: any, options?: CookieAttributes): void { + set(name, value, options); + this.updateSource() + } + + public remove(name: string, options?: CookieAttributes): void { + remove(name, options); + this.updateSource() + } + + public get(name: string): any { + return getJSON(name) + } + + public getAll(): any { + return getJSON() + } +} diff --git a/src/app/shared/services/cookie.service.spec.ts b/src/app/shared/services/cookie.service.spec.ts index 1bfddba99d..dddb8f095f 100644 --- a/src/app/shared/services/cookie.service.spec.ts +++ b/src/app/shared/services/cookie.service.spec.ts @@ -1,4 +1,3 @@ -import { PlatformService } from './platform.service' import { CookieService, ICookieService } from './cookie.service' import { async, TestBed } from '@angular/core/testing' import { REQUEST } from '@nguniversal/express-engine/tokens' @@ -10,8 +9,7 @@ describe(CookieService.name, () => { TestBed.configureTestingModule({ providers: [ CookieService, - PlatformService, - { provide: REQUEST, useValue: {} } + {provide: REQUEST, useValue: {}} ] }) })); diff --git a/src/app/shared/services/cookie.service.ts b/src/app/shared/services/cookie.service.ts index 61762f7cd9..8265651d81 100644 --- a/src/app/shared/services/cookie.service.ts +++ b/src/app/shared/services/cookie.service.ts @@ -1,62 +1,40 @@ -import { REQUEST } from '@nguniversal/express-engine/tokens' -import { PlatformService } from './platform.service' import { Inject, Injectable } from '@angular/core' + +import { REQUEST } from '@nguniversal/express-engine/tokens' + import { Subject } from 'rxjs/Subject' import { Observable } from 'rxjs/Observable' -import { CookieAttributes, getJSON, remove, set } from 'js-cookie' +import { CookieAttributes } from 'js-cookie' export interface ICookieService { readonly cookies$: Observable<{ readonly [key: string]: any }> + getAll(): any + get(name: string): any + set(name: string, value: any, options?: CookieAttributes): void + remove(name: string, options?: CookieAttributes): void } @Injectable() -export class CookieService implements ICookieService { - private readonly cookieSource = new Subject<{ readonly [key: string]: any }>(); +export abstract class CookieService implements ICookieService { + protected readonly cookieSource = new Subject<{ readonly [key: string]: any }>(); public readonly cookies$ = this.cookieSource.asObservable(); - constructor(private platformService: PlatformService, @Inject(REQUEST) private req: any) { } - - public set(name: string, value: any, options?: CookieAttributes): void { - if (this.platformService.isBrowser) { - set(name, value, options); - this.updateSource() - } + constructor(@Inject(REQUEST) protected req: any) { } - public remove(name: string, options?: CookieAttributes): void { - if (this.platformService.isBrowser) { - remove(name, options); - this.updateSource() - } - } + public abstract set(name: string, value: any, options?: CookieAttributes): void - public get(name: string): any { - if (this.platformService.isBrowser) { - return getJSON(name) - } else { - try { - return JSON.parse(this.req.cookies[name]) - } catch (err) { - return this.req ? this.req.cookies[name] : undefined - } - } - } + public abstract remove(name: string, options?: CookieAttributes): void - public getAll(): any { - if (this.platformService.isBrowser) { - return getJSON() - } else { - if (this.req) { - return this.req.cookies - } - } - } + public abstract get(name: string): any - private updateSource() { - this.cookieSource.next(this.getAll()) + public abstract getAll(): any + + protected updateSource() { + this.cookieSource.next(this.getAll()); } } diff --git a/src/app/shared/services/server-cookie.service.ts b/src/app/shared/services/server-cookie.service.ts new file mode 100644 index 0000000000..d6d706a7d7 --- /dev/null +++ b/src/app/shared/services/server-cookie.service.ts @@ -0,0 +1,30 @@ +import { Injectable } from '@angular/core' +import { CookieAttributes } from 'js-cookie' +import { CookieService, ICookieService } from './cookie.service'; + +@Injectable() +export class ServerCookieService extends CookieService implements ICookieService { + + public set(name: string, value: any, options?: CookieAttributes): void { + return + } + + public remove(name: string, options?: CookieAttributes): void { + return + } + + public get(name: string): any { + console.log(this.req.connection.remoteAddress); + try { + return JSON.parse(this.req.cookies[name]) + } catch (err) { + return this.req ? this.req.cookies[name] : undefined + } + } + + public getAll(): any { + if (this.req) { + return this.req.cookies + } + } +} diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts index ffaa30e29e..235507dc96 100644 --- a/src/modules/app/browser-app.module.ts +++ b/src/modules/app/browser-app.module.ts @@ -15,6 +15,10 @@ import { AppComponent } from '../../app/app.component'; import { AppModule } from '../../app/app.module'; import { DSpaceBrowserTransferStateModule } from '../transfer-state/dspace-browser-transfer-state.module'; import { DSpaceTransferState } from '../transfer-state/dspace-transfer-state.service'; +import { ClientCookieService } from '../../app/shared/services/client-cookie.service'; +import { CookieService } from '../../app/shared/services/cookie.service'; +import { ServerAuthService } from '../../app/core/auth/server-auth.service'; +import { AuthService } from '../../app/core/auth/auth.service'; export const REQ_KEY = makeStateKey('req'); @@ -57,6 +61,14 @@ export function getRequest(transferState: TransferState): any { provide: REQUEST, useFactory: getRequest, deps: [TransferState] + }, + { + provide: AuthService, + useClass: AuthService + }, + { + provide: CookieService, + useClass: ClientCookieService } ] }) diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts index ff8455cca0..98ae83b33f 100644 --- a/src/modules/app/server-app.module.ts +++ b/src/modules/app/server-app.module.ts @@ -15,6 +15,10 @@ import { DSpaceServerTransferStateModule } from '../transfer-state/dspace-server import { DSpaceTransferState } from '../transfer-state/dspace-transfer-state.service'; import { TranslateUniversalLoader } from '../translate-universal-loader'; +import { CookieService } from '../../app/shared/services/cookie.service'; +import { ServerCookieService } from '../../app/shared/services/server-cookie.service'; +import { AuthService } from '../../app/core/auth/auth.service'; +import { ServerAuthService } from '../../app/core/auth/server-auth.service'; export function createTranslateLoader() { return new TranslateUniversalLoader('dist/assets/i18n/', '.json'); @@ -42,6 +46,14 @@ export function createTranslateLoader() { AppModule ], providers: [ + { + provide: AuthService, + useClass: ServerAuthService + }, + { + provide: CookieService, + useClass: ServerCookieService + } ] }) export class ServerAppModule { From 2c938571b335b39b3b7c422bfacae9146018140e Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 3 May 2018 19:53:06 +0200 Subject: [PATCH 56/80] Fixed logout page view --- .../+logout-page/logout-page.component.html | 12 ++++++--- .../+logout-page/logout-page.component.scss | 16 +----------- src/app/core/auth/auth.service.ts | 1 + .../auth-nav-menu.component.html | 4 +-- .../auth-nav-menu/auth-nav-menu.component.ts | 26 +++++++------------ 5 files changed, 21 insertions(+), 38 deletions(-) diff --git a/src/app/+logout-page/logout-page.component.html b/src/app/+logout-page/logout-page.component.html index e427d78ff7..77da9482aa 100644 --- a/src/app/+logout-page/logout-page.component.html +++ b/src/app/+logout-page/logout-page.component.html @@ -1,5 +1,9 @@ -
    - -

    {{"logout.form.header" | translate}}

    - +
    +
    +
    + +

    {{"logout.form.header" | translate}}

    + +
    +
    diff --git a/src/app/+logout-page/logout-page.component.scss b/src/app/+logout-page/logout-page.component.scss index b71eee7ee1..7e594c0d9b 100644 --- a/src/app/+logout-page/logout-page.component.scss +++ b/src/app/+logout-page/logout-page.component.scss @@ -1,15 +1 @@ -.login-container { - height: 100%; - display: -ms-flexbox; - display: -webkit-box; - display: flex; - -ms-flex-align: center; - -ms-flex-pack: center; - -webkit-box-align: center; - align-items: center; - -webkit-box-pack: center; - justify-content: center; - padding-top: 40px; - padding-bottom: 40px; - background-color: #f5f5f5; -} +@import '../+login-page/login-page.component.scss'; diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index cbd532b467..530fb51720 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -26,6 +26,7 @@ import { NativeWindowRef, NativeWindowService } from '../../shared/services/wind import { REQUEST } from '@nguniversal/express-engine/tokens'; export const LOGIN_ROUTE = '/login'; +export const LOGOUT_ROUTE = '/logout'; export const REDIRECT_COOKIE = 'dsRedirectUrl'; diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html index 7e60b789dd..e67e49a2f0 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html @@ -1,5 +1,5 @@
      -
    • +
    • {{ 'nav.login' | translate }}
      @@ -10,7 +10,7 @@
    • {{ 'nav.login' | translate }}(current)
      • -
    • +
    • Hello {{(user | async).name}}
      diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts index c3246438c8..7633278d0c 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { RouterReducerState } from '@ngrx/router-store'; import { Store } from '@ngrx/store'; @@ -6,10 +6,10 @@ import { Store } from '@ngrx/store'; import { fadeInOut, fadeOut } from '../animations/fade'; import { HostWindowService } from '../host-window.service'; import { AppState, routerStateSelector } from '../../app.reducer'; -import { hasValue, isNotUndefined } from '../empty.util'; +import { isNotUndefined } from '../empty.util'; import { getAuthenticatedUser, isAuthenticated, isAuthenticationLoading } from '../../core/auth/selectors'; -import { Subscription } from 'rxjs/Subscription'; import { Eperson } from '../../core/eperson/models/eperson.model'; +import { LOGIN_ROUTE, LOGOUT_ROUTE } from '../../core/auth/auth.service'; @Component({ selector: 'ds-auth-nav-menu', @@ -17,7 +17,7 @@ import { Eperson } from '../../core/eperson/models/eperson.model'; styleUrls: ['./auth-nav-menu.component.scss'], animations: [fadeInOut, fadeOut] }) -export class AuthNavMenuComponent implements OnDestroy, OnInit { +export class AuthNavMenuComponent implements OnInit { /** * Whether user is authenticated. * @type {Observable} @@ -30,12 +30,10 @@ export class AuthNavMenuComponent implements OnDestroy, OnInit { */ public loading: Observable; - public showAuth = false; + public showAuth = Observable.of(false); public user: Observable; - protected subs: Subscription[] = []; - constructor(private store: Store, public windowService: HostWindowService) { } @@ -49,16 +47,10 @@ export class AuthNavMenuComponent implements OnDestroy, OnInit { this.user = this.store.select(getAuthenticatedUser); - this.subs.push(this.store.select(routerStateSelector) + this.showAuth = this.store.select(routerStateSelector) .filter((router: RouterReducerState) => isNotUndefined(router) && isNotUndefined(router.state)) - .subscribe((router: RouterReducerState) => { - this.showAuth = router.state.url !== '/login'; - })); - } - - ngOnDestroy() { - this.subs - .filter((sub) => hasValue(sub)) - .forEach((sub) => sub.unsubscribe()); + .map((router: RouterReducerState) => { + return router.state.url !== LOGIN_ROUTE && router.state.url !== LOGOUT_ROUTE; + }); } } From b0b4342f24383596cbf4f36ebf75ae8d4c98225e Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 8 May 2018 10:34:46 +0200 Subject: [PATCH 57/80] Fixed an issue with redirect url --- src/app/core/auth/auth.service.ts | 9 ++++----- src/app/core/auth/server-auth.service.ts | 1 - src/app/shared/services/server-cookie.service.ts | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 530fb51720..751927f24e 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -54,13 +54,13 @@ export class AuthService { // If current route is different from the one setted in authentication guard // and is not the login route, clear redirect url and messages - const routeUrlObs = this.store.select(routerStateSelector) + const routeUrl$ = this.store.select(routerStateSelector) .filter((routerState: RouterReducerState) => isNotUndefined(routerState) && isNotUndefined(routerState.state)) .filter((routerState: RouterReducerState) => !this.isLoginRoute(routerState.state.url)) .map((routerState: RouterReducerState) => routerState.state.url); - const redirectUrlObs = this.getRedirectUrl(); - routeUrlObs.pipe( - withLatestFrom(redirectUrlObs), + const redirectUrl$ = this.store.select(getRedirectUrl).distinctUntilChanged(); + routeUrl$.pipe( + withLatestFrom(redirectUrl$), map(([routeUrl, redirectUrl]) => [routeUrl, redirectUrl]) ).filter(([routeUrl, redirectUrl]) => isNotEmpty(redirectUrl) && (routeUrl !== redirectUrl)) .subscribe(() => { @@ -329,7 +329,6 @@ export class AuthService { this.getRedirectUrl() .first() .subscribe((redirectUrl) => { - console.log('Browser'); if (isNotEmpty(redirectUrl)) { this.clearRedirectUrl(); diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts index 1d240455f3..8ecf692e9e 100644 --- a/src/app/core/auth/server-auth.service.ts +++ b/src/app/core/auth/server-auth.service.ts @@ -58,7 +58,6 @@ export class ServerAuthService extends AuthService { this.getRedirectUrl() .first() .subscribe((redirectUrl) => { - console.log('server side'); if (isNotEmpty(redirectUrl)) { // override the route reuse strategy this.router.routeReuseStrategy.shouldReuseRoute = () => { diff --git a/src/app/shared/services/server-cookie.service.ts b/src/app/shared/services/server-cookie.service.ts index d6d706a7d7..49cc738346 100644 --- a/src/app/shared/services/server-cookie.service.ts +++ b/src/app/shared/services/server-cookie.service.ts @@ -14,7 +14,6 @@ export class ServerCookieService extends CookieService implements ICookieService } public get(name: string): any { - console.log(this.req.connection.remoteAddress); try { return JSON.parse(this.req.cookies[name]) } catch (err) { From 5682c8146c7e0588487d0fc6bf61ae264f22e059 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 8 May 2018 11:28:12 +0200 Subject: [PATCH 58/80] Fixed merge --- .../search-filter/search-filter.service.ts | 2 +- src/app/core/auth/auth-request.service.ts | 14 +++++++------- src/app/core/auth/auth.service.ts | 6 +++--- src/app/shared/host-window.service.ts | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.service.ts b/src/app/+search-page/search-filters/search-filter/search-filter.service.ts index 44d9c7e709..695e0204f2 100644 --- a/src/app/+search-page/search-filters/search-filter/search-filter.service.ts +++ b/src/app/+search-page/search-filters/search-filter/search-filter.service.ts @@ -14,7 +14,7 @@ import { import { hasValue, isEmpty, isNotEmpty, } from '../../../shared/empty.util'; import { SearchFilterConfig } from '../../search-service/search-filter-config.model'; import { SearchService } from '../../search-service/search.service'; -import { RouteService } from '../../../shared/route.service'; +import { RouteService } from '../../../shared/services/route.service'; import ObjectExpression from 'rollup/dist/typings/ast/nodes/ObjectExpression'; import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts index 3255d62d21..a57ad48865 100644 --- a/src/app/core/auth/auth-request.service.ts +++ b/src/app/core/auth/auth-request.service.ts @@ -12,14 +12,14 @@ import { AuthStatusResponse, ErrorResponse, RestResponse } from '../cache/respon import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; @Injectable() -export class AuthRequestService extends HALEndpointService { +export class AuthRequestService { protected linkName = 'authn'; protected browseEndpoint = ''; - constructor(protected responseCache: ResponseCacheService, - protected requestService: RequestService, - @Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig) { - super(); + constructor(@Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig, + protected halService: HALEndpointService, + protected responseCache: ResponseCacheService, + protected requestService: RequestService) { } protected fetchRequest(request: RestRequest): Observable { @@ -42,7 +42,7 @@ export class AuthRequestService extends HALEndpointService { } public postToEndpoint(method: string, body: any, options?: HttpOptions): Observable { - return this.getEndpoint() + return this.halService.getEndpoint(this.linkName) .filter((href: string) => isNotEmpty(href)) .map((endpointURL) => this.getEndpointByMethod(endpointURL, method)) .distinctUntilChanged() @@ -53,7 +53,7 @@ export class AuthRequestService extends HALEndpointService { } public getRequest(method: string, options?: HttpOptions): Observable { - return this.getEndpoint() + return this.halService.getEndpoint(this.linkName) .filter((href: string) => isNotEmpty(href)) .map((endpointURL) => this.getEndpointByMethod(endpointURL, method)) .distinctUntilChanged() diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 751927f24e..fb83d491e6 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -277,7 +277,7 @@ export class AuthService { */ public storeToken(token: AuthTokenInfo) { // Add 1 day to the current date - const expireDate = Date.now() + (1000 * 60 * 60 * 24 * 1); + const expireDate = Date.now() + (1000 * 60 * 60 * 24); // Set the cookie expire date const expires = new Date(expireDate); @@ -371,8 +371,8 @@ export class AuthService { * Set redirect url */ setRedirectUrl(url: string) { - // Add 1 day to the current date - const expireDate = Date.now() + (1000 * 60 * 60 * 24 * 1); + // Add 1 hour to the current date + const expireDate = Date.now() + (1000 * 60 * 60); // Set the cookie expire date const expires = new Date(expireDate); diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts index 8a9170a093..f32d7f2b7f 100644 --- a/src/app/shared/host-window.service.ts +++ b/src/app/shared/host-window.service.ts @@ -95,7 +95,7 @@ export class HostWindowService { isMobileView(): Observable { return this.getWidthObs() - .map((width) => width < GridBreakpoint.MD) + .map((width) => width < GridBreakpoint.MD_MIN) .distinctUntilChanged(); } } From e5bd262a2c1d8f70ae481e76a84152e906f48fef Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 8 May 2018 12:11:15 +0200 Subject: [PATCH 59/80] Fixed tests --- src/app/+search-page/search-service/search.service.spec.ts | 2 +- src/app/app.component.spec.ts | 5 ++++- src/app/shared/mocks/mock-auth.service.ts | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 src/app/shared/mocks/mock-auth.service.ts diff --git a/src/app/+search-page/search-service/search.service.spec.ts b/src/app/+search-page/search-service/search.service.spec.ts index 4b558f8726..5cc71d9bbd 100644 --- a/src/app/+search-page/search-service/search.service.spec.ts +++ b/src/app/+search-page/search-service/search.service.spec.ts @@ -7,7 +7,7 @@ import { Component } from '@angular/core'; import { SearchService } from './search.service'; import { ItemDataService } from './../../core/data/item-data.service'; import { ViewMode } from '../../+search-page/search-options.model'; -import { RouteService } from '../../shared/route.service'; +import { RouteService } from '../../shared/services/route.service'; import { GLOBAL_CONFIG } from '../../../config'; import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service'; import { ActivatedRoute, Router, UrlTree } from '@angular/router'; diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 391ff422c8..cbab798f1e 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -26,12 +26,14 @@ import { HostWindowResizeAction } from './shared/host-window.actions'; import { MetadataService } from './core/metadata/metadata.service'; import { GLOBAL_CONFIG, ENV_CONFIG } from '../config'; -import { NativeWindowRef, NativeWindowService } from './shared/window.service'; +import { NativeWindowRef, NativeWindowService } from './shared/services/window.service'; import { MockTranslateLoader } from './shared/mocks/mock-translate-loader'; import { MockMetadataService } from './shared/mocks/mock-metadata-service'; import { Angulartics2GoogleAnalytics } from 'angulartics2/ga'; import { AngularticsMock } from './shared/mocks/mock-angulartics.service'; +import { AuthServiceMock } from './shared/mocks/mock-auth.service'; +import { AuthService } from './core/auth/auth.service'; let comp: AppComponent; let fixture: ComponentFixture; @@ -59,6 +61,7 @@ describe('App component', () => { { provide: NativeWindowService, useValue: new NativeWindowRef() }, { provide: MetadataService, useValue: new MockMetadataService() }, { provide: Angulartics2GoogleAnalytics, useValue: new AngularticsMock() }, + { provide: AuthService, useValue: new AuthServiceMock() }, AppComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/shared/mocks/mock-auth.service.ts b/src/app/shared/mocks/mock-auth.service.ts new file mode 100644 index 0000000000..6258e4aa21 --- /dev/null +++ b/src/app/shared/mocks/mock-auth.service.ts @@ -0,0 +1,6 @@ +/* tslint:disable:no-empty */ +export class AuthServiceMock { + public checksAuthenticationToken() { + return + } +} From 88a05996a6faae2e55389cc36c777491591dec96 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Mon, 14 May 2018 18:45:04 +0200 Subject: [PATCH 60/80] Added tests --- src/app/core/auth/auth.reducer.spec.ts | 410 ++++++++++++++++++ src/app/core/auth/auth.reducers.ts | 5 +- src/app/core/auth/auth.service.spec.ts | 221 ++++++++++ .../testing/auth-request-service-stub.ts | 98 +++++ src/app/shared/testing/eperson-mock.ts | 34 ++ 5 files changed, 766 insertions(+), 2 deletions(-) create mode 100644 src/app/core/auth/auth.reducer.spec.ts create mode 100644 src/app/core/auth/auth.service.spec.ts create mode 100644 src/app/shared/testing/auth-request-service-stub.ts create mode 100644 src/app/shared/testing/eperson-mock.ts diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts new file mode 100644 index 0000000000..411e1064c6 --- /dev/null +++ b/src/app/core/auth/auth.reducer.spec.ts @@ -0,0 +1,410 @@ +import { authReducer, AuthState } from './auth.reducers'; +import { + AddAuthenticationMessageAction, + AuthenticateAction, + AuthenticatedAction, + AuthenticatedErrorAction, + AuthenticatedSuccessAction, + AuthenticationErrorAction, + AuthenticationSuccessAction, + CheckAuthenticationTokenAction, + CheckAuthenticationTokenErrorAction, + LogOutAction, + LogOutErrorAction, + LogOutSuccessAction, + RedirectWhenAuthenticationIsRequiredAction, RedirectWhenTokenExpiredAction, + RefreshTokenAction, + RefreshTokenErrorAction, + RefreshTokenSuccessAction, ResetAuthenticationMessagesAction, SetRedirectUrlAction +} from './auth.actions'; +import { AuthTokenInfo } from './models/auth-token-info.model'; +import { Eperson } from '../eperson/models/eperson.model'; +import { Group } from '../eperson/models/group.model'; +import { EpersonMock } from '../../shared/testing/eperson-mock'; + +describe('authReducer', () => { + + let initialState: AuthState; + let state: AuthState; + const mockTokenInfo = new AuthTokenInfo('test_token'); + const mockError = new Error('Test error message'); + + it('should properly set the state, in response to a AUTHENTICATE action', () => { + initialState = { + authenticated: false, + loaded: false, + loading: false, + }; + const action = new AuthenticateAction('user', 'password'); + const newState = authReducer(initialState, action); + state = { + authenticated: false, + loaded: false, + error: undefined, + loading: true, + info: undefined + }; + + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a AUTHENTICATE_SUCCESS action', () => { + initialState = { + authenticated: false, + loaded: false, + error: undefined, + loading: true, + info: undefined + }; + const action = new AuthenticationSuccessAction(mockTokenInfo); + const newState = authReducer(initialState, action); + + expect(newState).toEqual(initialState); + }); + + it('should properly set the state, in response to a AUTHENTICATE_ERROR action', () => { + initialState = { + authenticated: false, + loaded: false, + error: undefined, + loading: true, + info: undefined + }; + const action = new AuthenticationErrorAction(mockError); + const newState = authReducer(initialState, action); + state = { + authenticated: false, + loaded: false, + loading: false, + info: undefined, + authToken: undefined, + error: 'Test error message' + }; + + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a AUTHENTICATED action', () => { + initialState = { + authenticated: false, + loaded: false, + error: undefined, + loading: true, + info: undefined + }; + const action = new AuthenticatedAction(mockTokenInfo); + const newState = authReducer(initialState, action); + + expect(newState).toEqual(initialState); + }); + + it('should properly set the state, in response to a AUTHENTICATED_SUCCESS action', () => { + initialState = { + authenticated: false, + loaded: false, + error: undefined, + loading: true, + info: undefined + }; + const action = new AuthenticatedSuccessAction(true, mockTokenInfo, EpersonMock); + const newState = authReducer(initialState, action); + state = { + authenticated: true, + authToken: mockTokenInfo, + loaded: true, + error: undefined, + loading: false, + info: undefined, + user: EpersonMock + }; + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a AUTHENTICATED_ERROR action', () => { + initialState = { + authenticated: false, + loaded: false, + error: undefined, + loading: true, + info: undefined + }; + const action = new AuthenticatedErrorAction(mockError); + const newState = authReducer(initialState, action); + state = { + authenticated: false, + authToken: undefined, + error: 'Test error message', + loaded: true, + loading: false, + info: undefined + }; + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a CHECK_AUTHENTICATION_TOKEN action', () => { + initialState = { + authenticated: false, + loaded: false, + loading: false, + }; + const action = new CheckAuthenticationTokenAction(); + const newState = authReducer(initialState, action); + state = { + authenticated: false, + loaded: false, + loading: true, + }; + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a CHECK_AUTHENTICATION_TOKEN_ERROR action', () => { + initialState = { + authenticated: false, + loaded: false, + loading: true, + }; + const action = new CheckAuthenticationTokenErrorAction(); + const newState = authReducer(initialState, action); + state = { + authenticated: false, + loaded: false, + loading: false, + }; + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a LOG_OUT action', () => { + initialState = { + authenticated: true, + authToken: mockTokenInfo, + loaded: true, + error: undefined, + loading: false, + info: undefined, + user: EpersonMock + }; + + const action = new LogOutAction(); + const newState = authReducer(initialState, action); + + expect(newState).toEqual(initialState); + }); + + it('should properly set the state, in response to a LOG_OUT_SUCCESS action', () => { + initialState = { + authenticated: true, + authToken: mockTokenInfo, + loaded: true, + error: undefined, + loading: false, + info: undefined, + user: EpersonMock + }; + + const action = new LogOutSuccessAction(); + const newState = authReducer(initialState, action); + state = { + authenticated: false, + authToken: undefined, + error: undefined, + loaded: false, + loading: false, + info: undefined, + refreshing: false, + user: undefined + }; + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a LOG_OUT_ERROR action', () => { + initialState = { + authenticated: true, + authToken: mockTokenInfo, + loaded: true, + error: undefined, + loading: false, + info: undefined, + user: EpersonMock + }; + + const action = new LogOutErrorAction(mockError); + const newState = authReducer(initialState, action); + state = { + authenticated: true, + authToken: mockTokenInfo, + loaded: true, + error: 'Test error message', + loading: false, + info: undefined, + user: EpersonMock + }; + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a REFRESH_TOKEN action', () => { + initialState = { + authenticated: true, + authToken: mockTokenInfo, + loaded: true, + error: undefined, + loading: false, + info: undefined, + user: EpersonMock + }; + const newTokenInfo = new AuthTokenInfo('Refreshed token'); + const action = new RefreshTokenAction(newTokenInfo); + const newState = authReducer(initialState, action); + state = { + authenticated: true, + authToken: mockTokenInfo, + loaded: true, + error: undefined, + loading: false, + info: undefined, + user: EpersonMock, + refreshing: true + }; + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a REFRESH_TOKEN_SUCCESS action', () => { + initialState = { + authenticated: true, + authToken: mockTokenInfo, + loaded: true, + error: undefined, + loading: false, + info: undefined, + user: EpersonMock, + refreshing: true + }; + const newTokenInfo = new AuthTokenInfo('Refreshed token'); + const action = new RefreshTokenSuccessAction(newTokenInfo); + const newState = authReducer(initialState, action); + state = { + authenticated: true, + authToken: newTokenInfo, + loaded: true, + error: undefined, + loading: false, + info: undefined, + user: EpersonMock, + refreshing: false + }; + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a REFRESH_TOKEN_ERROR action', () => { + initialState = { + authenticated: true, + authToken: mockTokenInfo, + loaded: true, + error: undefined, + loading: false, + info: undefined, + user: EpersonMock, + refreshing: true + }; + const action = new RefreshTokenErrorAction(); + const newState = authReducer(initialState, action); + state = { + authenticated: false, + authToken: undefined, + error: undefined, + loaded: false, + loading: false, + info: undefined, + refreshing: false, + user: undefined + }; + expect(newState).toEqual(state); + }); + + beforeEach(() => { + initialState = { + authenticated: true, + authToken: mockTokenInfo, + loaded: true, + error: undefined, + loading: false, + info: undefined, + user: EpersonMock + }; + + state = { + authenticated: false, + authToken: undefined, + loaded: false, + loading: false, + error: undefined, + info: 'Message', + user: undefined + }; + }); + + it('should properly set the state, in response to a REDIRECT_AUTHENTICATION_REQUIRED action', () => { + const action = new RedirectWhenAuthenticationIsRequiredAction('Message'); + const newState = authReducer(initialState, action); + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a REDIRECT_TOKEN_EXPIRED action', () => { + const action = new RedirectWhenTokenExpiredAction('Message'); + const newState = authReducer(initialState, action); + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a ADD_MESSAGE action', () => { + initialState = { + authenticated: false, + loaded: false, + loading: false, + }; + const action = new AddAuthenticationMessageAction('Message'); + const newState = authReducer(initialState, action); + state = { + authenticated: false, + loaded: false, + loading: false, + info: 'Message' + }; + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a RESET_MESSAGES action', () => { + initialState = { + authenticated: false, + loaded: false, + loading: false, + error: 'Error', + info: 'Message' + }; + const action = new ResetAuthenticationMessagesAction(); + const newState = authReducer(initialState, action); + state = { + authenticated: false, + loaded: false, + loading: false, + error: undefined, + info: undefined + }; + expect(newState).toEqual(state); + }); + + it('should properly set the state, in response to a SET_REDIRECT_URL action', () => { + initialState = { + authenticated: false, + loaded: false, + loading: false + }; + const action = new SetRedirectUrlAction('redirect.url'); + const newState = authReducer(initialState, action); + state = { + authenticated: false, + loaded: false, + loading: false, + redirectUrl: 'redirect.url' + }; + expect(newState).toEqual(state); + }); +}); diff --git a/src/app/core/auth/auth.reducers.ts b/src/app/core/auth/auth.reducers.ts index 9664773ac5..70efddf11e 100644 --- a/src/app/core/auth/auth.reducers.ts +++ b/src/app/core/auth/auth.reducers.ts @@ -98,7 +98,9 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut loading: false }); + case AuthActionTypes.AUTHENTICATED: case AuthActionTypes.AUTHENTICATE_SUCCESS: + case AuthActionTypes.LOG_OUT: return state; case AuthActionTypes.CHECK_AUTHENTICATION_TOKEN: @@ -114,8 +116,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut case AuthActionTypes.LOG_OUT_ERROR: return Object.assign({}, state, { authenticated: true, - error: (action as LogOutErrorAction).payload.message, - user: undefined + error: (action as LogOutErrorAction).payload.message }); case AuthActionTypes.LOG_OUT_SUCCESS: diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts new file mode 100644 index 0000000000..79d56c58dd --- /dev/null +++ b/src/app/core/auth/auth.service.spec.ts @@ -0,0 +1,221 @@ +import { async, inject, TestBed } from '@angular/core/testing'; +import { CommonModule } from '@angular/common'; +import { ActivatedRoute, Router } from '@angular/router'; + +import { Store, StoreModule } from '@ngrx/store'; +import { Observable } from 'rxjs/Observable'; +import { REQUEST } from '@nguniversal/express-engine/tokens'; +import 'rxjs/add/observable/of'; + +import { authReducer, AuthState } from './auth.reducers'; +import { NativeWindowRef, NativeWindowService } from '../../shared/services/window.service'; +import { AuthService } from './auth.service'; +import { RouterStub } from '../../shared/testing/router-stub'; +import { ActivatedRouteStub } from '../../shared/testing/active-router-stub'; + +import { CookieService } from '../../shared/services/cookie.service'; +import { AuthRequestServiceStub } from '../../shared/testing/auth-request-service-stub'; +import { AuthRequestService } from './auth-request.service'; +import { AuthStatus } from './models/auth-status.model'; +import { AuthTokenInfo } from './models/auth-token-info.model'; +import { Eperson } from '../eperson/models/eperson.model'; +import { EpersonMock } from '../../shared/testing/eperson-mock'; +import { AppState } from '../../app.reducer'; +import { ClientCookieService } from '../../shared/services/client-cookie.service'; + +describe('AuthService test', () => { + + const mockStore: Store = jasmine.createSpyObj('store', { + dispatch: {}, + select: Observable.of(true) + }); + let authService: AuthService; + const authRequest = new AuthRequestServiceStub(); + const window = new NativeWindowRef(); + const routerStub = new RouterStub(); + const routeStub = new ActivatedRouteStub(); + let storage: CookieService; + const token: AuthTokenInfo = new AuthTokenInfo('test_token'); + token.expires = Date.now() + (1000 * 60 * 60); + let authenticatedState = { + authenticated: true, + loaded: true, + loading: false, + authToken: token, + user: EpersonMock + }; + + describe('', () => { + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + CommonModule, + StoreModule.forRoot({authReducer}), + ], + declarations: [], + providers: [ + {provide: AuthRequestService, useValue: authRequest}, + {provide: NativeWindowService, useValue: window}, + {provide: REQUEST, useValue: {}}, + {provide: Router, useValue: routerStub}, + {provide: ActivatedRoute, useValue: routeStub}, + {provide: Store, useValue: mockStore}, + CookieService, + AuthService + ], + }); + authService = TestBed.get(AuthService); + }); + + it('should return the authentication status object when user credentials are correct', () => { + authService.authenticate('user', 'password').subscribe((status: AuthStatus) => { + expect(status).toBeDefined(); + }); + }); + + it('should throw an error when user credentials are wrong', () => { + expect(authService.authenticate.bind(null, 'user', 'passwordwrong')).toThrow(); + }); + + it('should return the authenticated user object when user token is valid', () => { + authService.authenticatedUser(new AuthTokenInfo('test_token')).subscribe((user: Eperson) => { + expect(user).toBeDefined(); + }); + }); + + it('should throw an error when user credentials when user token is not valid', () => { + expect(authService.authenticatedUser.bind(null, new AuthTokenInfo('test_token_expired'))).toThrow(); + }); + + it('should return a valid refreshed token', () => { + authService.refreshAuthenticationToken(new AuthTokenInfo('test_token')).subscribe((tokenState: AuthTokenInfo) => { + expect(tokenState).toBeDefined(); + }); + }); + + it('should throw an error when is not possible to refresh token', () => { + expect(authService.refreshAuthenticationToken.bind(null, new AuthTokenInfo('test_token_expired'))).toThrow(); + }); + + it('should return true when logout succeeded', () => { + authService.logout().subscribe((status: boolean) => { + expect(status).toBe(true); + }); + }); + + it('should throw an error when logout is not succeeded', () => { + expect(authService.logout.bind(null)).toThrow(); + }); + + }); + + describe('', () => { + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + StoreModule.forRoot({authReducer}) + ], + providers: [ + {provide: AuthRequestService, useValue: authRequest}, + {provide: REQUEST, useValue: {}}, + {provide: Router, useValue: routerStub}, + CookieService + ] + }).compileComponents(); + })); + + beforeEach(inject([CookieService, AuthRequestService, Store, Router], (cookieService: CookieService, authReqService: AuthRequestService, store: Store, router: Router) => { + store + .subscribe((state) => { + (state as any).core = Object.create({}); + (state as any).core.auth = authenticatedState; + }); + authService = new AuthService({}, window, authReqService, router, cookieService, store); + })); + + it('should return true when user is logged in', () => { + authService.isAuthenticated().subscribe((status: boolean) => { + expect(status).toBe(true); + }); + }); + + it('should return token object when it is valid', () => { + authService.hasValidAuthenticationToken().subscribe((tokenState: AuthTokenInfo) => { + expect(tokenState).toBe(token); + }); + }); + + it('should return a token object', () => { + const result = authService.getToken(); + expect(result).toBe(token); + }); + + it('should return false when token is not expired', () => { + const result = authService.isTokenExpired(); + expect(result).toBe(false); + }); + + }); + + describe('', () => { + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + StoreModule.forRoot({authReducer}) + ], + providers: [ + {provide: AuthRequestService, useValue: authRequest}, + {provide: REQUEST, useValue: {}}, + {provide: Router, useValue: routerStub}, + ClientCookieService, + CookieService + ] + }).compileComponents(); + })); + + beforeEach(inject([ClientCookieService, AuthRequestService, Store, Router], (cookieService: ClientCookieService, authReqService: AuthRequestService, store: Store, router: Router) => { + const expiredToken: AuthTokenInfo = new AuthTokenInfo('test_token'); + expiredToken.expires = Date.now() - (1000 * 60 * 60); + authenticatedState = { + authenticated: true, + loaded: true, + loading: false, + authToken: expiredToken, + user: EpersonMock + }; + store + .subscribe((state) => { + (state as any).core = Object.create({}); + (state as any).core.auth = authenticatedState; + }); + authService = new AuthService({}, window, authReqService, router, cookieService, store); + storage = (authService as any).storage; + spyOn(storage, 'get'); + spyOn(storage, 'remove'); + spyOn(storage, 'set'); + })); + + it('should throw false when token is not valid', () => { + expect(authService.hasValidAuthenticationToken.bind(null)).toThrow(); + }); + + it('should return true when token is expired', () => { + const result = authService.isTokenExpired(); + expect(result).toBe(true); + }); + + it('should save token into storage', () => { + authService.storeToken(token); + expect(storage.set).toHaveBeenCalled(); + }); + + it('should remove token from storage', () => { + authService.removeToken(); + expect(storage.remove).toHaveBeenCalled(); + }); + + }); +}); diff --git a/src/app/shared/testing/auth-request-service-stub.ts b/src/app/shared/testing/auth-request-service-stub.ts new file mode 100644 index 0000000000..b07b7eb406 --- /dev/null +++ b/src/app/shared/testing/auth-request-service-stub.ts @@ -0,0 +1,98 @@ +import { Observable } from 'rxjs/Observable'; +import { HttpOptions } from '../../core/dspace-rest-v2/dspace-rest-v2.service'; +import { AuthStatus } from '../../core/auth/models/auth-status.model'; +import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; +import { Eperson } from '../../core/eperson/models/eperson.model'; +import { isNotEmpty } from '../empty.util'; + +export class AuthRequestServiceStub { + protected mockUser: Eperson = Object.assign(new Eperson(), { + id: 'test', + uuid: 'test', + name: 'User Test', + handle: 'test', + metadata: [ + { + key: 'eperson.firstname', + value: 'User', + language: null, + authority: null, + confidence: 0 + }, + { + key: 'eperson.lastname', + value: 'Test', + language: null, + authority: null, + confidence: 0 + } + ], + groups: [], + netid: 'test', + lastActive: '', + canLogIn: true, + email: 'test@test.com', + requireCertificate: true, + selfRegistered: false, + self: {}, + type: 'eperson' + }); + protected mockTokenInfo = new AuthTokenInfo('test_token'); + + public postToEndpoint(method: string, body: any, options?: HttpOptions): Observable { + const authStatusStub: AuthStatus = new AuthStatus(); + if (isNotEmpty(body)) { + const parsedBody = this.parseQueryString(body); + authStatusStub.okay = true; + if (parsedBody.user === 'user' && parsedBody.password === 'password') { + authStatusStub.authenticated = true; + authStatusStub.token = this.mockTokenInfo; + } else { + authStatusStub.authenticated = false; + } + } else { + const token = (options.headers as any).lazyUpdate[1].value; + if (this.validateToken(token)) { + authStatusStub.authenticated = true; + authStatusStub.token = this.mockTokenInfo; + authStatusStub.eperson = [this.mockUser]; + } else { + authStatusStub.authenticated = false; + } + } + return Observable.of(authStatusStub); + } + + public getRequest(method: string, options?: HttpOptions): Observable { + const authStatusStub: AuthStatus = new AuthStatus(); + switch (method) { + case 'logout': + authStatusStub.authenticated = false; + break; + case 'status': + const token = (options.headers as any).lazyUpdate[1].value; + if (this.validateToken(token)) { + authStatusStub.authenticated = true; + authStatusStub.token = this.mockTokenInfo; + authStatusStub.eperson = [this.mockUser]; + } else { + authStatusStub.authenticated = false; + } + break; + } + return Observable.of(authStatusStub); + } + + private validateToken(token): boolean { + return (token === 'Bearer test_token'); + } + private parseQueryString(query): any { + const obj = Object.create({}); + const vars = query.split('&'); + for (const param of vars) { + const pair = param.split('='); + obj[pair[0]] = pair[1] + } + return obj; + } +} diff --git a/src/app/shared/testing/eperson-mock.ts b/src/app/shared/testing/eperson-mock.ts new file mode 100644 index 0000000000..9cf938fcf2 --- /dev/null +++ b/src/app/shared/testing/eperson-mock.ts @@ -0,0 +1,34 @@ +import { Eperson } from '../../core/eperson/models/eperson.model'; + +export const EpersonMock: Eperson = Object.assign(new Eperson(),{ + handle: null, + groups: [], + netid: 'test@test.com', + lastActive: '2018-05-14T12:25:42.411+0000', + canLogIn: true, + email: 'test@test.com', + requireCertificate: false, + selfRegistered: false, + self: 'https://dspace.4science.it/dspace-spring-rest/api/eperson/epersons/testid', + id: 'testid', + uuid: 'testid', + type: 'eperson', + name: 'User Test', + metadata: [ + { + key: 'eperson.firstname', + language: null, + value: 'User' + }, + { + key: 'eperson.lastname', + language: null, + value: 'Test' + }, + { + key: 'eperson.language', + language: null, + value: 'en' + } + ] +}); From 27a36362cfb8abd1de23f90ba42fd8eef1004839 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 15 May 2018 16:54:27 +0200 Subject: [PATCH 61/80] Added tests --- .../auth-response-parsing.service.spec.ts | 117 +++++++ src/app/core/auth/auth.reducer.spec.ts | 9 +- .../auth-nav-menu.component.html | 4 +- .../auth-nav-menu.component.spec.ts | 297 ++++++++++++++++++ .../shared/log-in/log-in.component.spec.ts | 69 ++-- .../shared/log-out/log-out.component.spec.ts | 100 ++++-- src/app/shared/testing/auth-service-stub.ts | 6 + 7 files changed, 547 insertions(+), 55 deletions(-) create mode 100644 src/app/core/auth/auth-response-parsing.service.spec.ts create mode 100644 src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts create mode 100644 src/app/shared/testing/auth-service-stub.ts diff --git a/src/app/core/auth/auth-response-parsing.service.spec.ts b/src/app/core/auth/auth-response-parsing.service.spec.ts new file mode 100644 index 0000000000..f7d899a9bc --- /dev/null +++ b/src/app/core/auth/auth-response-parsing.service.spec.ts @@ -0,0 +1,117 @@ +import { AuthStatusResponse } from '../cache/response-cache.models'; + +import { ObjectCacheService } from '../cache/object-cache.service'; +import { GlobalConfig } from '../../../config/global-config.interface'; + +import { Store } from '@ngrx/store'; +import { CoreState } from '../core.reducers'; +import { AuthStatus } from './models/auth-status.model'; +import { AuthResponseParsingService } from './auth-response-parsing.service'; +import { AuthGetRequest, AuthPostRequest } from '../data/request.models'; + +describe('ConfigResponseParsingService', () => { + let service: AuthResponseParsingService; + + const EnvConfig = {} as GlobalConfig; + const store = {} as Store; + const objectCacheService = new ObjectCacheService(store); + + beforeEach(() => { + service = new AuthResponseParsingService(EnvConfig, objectCacheService); + }); + + describe('parse', () => { + const validRequest = new AuthPostRequest( + '69f375b5-19f4-4453-8c7a-7dc5c55aafbb', + 'https://rest.api/dspace-spring-rest/api/authn/login', + 'password=test&user=myself@testshib.org'); + + const validRequest2 = new AuthGetRequest( + '69f375b5-19f4-4453-8c7a-7dc5c55aafbb', + 'https://rest.api/dspace-spring-rest/api/authn/status'); + + const validResponse = { + payload: { + authenticated: true, + id: null, + okay: true, + token: { + accessToken: 'eyJhbGciOiJIUzI1NiJ9.eyJlaWQiOiI0ZGM3MGFiNS1jZDczLTQ5MmYtYjAwNy0zMTc5ZDJkOTI5NmIiLCJzZyI6W10sImV4cCI6MTUyNjMxODMyMn0.ASmvcbJFBfzhN7D5ncloWnaVZr5dLtgTuOgHaCKiimc', + expires: 1526318322000 + }, + } as AuthStatus, + statusCode: '200' + }; + + const validResponse1 = { + payload: {}, + statusCode: '404' + }; + + const validResponse2 = { + payload: { + authenticated: true, + id: null, + okay: true, + type: 'status', + _embedded: { + eperson: { + canLogIn: true, + email: 'myself@testshib.org', + groups: [], + handle: null, + id: '4dc70ab5-cd73-492f-b007-3179d2d9296b', + lastActive: '2018-05-14T17:03:31.277+0000', + metadata: [ + { + key: 'eperson.firstname', + language: null, + value: 'User' + }, + { + key: 'eperson.lastname', + language: null, + value: 'Test' + }, + { + key: 'eperson.language', + language: null, + value: 'en' + } + ], + name: 'User Test', + netid: 'myself@testshib.org', + requireCertificate: false, + selfRegistered: false, + type: 'eperson', + uuid: '4dc70ab5-cd73-492f-b007-3179d2d9296b', + _links: { + self: 'https://hasselt-dspace.dev01.4science.it/dspace-spring-rest/api/eperson/epersons/4dc70ab5-cd73-492f-b007-3179d2d9296b' + } + } + }, + _links: { + eperson: 'https://hasselt-dspace.dev01.4science.it/dspace-spring-rest/api/eperson/epersons/4dc70ab5-cd73-492f-b007-3179d2d9296b', + self: 'https://hasselt-dspace.dev01.4science.it/dspace-spring-rest/api/authn/status' + } + }, + statusCode: '200' + }; + + it('should return a AuthStatusResponse if data contains a valid AuthStatus object as payload', () => { + const response = service.parse(validRequest, validResponse); + expect(response.constructor).toBe(AuthStatusResponse); + }); + + it('should return a AuthStatusResponse if data contains a valid endpoint response', () => { + const response = service.parse(validRequest2, validResponse2); + expect(response.constructor).toBe(AuthStatusResponse); + }); + + it('should return a AuthStatusResponse if data contains an empty 404 endpoint response', () => { + const response = service.parse(validRequest, validResponse1); + expect(response.constructor).toBe(AuthStatusResponse); + }); + + }); +}); diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts index 411e1064c6..d64aa824e5 100644 --- a/src/app/core/auth/auth.reducer.spec.ts +++ b/src/app/core/auth/auth.reducer.spec.ts @@ -12,14 +12,15 @@ import { LogOutAction, LogOutErrorAction, LogOutSuccessAction, - RedirectWhenAuthenticationIsRequiredAction, RedirectWhenTokenExpiredAction, + RedirectWhenAuthenticationIsRequiredAction, + RedirectWhenTokenExpiredAction, RefreshTokenAction, RefreshTokenErrorAction, - RefreshTokenSuccessAction, ResetAuthenticationMessagesAction, SetRedirectUrlAction + RefreshTokenSuccessAction, + ResetAuthenticationMessagesAction, + SetRedirectUrlAction } from './auth.actions'; import { AuthTokenInfo } from './models/auth-token-info.model'; -import { Eperson } from '../eperson/models/eperson.model'; -import { Group } from '../eperson/models/group.model'; import { EpersonMock } from '../../shared/testing/eperson-mock'; describe('authReducer', () => { diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html index e67e49a2f0..7203dc07ab 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html @@ -8,7 +8,7 @@
    • - {{ 'nav.login' | translate }}(current) + {{ 'nav.login' | translate }}(current)
    • @@ -19,7 +19,7 @@
    • - {{ 'nav.logout' | translate }}(current) + {{ 'nav.logout' | translate }}(current)
    diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts new file mode 100644 index 0000000000..fb63389206 --- /dev/null +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts @@ -0,0 +1,297 @@ +import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core'; +import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; + +import { By } from '@angular/platform-browser'; +import { Store, StoreModule } from '@ngrx/store'; + +import { authReducer, AuthState } from '../../core/auth/auth.reducers'; +import { EpersonMock } from '../testing/eperson-mock'; +import { TranslateModule } from '@ngx-translate/core'; +import { AppState } from '../../app.reducer'; +import { AuthNavMenuComponent } from './auth-nav-menu.component'; +import { HostWindowServiceStub } from '../testing/host-window-service-stub'; +import { HostWindowService } from '../host-window.service'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; + +describe('AuthNavMenuComponent', () => { + + let component: AuthNavMenuComponent; + let deNavMenu: DebugElement; + let deNavMenuItem: DebugElement; + let fixture: ComponentFixture; + + const notAuthState: AuthState = { + authenticated: false, + loaded: false, + loading: false + }; + const authState: AuthState = { + authenticated: true, + loaded: true, + loading: false, + authToken: new AuthTokenInfo('test_token'), + user: EpersonMock + }; + let routerState = { + url: '/home' + }; + + describe('when is a not mobile view', () => { + beforeEach(async(() => { + const window = new HostWindowServiceStub(800); + + // refine the test module by declaring the test component + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, + StoreModule.forRoot(authReducer), + TranslateModule.forRoot() + ], + declarations: [ + AuthNavMenuComponent + ], + providers: [ + {provide: HostWindowService, useValue: window}, + ], + schemas: [ + CUSTOM_ELEMENTS_SCHEMA + ] + }) + .compileComponents(); + + })); + + describe('when route is /login and user is not authenticated', () => { + routerState = { + url: '/login' + }; + beforeEach(inject([Store], (store: Store) => { + store + .subscribe((state) => { + (state as any).router = Object.create({}); + (state as any).router.state = routerState; + (state as any).core = Object.create({}); + (state as any).core.auth = notAuthState; + }); + + // create component and test fixture + fixture = TestBed.createComponent(AuthNavMenuComponent); + + // get test component from the fixture + component = fixture.componentInstance; + + fixture.detectChanges(); + + const navMenuSelector = '.navbar-nav'; + deNavMenu = fixture.debugElement.query(By.css(navMenuSelector)); + + const navMenuItemSelector = 'li'; + deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector)); + })); + + it('should not render', () => { + expect(component).toBeTruthy(); + expect(deNavMenu.nativeElement).toBeDefined(); + expect(deNavMenuItem).toBeNull(); + }); + + }); + + describe('when route is /logout and user is authenticated', () => { + routerState = { + url: '/logout' + }; + beforeEach(inject([Store], (store: Store) => { + store + .subscribe((state) => { + (state as any).router = Object.create({}); + (state as any).router.state = routerState; + (state as any).core = Object.create({}); + (state as any).core.auth = authState; + }); + + // create component and test fixture + fixture = TestBed.createComponent(AuthNavMenuComponent); + + // get test component from the fixture + component = fixture.componentInstance; + + fixture.detectChanges(); + + const navMenuSelector = '.navbar-nav'; + deNavMenu = fixture.debugElement.query(By.css(navMenuSelector)); + + const navMenuItemSelector = 'li'; + deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector)); + })); + + it('should not render', () => { + expect(component).toBeTruthy(); + expect(deNavMenu.nativeElement).toBeDefined(); + expect(deNavMenuItem).toBeNull(); + }); + + }); + + describe('when route is not /login neither /logout', () => { + describe('when user is not authenticated', () => { + + beforeEach(inject([Store], (store: Store) => { + routerState = { + url: '/home' + }; + store + .subscribe((state) => { + (state as any).router = Object.create({}); + (state as any).router.state = routerState; + (state as any).core = Object.create({}); + (state as any).core.auth = notAuthState; + }); + + // create component and test fixture + fixture = TestBed.createComponent(AuthNavMenuComponent); + + // get test component from the fixture + component = fixture.componentInstance; + + fixture.detectChanges(); + + const navMenuSelector = '.navbar-nav'; + deNavMenu = fixture.debugElement.query(By.css(navMenuSelector)); + + const navMenuItemSelector = 'li'; + deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector)); + })); + + it('should render login dropdown menu', () => { + const loginDropdownMenu = deNavMenuItem.query(By.css('div[id=loginDropdownMenu]')); + expect(loginDropdownMenu.nativeElement).toBeDefined(); + }); + }); + + describe('when user is authenticated', () => { + beforeEach(inject([Store], (store: Store) => { + routerState = { + url: '/home' + }; + store + .subscribe((state) => { + (state as any).router = Object.create({}); + (state as any).router.state = routerState; + (state as any).core = Object.create({}); + (state as any).core.auth = authState; + }); + + // create component and test fixture + fixture = TestBed.createComponent(AuthNavMenuComponent); + + // get test component from the fixture + component = fixture.componentInstance; + + fixture.detectChanges(); + + const navMenuSelector = '.navbar-nav'; + deNavMenu = fixture.debugElement.query(By.css(navMenuSelector)); + + const navMenuItemSelector = 'li'; + deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector)); + })); + + it('should render logout dropdown menu', () => { + const logoutDropdownMenu = deNavMenuItem.query(By.css('div[id=logoutDropdownMenu]')); + expect(logoutDropdownMenu.nativeElement).toBeDefined(); + }); + }) + }) + }); + + describe('when is a mobile view', () => { + beforeEach(async(() => { + const window = new HostWindowServiceStub(300); + + // refine the test module by declaring the test component + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, + StoreModule.forRoot(authReducer), + TranslateModule.forRoot() + ], + declarations: [ + AuthNavMenuComponent + ], + providers: [ + {provide: HostWindowService, useValue: window}, + ], + schemas: [ + CUSTOM_ELEMENTS_SCHEMA + ] + }) + .compileComponents(); + + })); + + describe('when user is not authenticated', () => { + + beforeEach(inject([Store], (store: Store) => { + store + .subscribe((state) => { + (state as any).router = Object.create({}); + (state as any).router.state = routerState; + (state as any).core = Object.create({}); + (state as any).core.auth = notAuthState; + }); + + // create component and test fixture + fixture = TestBed.createComponent(AuthNavMenuComponent); + + // get test component from the fixture + component = fixture.componentInstance; + + fixture.detectChanges(); + + const navMenuSelector = '.navbar-nav'; + deNavMenu = fixture.debugElement.query(By.css(navMenuSelector)); + + const navMenuItemSelector = 'li'; + deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector)); + })); + + it('should render login link', () => { + const loginDropdownMenu = deNavMenuItem.query(By.css('a[id=loginLink]')); + expect(loginDropdownMenu.nativeElement).toBeDefined(); + }); + }); + + describe('when user is authenticated', () => { + beforeEach(inject([Store], (store: Store) => { + store + .subscribe((state) => { + (state as any).router = Object.create({}); + (state as any).router.state = routerState; + (state as any).core = Object.create({}); + (state as any).core.auth = authState; + }); + + // create component and test fixture + fixture = TestBed.createComponent(AuthNavMenuComponent); + + // get test component from the fixture + component = fixture.componentInstance; + + fixture.detectChanges(); + + const navMenuSelector = '.navbar-nav'; + deNavMenu = fixture.debugElement.query(By.css(navMenuSelector)); + + const navMenuItemSelector = 'li'; + deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector)); + })); + + it('should render logout link', inject([Store], (store: Store) => { + const logoutDropdownMenu = deNavMenuItem.query(By.css('a[id=logoutLink]')); + expect(logoutDropdownMenu.nativeElement).toBeDefined(); + })); + }) + }) +}); diff --git a/src/app/shared/log-in/log-in.component.spec.ts b/src/app/shared/log-in/log-in.component.spec.ts index c73a8e481d..eab1d65ad0 100644 --- a/src/app/shared/log-in/log-in.component.spec.ts +++ b/src/app/shared/log-in/log-in.component.spec.ts @@ -1,33 +1,34 @@ -/* tslint:disable:no-unused-variable */ -/*import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core'; -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MaterialModule } from '@angular/material'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; +import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; + import { By } from '@angular/platform-browser'; import { Store, StoreModule } from '@ngrx/store'; -import { go } from '@ngrx/router-store'; -// reducers -import { reducer } from '../../app.reducers'; - -// models -import { User } from '../../core/models/user'; - -// services -import { MOCK_USER } from '../../core/services/user.service'; - -// this component to test import { LogInComponent } from './log-in.component'; +import { authReducer } from '../../core/auth/auth.reducers'; +import { EpersonMock } from '../testing/eperson-mock'; +import { Eperson } from '../../core/eperson/models/eperson.model'; +import { TranslateModule } from '@ngx-translate/core'; +import { AuthService } from '../../core/auth/auth.service'; +import { AuthServiceStub } from '../testing/auth-service-stub'; +import { AppState } from '../../app.reducer'; describe('LogInComponent', () => { let component: LogInComponent; let fixture: ComponentFixture; let page: Page; - let user: User = new User(); + let user: Eperson; + + const authState = { + authenticated: false, + loaded: false, + loading: false, + }; beforeEach(() => { - user = MOCK_USER; + user = EpersonMock; }); beforeEach(async(() => { @@ -35,27 +36,37 @@ describe('LogInComponent', () => { TestBed.configureTestingModule({ imports: [ FormsModule, - MaterialModule, ReactiveFormsModule, - StoreModule.provideStore(reducer) + StoreModule.forRoot(authReducer), + TranslateModule.forRoot() ], declarations: [ LogInComponent ], + providers: [ + {provide: AuthService, useClass: AuthServiceStub} + ], schemas: [ CUSTOM_ELEMENTS_SCHEMA ] }) - .compileComponents(); + .compileComponents(); + + })); + + beforeEach(inject([Store], (store: Store) => { + store + .subscribe((state) => { + (state as any).core = Object.create({}); + (state as any).core.auth = authState; + }); // create component and test fixture fixture = TestBed.createComponent(LogInComponent); // get test component from the fixture component = fixture.componentInstance; - })); - beforeEach(() => { // create page page = new Page(component, fixture); @@ -63,7 +74,8 @@ describe('LogInComponent', () => { fixture.whenStable().then(() => { page.addPageElements(); }); - }); + + })); it('should create a FormGroup comprised of FormControls', () => { fixture.detectChanges(); @@ -74,8 +86,8 @@ describe('LogInComponent', () => { fixture.detectChanges(); // set FormControl values - component.form.controls['email'].setValue(user.email); - component.form.controls['password'].setValue(user.password); + component.form.controls.email.setValue('user'); + component.form.controls.password.setValue('password'); // submit form component.submit(); @@ -90,7 +102,6 @@ describe('LogInComponent', () => { * * @class Page */ -/* class Page { public emailInput: HTMLInputElement; @@ -103,16 +114,14 @@ class Page { const store = injector.get(Store); // add spies - this.navigateSpy = spyOn(store, 'dispatch'); + this.navigateSpy = spyOn(store, 'dispatch'); } public addPageElements() { const emailInputSelector = 'input[formcontrolname=\'email\']'; - // console.log(this.fixture.debugElement.query(By.css(emailInputSelector))); this.emailInput = this.fixture.debugElement.query(By.css(emailInputSelector)).nativeElement; const passwordInputSelector = 'input[formcontrolname=\'password\']'; this.passwordInput = this.fixture.debugElement.query(By.css(passwordInputSelector)).nativeElement; } } -*/ diff --git a/src/app/shared/log-out/log-out.component.spec.ts b/src/app/shared/log-out/log-out.component.spec.ts index cb83b96892..7e07e1b7cc 100644 --- a/src/app/shared/log-out/log-out.component.spec.ts +++ b/src/app/shared/log-out/log-out.component.spec.ts @@ -1,46 +1,108 @@ -/* tslint:disable:no-unused-variable */ -/*import { DebugElement, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { Router } from '@angular/router'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -// import ngrx import { Store, StoreModule } from '@ngrx/store'; -// reducers -import { reducer } from '../../app.reducers'; +import { authReducer } from '../../core/auth/auth.reducers'; +import { EpersonMock } from '../testing/eperson-mock'; +import { Eperson } from '../../core/eperson/models/eperson.model'; +import { TranslateModule } from '@ngx-translate/core'; +import { Router } from '@angular/router'; +import { AppState } from '../../app.reducer'; +import { LogOutComponent } from './log-out.component'; +import { RouterStub } from '../testing/router-stub'; -// test this component -import { SignOutComponent } from './log-out.component'; +describe('LogOutComponent', () => { -describe('Component: Signout', () => { - let component: SignOutComponent; - let fixture: ComponentFixture; + let component: LogOutComponent; + let fixture: ComponentFixture; + let page: Page; + let user: Eperson; + + const authState = { + authenticated: false, + loaded: false, + loading: false, + }; + const routerStub = new RouterStub(); + + beforeEach(() => { + user = EpersonMock; + }); beforeEach(async(() => { // refine the test module by declaring the test component TestBed.configureTestingModule({ imports: [ - StoreModule.provideStore(reducer) + FormsModule, + ReactiveFormsModule, + StoreModule.forRoot(authReducer), + TranslateModule.forRoot() ], declarations: [ - SignOutComponent + LogOutComponent + ], + providers: [ + {provide: Router, useValue: routerStub}, ], schemas: [ CUSTOM_ELEMENTS_SCHEMA ] }) - .compileComponents(); + .compileComponents(); + + })); + + beforeEach(inject([Store], (store: Store) => { + store + .subscribe((state) => { + (state as any).core = Object.create({}); + (state as any).core.auth = authState; + }); // create component and test fixture - fixture = TestBed.createComponent(SignOutComponent); + fixture = TestBed.createComponent(LogOutComponent); // get test component from the fixture component = fixture.componentInstance; + + // create page + page = new Page(component, fixture); + })); it('should create an instance', () => { - expect(component).toBeTruthy(); + expect(component).toBeTruthy(); + }); + + it('should log out', () => { + fixture.detectChanges(); + + // submit form + component.logOut(); + + // verify Store.dispatch() is invoked + expect(page.navigateSpy.calls.any()).toBe(true, 'Store.dispatch not invoked'); }); }); -*/ + +/** + * I represent the DOM elements and attach spies. + * + * @class Page + */ +class Page { + + public navigateSpy: jasmine.Spy; + + constructor(private component: LogOutComponent, private fixture: ComponentFixture) { + // use injector to get services + const injector = fixture.debugElement.injector; + const store = injector.get(Store); + + // add spies + this.navigateSpy = spyOn(store, 'dispatch'); + } + +} diff --git a/src/app/shared/testing/auth-service-stub.ts b/src/app/shared/testing/auth-service-stub.ts new file mode 100644 index 0000000000..5c5f2c67dd --- /dev/null +++ b/src/app/shared/testing/auth-service-stub.ts @@ -0,0 +1,6 @@ +export class AuthServiceStub { + + public redirectToPreviousUrl() { + return; + } +} From 989a405947353b349e7b29a648727327bc8e89bc Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 15 May 2018 17:14:39 +0200 Subject: [PATCH 62/80] Fixed merge --- src/app/core/core.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index f3e2292db1..0ed48c23d5 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -105,7 +105,7 @@ const PROVIDERS = [ provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true - } + }, NotificationsService, { provide: NativeWindowService, useFactory: NativeWindowFactory } ]; From 4fc76139b9dad9d178226251f1c849eebce9d815 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 15 May 2018 18:12:35 +0200 Subject: [PATCH 63/80] Added tests --- .../+login-page/login-page.component.spec.ts | 47 +++++++++++++++++++ .../logout-page.component.spec.ts | 31 ++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 src/app/+login-page/login-page.component.spec.ts create mode 100644 src/app/+logout-page/logout-page.component.spec.ts diff --git a/src/app/+login-page/login-page.component.spec.ts b/src/app/+login-page/login-page.component.spec.ts new file mode 100644 index 0000000000..2ac555b793 --- /dev/null +++ b/src/app/+login-page/login-page.component.spec.ts @@ -0,0 +1,47 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { Store } from '@ngrx/store'; +import { TranslateModule } from '@ngx-translate/core'; +import { Observable } from 'rxjs/Observable'; +import 'rxjs/add/Observable/of'; + +import { LoginPageComponent } from './login-page.component'; + +fdescribe('LoginPageComponent', () => { + let comp: LoginPageComponent; + let fixture: ComponentFixture; + + const store: Store = jasmine.createSpyObj('store', { + /* tslint:disable:no-empty */ + dispatch: {}, + /* tslint:enable:no-empty */ + select: Observable.of(true) + }); + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot() + ], + declarations: [LoginPageComponent], + providers: [ + { + provide: Store, useValue: store + } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(LoginPageComponent); + comp = fixture.componentInstance; // SearchPageComponent test instance + fixture.detectChanges(); + }); + + it('should create instance', () => { + expect(comp).toBeDefined() + }); + +}); diff --git a/src/app/+logout-page/logout-page.component.spec.ts b/src/app/+logout-page/logout-page.component.spec.ts new file mode 100644 index 0000000000..fe169accc3 --- /dev/null +++ b/src/app/+logout-page/logout-page.component.spec.ts @@ -0,0 +1,31 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; + +import { LogoutPageComponent } from './logout-page.component'; + +fdescribe('LogoutPageComponent', () => { + let comp: LogoutPageComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot() + ], + declarations: [LogoutPageComponent], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(LogoutPageComponent); + comp = fixture.componentInstance; // SearchPageComponent test instance + fixture.detectChanges(); + }); + + it('should create instance', () => { + expect(comp).toBeDefined() + }); + +}); From b3e62b428b9590791a8318dc632a7580a6552fcd Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 15 May 2018 18:26:41 +0200 Subject: [PATCH 64/80] Fixed tests --- src/app/+login-page/login-page.component.spec.ts | 2 +- src/app/+logout-page/logout-page.component.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/+login-page/login-page.component.spec.ts b/src/app/+login-page/login-page.component.spec.ts index 2ac555b793..688fe88295 100644 --- a/src/app/+login-page/login-page.component.spec.ts +++ b/src/app/+login-page/login-page.component.spec.ts @@ -8,7 +8,7 @@ import 'rxjs/add/Observable/of'; import { LoginPageComponent } from './login-page.component'; -fdescribe('LoginPageComponent', () => { +describe('LoginPageComponent', () => { let comp: LoginPageComponent; let fixture: ComponentFixture; diff --git a/src/app/+logout-page/logout-page.component.spec.ts b/src/app/+logout-page/logout-page.component.spec.ts index fe169accc3..5fd4e076f2 100644 --- a/src/app/+logout-page/logout-page.component.spec.ts +++ b/src/app/+logout-page/logout-page.component.spec.ts @@ -4,7 +4,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { LogoutPageComponent } from './logout-page.component'; -fdescribe('LogoutPageComponent', () => { +describe('LogoutPageComponent', () => { let comp: LogoutPageComponent; let fixture: ComponentFixture; From e0ac7ea045e56473faaad8ca4eb4b70fff9b5f36 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 15 May 2018 18:40:59 +0200 Subject: [PATCH 65/80] Fixed test --- src/app/+login-page/login-page.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/+login-page/login-page.component.spec.ts b/src/app/+login-page/login-page.component.spec.ts index 688fe88295..609cf47794 100644 --- a/src/app/+login-page/login-page.component.spec.ts +++ b/src/app/+login-page/login-page.component.spec.ts @@ -4,7 +4,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/Observable/of'; +import 'rxjs/add/observable/of'; import { LoginPageComponent } from './login-page.component'; From f34490db71c064a03a52ee5d27d8d6cc4100698e Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 16 May 2018 16:00:43 +0200 Subject: [PATCH 66/80] Added tests --- src/app/core/auth/auth.effects.spec.ts | 198 ++++++++++++++++++++ src/app/core/auth/auth.effects.ts | 42 +++-- src/app/shared/testing/auth-service-stub.ts | 48 +++++ 3 files changed, 270 insertions(+), 18 deletions(-) create mode 100644 src/app/core/auth/auth.effects.spec.ts diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts new file mode 100644 index 0000000000..12679fc325 --- /dev/null +++ b/src/app/core/auth/auth.effects.spec.ts @@ -0,0 +1,198 @@ +import { cold, hot } from 'jasmine-marbles'; +import { Observable } from 'rxjs/Observable'; +import { TestBed } from '@angular/core/testing'; +import { provideMockActions } from '@ngrx/effects/testing'; +import { AuthEffects } from './auth.effects'; +import { + AuthActionTypes, + AuthenticatedAction, + AuthenticatedErrorAction, + AuthenticatedSuccessAction, + AuthenticationErrorAction, + AuthenticationSuccessAction, + CheckAuthenticationTokenErrorAction, + LogOutErrorAction, + LogOutSuccessAction, + RefreshTokenErrorAction, + RefreshTokenSuccessAction +} from './auth.actions'; +import { AuthTokenInfo } from './models/auth-token-info.model'; +import { AuthServiceStub } from '../../shared/testing/auth-service-stub'; +import { AuthService } from './auth.service'; +import { TruncatablesState } from '../../shared/truncatable/truncatable.reducer'; +import { Store } from '@ngrx/store'; +import { EpersonMock } from '../../shared/testing/eperson-mock'; + +describe('AuthEffects', () => { + let authEffects: AuthEffects; + let actions: Observable; + const store: Store = jasmine.createSpyObj('store', { + /* tslint:disable:no-empty */ + dispatch: {}, + /* tslint:enable:no-empty */ + select: Observable.of(true) + }); + const token = new AuthTokenInfo('token_test'); + + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ + AuthEffects, + {provide: AuthService, useClass: AuthServiceStub}, + {provide: Store, useValue: store}, + provideMockActions(() => actions), + // other providers + ], + }); + + authEffects = TestBed.get(AuthEffects); + }); + + describe('authenticate$', () => { + describe('when credentials are correct', () => { + it('should return a AUTHENTICATE_SUCCESS action in response to a AUTHENTICATE action', () => { + actions = hot('--a-', { + a: { + type: AuthActionTypes.AUTHENTICATE, + payload: {email: 'user', password: 'password'} + } + }); + + const expected = cold('--b-', {b: new AuthenticationSuccessAction(new AuthTokenInfo('token_test'))}); + + expect(authEffects.authenticate$).toBeObservable(expected); + }); + }); + + describe('when credentials are wrong', () => { + it('should return a AUTHENTICATE_ERROR action in response to a AUTHENTICATE action', () => { + spyOn((authEffects as any).authService, 'authenticate').and.returnValue(Observable.throw(new Error('Message Error test'))); + + actions = hot('--a-', { + a: { + type: AuthActionTypes.AUTHENTICATE, + payload: {email: 'user', password: 'wrongpassword'} + } + }); + + const expected = cold('--b-', {b: new AuthenticationErrorAction(new Error('Message Error test'))}); + + expect(authEffects.authenticate$).toBeObservable(expected); + }); + }); + }); + + describe('authenticateSuccess$', () => { + + it('should return a AUTHENTICATED action in response to a AUTHENTICATE_SUCCESS action', () => { + actions = hot('--a-', {a: {type: AuthActionTypes.AUTHENTICATE_SUCCESS, payload: token}}); + + const expected = cold('--b-', {b: new AuthenticatedAction(new AuthTokenInfo('token_test'))}); + + expect(authEffects.authenticateSuccess$).toBeObservable(expected); + }); + }); + + describe('authenticated$', () => { + + describe('when token is valid', () => { + it('should return a AUTHENTICATED_SUCCESS action in response to a AUTHENTICATED action', () => { + actions = hot('--a-', {a: {type: AuthActionTypes.AUTHENTICATED, payload: token}}); + + const expected = cold('--b-', {b: new AuthenticatedSuccessAction(true, token, EpersonMock)}); + + expect(authEffects.authenticated$).toBeObservable(expected); + }); + }); + + describe('when token is not valid', () => { + it('should return a AUTHENTICATED_ERROR action in response to a AUTHENTICATED action', () => { + spyOn((authEffects as any).authService, 'authenticatedUser').and.returnValue(Observable.throw(new Error('Message Error test'))); + + actions = hot('--a-', {a: {type: AuthActionTypes.AUTHENTICATED, payload: token}}); + + const expected = cold('--b-', {b: new AuthenticatedErrorAction(new Error('Message Error test'))}); + + expect(authEffects.authenticated$).toBeObservable(expected); + }); + }); + }); + + describe('checkToken$', () => { + + describe('when check token succeeded', () => { + it('should return a AUTHENTICATED action in response to a CHECK_AUTHENTICATION_TOKEN action', () => { + + actions = hot('--a-', {a: {type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN}}); + + const expected = cold('--b-', {b: new AuthenticatedAction(new AuthTokenInfo('token_test'))}); + + expect(authEffects.checkToken$).toBeObservable(expected); + }); + }); + + describe('when check token failed', () => { + it('should return a CHECK_AUTHENTICATION_TOKEN_ERROR action in response to a CHECK_AUTHENTICATION_TOKEN action', () => { + spyOn((authEffects as any).authService, 'hasValidAuthenticationToken').and.returnValue(Observable.throw('')); + + actions = hot('--a-', {a: {type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN, payload: token}}); + + const expected = cold('--b-', {b: new CheckAuthenticationTokenErrorAction()}); + + expect(authEffects.checkToken$).toBeObservable(expected); + }); + }) + }); + + describe('refreshToken$', () => { + + describe('when refresh token succeeded', () => { + it('should return a REFRESH_TOKEN_SUCCESS action in response to a REFRESH_TOKEN action', () => { + + actions = hot('--a-', {a: {type: AuthActionTypes.REFRESH_TOKEN}}); + + const expected = cold('--b-', {b: new RefreshTokenSuccessAction(new AuthTokenInfo('token_test'))}); + + expect(authEffects.refreshToken$).toBeObservable(expected); + }); + }); + + describe('when refresh token failed', () => { + it('should return a REFRESH_TOKEN_ERROR action in response to a REFRESH_TOKEN action', () => { + spyOn((authEffects as any).authService, 'refreshAuthenticationToken').and.returnValue(Observable.throw('')); + + actions = hot('--a-', {a: {type: AuthActionTypes.REFRESH_TOKEN, payload: token}}); + + const expected = cold('--b-', {b: new RefreshTokenErrorAction()}); + + expect(authEffects.refreshToken$).toBeObservable(expected); + }); + }) + }); + + describe('logOut$', () => { + + describe('when refresh token succeeded', () => { + it('should return a LOG_OUT_SUCCESS action in response to a LOG_OUT action', () => { + + actions = hot('--a-', {a: {type: AuthActionTypes.LOG_OUT}}); + + const expected = cold('--b-', {b: new LogOutSuccessAction()}); + + expect(authEffects.logOut$).toBeObservable(expected); + }); + }); + + describe('when refresh token failed', () => { + it('should return a REFRESH_TOKEN_ERROR action in response to a LOG_OUT action', () => { + spyOn((authEffects as any).authService, 'logout').and.returnValue(Observable.throw(new Error('Message Error test'))); + + actions = hot('--a-', {a: {type: AuthActionTypes.LOG_OUT, payload: token}}); + + const expected = cold('--b-', {b: new LogOutErrorAction(new Error('Message Error test'))}); + + expect(authEffects.logOut$).toBeObservable(expected); + }); + }) + }); +}); diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index f3bebebbcd..60fe04a5d1 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; // import @ngrx -import { Effect, Actions } from '@ngrx/effects'; +import { Actions, Effect } from '@ngrx/effects'; import { Action, Store } from '@ngrx/store'; // import rxjs @@ -9,16 +9,22 @@ import { Observable } from 'rxjs/Observable'; // import services import { AuthService } from './auth.service'; - // import actions import { - AuthActionTypes, AuthenticateAction, AuthenticatedAction, + AuthActionTypes, + AuthenticateAction, + AuthenticatedAction, AuthenticatedErrorAction, AuthenticatedSuccessAction, AuthenticationErrorAction, - AuthenticationSuccessAction, CheckAuthenticationTokenErrorAction, + AuthenticationSuccessAction, + CheckAuthenticationTokenErrorAction, LogOutErrorAction, - LogOutSuccessAction, RefreshTokenAction, RefreshTokenErrorAction, RefreshTokenSuccessAction, RegistrationAction, + LogOutSuccessAction, + RefreshTokenAction, + RefreshTokenErrorAction, + RefreshTokenSuccessAction, + RegistrationAction, RegistrationErrorAction, RegistrationSuccessAction } from './auth.actions'; @@ -37,7 +43,7 @@ export class AuthEffects { * @method authenticate */ @Effect() - public authenticate: Observable = this.actions$ + public authenticate$: Observable = this.actions$ .ofType(AuthActionTypes.AUTHENTICATE) .switchMap((action: AuthenticateAction) => { return this.authService.authenticate(action.payload.email, action.payload.password) @@ -47,13 +53,13 @@ export class AuthEffects { }); @Effect() - public authenticateSuccess: Observable = this.actions$ + public authenticateSuccess$: Observable = this.actions$ .ofType(AuthActionTypes.AUTHENTICATE_SUCCESS) .do((action: AuthenticationSuccessAction) => this.authService.storeToken(action.payload)) .map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload)); @Effect() - public authenticated: Observable = this.actions$ + public authenticated$: Observable = this.actions$ .ofType(AuthActionTypes.AUTHENTICATED) .switchMap((action: AuthenticatedAction) => { return this.authService.authenticatedUser(action.payload) @@ -63,12 +69,12 @@ export class AuthEffects { // It means "reacts to this action but don't send another" @Effect({dispatch: false}) - public authenticatedError: Observable = this.actions$ + public authenticatedError$: Observable = this.actions$ .ofType(AuthActionTypes.AUTHENTICATED_ERROR) .do((action: LogOutSuccessAction) => this.authService.removeToken()); @Effect() - public checkToken: Observable = this.actions$ + public checkToken$: Observable = this.actions$ .ofType(AuthActionTypes.CHECK_AUTHENTICATION_TOKEN) .switchMap(() => { return this.authService.hasValidAuthenticationToken() @@ -77,7 +83,7 @@ export class AuthEffects { }); @Effect() - public createUser: Observable = this.actions$ + public createUser$: Observable = this.actions$ .ofType(AuthActionTypes.REGISTRATION) .debounceTime(500) // to remove when functionality is implemented .switchMap((action: RegistrationAction) => { @@ -87,7 +93,7 @@ export class AuthEffects { }); @Effect() - public refreshToken: Observable = this.actions$ + public refreshToken$: Observable = this.actions$ .ofType(AuthActionTypes.REFRESH_TOKEN) .switchMap((action: RefreshTokenAction) => { return this.authService.refreshAuthenticationToken(action.payload) @@ -97,7 +103,7 @@ export class AuthEffects { // It means "reacts to this action but don't send another" @Effect({dispatch: false}) - public refreshTokenSuccess: Observable = this.actions$ + public refreshTokenSuccess$: Observable = this.actions$ .ofType(AuthActionTypes.REFRESH_TOKEN_SUCCESS) .do((action: RefreshTokenSuccessAction) => this.authService.replaceToken(action.payload)); @@ -106,7 +112,7 @@ export class AuthEffects { * clear a possible invalid token or authentication errors */ @Effect({dispatch: false}) - public clearInvalidTokenOnRehydrate = this.actions$ + public clearInvalidTokenOnRehydrate$: Observable = this.actions$ .ofType(StoreActionTypes.REHYDRATE) .switchMap(() => { return this.store.select(isAuthenticated) @@ -117,7 +123,7 @@ export class AuthEffects { }); @Effect() - public logOut: Observable = this.actions$ + public logOut$: Observable = this.actions$ .ofType(AuthActionTypes.LOG_OUT) .switchMap(() => { return this.authService.logout() @@ -126,19 +132,19 @@ export class AuthEffects { }); @Effect({dispatch: false}) - public logOutSuccess: Observable = this.actions$ + public logOutSuccess$: Observable = this.actions$ .ofType(AuthActionTypes.LOG_OUT_SUCCESS) .do(() => this.authService.removeToken()) .do(() => this.authService.refreshAfterLogout()); @Effect({dispatch: false}) - public redirectToLogin: Observable = this.actions$ + public redirectToLogin$: Observable = this.actions$ .ofType(AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED) .do(() => this.authService.removeToken()) .do(() => this.authService.redirectToLogin()); @Effect({dispatch: false}) - public redirectToLoginTokenExpired: Observable = this.actions$ + public redirectToLoginTokenExpired$: Observable = this.actions$ .ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED) .do(() => this.authService.removeToken()) .do(() => this.authService.redirectToLoginWhenTokenExpired()); diff --git a/src/app/shared/testing/auth-service-stub.ts b/src/app/shared/testing/auth-service-stub.ts index 5c5f2c67dd..2a8e2f467f 100644 --- a/src/app/shared/testing/auth-service-stub.ts +++ b/src/app/shared/testing/auth-service-stub.ts @@ -1,6 +1,54 @@ +import { AuthStatus } from '../../core/auth/models/auth-status.model'; +import { Observable } from 'rxjs/Observable'; +import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; +import { EpersonMock } from './eperson-mock'; +import { Eperson } from '../../core/eperson/models/eperson.model'; + export class AuthServiceStub { + public authenticate(user: string, password: string): Observable { + if (user === 'user' && password === 'password') { + const authStatus = new AuthStatus(); + authStatus.okay = true; + authStatus.authenticated = true; + authStatus.token = new AuthTokenInfo('token_test'); + authStatus.eperson = [EpersonMock]; + return Observable.of(authStatus); + } else { + console.log('error'); + throw(new Error('Message Error test')); + } + } + + public authenticatedUser(token: AuthTokenInfo): Observable { + if (token.accessToken === 'token_test') { + return Observable.of(EpersonMock); + } else { + throw(new Error('Message Error test')); + } + } + + public hasValidAuthenticationToken(): Observable { + return Observable.of(new AuthTokenInfo('token_test')); + } + + public logout(): Observable { + return Observable.of(true); + } + + public refreshAuthenticationToken(token: AuthTokenInfo): Observable { + return Observable.of(new AuthTokenInfo('token_test')); + } + public redirectToPreviousUrl() { return; } + + public removeToken() { + return; + } + + public storeToken(token: AuthTokenInfo) { + return; + } } From f66dd32658cb4de73812e9c3f42517663b950760 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 17 May 2018 11:05:26 +0200 Subject: [PATCH 67/80] Added tests --- src/app/core/auth/auth.effects.spec.ts | 26 +++-- src/app/core/auth/auth.interceptor.spec.ts | 98 +++++++++++++++++++ .../testing/auth-request-service-stub.ts | 33 +------ src/app/shared/testing/auth-service-stub.ts | 47 ++++++++- 4 files changed, 161 insertions(+), 43 deletions(-) create mode 100644 src/app/core/auth/auth.interceptor.spec.ts diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts index 12679fc325..fae5015184 100644 --- a/src/app/core/auth/auth.effects.spec.ts +++ b/src/app/core/auth/auth.effects.spec.ts @@ -1,7 +1,12 @@ -import { cold, hot } from 'jasmine-marbles'; -import { Observable } from 'rxjs/Observable'; import { TestBed } from '@angular/core/testing'; + import { provideMockActions } from '@ngrx/effects/testing'; +import { Store } from '@ngrx/store'; +import { cold, hot } from 'jasmine-marbles'; + +import { Observable } from 'rxjs/Observable'; +import 'rxjs/add/observable/of' + import { AuthEffects } from './auth.effects'; import { AuthActionTypes, @@ -20,25 +25,27 @@ import { AuthTokenInfo } from './models/auth-token-info.model'; import { AuthServiceStub } from '../../shared/testing/auth-service-stub'; import { AuthService } from './auth.service'; import { TruncatablesState } from '../../shared/truncatable/truncatable.reducer'; -import { Store } from '@ngrx/store'; + import { EpersonMock } from '../../shared/testing/eperson-mock'; describe('AuthEffects', () => { let authEffects: AuthEffects; let actions: Observable; + + const authServiceStub = new AuthServiceStub(); const store: Store = jasmine.createSpyObj('store', { /* tslint:disable:no-empty */ dispatch: {}, /* tslint:enable:no-empty */ select: Observable.of(true) }); - const token = new AuthTokenInfo('token_test'); + const token = authServiceStub.getToken(); beforeEach(() => { TestBed.configureTestingModule({ providers: [ AuthEffects, - {provide: AuthService, useClass: AuthServiceStub}, + {provide: AuthService, useValue: authServiceStub}, {provide: Store, useValue: store}, provideMockActions(() => actions), // other providers @@ -58,7 +65,8 @@ describe('AuthEffects', () => { } }); - const expected = cold('--b-', {b: new AuthenticationSuccessAction(new AuthTokenInfo('token_test'))}); + + const expected = cold('--b-', {b: new AuthenticationSuccessAction(token)}); expect(authEffects.authenticate$).toBeObservable(expected); }); @@ -87,7 +95,7 @@ describe('AuthEffects', () => { it('should return a AUTHENTICATED action in response to a AUTHENTICATE_SUCCESS action', () => { actions = hot('--a-', {a: {type: AuthActionTypes.AUTHENTICATE_SUCCESS, payload: token}}); - const expected = cold('--b-', {b: new AuthenticatedAction(new AuthTokenInfo('token_test'))}); + const expected = cold('--b-', {b: new AuthenticatedAction(token)}); expect(authEffects.authenticateSuccess$).toBeObservable(expected); }); @@ -125,7 +133,7 @@ describe('AuthEffects', () => { actions = hot('--a-', {a: {type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN}}); - const expected = cold('--b-', {b: new AuthenticatedAction(new AuthTokenInfo('token_test'))}); + const expected = cold('--b-', {b: new AuthenticatedAction(token)}); expect(authEffects.checkToken$).toBeObservable(expected); }); @@ -151,7 +159,7 @@ describe('AuthEffects', () => { actions = hot('--a-', {a: {type: AuthActionTypes.REFRESH_TOKEN}}); - const expected = cold('--b-', {b: new RefreshTokenSuccessAction(new AuthTokenInfo('token_test'))}); + const expected = cold('--b-', {b: new RefreshTokenSuccessAction(token)}); expect(authEffects.refreshToken$).toBeObservable(expected); }); diff --git a/src/app/core/auth/auth.interceptor.spec.ts b/src/app/core/auth/auth.interceptor.spec.ts new file mode 100644 index 0000000000..528c2cfab3 --- /dev/null +++ b/src/app/core/auth/auth.interceptor.spec.ts @@ -0,0 +1,98 @@ +import { TestBed } from '@angular/core/testing'; +import { HttpClientTestingModule, HttpTestingController, } from '@angular/common/http/testing'; +import { HTTP_INTERCEPTORS } from '@angular/common/http'; +import { Router } from '@angular/router'; + +import { Store } from '@ngrx/store'; +import { Observable } from 'rxjs/Observable'; + +import { AuthInterceptor } from './auth.interceptor'; +import { AuthService } from './auth.service'; +import { DSpaceRESTv2Service } from '../dspace-rest-v2/dspace-rest-v2.service'; +import { RestRequestMethod } from '../data/request.models'; +import { RouterStub } from '../../shared/testing/router-stub'; +import { TruncatablesState } from '../../shared/truncatable/truncatable.reducer'; +import { AuthServiceStub } from '../../shared/testing/auth-service-stub'; + +describe(`AuthInterceptor`, () => { + let service: DSpaceRESTv2Service; + let httpMock: HttpTestingController; + + const authServiceStub = new AuthServiceStub(); + const store: Store = jasmine.createSpyObj('store', { + /* tslint:disable:no-empty */ + dispatch: {}, + /* tslint:enable:no-empty */ + select: Observable.of(true) + }); + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + DSpaceRESTv2Service, + {provide: AuthService, useValue: authServiceStub}, + {provide: Router, useClass: RouterStub}, + { + provide: HTTP_INTERCEPTORS, + useClass: AuthInterceptor, + multi: true, + }, + {provide: Store, useValue: store}, + ], + }); + + service = TestBed.get(DSpaceRESTv2Service); + httpMock = TestBed.get(HttpTestingController); + }); + + describe('when has a valid token', () => { + + it('should not add an Authorization header when we’re sending a HTTP request to \'authn\' endpoint', () => { + service.request(RestRequestMethod.Post, 'dspace-spring-rest/api/authn/login', 'password=password&user=user').subscribe((response) => { + expect(response).toBeTruthy(); + }); + + const httpRequest = httpMock.expectOne(`dspace-spring-rest/api/authn/login`); + + const token = httpRequest.request.headers.get('authorization'); + expect(token).toBeNull(); + }); + + it('should add an Authorization header when we’re sending a HTTP request to \'authn\' endpoint', () => { + service.request(RestRequestMethod.Post, 'dspace-spring-rest/api/submission/workspaceitems', 'test').subscribe((response) => { + expect(response).toBeTruthy(); + }); + + const httpRequest = httpMock.expectOne(`dspace-spring-rest/api/submission/workspaceitems`); + + expect(httpRequest.request.headers.has('authorization')); + const token = httpRequest.request.headers.get('authorization'); + expect(token).toBe('Bearer token_test'); + }); + + }); + + describe('when has an expired token', () => { + + beforeEach(() => { + authServiceStub.setTokenAsExpired(); + }); + + afterEach(() => { + authServiceStub.setTokenAsNotExpired(); + }); + + it('should redirect to login', () => { + + service.request(RestRequestMethod.Post, 'dspace-spring-rest/api/submission/workspaceitems', 'password=password&user=user').subscribe((response) => { + expect(response).toBeTruthy(); + }); + + service.request(RestRequestMethod.Post, 'dspace-spring-rest/api/submission/workspaceitems', 'password=password&user=user'); + + httpMock.expectNone('dspace-spring-rest/api/submission/workspaceitems'); + }); + }) + +}); diff --git a/src/app/shared/testing/auth-request-service-stub.ts b/src/app/shared/testing/auth-request-service-stub.ts index b07b7eb406..2c47068af4 100644 --- a/src/app/shared/testing/auth-request-service-stub.ts +++ b/src/app/shared/testing/auth-request-service-stub.ts @@ -4,39 +4,10 @@ import { AuthStatus } from '../../core/auth/models/auth-status.model'; import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; import { Eperson } from '../../core/eperson/models/eperson.model'; import { isNotEmpty } from '../empty.util'; +import { EpersonMock } from './eperson-mock'; export class AuthRequestServiceStub { - protected mockUser: Eperson = Object.assign(new Eperson(), { - id: 'test', - uuid: 'test', - name: 'User Test', - handle: 'test', - metadata: [ - { - key: 'eperson.firstname', - value: 'User', - language: null, - authority: null, - confidence: 0 - }, - { - key: 'eperson.lastname', - value: 'Test', - language: null, - authority: null, - confidence: 0 - } - ], - groups: [], - netid: 'test', - lastActive: '', - canLogIn: true, - email: 'test@test.com', - requireCertificate: true, - selfRegistered: false, - self: {}, - type: 'eperson' - }); + protected mockUser: Eperson = EpersonMock; protected mockTokenInfo = new AuthTokenInfo('test_token'); public postToEndpoint(method: string, body: any, options?: HttpOptions): Observable { diff --git a/src/app/shared/testing/auth-service-stub.ts b/src/app/shared/testing/auth-service-stub.ts index 2a8e2f467f..c7d5556910 100644 --- a/src/app/shared/testing/auth-service-stub.ts +++ b/src/app/shared/testing/auth-service-stub.ts @@ -6,12 +6,19 @@ import { Eperson } from '../../core/eperson/models/eperson.model'; export class AuthServiceStub { + token: AuthTokenInfo = new AuthTokenInfo('token_test'); + private _tokenExpired = false; + + constructor() { + this.token.expires = Date.now() + (1000 * 60 * 60); + } + public authenticate(user: string, password: string): Observable { if (user === 'user' && password === 'password') { const authStatus = new AuthStatus(); authStatus.okay = true; authStatus.authenticated = true; - authStatus.token = new AuthTokenInfo('token_test'); + authStatus.token = this.token; authStatus.eperson = [EpersonMock]; return Observable.of(authStatus); } else { @@ -28,16 +35,46 @@ export class AuthServiceStub { } } + public buildAuthHeader(token?: AuthTokenInfo): string { + return `Bearer ${token.accessToken}`; + } + + public getToken(): AuthTokenInfo { + return this.token; + } + public hasValidAuthenticationToken(): Observable { - return Observable.of(new AuthTokenInfo('token_test')); + return Observable.of(this.token); } public logout(): Observable { return Observable.of(true); } + public isTokenExpired(token?: AuthTokenInfo): boolean { + return this._tokenExpired; + } + + /** + * This method is used to ease testing + */ + public setTokenAsExpired() { + this._tokenExpired = true + } + + /** + * This method is used to ease testing + */ + public setTokenAsNotExpired() { + this._tokenExpired = false + } + + public isTokenExpiring(): Observable { + return Observable.of(false); + } + public refreshAuthenticationToken(token: AuthTokenInfo): Observable { - return Observable.of(new AuthTokenInfo('token_test')); + return Observable.of(this.token); } public redirectToPreviousUrl() { @@ -48,6 +85,10 @@ export class AuthServiceStub { return; } + setRedirectUrl(url: string) { + return; + } + public storeToken(token: AuthTokenInfo) { return; } From d43d36513e045cce5380b22a91dcaed44c67e85b Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 17 May 2018 11:16:27 +0200 Subject: [PATCH 68/80] Fixed auth.effects.spec --- src/app/core/auth/auth.effects.spec.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts index fae5015184..3b569e523f 100644 --- a/src/app/core/auth/auth.effects.spec.ts +++ b/src/app/core/auth/auth.effects.spec.ts @@ -21,7 +21,6 @@ import { RefreshTokenErrorAction, RefreshTokenSuccessAction } from './auth.actions'; -import { AuthTokenInfo } from './models/auth-token-info.model'; import { AuthServiceStub } from '../../shared/testing/auth-service-stub'; import { AuthService } from './auth.service'; import { TruncatablesState } from '../../shared/truncatable/truncatable.reducer'; @@ -65,7 +64,6 @@ describe('AuthEffects', () => { } }); - const expected = cold('--b-', {b: new AuthenticationSuccessAction(token)}); expect(authEffects.authenticate$).toBeObservable(expected); From 95d6527e314e564c5b1b76659752e01d5ccaf5fe Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Mon, 21 May 2018 17:06:38 +0200 Subject: [PATCH 69/80] Fixes --- src/app/shared/auth-nav-menu/auth-nav-menu.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts index 7633278d0c..bef7ac3f3a 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts @@ -50,7 +50,7 @@ export class AuthNavMenuComponent implements OnInit { this.showAuth = this.store.select(routerStateSelector) .filter((router: RouterReducerState) => isNotUndefined(router) && isNotUndefined(router.state)) .map((router: RouterReducerState) => { - return router.state.url !== LOGIN_ROUTE && router.state.url !== LOGOUT_ROUTE; + return !router.state.url.startsWith(LOGIN_ROUTE) && !router.state.url.startsWith(LOGOUT_ROUTE); }); } } From e0efa5f8e53c133d5fddd71232acac3499a782ed Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 23 May 2018 18:13:34 +0200 Subject: [PATCH 70/80] changes based on review comments --- src/app/+login-page/login-page.component.html | 6 +- .../+logout-page/logout-page.component.html | 4 +- src/app/app.component.ts | 2 +- src/app/core/auth/auth.actions.ts | 3 +- src/app/core/auth/auth.reducer.spec.ts | 2 +- .../{auth.reducers.ts => auth.reducer.ts} | 101 ++------------- src/app/core/auth/auth.service.spec.ts | 2 +- src/app/core/auth/auth.service.ts | 2 +- src/app/core/auth/models/auth-status.model.ts | 8 +- src/app/core/auth/selectors.ts | 115 +++++++++++++++--- src/app/core/auth/server-auth.service.ts | 2 +- src/app/core/core.module.ts | 2 - src/app/core/core.reducers.ts | 2 +- src/app/core/data/request.service.spec.ts | 79 ++++++------ src/app/core/data/request.service.ts | 15 +-- .../auth-nav-menu.component.scss | 1 + .../auth-nav-menu.component.spec.ts | 2 +- .../shared/log-in/log-in.component.spec.ts | 2 +- src/app/shared/log-out/log-out.component.html | 2 +- .../shared/log-out/log-out.component.spec.ts | 2 +- .../shared/services/platform.service.spec.ts | 59 --------- src/app/shared/services/platform.service.ts | 20 --- 22 files changed, 175 insertions(+), 258 deletions(-) rename src/app/core/auth/{auth.reducers.ts => auth.reducer.ts} (65%) delete mode 100644 src/app/shared/services/platform.service.spec.ts delete mode 100644 src/app/shared/services/platform.service.ts diff --git a/src/app/+login-page/login-page.component.html b/src/app/+login-page/login-page.component.html index 8ff87748ca..6dcb11fbb0 100644 --- a/src/app/+login-page/login-page.component.html +++ b/src/app/+login-page/login-page.component.html @@ -1,6 +1,6 @@ -
    -
    -
    +
    +
    +

    {{"login.form.header" | translate}}

    diff --git a/src/app/+logout-page/logout-page.component.html b/src/app/+logout-page/logout-page.component.html index 77da9482aa..9c6185b665 100644 --- a/src/app/+logout-page/logout-page.component.html +++ b/src/app/+logout-page/logout-page.component.html @@ -1,6 +1,6 @@ -
    +
    -
    +

    {{"logout.form.header" | translate}}

    diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 3df38a163f..1c1a47cf12 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -54,7 +54,7 @@ export class AppComponent implements OnInit { this.store.select(isAuthenticated) .take(1) .filter((authenticated) => !authenticated) - .subscribe((authenticated) => this.authService.checksAuthenticationToken()); + .subscribe((authenticated) => this.authService.checkAuthenticationToken()); } diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts index 0aed7bca36..207e8fae70 100644 --- a/src/app/core/auth/auth.actions.ts +++ b/src/app/core/auth/auth.actions.ts @@ -329,8 +329,7 @@ export class SetRedirectUrlAction implements Action { * @type {AuthActions} */ export type AuthActions - = - AuthenticateAction + = AuthenticateAction | AuthenticatedAction | AuthenticatedErrorAction | AuthenticatedSuccessAction diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts index d64aa824e5..f148f3ac8d 100644 --- a/src/app/core/auth/auth.reducer.spec.ts +++ b/src/app/core/auth/auth.reducer.spec.ts @@ -1,4 +1,4 @@ -import { authReducer, AuthState } from './auth.reducers'; +import { authReducer, AuthState } from './auth.reducer'; import { AddAuthenticationMessageAction, AuthenticateAction, diff --git a/src/app/core/auth/auth.reducers.ts b/src/app/core/auth/auth.reducer.ts similarity index 65% rename from src/app/core/auth/auth.reducers.ts rename to src/app/core/auth/auth.reducer.ts index 70efddf11e..c3a425c192 100644 --- a/src/app/core/auth/auth.reducers.ts +++ b/src/app/core/auth/auth.reducer.ts @@ -1,11 +1,16 @@ // import actions import { AddAuthenticationMessageAction, - AuthActions, AuthActionTypes, AuthenticatedSuccessAction, AuthenticationErrorAction, - AuthenticationSuccessAction, LogOutErrorAction, RedirectWhenAuthenticationIsRequiredAction, - RedirectWhenTokenExpiredAction, RefreshTokenSuccessAction, SetRedirectUrlAction + AuthActions, + AuthActionTypes, + AuthenticatedSuccessAction, + AuthenticationErrorAction, + LogOutErrorAction, + RedirectWhenAuthenticationIsRequiredAction, + RedirectWhenTokenExpiredAction, + RefreshTokenSuccessAction, + SetRedirectUrlAction } from './auth.actions'; - // import models import { Eperson } from '../eperson/models/eperson.model'; import { AuthTokenInfo } from './models/auth-token-info.model'; @@ -186,91 +191,3 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut return state; } } - -/** - * Returns true if the user is authenticated. - * @function _isAuthenticated - * @param {State} state - * @returns {boolean} - */ -export const _isAuthenticated = (state: AuthState) => state.authenticated; - -/** - * Returns true if the authenticated has loaded. - * @function _isAuthenticatedLoaded - * @param {State} state - * @returns {boolean} - */ -export const _isAuthenticatedLoaded = (state: AuthState) => state.loaded; - -/** - * Return the users state - * @function _getAuthenticatedUser - * @param {State} state - * @returns {User} - */ -export const _getAuthenticatedUser = (state: AuthState) => state.user; - -/** - * Returns the authentication error. - * @function _getAuthenticationError - * @param {State} state - * @returns {string} - */ -export const _getAuthenticationError = (state: AuthState) => state.error; - -/** - * Returns the authentication info message. - * @function _getAuthenticationInfo - * @param {State} state - * @returns {string} - */ -export const _getAuthenticationInfo = (state: AuthState) => state.info; - -/** - * Returns true if request is in progress. - * @function _isLoading - * @param {State} state - * @returns {boolean} - */ -export const _isLoading = (state: AuthState) => state.loading; - -/** - * Returns true if a refresh token request is in progress. - * @function _isRefreshing - * @param {State} state - * @returns {boolean} - */ -export const _isRefreshing = (state: AuthState) => state.refreshing; - -/** - * Returns the authentication token. - * @function _getAuthenticationToken - * @param {State} state - * @returns {AuthToken} - */ -export const _getAuthenticationToken = (state: AuthState) => state.authToken; - -/** - * Returns the sign out error. - * @function _getLogOutError - * @param {State} state - * @returns {string} - */ -export const _getLogOutError = (state: AuthState) => state.error; - -/** - * Returns the sign up error. - * @function _getRegistrationError - * @param {State} state - * @returns {string} - */ -export const _getRegistrationError = (state: AuthState) => state.error; - -/** - * Returns the redirect url. - * @function _getRedirectUrl - * @param {State} state - * @returns {string} - */ -export const _getRedirectUrl = (state: AuthState) => state.redirectUrl; diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts index 79d56c58dd..b54f65078e 100644 --- a/src/app/core/auth/auth.service.spec.ts +++ b/src/app/core/auth/auth.service.spec.ts @@ -7,7 +7,7 @@ import { Observable } from 'rxjs/Observable'; import { REQUEST } from '@nguniversal/express-engine/tokens'; import 'rxjs/add/observable/of'; -import { authReducer, AuthState } from './auth.reducers'; +import { authReducer, AuthState } from './auth.reducer'; import { NativeWindowRef, NativeWindowService } from '../../shared/services/window.service'; import { AuthService } from './auth.service'; import { RouterStub } from '../../shared/testing/router-stub'; diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index fb83d491e6..c0386b12aa 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -138,7 +138,7 @@ export class AuthService { /** * Checks if token is present into browser storage and is valid. (NB Check is done only on SSR) */ - public checksAuthenticationToken() { + public checkAuthenticationToken() { return } diff --git a/src/app/core/auth/models/auth-status.model.ts b/src/app/core/auth/models/auth-status.model.ts index 98a07c0e9d..22c9d14718 100644 --- a/src/app/core/auth/models/auth-status.model.ts +++ b/src/app/core/auth/models/auth-status.model.ts @@ -3,7 +3,9 @@ import { AuthTokenInfo } from './auth-token-info.model'; import { DSpaceObject } from '../../shared/dspace-object.model'; import { Eperson } from '../../eperson/models/eperson.model'; -export class AuthStatus extends DSpaceObject { +export class AuthStatus { + + id: string; okay: boolean; @@ -13,5 +15,7 @@ export class AuthStatus extends DSpaceObject { eperson: Eperson[]; - token?: AuthTokenInfo + token?: AuthTokenInfo; + + self: string; } diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts index 9d592eba0c..24353a04a2 100644 --- a/src/app/core/auth/selectors.ts +++ b/src/app/core/auth/selectors.ts @@ -1,15 +1,12 @@ import { createSelector } from '@ngrx/store'; -import { AuthState } from './auth.reducers'; -import { coreSelector, CoreState } from '../core.reducers'; - /** * Every reducer module's default export is the reducer function itself. In * addition, each module should export a type or interface that describes * the state of the reducer plus any selector functions. The `* as` * notation packages up all of the exports into a single object. */ -import * as auth from './auth.reducers'; +import { AuthState } from './auth.reducer'; import { AppState } from '../../app.reducer'; /** @@ -20,6 +17,94 @@ import { AppState } from '../../app.reducer'; */ export const getAuthState = (state: any) => state.core.auth; +/** + * Returns true if the user is authenticated. + * @function _isAuthenticated + * @param {State} state + * @returns {boolean} + */ +const _isAuthenticated = (state: AuthState) => state.authenticated; + +/** + * Returns true if the authenticated has loaded. + * @function _isAuthenticatedLoaded + * @param {State} state + * @returns {boolean} + */ +const _isAuthenticatedLoaded = (state: AuthState) => state.loaded; + +/** + * Return the users state + * @function _getAuthenticatedUser + * @param {State} state + * @returns {User} + */ +const _getAuthenticatedUser = (state: AuthState) => state.user; + +/** + * Returns the authentication error. + * @function _getAuthenticationError + * @param {State} state + * @returns {string} + */ +const _getAuthenticationError = (state: AuthState) => state.error; + +/** + * Returns the authentication info message. + * @function _getAuthenticationInfo + * @param {State} state + * @returns {string} + */ +const _getAuthenticationInfo = (state: AuthState) => state.info; + +/** + * Returns true if request is in progress. + * @function _isLoading + * @param {State} state + * @returns {boolean} + */ +const _isLoading = (state: AuthState) => state.loading; + +/** + * Returns true if a refresh token request is in progress. + * @function _isRefreshing + * @param {State} state + * @returns {boolean} + */ +const _isRefreshing = (state: AuthState) => state.refreshing; + +/** + * Returns the authentication token. + * @function _getAuthenticationToken + * @param {State} state + * @returns {AuthToken} + */ +const _getAuthenticationToken = (state: AuthState) => state.authToken; + +/** + * Returns the sign out error. + * @function _getLogOutError + * @param {State} state + * @returns {string} + */ +const _getLogOutError = (state: AuthState) => state.error; + +/** + * Returns the sign up error. + * @function _getRegistrationError + * @param {State} state + * @returns {string} + */ +const _getRegistrationError = (state: AuthState) => state.error; + +/** + * Returns the redirect url. + * @function _getRedirectUrl + * @param {State} state + * @returns {string} + */ +const _getRedirectUrl = (state: AuthState) => state.redirectUrl; + /** * Returns the authenticated user * @function getAuthenticatedUser @@ -27,7 +112,7 @@ export const getAuthState = (state: any) => state.core.auth; * @param {any} props * @return {User} */ -export const getAuthenticatedUser = createSelector(getAuthState, auth._getAuthenticatedUser); +export const getAuthenticatedUser = createSelector(getAuthState, _getAuthenticatedUser); /** * Returns the authentication error. @@ -36,7 +121,7 @@ export const getAuthenticatedUser = createSelector(getAuthState, auth._getAuthen * @param {any} props * @return {Error} */ -export const getAuthenticationError = createSelector(getAuthState, auth._getAuthenticationError); +export const getAuthenticationError = createSelector(getAuthState, _getAuthenticationError); /** * Returns the authentication info message. @@ -45,7 +130,7 @@ export const getAuthenticationError = createSelector(getAuthState, auth._getAuth * @param {any} props * @return {string} */ -export const getAuthenticationInfo = createSelector(getAuthState, auth._getAuthenticationInfo); +export const getAuthenticationInfo = createSelector(getAuthState, _getAuthenticationInfo); /** * Returns true if the user is authenticated @@ -54,7 +139,7 @@ export const getAuthenticationInfo = createSelector(getAuthState, auth._getAuthe * @param {any} props * @return {boolean} */ -export const isAuthenticated = createSelector(getAuthState, auth._isAuthenticated); +export const isAuthenticated = createSelector(getAuthState, _isAuthenticated); /** * Returns true if the user is authenticated @@ -63,7 +148,7 @@ export const isAuthenticated = createSelector(getAuthState, auth._isAuthenticate * @param {any} props * @return {boolean} */ -export const isAuthenticatedLoaded = createSelector(getAuthState, auth._isAuthenticatedLoaded); +export const isAuthenticatedLoaded = createSelector(getAuthState, _isAuthenticatedLoaded); /** * Returns true if the authentication request is loading. @@ -72,7 +157,7 @@ export const isAuthenticatedLoaded = createSelector(getAuthState, auth._isAuthen * @param {any} props * @return {boolean} */ -export const isAuthenticationLoading = createSelector(getAuthState, auth._isLoading); +export const isAuthenticationLoading = createSelector(getAuthState, _isLoading); /** * Returns true if the refresh token request is loading. @@ -81,7 +166,7 @@ export const isAuthenticationLoading = createSelector(getAuthState, auth._isLoad * @param {any} props * @return {boolean} */ -export const isTokenRefreshing = createSelector(getAuthState, auth._isRefreshing); +export const isTokenRefreshing = createSelector(getAuthState, _isRefreshing); /** * Returns the authentication token. @@ -89,7 +174,7 @@ export const isTokenRefreshing = createSelector(getAuthState, auth._isRefreshing * @param {State} state * @returns {AuthToken} */ -export const getAuthenticationToken = createSelector(getAuthState, auth._getAuthenticationToken); +export const getAuthenticationToken = createSelector(getAuthState, _getAuthenticationToken); /** * Returns the log out error. @@ -98,7 +183,7 @@ export const getAuthenticationToken = createSelector(getAuthState, auth._getAuth * @param {any} props * @return {Error} */ -export const getLogOutError = createSelector(getAuthState, auth._getLogOutError); +export const getLogOutError = createSelector(getAuthState, _getLogOutError); /** * Returns the registration error. @@ -107,7 +192,7 @@ export const getLogOutError = createSelector(getAuthState, auth._getLogOutError) * @param {any} props * @return {Error} */ -export const getRegistrationError = createSelector(getAuthState, auth._getRegistrationError); +export const getRegistrationError = createSelector(getAuthState, _getRegistrationError); /** * Returns the redirect url.. @@ -116,4 +201,4 @@ export const getRegistrationError = createSelector(getAuthState, auth._getRegist * @param {any} props * @return {string} */ -export const getRedirectUrl = createSelector(getAuthState, auth._getRedirectUrl); +export const getRedirectUrl = createSelector(getAuthState, _getRedirectUrl); diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts index 8ecf692e9e..afbf4611be 100644 --- a/src/app/core/auth/server-auth.service.ts +++ b/src/app/core/auth/server-auth.service.ts @@ -47,7 +47,7 @@ export class ServerAuthService extends AuthService { /** * Checks if token is present into browser storage and is valid. (NB Check is done only on SSR) */ - public checksAuthenticationToken() { + public checkAuthenticationToken() { this.store.dispatch(new CheckAuthenticationTokenAction()) } diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index be5cbcc71c..e4f30ed815 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -46,7 +46,6 @@ import { AuthRequestService } from './auth/auth-request.service'; import { AuthResponseParsingService } from './auth/auth-response-parsing.service'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { AuthInterceptor } from './auth/auth.interceptor'; -import { PlatformService } from '../shared/services/platform.service'; import { HALEndpointService } from './shared/hal-endpoint.service'; import { FacetValueResponseParsingService } from './data/facet-value-response-parsing.service'; import { FacetValueMapResponseParsingService } from './data/facet-value-map-response-parsing.service'; @@ -82,7 +81,6 @@ const PROVIDERS = [ MetadataService, ObjectCacheService, PaginationComponentOptions, - PlatformService, RemoteDataBuildService, RequestService, ResponseCacheService, diff --git a/src/app/core/core.reducers.ts b/src/app/core/core.reducers.ts index 37027465b4..c764a2acff 100644 --- a/src/app/core/core.reducers.ts +++ b/src/app/core/core.reducers.ts @@ -4,7 +4,7 @@ import { responseCacheReducer, ResponseCacheState } from './cache/response-cache import { objectCacheReducer, ObjectCacheState } from './cache/object-cache.reducer'; import { indexReducer, IndexState } from './index/index.reducer'; import { requestReducer, RequestState } from './data/request.reducer'; -import { authReducer, AuthState } from './auth/auth.reducers'; +import { authReducer, AuthState } from './auth/auth.reducer'; export interface CoreState { 'data/object': ObjectCacheState, diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts index 9f82f32c4e..aa9954f680 100644 --- a/src/app/core/data/request.service.spec.ts +++ b/src/app/core/data/request.service.spec.ts @@ -1,6 +1,7 @@ import { Store } from '@ngrx/store'; import { cold, hot } from 'jasmine-marbles'; import { Observable } from 'rxjs/Observable'; +import 'rxjs/add/observable/of'; import { getMockObjectCacheService } from '../../shared/mocks/mock-object-cache.service'; import { getMockResponseCacheService } from '../../shared/mocks/mock-response-cache.service'; import { getMockStore } from '../../shared/mocks/mock-store'; @@ -229,6 +230,11 @@ describe('RequestService', () => { request = testGetRequest; }); + it('should track it on it\'s way to the store', () => { + spyOn(serviceAsAny, 'trackRequestsOnTheirWayToTheStore'); + service.configure(request); + expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).toHaveBeenCalledWith(request); + }); describe('and it isn\'t cached or pending', () => { beforeEach(() => { spyOn(serviceAsAny, 'isCachedOrPending').and.returnValue(false); @@ -236,7 +242,7 @@ describe('RequestService', () => { it('should dispatch the request', () => { service.configure(request); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(request, false); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(request); }); }); describe('and it is already cached or pending', () => { @@ -254,22 +260,44 @@ describe('RequestService', () => { describe('when the request isn\'t a GET request', () => { it('should dispatch the request', () => { service.configure(testPostRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPostRequest, false); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPostRequest); service.configure(testPutRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPutRequest, false); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPutRequest); service.configure(testDeleteRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testDeleteRequest, false); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testDeleteRequest); service.configure(testOptionsRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testOptionsRequest, false); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testOptionsRequest); service.configure(testHeadRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testHeadRequest, false); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testHeadRequest); service.configure(testPatchRequest); - expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPatchRequest, false); + expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(testPatchRequest); + }); + + it('shouldn\'t track it on it\'s way to the store', () => { + spyOn(serviceAsAny, 'trackRequestsOnTheirWayToTheStore'); + + serviceAsAny.dispatchRequest(testPostRequest); + expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); + + serviceAsAny.dispatchRequest(testPutRequest); + expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); + + serviceAsAny.dispatchRequest(testDeleteRequest); + expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); + + serviceAsAny.dispatchRequest(testOptionsRequest); + expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); + + serviceAsAny.dispatchRequest(testHeadRequest); + expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); + + serviceAsAny.dispatchRequest(testPatchRequest); + expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); }); }); }); @@ -381,43 +409,6 @@ describe('RequestService', () => { serviceAsAny.dispatchRequest(request); expect(store.dispatch).toHaveBeenCalledWith(new RequestExecuteAction(request.uuid)); }); - - describe('when it\'s a GET request', () => { - let request: RestRequest; - beforeEach(() => { - request = testGetRequest; - }); - - it('should track it on it\'s way to the store', () => { - spyOn(serviceAsAny, 'trackRequestsOnTheirWayToTheStore'); - serviceAsAny.dispatchRequest(request); - expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).toHaveBeenCalledWith(request); - }); - }); - - describe('when it\'s not a GET request', () => { - it('shouldn\'t track it', () => { - spyOn(serviceAsAny, 'trackRequestsOnTheirWayToTheStore'); - - serviceAsAny.dispatchRequest(testPostRequest); - expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); - - serviceAsAny.dispatchRequest(testPutRequest); - expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); - - serviceAsAny.dispatchRequest(testDeleteRequest); - expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); - - serviceAsAny.dispatchRequest(testOptionsRequest); - expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); - - serviceAsAny.dispatchRequest(testHeadRequest); - expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); - - serviceAsAny.dispatchRequest(testPatchRequest); - expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).not.toHaveBeenCalled(); - }); - }); }); describe('trackRequestsOnTheirWayToTheStore', () => { diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts index fa33eb47e6..12933f83fc 100644 --- a/src/app/core/data/request.service.ts +++ b/src/app/core/data/request.service.ts @@ -68,9 +68,13 @@ export class RequestService { } // TODO to review "overrideRequest" param when https://github.com/DSpace/dspace-angular/issues/217 will be fixed - configure(request: RestRequest, overrideRequest: boolean = false): void { - if (request.method !== RestRequestMethod.Get || !this.isCachedOrPending(request) || overrideRequest) { - this.dispatchRequest(request, overrideRequest); + configure(request: RestRequest, forceBypassCache: boolean = false): void { + const isGetRequest = request.method === RestRequestMethod.Get; + if (!isGetRequest || !this.isCachedOrPending(request) || forceBypassCache) { + this.dispatchRequest(request); + if (isGetRequest && !forceBypassCache) { + this.trackRequestsOnTheirWayToTheStore(request); + } } } @@ -103,12 +107,9 @@ export class RequestService { return isCached || isPending; } - private dispatchRequest(request: RestRequest, overrideRequest: boolean = false) { + private dispatchRequest(request: RestRequest) { this.store.dispatch(new RequestConfigureAction(request)); this.store.dispatch(new RequestExecuteAction(request.uuid)); - if (request.method === RestRequestMethod.Get && !overrideRequest) { - this.trackRequestsOnTheirWayToTheStore(request); - } } /** diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss index 26de13150f..a8c7b84f56 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss @@ -1,5 +1,6 @@ #loginDropdownMenu, #logoutDropdownMenu { min-width: 330px; + z-index: 1002; } #loginDropdownMenu { diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts index fb63389206..8b9f7c8775 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts @@ -4,7 +4,7 @@ import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing' import { By } from '@angular/platform-browser'; import { Store, StoreModule } from '@ngrx/store'; -import { authReducer, AuthState } from '../../core/auth/auth.reducers'; +import { authReducer, AuthState } from '../../core/auth/auth.reducer'; import { EpersonMock } from '../testing/eperson-mock'; import { TranslateModule } from '@ngx-translate/core'; import { AppState } from '../../app.reducer'; diff --git a/src/app/shared/log-in/log-in.component.spec.ts b/src/app/shared/log-in/log-in.component.spec.ts index eab1d65ad0..dc4a0be1c6 100644 --- a/src/app/shared/log-in/log-in.component.spec.ts +++ b/src/app/shared/log-in/log-in.component.spec.ts @@ -6,7 +6,7 @@ import { By } from '@angular/platform-browser'; import { Store, StoreModule } from '@ngrx/store'; import { LogInComponent } from './log-in.component'; -import { authReducer } from '../../core/auth/auth.reducers'; +import { authReducer } from '../../core/auth/auth.reducer'; import { EpersonMock } from '../testing/eperson-mock'; import { Eperson } from '../../core/eperson/models/eperson.model'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/src/app/shared/log-out/log-out.component.html b/src/app/shared/log-out/log-out.component.html index a917f0520f..f3ceae0087 100644 --- a/src/app/shared/log-out/log-out.component.html +++ b/src/app/shared/log-out/log-out.component.html @@ -2,6 +2,6 @@ diff --git a/src/app/shared/log-out/log-out.component.spec.ts b/src/app/shared/log-out/log-out.component.spec.ts index 7e07e1b7cc..ad609f0aea 100644 --- a/src/app/shared/log-out/log-out.component.spec.ts +++ b/src/app/shared/log-out/log-out.component.spec.ts @@ -4,7 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { Store, StoreModule } from '@ngrx/store'; -import { authReducer } from '../../core/auth/auth.reducers'; +import { authReducer } from '../../core/auth/auth.reducer'; import { EpersonMock } from '../testing/eperson-mock'; import { Eperson } from '../../core/eperson/models/eperson.model'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/src/app/shared/services/platform.service.spec.ts b/src/app/shared/services/platform.service.spec.ts deleted file mode 100644 index ddc4d13334..0000000000 --- a/src/app/shared/services/platform.service.spec.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { IPlatformService, PlatformService } from './platform.service' -import { async, TestBed } from '@angular/core/testing' -import { PLATFORM_ID } from '@angular/core' - -describe('PlatformService', () => { - let service: IPlatformService; - - describe('PlatformService browser', () => { - beforeEach(async(() => { - TestBed.configureTestingModule({ - providers: [ - PlatformService, - { provide: PLATFORM_ID, useValue: 'browser' } - ] - }) - })); - - beforeEach(async(() => { - service = TestBed.get(PlatformService) - })); - - afterEach(async(() => { - TestBed.resetTestingModule() - })); - - it('should construct', async(() => { - expect(service).not.toBeNull() - })); - - it('should be browser', async(() => { - expect(service.isBrowser).toEqual(true); - expect(service.isServer).toEqual(false) - })); - }); - - describe('PlatformService server', () => { - beforeEach(async(() => { - TestBed.configureTestingModule({ - providers: [ - PlatformService, - { provide: PLATFORM_ID, useValue: 'server' } - ] - }) - })); - - beforeEach(async(() => { - service = TestBed.get(PlatformService) - })); - - afterEach(async(() => { - TestBed.resetTestingModule() - })); - - it('should be server', async(() => { - expect(service.isServer).toEqual(true); - expect(service.isBrowser).toEqual(false) - })) - }) -}); diff --git a/src/app/shared/services/platform.service.ts b/src/app/shared/services/platform.service.ts deleted file mode 100644 index 59c3830cce..0000000000 --- a/src/app/shared/services/platform.service.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Inject, Injectable, PLATFORM_ID } from '@angular/core' -import { isPlatformBrowser, isPlatformServer } from '@angular/common' - -export interface IPlatformService { - readonly isBrowser: boolean - readonly isServer: boolean -} - -@Injectable() -export class PlatformService implements IPlatformService { - constructor( @Inject(PLATFORM_ID) private platformId: any) { } - - public get isBrowser(): boolean { - return isPlatformBrowser(this.platformId) - } - - public get isServer(): boolean { - return isPlatformServer(this.platformId) - } -} From b427b4846a0ff5418b3cffe8344efdd9fc6c167b Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 23 May 2018 18:55:20 +0200 Subject: [PATCH 71/80] Renamed isMobileView() into isXsOrSm() --- src/app/+search-page/search-page.component.html | 8 ++++---- src/app/+search-page/search-page.component.spec.ts | 4 +++- src/app/+search-page/search-page.component.ts | 8 ++------ .../search-sidebar/search-sidebar.service.spec.ts | 4 +++- .../search-sidebar/search-sidebar.service.ts | 11 +++-------- .../auth-nav-menu/auth-nav-menu.component.html | 12 ++++++------ .../shared/auth-nav-menu/auth-nav-menu.component.ts | 5 ++++- src/app/shared/host-window.service.ts | 10 ++++++---- src/app/shared/testing/host-window-service-stub.ts | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/app/+search-page/search-page.component.html b/src/app/+search-page/search-page.component.html index 1a1f379920..e8dee94139 100644 --- a/src/app/+search-page/search-page.component.html +++ b/src/app/+search-page/search-page.component.html @@ -1,8 +1,8 @@
    - +
    - { provide: HostWindowService, useValue: jasmine.createSpyObj('hostWindowService', { isXs: Observable.of(true), - isSm: Observable.of(false) + isSm: Observable.of(false), + isXsOrSm: Observable.of(true) }) }, { diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts index 4f50723ced..63e72960d8 100644 --- a/src/app/+search-page/search-page.component.ts +++ b/src/app/+search-page/search-page.component.ts @@ -34,7 +34,7 @@ export class SearchPageComponent implements OnInit { searchOptions$: Observable; sortConfig: SortOptions; scopeListRD$: Observable>>; - isMobileView$: Observable; + isXsOrSm$: Observable; pageSize; pageSizeOptions; defaults = { @@ -52,11 +52,7 @@ export class SearchPageComponent implements OnInit { private sidebarService: SearchSidebarService, private windowService: HostWindowService, private filterService: SearchFilterService) { - this.isMobileView$ = Observable.combineLatest( - this.windowService.isXs(), - this.windowService.isSm(), - ((isXs, isSm) => isXs || isSm) - ); + this.isXsOrSm$ = this.windowService.isXsOrSm(); this.scopeListRD$ = communityService.findAll(); } diff --git a/src/app/+search-page/search-sidebar/search-sidebar.service.spec.ts b/src/app/+search-page/search-sidebar/search-sidebar.service.spec.ts index 8b817d5523..b6439be4df 100644 --- a/src/app/+search-page/search-sidebar/search-sidebar.service.spec.ts +++ b/src/app/+search-page/search-sidebar/search-sidebar.service.spec.ts @@ -3,6 +3,7 @@ import { SearchSidebarService } from './search-sidebar.service'; import { AppState } from '../../app.reducer'; import { async, inject, TestBed } from '@angular/core/testing'; import { Observable } from 'rxjs/Observable'; +import 'rxjs/add/observable/of'; import { SearchSidebarCollapseAction, SearchSidebarExpandAction } from './search-sidebar.actions'; import { HostWindowService } from '../../shared/host-window.service'; @@ -17,7 +18,8 @@ describe('SearchSidebarService', () => { const windowService = jasmine.createSpyObj('hostWindowService', { isXs: Observable.of(true), - isSm: Observable.of(false) + isSm: Observable.of(false), + isXsOrSm: Observable.of(true) }); beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/app/+search-page/search-sidebar/search-sidebar.service.ts b/src/app/+search-page/search-sidebar/search-sidebar.service.ts index e2ad5e0960..3a17dc87ab 100644 --- a/src/app/+search-page/search-sidebar/search-sidebar.service.ts +++ b/src/app/+search-page/search-sidebar/search-sidebar.service.ts @@ -11,22 +11,17 @@ const sidebarCollapsedSelector = createSelector(sidebarStateSelector, (sidebar: @Injectable() export class SearchSidebarService { - private isMobileView: Observable; + private isXsOrSm$: Observable; private isCollapsdeInStored: Observable; constructor(private store: Store, private windowService: HostWindowService) { - this.isMobileView = - Observable.combineLatest( - this.windowService.isXs(), - this.windowService.isSm(), - ((isXs, isSm) => isXs || isSm) - ); + this.isXsOrSm$ = this.windowService.isXsOrSm(); this.isCollapsdeInStored = this.store.select(sidebarCollapsedSelector); } get isCollapsed(): Observable { return Observable.combineLatest( - this.isMobileView, + this.isXsOrSm$, this.isCollapsdeInStored, (mobile, store) => mobile ? store : true); } diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html index 7203dc07ab..cc9b8c410b 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html @@ -1,5 +1,5 @@ -
      -
    • + diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts index bef7ac3f3a..1c376258fb 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts @@ -30,12 +30,15 @@ export class AuthNavMenuComponent implements OnInit { */ public loading: Observable; + public isXsOrSm$: Observable; + public showAuth = Observable.of(false); public user: Observable; constructor(private store: Store, - public windowService: HostWindowService) { + private windowService: HostWindowService) { + this.isXsOrSm$ = this.windowService.isXsOrSm(); } ngOnInit(): void { diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts index f32d7f2b7f..ecbee685f1 100644 --- a/src/app/shared/host-window.service.ts +++ b/src/app/shared/host-window.service.ts @@ -93,9 +93,11 @@ export class HostWindowService { ); } - isMobileView(): Observable { - return this.getWidthObs() - .map((width) => width < GridBreakpoint.MD_MIN) - .distinctUntilChanged(); + isXsOrSm(): Observable { + return Observable.combineLatest( + this.isXs(), + this.isSm(), + ((isXs, isSm) => isXs || isSm) + ).distinctUntilChanged(); } } diff --git a/src/app/shared/testing/host-window-service-stub.ts b/src/app/shared/testing/host-window-service-stub.ts index f9c436aa5e..2833415477 100644 --- a/src/app/shared/testing/host-window-service-stub.ts +++ b/src/app/shared/testing/host-window-service-stub.ts @@ -17,7 +17,7 @@ export class HostWindowServiceStub { return Observable.of(this.width < 576); } - isMobileView(): Observable { + isXsOrSm(): Observable { return this.isXs(); } } From 37e7d96eb32597008448745087b843300335972b Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 24 May 2018 10:28:59 +0200 Subject: [PATCH 72/80] Test to fix travis build issue --- src/app/+search-page/search-options.model.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/+search-page/search-options.model.ts b/src/app/+search-page/search-options.model.ts index df8d8e713a..4164321680 100644 --- a/src/app/+search-page/search-options.model.ts +++ b/src/app/+search-page/search-options.model.ts @@ -1,6 +1,5 @@ import { isNotEmpty } from '../shared/empty.util'; import { URLCombiner } from '../core/url-combiner/url-combiner'; -import 'core-js/fn/object/entries'; export enum ViewMode { List = 'list', From 7d8324d7015afe535d276313466f4f1747daaec3 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 24 May 2018 11:34:28 +0200 Subject: [PATCH 73/80] Test to fix travis build issue --- src/app/+search-page/search-options.model.ts | 1 + tsconfig.json | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/+search-page/search-options.model.ts b/src/app/+search-page/search-options.model.ts index 4164321680..4b4987a096 100644 --- a/src/app/+search-page/search-options.model.ts +++ b/src/app/+search-page/search-options.model.ts @@ -1,5 +1,6 @@ import { isNotEmpty } from '../shared/empty.util'; import { URLCombiner } from '../core/url-combiner/url-combiner'; +import 'core-js/library/fn/object/entries'; export enum ViewMode { List = 'list', diff --git a/tsconfig.json b/tsconfig.json index 8ab72a4327..8037c659ed 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,8 +26,7 @@ "es6", "es2015", "es2016", - "es2017", - "es2017.object" + "es2017" ] }, "exclude": [ From 4e74530a217132eb384099d868abda846ef168ac Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 25 May 2018 10:12:45 +0200 Subject: [PATCH 74/80] 50632: Increased page size for bitstream-format and metadata-registry --- .../bitstream-formats/bitstream-formats.component.ts | 2 +- .../metadata-registry/metadata-registry.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index d54d2c5e96..d6c84ac858 100644 --- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -15,7 +15,7 @@ export class BitstreamFormatsComponent { bitstreamFormats: Observable>>; config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { id: 'registry-bitstreamformats-pagination', - pageSize: 20 + pageSize: 10000 }); constructor(private registryService: RegistryService) { diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts index 2baed2ef6e..15dc6b0d80 100644 --- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts @@ -15,7 +15,7 @@ export class MetadataRegistryComponent { metadataSchemas: Observable>>; config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { id: 'registry-metadataschemas-pagination', - pageSize: 10 + pageSize: 10000 }); constructor(private registryService: RegistryService) { From 66295d10ed62fc2cab3ecf35d1ab5a37917d28eb Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 29 May 2018 10:51:07 +0200 Subject: [PATCH 75/80] Fixed issue with credentials that have special chars --- src/app/core/auth/auth.service.ts | 20 +++++++++---------- .../shared/utils/encode-decode.util.spec.ts | 10 ++++++++++ src/app/shared/utils/encode-decode.util.ts | 10 ++++++++++ 3 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 src/app/shared/utils/encode-decode.util.spec.ts create mode 100644 src/app/shared/utils/encode-decode.util.ts diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index c0386b12aa..2848b54b50 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -1,12 +1,17 @@ import { Inject, Injectable } from '@angular/core'; import { PRIMARY_OUTLET, Router, UrlSegmentGroup, UrlTree } from '@angular/router'; +import { HttpHeaders } from '@angular/common/http'; +import { REQUEST } from '@nguniversal/express-engine/tokens'; +import { RouterReducerState } from '@ngrx/router-store'; +import { Store } from '@ngrx/store'; +import { CookieAttributes } from 'js-cookie'; import { Observable } from 'rxjs/Observable'; import { map, withLatestFrom } from 'rxjs/operators'; import { Eperson } from '../eperson/models/eperson.model'; import { AuthRequestService } from './auth-request.service'; -import { HttpHeaders } from '@angular/common/http'; + import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service'; import { AuthStatus } from './models/auth-status.model'; import { AuthTokenInfo, TOKENITEM } from './models/auth-token-info.model'; @@ -14,16 +19,9 @@ import { isEmpty, isNotEmpty, isNotNull, isNotUndefined } from '../../shared/emp import { CookieService } from '../../shared/services/cookie.service'; import { getAuthenticationToken, getRedirectUrl, isAuthenticated, isTokenRefreshing } from './selectors'; import { AppState, routerStateSelector } from '../../app.reducer'; -import { Store } from '@ngrx/store'; -import { - CheckAuthenticationTokenAction, - ResetAuthenticationMessagesAction, - SetRedirectUrlAction -} from './auth.actions'; -import { RouterReducerState } from '@ngrx/router-store'; -import { CookieAttributes } from 'js-cookie'; +import { ResetAuthenticationMessagesAction, SetRedirectUrlAction } from './auth.actions'; import { NativeWindowRef, NativeWindowService } from '../../shared/services/window.service'; -import { REQUEST } from '@nguniversal/express-engine/tokens'; +import { Base64EncodeUrl } from '../../shared/utils/encode-decode.util'; export const LOGIN_ROUTE = '/login'; export const LOGOUT_ROUTE = '/logout'; @@ -90,7 +88,7 @@ export class AuthService { */ public authenticate(user: string, password: string): Observable { // Attempt authenticating the user using the supplied credentials. - const body = encodeURI(`password=${password}&user=${user}`); + const body = (`password=${Base64EncodeUrl(password)}&user=${Base64EncodeUrl(user)}`); const options: HttpOptions = Object.create({}); let headers = new HttpHeaders(); headers = headers.append('Content-Type', 'application/x-www-form-urlencoded'); diff --git a/src/app/shared/utils/encode-decode.util.spec.ts b/src/app/shared/utils/encode-decode.util.spec.ts new file mode 100644 index 0000000000..c3039c482e --- /dev/null +++ b/src/app/shared/utils/encode-decode.util.spec.ts @@ -0,0 +1,10 @@ +import { Base64EncodeUrl } from './encode-decode.util'; + +describe('Encode/Decode Utils', () => { + const strng = '+string+/=t-'; + const encodedStrng = '%2Bstring%2B%2F%3Dt-'; + + it('should return encoded string', () => { + expect(Base64EncodeUrl(strng)).toBe(encodedStrng); + }); +}); diff --git a/src/app/shared/utils/encode-decode.util.ts b/src/app/shared/utils/encode-decode.util.ts new file mode 100644 index 0000000000..e21034b7bd --- /dev/null +++ b/src/app/shared/utils/encode-decode.util.ts @@ -0,0 +1,10 @@ +/** + * use this to make a Base64 encoded string URL friendly, + * i.e. '+' and '/' are replaced with special percent-encoded hexadecimal sequences + * + * @param {String} str the encoded string + * @returns {String} the URL friendly encoded String + */ +export function Base64EncodeUrl(str): string { + return str.replace(/\+/g, '%2B').replace(/\//g, '%2F').replace(/\=/g, '%3D'); +} From 12d93cf4deebb621b42934602da6da6fc0d20ffa Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Thu, 31 May 2018 16:32:44 +0200 Subject: [PATCH 76/80] Update README.md Removed the "yarn run global" instruction, as it isn't necessary for first installs, and can cause issues --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 466e736de2..dceb415d58 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,6 @@ git clone https://github.com/DSpace/dspace-angular.git # change directory to our repo cd dspace-angular -# install the global dependencies -yarn run global - # install the local dependencies yarn install From 099ebd487f1c249a8f7290a16d64e0cc295d9ee1 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 7 Jun 2018 12:30:24 +0200 Subject: [PATCH 77/80] fixes --- src/app/core/auth/auth.effects.ts | 1 + src/app/core/auth/auth.reducer.ts | 5 +++++ src/app/core/auth/selectors.ts | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index 60fe04a5d1..e2d6c80b5e 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -135,6 +135,7 @@ export class AuthEffects { public logOutSuccess$: Observable = this.actions$ .ofType(AuthActionTypes.LOG_OUT_SUCCESS) .do(() => this.authService.removeToken()) + .do(() => this.authService.clearRedirectUrl()) .do(() => this.authService.refreshAfterLogout()); @Effect({dispatch: false}) diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts index c3a425c192..0c5e36ce91 100644 --- a/src/app/core/auth/auth.reducer.ts +++ b/src/app/core/auth/auth.reducer.ts @@ -74,6 +74,11 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut info: undefined }); + case AuthActionTypes.AUTHENTICATED: + return Object.assign({}, state, { + loading: true + }); + case AuthActionTypes.AUTHENTICATED_ERROR: return Object.assign({}, state, { authenticated: false, diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts index 24353a04a2..fa637981ae 100644 --- a/src/app/core/auth/selectors.ts +++ b/src/app/core/auth/selectors.ts @@ -195,7 +195,7 @@ export const getLogOutError = createSelector(getAuthState, _getLogOutError); export const getRegistrationError = createSelector(getAuthState, _getRegistrationError); /** - * Returns the redirect url.. + * Returns the redirect url. * @function getRedirectUrl * @param {AuthState} state * @param {any} props From 3126a96554058764391fd17e931e075fc2f57dd7 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 28 Jun 2018 11:51:52 +0200 Subject: [PATCH 78/80] Added x-forwarded-for header to pass server ip check --- src/app/core/auth/server-auth.service.ts | 30 +++++++++++------------- src/modules/app/browser-app.module.ts | 1 - 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts index afbf4611be..5bcdd52003 100644 --- a/src/app/core/auth/server-auth.service.ts +++ b/src/app/core/auth/server-auth.service.ts @@ -8,6 +8,7 @@ import { isNotEmpty } from '../../shared/empty.util'; import { AuthService } from './auth.service'; import { AuthTokenInfo } from './models/auth-token-info.model'; import { CheckAuthenticationTokenAction } from './auth.actions'; +import { Eperson } from '../eperson/models/eperson.model'; /** * The auth service. @@ -16,32 +17,29 @@ import { CheckAuthenticationTokenAction } from './auth.actions'; export class ServerAuthService extends AuthService { /** - * Authenticate the user - * - * @param {string} user The user name - * @param {string} password The user's password - * @returns {Observable} The authenticated user observable. + * Returns the authenticated user + * @returns {User} */ - public authenticate(user: string, password: string): Observable { - // Attempt authenticating the user using the supplied credentials. - const body = encodeURI(`password=${password}&user=${user}`); + public authenticatedUser(token: AuthTokenInfo): Observable { + // Determine if the user has an existing auth session on the server const options: HttpOptions = Object.create({}); let headers = new HttpHeaders(); - // NB this could be use to avoid the problem with the authentication is case the UI is rendered by Angular Universal. - const clientIp = this.req.connection.remoteAddress; + headers = headers.append('Accept', 'application/json'); + headers = headers.append('Authorization', `Bearer ${token.accessToken}`); + // NB this is used to pass server client IP check. + const clientIp = this.req.get('x-forwarded-for'); + headers = headers.append('X-Forwarded-For', clientIp); - headers = headers.append('Content-Type', 'application/x-www-form-urlencoded'); options.headers = headers; - return this.authRequestService.postToEndpoint('login', body, options) + return this.authRequestService.getRequest('status', options) .map((status: AuthStatus) => { if (status.authenticated) { - return status; + return status.eperson[0]; } else { - throw(new Error('Invalid email or password')); + throw(new Error('Not authenticated')); } - }) - + }); } /** diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts index 562b0e77aa..a7a59dc837 100644 --- a/src/modules/app/browser-app.module.ts +++ b/src/modules/app/browser-app.module.ts @@ -17,7 +17,6 @@ import { DSpaceBrowserTransferStateModule } from '../transfer-state/dspace-brows import { DSpaceTransferState } from '../transfer-state/dspace-transfer-state.service'; import { ClientCookieService } from '../../app/shared/services/client-cookie.service'; import { CookieService } from '../../app/shared/services/cookie.service'; -import { ServerAuthService } from '../../app/core/auth/server-auth.service'; import { AuthService } from '../../app/core/auth/auth.service'; import { Angulartics2Module } from 'angulartics2'; import { Angulartics2GoogleAnalytics } from 'angulartics2/ga'; From 6b7c748251c1b89adfb1316ee99d6e8784471a0c Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 5 Jul 2018 09:25:35 +0200 Subject: [PATCH 79/80] Added a fallback for x-forwarded-for header --- src/app/core/auth/server-auth.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts index 5bcdd52003..96ee2e355a 100644 --- a/src/app/core/auth/server-auth.service.ts +++ b/src/app/core/auth/server-auth.service.ts @@ -28,7 +28,7 @@ export class ServerAuthService extends AuthService { headers = headers.append('Accept', 'application/json'); headers = headers.append('Authorization', `Bearer ${token.accessToken}`); // NB this is used to pass server client IP check. - const clientIp = this.req.get('x-forwarded-for'); + const clientIp = this.req.get('x-forwarded-for') || this.req.connection.remoteAddress; headers = headers.append('X-Forwarded-For', clientIp); options.headers = headers; From dc633ea77d85143d2c956387825ffd165dd8180f Mon Sep 17 00:00:00 2001 From: MatMercer Date: Mon, 9 Jul 2018 22:30:31 -0300 Subject: [PATCH 80/80] Fix truncated text being difficult to select Related to Google Chrome browser --- .../truncatable-part/truncatable-part.component.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss index ac3641df39..133328fec1 100644 --- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss +++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss @@ -23,6 +23,7 @@ max-width: 150px; height: $height; background: linear-gradient(to right, rgba(255, 255, 255, 0), $body-bg 70%); + pointer-events: none; } } } @@ -60,4 +61,4 @@ $h4-factor: strip-unit($h4-font-size); } } } -} \ No newline at end of file +}