diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index f3196ffeed..1ba62acce5 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,41 +1,57 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component'; -import { AuthenticatedGuard } from './core/auth/authenticated.guard'; +import {PageNotFoundComponent} from './pagenotfound/pagenotfound.component'; +import {AuthenticatedGuard} from './core/auth/authenticated.guard'; import {ShibbolethComponent} from './+login-page/shibboleth/shibboleth.component'; const ITEM_MODULE_PATH = 'items'; + export function getItemModulePath() { return `/${ITEM_MODULE_PATH}`; } + const COLLECTION_MODULE_PATH = 'collections'; + export function getCollectionModulePath() { return `/${COLLECTION_MODULE_PATH}`; } + const COMMUNITY_MODULE_PATH = 'communities'; + export function getCommunityModulePath() { return `/${COMMUNITY_MODULE_PATH}`; } + @NgModule({ imports: [ RouterModule.forRoot([ - { path: '', redirectTo: '/home', pathMatch: 'full' }, - { path: 'home', loadChildren: './+home-page/home-page.module#HomePageModule' }, - { path: COMMUNITY_MODULE_PATH, loadChildren: './+community-page/community-page.module#CommunityPageModule' }, - { path: COLLECTION_MODULE_PATH, loadChildren: './+collection-page/collection-page.module#CollectionPageModule' }, - { path: ITEM_MODULE_PATH, loadChildren: './+item-page/item-page.module#ItemPageModule' }, - { path: 'mydspace', loadChildren: './+my-dspace-page/my-dspace-page.module#MyDSpacePageModule', canActivate: [AuthenticatedGuard] }, - { path: 'search', loadChildren: './+search-page/search-page.module#SearchPageModule' }, - { path: 'browse', loadChildren: './+browse-by/browse-by.module#BrowseByModule' }, - { path: 'admin', loadChildren: './+admin/admin.module#AdminModule', canActivate: [AuthenticatedGuard] }, - { path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule' }, - { path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' }, - { path: 'submit', loadChildren: './+submit-page/submit-page.module#SubmitPageModule' }, - { path: 'workspaceitems', loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule' }, - { path: 'workflowitems', loadChildren: './+workflowitems-edit-page/workflowitems-edit-page.module#WorkflowitemsEditPageModule' }, - { path: 'shibboleth', pathMatch: 'full', component: ShibbolethComponent }, - { path: '**', pathMatch: 'full', component: PageNotFoundComponent }, + {path: '', redirectTo: '/home', pathMatch: 'full'}, + {path: 'home', loadChildren: './+home-page/home-page.module#HomePageModule'}, + {path: COMMUNITY_MODULE_PATH, loadChildren: './+community-page/community-page.module#CommunityPageModule'}, + {path: COLLECTION_MODULE_PATH, loadChildren: './+collection-page/collection-page.module#CollectionPageModule'}, + {path: ITEM_MODULE_PATH, loadChildren: './+item-page/item-page.module#ItemPageModule'}, + { + path: 'mydspace', + loadChildren: './+my-dspace-page/my-dspace-page.module#MyDSpacePageModule', + canActivate: [AuthenticatedGuard] + }, + {path: 'search', loadChildren: './+search-page/search-page.module#SearchPageModule'}, + {path: 'browse', loadChildren: './+browse-by/browse-by.module#BrowseByModule'}, + {path: 'admin', loadChildren: './+admin/admin.module#AdminModule', canActivate: [AuthenticatedGuard]}, + {path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule'}, + {path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule'}, + {path: 'submit', loadChildren: './+submit-page/submit-page.module#SubmitPageModule'}, + {path: 'shibboleth', pathMatch: 'full', component: ShibbolethComponent}, + { + path: 'workspaceitems', + loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule' + }, + /* { + path: 'workflowitems', + loadChildren: './+workflowitems-edit-page/workflowitems-edit-page.module#WorkflowitemsEditPageModule' + },*/ + {path: '**', pathMatch: 'full', component: PageNotFoundComponent}, ]) ], exports: [RouterModule] diff --git a/src/app/core/auth/models/auth-status.model.ts b/src/app/core/auth/models/auth-status.model.ts index c637bdebef..19b69479f4 100644 --- a/src/app/core/auth/models/auth-status.model.ts +++ b/src/app/core/auth/models/auth-status.model.ts @@ -42,8 +42,6 @@ export class AuthStatus implements CacheableObject { */ eperson: Observable>; - ssoLoginUrl?: string; - /** * True if the token is valid, false if there was no token or the token wasn't valid */