Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/utils/urls/urlHelper.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ describe('Shared urlHelper.ts', () => {
});

test('logoutUrlAltinn() should return correct url for each env.', () => {
const originTT = 'https://ttd.apps.tt02.altinn.no/tdd/tjeneste-20190826-1130';
const originAT = 'https://ttd.apps.at21.altinn.cloud/tdd/tjeneste-20190826-1130';
const originYT = 'https://ttd.apps.yt01.altinn.cloud/tdd/tjeneste-20190826-1130';
const originProd = 'https://ttd.apps.altinn.no/tdd/tjeneste-20190826-1130';
expect(logoutUrlAltinn(originTT)).toContain('tt02.altinn.no/ui/authentication/LogOut');
expect(logoutUrlAltinn(originAT)).toContain('at21.altinn.cloud/ui/authentication/LogOut');
expect(logoutUrlAltinn(originYT)).toContain('yt01.altinn.cloud/ui/authentication/LogOut');
expect(logoutUrlAltinn(originProd)).toContain('altinn.no/ui/authentication/LogOut');
expect(logoutUrlAltinn(originTT)).toBe('https://platform.tt02.altinn.no/authentication/api/v1/logout');
expect(logoutUrlAltinn(originAT)).toBe('https://platform.at21.altinn.cloud/authentication/api/v1/logout');
expect(logoutUrlAltinn(originYT)).toBe('https://platform.yt01.altinn.cloud/authentication/api/v1/logout');
expect(logoutUrlAltinn(originProd)).toBe('https://platform.altinn.no/authentication/api/v1/logout');
expect(logoutUrlAltinn(originLocalCloud)).toBe('/');
expect(logoutUrlAltinn(originLocalCloudWithPort)).toBe('/');
expect(logoutUrlAltinn(originLocal)).toBe('/');
expect(logoutUrlAltinn(originUnknown)).toBe('/');
});

test('makeUrlRelativeIfSameDomain()', () => {
Expand Down
5 changes: 4 additions & 1 deletion src/utils/urls/urlHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,10 @@ export function customEncodeURI(uri: string): string {
return result;
}

export const logoutUrlAltinn = (url: string): string => `${returnBaseUrlToAltinn(url)}ui/authentication/LogOut`;
export const logoutUrlAltinn = (url: string): string => {
const host = extractHostFromUrl(url);
return host ? `https://platform.${host}/authentication/api/v1/logout` : '/';
};

// Storage is always returning https:// links for attachments.
// on localhost (without https) this is a problem, so we make links
Expand Down
Loading