Skip to content

fix(ENG-10262): fixed login url encoding #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ihorsokhanexoft wants to merge 2 commits into
base: feature/osf4i-in-progress-sso
Choose a base branch
from
Open

fix(ENG-10262): fixed login url encoding #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54cb9ec
fix(ENG-10262): fixed login url encoding
ihorsokhanexoft Feb 17, 2026
ef75a2e
fix(ENG-10262): unified encoding of login
ihorsokhanexoft Feb 17, 2026
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
4 changes: 2 additions & 2 deletions src/app/core/services/auth.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { inject, Injectable, PLATFORM_ID } from '@angular/core';
import { SignUpModel } from '@core/models/sign-up.model';
import { ENVIRONMENT } from '@core/provider/environment.provider';
import { ClearCurrentUser } from '@osf/core/store/user';
import { urlParam } from '@osf/shared/helpers/url-param.helper';
import { doubleEncodedUrlParam, urlParam } from '@osf/shared/helpers/url-param.helper';
import { JsonApiService } from '@osf/shared/services/json-api.service';
import { LoaderService } from '@osf/shared/services/loader.service';

Expand Down Expand Up @@ -41,7 +41,7 @@ export class AuthService {
}

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

Expand Down
12 changes: 12 additions & 0 deletions src/app/shared/helpers/url-param.helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,15 @@ export const urlParam = (params: Record<string, string>) => {
.map((entry) => entry.map((comp) => encodeURIComponent(comp)).join('='))
.join('&');
};

export const doubleEncodedUrlParam = (params: { service: string; next?: string }): string => {
const { service, next } = params;

if (!next) {
return `service=${encodeURIComponent(service)}`;
}

const encodedNext = encodeURIComponent(next);
const valueAfterService = `${service}?next=${encodedNext}`;
return `service=${encodeURIComponent(valueAfterService)}`;
};