diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts index ad54582021..73ab582762 100644 --- a/src/app/core/auth/auth.interceptor.ts +++ b/src/app/core/auth/auth.interceptor.ts @@ -101,6 +101,8 @@ export class AuthInterceptor implements HttpInterceptor { const token = authService.getToken(); let newReq; + console.log('intercept() request: ', req); + if (authService.isTokenExpired()) { authService.setRedirectUrl(this.router.url); // The access token is expired diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index e3d156503c..7a66b43d00 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -38,7 +38,7 @@ HardCoded Shibb + >HardCoded Shibb diff --git a/src/app/shared/log-in/shibboleth/shibboleth.component.html b/src/app/shared/log-in/shibboleth/shibboleth.component.html new file mode 100644 index 0000000000..d27c8fe57d --- /dev/null +++ b/src/app/shared/log-in/shibboleth/shibboleth.component.html @@ -0,0 +1,3 @@ +

+ Shibboleth Login Page +

diff --git a/src/app/shared/log-in/shibboleth/shibboleth.component.spec.ts b/src/app/shared/log-in/shibboleth/shibboleth.component.spec.ts new file mode 100644 index 0000000000..a12c43866f --- /dev/null +++ b/src/app/shared/log-in/shibboleth/shibboleth.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ShibbolethComponent } from './shibboleth.component'; + +describe('ShibbolethComponent', () => { + let component: ShibbolethComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ShibbolethComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ShibbolethComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/log-in/shibboleth/shibboleth.component.ts b/src/app/shared/log-in/shibboleth/shibboleth.component.ts new file mode 100644 index 0000000000..3d9d83511d --- /dev/null +++ b/src/app/shared/log-in/shibboleth/shibboleth.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'shibboleth', + templateUrl: './shibboleth.component.html', + styleUrls: ['./shibboleth.component.css'] +}) +export class ShibbolethComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 816139c8b9..a898d63bdc 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -138,6 +138,7 @@ import { RoleDirective } from './roles/role.directive'; import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component'; import { ClaimedTaskActionsReturnToPoolComponent } from './mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component'; import { ItemDetailPreviewFieldComponent } from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component'; +import { ShibbolethComponent } from './log-in/shibboleth/shibboleth.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -338,7 +339,8 @@ const DIRECTIVES = [ ...COMPONENTS, ...DIRECTIVES, ...ENTRY_COMPONENTS, - ...SHARED_ITEM_PAGE_COMPONENTS + ...SHARED_ITEM_PAGE_COMPONENTS, + ShibbolethComponent ], providers: [ ...PROVIDERS