Skip to content
Draft
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
12 changes: 9 additions & 3 deletions src/app/core/services/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,14 @@ export class AuthService {
}

this.loaderService.show();
const loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login`, next: window.location.href })}`;
window.location.href = loginUrl;

const serviceUrl = new URL(`${this.webUrl}/login`);
serviceUrl.searchParams.set('next', window.location.href);

const loginUrl = new URL(`${this.casUrl}/login`);
loginUrl.searchParams.set('service', serviceUrl.toString());

window.location.href = loginUrl.toString();
}

navigateToOrcidSignIn(): void {
Expand Down Expand Up @@ -79,7 +85,7 @@ export class AuthService {

if (isPlatformBrowser(this.platformId)) {
this.cookieService.deleteAll();
window.location.href = `${this.webUrl}/logout/?next=${encodeURIComponent('/')}`;
window.location.href = `${this.webUrl}/logout/?next=${encodeURIComponent(window.location.origin)}`;
}
}

Expand Down
1 change: 1 addition & 0 deletions src/app/shared/mappers/institutions/institutions.mapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export class InstitutionsMapper {
logoPath: data.attributes.logo_path,
userMetricsUrl: data.relationships?.user_metrics?.links?.related?.href,
linkToExternalReportsArchive: data.attributes.link_to_external_reports_archive,
sso_availability: data.attributes.sso_availability,
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ interface InstitutionAttributesJsonApi {
institutional_request_access_enabled: boolean;
logo_path: string;
link_to_external_reports_archive: string;
sso_availability: string;
}

interface InstitutionLinksJsonApi {
Expand Down
1 change: 1 addition & 0 deletions src/app/shared/models/institutions/institutions.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export interface Institution {
logoPath: string;
userMetricsUrl?: string;
linkToExternalReportsArchive?: string;
sso_availability: string;
}

export interface InstitutionAssets {
Expand Down
Loading