forked from hazza/dspace-angular
[DSC-287] Created new page error 500, added guard to check for initial api request, redirect to page 500
This commit is contained in:
Rezart Vata
@@ -26,6 +26,9 @@ import { SiteRegisterGuard } from './core/data/feature-authorization/feature-aut
|
||||
import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
|
||||
import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
|
||||
import { GroupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
|
||||
import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
|
||||
import { ServerCheckGuard } from './core/server-check/server-check.guard';
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
@@ -33,157 +36,160 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
|
||||
path: '', canActivate: [AuthBlockingGuard],
|
||||
children: [
|
||||
{ path: '', redirectTo: '/home', pathMatch: 'full' },
|
||||
{ path: 'reload/:rnd', component: ThemedPageNotFoundComponent, pathMatch: 'full', canActivate: [ReloadGuard] },
|
||||
{ path: 'reload/:rnd', component: ThemedPageNotFoundComponent, pathMatch: 'full', canActivate: [ServerCheckGuard, ReloadGuard] },
|
||||
{
|
||||
path: 'home',
|
||||
loadChildren: () => import('./home-page/home-page.module')
|
||||
.then((m) => m.HomePageModule),
|
||||
data: { showBreadcrumbs: false },
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: 'community-list',
|
||||
loadChildren: () => import('./community-list-page/community-list-page.module')
|
||||
.then((m) => m.CommunityListPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: 'id',
|
||||
loadChildren: () => import('./lookup-by-id/lookup-by-id.module')
|
||||
.then((m) => m.LookupIdModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: 'handle',
|
||||
loadChildren: () => import('./lookup-by-id/lookup-by-id.module')
|
||||
.then((m) => m.LookupIdModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: REGISTER_PATH,
|
||||
loadChildren: () => import('./register-page/register-page.module')
|
||||
.then((m) => m.RegisterPageModule),
|
||||
canActivate: [SiteRegisterGuard]
|
||||
canActivate: [ServerCheckGuard, SiteRegisterGuard]
|
||||
},
|
||||
{
|
||||
path: FORGOT_PASSWORD_PATH,
|
||||
loadChildren: () => import('./forgot-password/forgot-password.module')
|
||||
.then((m) => m.ForgotPasswordModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: COMMUNITY_MODULE_PATH,
|
||||
loadChildren: () => import('./community-page/community-page.module')
|
||||
.then((m) => m.CommunityPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: COLLECTION_MODULE_PATH,
|
||||
loadChildren: () => import('./collection-page/collection-page.module')
|
||||
.then((m) => m.CollectionPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: ITEM_MODULE_PATH,
|
||||
loadChildren: () => import('./item-page/item-page.module')
|
||||
.then((m) => m.ItemPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{ path: 'entities/:entity-type',
|
||||
loadChildren: () => import('./item-page/item-page.module')
|
||||
.then((m) => m.ItemPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: LEGACY_BITSTREAM_MODULE_PATH,
|
||||
loadChildren: () => import('./bitstream-page/bitstream-page.module')
|
||||
.then((m) => m.BitstreamPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: BITSTREAM_MODULE_PATH,
|
||||
loadChildren: () => import('./bitstream-page/bitstream-page.module')
|
||||
.then((m) => m.BitstreamPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: 'mydspace',
|
||||
loadChildren: () => import('./my-dspace-page/my-dspace-page.module')
|
||||
.then((m) => m.MyDSpacePageModule),
|
||||
canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: 'search',
|
||||
loadChildren: () => import('./search-page/search-page-routing.module')
|
||||
.then((m) => m.SearchPageRoutingModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: 'browse',
|
||||
loadChildren: () => import('./browse-by/browse-by-page.module')
|
||||
.then((m) => m.BrowseByPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: ADMIN_MODULE_PATH,
|
||||
loadChildren: () => import('./admin/admin.module')
|
||||
.then((m) => m.AdminModule),
|
||||
canActivate: [SiteAdministratorGuard, EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, SiteAdministratorGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: 'login',
|
||||
loadChildren: () => import('./login-page/login-page.module')
|
||||
.then((m) => m.LoginPageModule),
|
||||
canActivate: [ServerCheckGuard]
|
||||
},
|
||||
{
|
||||
path: 'logout',
|
||||
loadChildren: () => import('./logout-page/logout-page.module')
|
||||
.then((m) => m.LogoutPageModule),
|
||||
canActivate: [ServerCheckGuard]
|
||||
},
|
||||
{
|
||||
path: 'submit',
|
||||
loadChildren: () => import('./submit-page/submit-page.module')
|
||||
.then((m) => m.SubmitPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: 'import-external',
|
||||
loadChildren: () => import('./import-external-page/import-external-page.module')
|
||||
.then((m) => m.ImportExternalPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: 'workspaceitems',
|
||||
loadChildren: () => import('./workspaceitems-edit-page/workspaceitems-edit-page.module')
|
||||
.then((m) => m.WorkspaceitemsEditPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: WORKFLOW_ITEM_MODULE_PATH,
|
||||
loadChildren: () => import('./workflowitems-edit-page/workflowitems-edit-page.module')
|
||||
.then((m) => m.WorkflowItemsEditPageModule),
|
||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: PROFILE_MODULE_PATH,
|
||||
loadChildren: () => import('./profile-page/profile-page.module')
|
||||
.then((m) => m.ProfilePageModule),
|
||||
canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: PROCESS_MODULE_PATH,
|
||||
loadChildren: () => import('./process-page/process-page.module')
|
||||
.then((m) => m.ProcessPageModule),
|
||||
canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: INFO_MODULE_PATH,
|
||||
loadChildren: () => import('./info/info.module').then((m) => m.InfoModule),
|
||||
canActivate: [ServerCheckGuard]
|
||||
},
|
||||
{
|
||||
path: REQUEST_COPY_MODULE_PATH,
|
||||
loadChildren: () => import('./request-copy/request-copy.module').then((m) => m.RequestCopyModule),
|
||||
canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
|
||||
canActivate: [ServerCheckGuard, AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
|
||||
},
|
||||
{
|
||||
path: FORBIDDEN_PATH,
|
||||
@@ -193,12 +199,14 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
|
||||
path: 'statistics',
|
||||
loadChildren: () => import('./statistics-page/statistics-page-routing.module')
|
||||
.then((m) => m.StatisticsPageRoutingModule),
|
||||
canActivate: [ServerCheckGuard]
|
||||
},
|
||||
{
|
||||
path: ACCESS_CONTROL_MODULE_PATH,
|
||||
loadChildren: () => import('./access-control/access-control.module').then((m) => m.AccessControlModule),
|
||||
canActivate: [GroupAdministratorGuard],
|
||||
canActivate: [ServerCheckGuard, GroupAdministratorGuard],
|
||||
},
|
||||
{ path: '500', component: ThemedPageInternalServerErrorComponent },
|
||||
{ path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent },
|
||||
]}
|
||||
],{
|
||||
|
||||
Reference in New Issue
Block a user