inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

AAE-37746 revert previous changes, update the front-channel-logout component logic to always logout the user

Browse Source
This commit is contained in:
alep85
2025-10-28 15:33:42 +01:00
parent a392fc22f1
commit 4e349fb905
6 changed files with 13 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/src/lib/auth/oidc/auth.service.ts
-14
View File
@@ -71,18 +71,4 @@ export abstract class AuthService {
*/
abstract loginCallback(loginOptions?: LoginOptions): Promise<string | undefined>;
abstract updateIDPConfiguration(...args: any[]): void;
/**
* Get the stored issuer URL.
*
* @returns stored issuer URL
*/
abstract getStoredIssuer(): string;
/**
* Get the stored session ID.
*
* @returns stored session ID
*/
abstract getStoredSessionId(): string;
}
lib/core/src/lib/auth/oidc/front-channel-logout.component.spec.ts
+3 -146
View File
@@ -16,7 +16,6 @@
*/
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router';
import { AuthService } from './auth.service';
import { FrontChannelLogoutComponent } from './front-channel-logout.component';
@@ -24,26 +23,13 @@ describe('FrontChannelLogoutComponent', () => {
let component: FrontChannelLogoutComponent;
let fixture: ComponentFixture<FrontChannelLogoutComponent>;
let authServiceSpy: jasmine.SpyObj<AuthService>;
let activatedRouteMock: any;
beforeEach(async () => {
authServiceSpy = jasmine.createSpyObj('AuthService', ['logout', 'getStoredIssuer', 'getStoredSessionId']);
activatedRouteMock = {
snapshot: {
queryParamMap: {
get: jasmine.createSpy('get')
}
}
};
authServiceSpy = jasmine.createSpyObj('AuthService', ['logout']);
await TestBed.configureTestingModule({
imports: [FrontChannelLogoutComponent],
providers: [
{ provide: AuthService, useValue: authServiceSpy },
{ provide: ActivatedRoute, useValue: activatedRouteMock }
]
providers: [{ provide: AuthService, useValue: authServiceSpy }]
}).compileComponents();
fixture = TestBed.createComponent(FrontChannelLogoutComponent);
component = fixture.componentInstance;
});
@@ -53,138 +39,9 @@ describe('FrontChannelLogoutComponent', () => {
});
describe('ngOnInit - logout logic', () => {
it('should call logout when both stored and URL issuer match AND both stored and URL session ID match', () => {
const testIssuer = 'test-issuer';
const testSessionId = 'test-session-id';
authServiceSpy.getStoredIssuer.and.returnValue(testIssuer);
authServiceSpy.getStoredSessionId.and.returnValue(testSessionId);
activatedRouteMock.snapshot.queryParamMap.get.and.callFake((param: string) => {
if (param === 'iss') return testIssuer;
if (param === 'sid') return testSessionId;
return null;
});
it('should always call logout on init', () => {
component.ngOnInit();
expect(authServiceSpy.logout).toHaveBeenCalledTimes(1);
});
it('should not call logout when issuer matches but session ID differs between stored and URL values', () => {
const testIssuer = 'test-issuer';
const storedSessionId = 'stored-session-id';
const urlSessionId = 'different-session-id';
authServiceSpy.getStoredIssuer.and.returnValue(testIssuer);
authServiceSpy.getStoredSessionId.and.returnValue(storedSessionId);
activatedRouteMock.snapshot.queryParamMap.get.and.callFake((param: string) => {
if (param === 'iss') return testIssuer;
if (param === 'sid') return urlSessionId;
return null;
});
component.ngOnInit();
expect(authServiceSpy.logout).not.toHaveBeenCalled();
});
it('should not call logout when session ID matches but issuer differs between stored and URL values', () => {
const testSessionId = 'test-session-id';
const storedIssuer = 'stored-issuer';
const urlIssuer = 'different-issuer';
authServiceSpy.getStoredIssuer.and.returnValue(storedIssuer);
authServiceSpy.getStoredSessionId.and.returnValue(testSessionId);
activatedRouteMock.snapshot.queryParamMap.get.and.callFake((param: string) => {
if (param === 'iss') return urlIssuer;
if (param === 'sid') return testSessionId;
return null;
});
component.ngOnInit();
expect(authServiceSpy.logout).not.toHaveBeenCalled();
});
it('should not call logout when both issuer and session ID differ between stored and URL values', () => {
const storedIssuer = 'stored-issuer';
const storedSessionId = 'stored-session-id';
const urlIssuer = 'different-issuer';
const urlSessionId = 'different-session-id';
authServiceSpy.getStoredIssuer.and.returnValue(storedIssuer);
authServiceSpy.getStoredSessionId.and.returnValue(storedSessionId);
activatedRouteMock.snapshot.queryParamMap.get.and.callFake((param: string) => {
if (param === 'iss') return urlIssuer;
if (param === 'sid') return urlSessionId;
return null;
});
component.ngOnInit();
expect(authServiceSpy.logout).not.toHaveBeenCalled();
});
it('should not call logout when stored issuer is null but URL parameters are valid', () => {
const testSessionId = 'test-session-id';
authServiceSpy.getStoredIssuer.and.returnValue(null);
authServiceSpy.getStoredSessionId.and.returnValue(testSessionId);
activatedRouteMock.snapshot.queryParamMap.get.and.callFake((param: string) => {
if (param === 'iss') return 'test-issuer';
if (param === 'sid') return testSessionId;
return null;
});
component.ngOnInit();
expect(authServiceSpy.logout).not.toHaveBeenCalled();
});
it('should not call logout when stored session ID is null but URL parameters are valid', () => {
const testIssuer = 'test-issuer';
authServiceSpy.getStoredIssuer.and.returnValue(testIssuer);
authServiceSpy.getStoredSessionId.and.returnValue(null);
activatedRouteMock.snapshot.queryParamMap.get.and.callFake((param: string) => {
if (param === 'iss') return testIssuer;
if (param === 'sid') return 'test-session-id';
return null;
});
component.ngOnInit();
expect(authServiceSpy.logout).not.toHaveBeenCalled();
});
it('should not call logout when URL issuer parameter is missing but stored values are valid', () => {
const testIssuer = 'test-issuer';
const testSessionId = 'test-session-id';
authServiceSpy.getStoredIssuer.and.returnValue(testIssuer);
authServiceSpy.getStoredSessionId.and.returnValue(testSessionId);
activatedRouteMock.snapshot.queryParamMap.get.and.callFake((param: string) => {
if (param === 'iss') return null;
if (param === 'sid') return testSessionId;
return null;
});
component.ngOnInit();
expect(authServiceSpy.logout).not.toHaveBeenCalled();
});
it('should not call logout when URL session ID parameter is missing but stored values are valid', () => {
const testIssuer = 'test-issuer';
const testSessionId = 'test-session-id';
authServiceSpy.getStoredIssuer.and.returnValue(testIssuer);
authServiceSpy.getStoredSessionId.and.returnValue(testSessionId);
activatedRouteMock.snapshot.queryParamMap.get.and.callFake((param: string) => {
if (param === 'iss') return testIssuer;
if (param === 'sid') return null;
return null;
});
component.ngOnInit();
expect(authServiceSpy.logout).not.toHaveBeenCalled();
});
it('should not call logout when both stored and URL values are empty strings', () => {
authServiceSpy.getStoredIssuer.and.returnValue('');
authServiceSpy.getStoredSessionId.and.returnValue('');
activatedRouteMock.snapshot.queryParamMap.get.and.returnValue('');
component.ngOnInit();
expect(authServiceSpy.logout).not.toHaveBeenCalled();
});
it('should not call logout when AuthService returns undefined for stored issuer and session ID', () => {
authServiceSpy.getStoredIssuer.and.returnValue(undefined);
authServiceSpy.getStoredSessionId.and.returnValue(undefined);
activatedRouteMock.snapshot.queryParamMap.get.and.callFake((param: string) => {
if (param === 'iss') return 'test-issuer';
if (param === 'sid') return 'test-session-id';
return null;
});
expect(() => component.ngOnInit()).not.toThrow();
expect(authServiceSpy.logout).not.toHaveBeenCalled();
});
});
});
lib/core/src/lib/auth/oidc/front-channel-logout.component.ts
+1 -29
View File
@@ -16,41 +16,13 @@
*/
import { Component, inject, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { AuthService } from './auth.service';
@Component({ template: '', standalone: true })
export class FrontChannelLogoutComponent implements OnInit {
private readonly activatedRoute = inject(ActivatedRoute);
private readonly authService = inject(AuthService);
ngOnInit() {
const { issuerParam, sessionIdParam } = this.getIssuerAndSessionIdFromRouteParams();
const { storedIssuer, storedSessionId } = this.getIssuerAndSessionIdFromAuthService();
this.logoutIfIssuerAndSessionIdMatch(storedIssuer, issuerParam, storedSessionId, sessionIdParam);
}
private logoutIfIssuerAndSessionIdMatch(storedIssuer: string, issuerParam: string, storedSessionId: string, sessionIdParam: string) {
const storedIssuerMatchUrlIssuerParam = storedIssuer && issuerParam && storedIssuer === issuerParam;
const storedSessionIdMatchUrlSessionIdParam = storedSessionId && sessionIdParam && storedSessionId === sessionIdParam;
if (storedIssuerMatchUrlIssuerParam && storedSessionIdMatchUrlSessionIdParam) {
this.authService.logout();
}
}
private getIssuerAndSessionIdFromAuthService() {
const storedIssuer = this.authService.getStoredIssuer();
const storedSessionId = this.authService.getStoredSessionId();
return { storedIssuer, storedSessionId };
}
private getIssuerAndSessionIdFromRouteParams() {
const queryParamMap = this.activatedRoute.snapshot.queryParamMap;
const issuerParam = queryParamMap.get('iss');
const sessionIdParam = queryParamMap.get('sid');
return { issuerParam, sessionIdParam };
this.authService.logout();
}
}
lib/core/src/lib/auth/oidc/redirect-auth.service.spec.ts
-38
View File
@@ -537,42 +537,4 @@ describe('RedirectAuthService', () => {
expect(expectedLogoutIsEmitted).toBeTrue();
});
describe('getStoredIssuer', () => {
it('should return the stored issuer from the OAuthStorage', () => {
const expectedIssuer = 'https://example.com/auth';
oauthServiceSpy.getIdentityClaims.and.returnValue({ iss: expectedIssuer });
const storedIssuer = service.getStoredIssuer();
expect(storedIssuer).toBe(expectedIssuer);
});
it('should return empty string if no issuer is stored in the OAuthStorage', () => {
oauthServiceSpy.getIdentityClaims.and.returnValue({ iss: null });
const storedIssuer = service.getStoredIssuer();
expect(storedIssuer).toBe('');
});
});
describe('getStoredSessionId', () => {
it('should return the stored session id from the OAuthStorage', () => {
const expectedSessionId = '12345678910';
oauthServiceSpy.getIdentityClaims.and.returnValue({ sid: expectedSessionId });
const storedSessionId = service.getStoredSessionId();
expect(storedSessionId).toBe(expectedSessionId);
});
it('should return string if no session id is stored in the OAuthStorage', () => {
oauthServiceSpy.getIdentityClaims.and.returnValue({ sid: null });
const storedSessionId = service.getStoredSessionId();
expect(storedSessionId).toBe('');
});
});
});
lib/core/src/lib/auth/oidc/redirect-auth.service.ts
-10
View File
@@ -318,16 +318,6 @@ export class RedirectAuthService extends AuthService {
.then(() => this._getRedirectUrl());
}
getStoredIssuer(): string {
const claims = this.oauthService.getIdentityClaims();
return claims?.['iss'] || '';
}
getStoredSessionId(): string {
const claims = this.oauthService.getIdentityClaims();
return claims?.['sid'] || '';
}
private _getRedirectUrl() {
const DEFAULT_REDIRECT = '/';
const stateKey = this.oauthService.state;