Skip to content

Refresh token did not work in self-hosted respository #311

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
levente-juhasz-codespring wants to merge 1 commit into
base: 18.x
Choose a base branch
from
+11 −5
Open

Refresh token did not work in self-hosted respository #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion projects/ui-components/lf-login/login-utils/self-hosted-login-provider.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ describe('SelfHostedLoginProvider', () => {
'extractCodeFromUrl',
'extractErrorFromUrl',
'accessTokenStorageKey',
'getAccountEndpoints',
],
{
self_hosted_base_url: 'https://example.com',
self_hosted_account_endpoints: accountEndpointsMock,
},
);
Expand All @@ -47,13 +47,15 @@ describe('SelfHostedLoginProvider', () => {

describe('getTokenClient', () => {
it('should return a TokenClient instance', () => {
lfLoginServiceMock.getAccountEndpoints.and.returnValue(accountEndpointsMock);
const tokenClient = provider.getTokenClient();
expect(tokenClient).toBeInstanceOf(SelfHostedTokenClient);
});
});

describe('getBaseAuthorizeUrl', () => {
it('should return the base authorize URL when last OAuth authorize URL exist and host name does not include dev and test environments', () => {
lfLoginServiceMock.getAccountEndpoints.and.returnValue(accountEndpointsMock);
const baseAuthorizeUrl = provider.getBaseAuthorizeUrl();
expect(baseAuthorizeUrl).toBe(accountEndpointsMock.oauthAuthorizeUrl);
});
Expand Down
12 changes: 8 additions & 4 deletions projects/ui-components/lf-login/login-utils/self-hosted-login-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@ export class SelfHostedLoginProvider implements LoginProvider {
) {}

getTokenClient() {
return new SelfHostedTokenClient(
`${this.lfLoginService.self_hosted_base_url}/v2/Repositories/${this.repositoryId}/Token`,
);
const baseUrl =
this.lfLoginService.self_hosted_base_url ?? this.lfLoginService.getAccountEndpoints()?.regionalDomain;
return new SelfHostedTokenClient(`${baseUrl}/v2/Repositories/${this.repositoryId}/Token`);
}

getBaseAuthorizeUrl(): string {
return this.lfLoginService.self_hosted_account_endpoints?.oauthAuthorizeUrl ?? '';
return (
this.lfLoginService.self_hosted_account_endpoints?.oauthAuthorizeUrl ??
this.lfLoginService.getAccountEndpoints()?.oauthAuthorizeUrl ??
''
);
}

storeInLocalStorage(accessTokenCredentials: AuthorizationCredentials, _accountId: string, _regionalDomain: string) {
Expand Down
Loading