beenull/immich
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(server): oauth mobile callback url (#2339)

Browse source 
* fix(server): mobile redirect uri

* chore: add test
This commit is contained in:
Jason Rasmussen 2023-04-26 16:39:18 -04:00 committed by GitHub
parent c329a17975
commit c4f5dc6d01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/libs/domain/src/oauth/oauth.core.ts
View file

@ -97,7 +97,7 @@ export class OAuthCore {
} }
private normalize(redirectUri: string) { private normalize(redirectUri: string) {
const isMobile = redirectUri === MOBILE_REDIRECT; const isMobile = redirectUri.startsWith(MOBILE_REDIRECT);
const { mobileRedirectUri, mobileOverrideEnabled } = this.config.oauth; const { mobileRedirectUri, mobileOverrideEnabled } = this.config.oauth;
if (isMobile && mobileOverrideEnabled && mobileRedirectUri) { if (isMobile && mobileOverrideEnabled && mobileRedirectUri) {
return mobileRedirectUri; return mobileRedirectUri;

11
server/libs/domain/src/oauth/oauth.service.spec.ts
View file

@ -154,6 +154,17 @@ describe('OAuthService', () => {
expect(callbackMock).toHaveBeenCalledWith('http://mobile-redirect', { state: 'state' }, { state: 'state' }); expect(callbackMock).toHaveBeenCalledWith('http://mobile-redirect', { state: 'state' }, { state: 'state' });
}); });
it('should use the mobile redirect override for ios urls with multiple slashes', async () => {
sut = create(systemConfigStub.override);
userMock.getByOAuthId.mockResolvedValue(userEntityStub.user1);
userTokenMock.create.mockResolvedValue(userTokenEntityStub.userToken);
await sut.login({ url: `app.immich:///?code=abc123` }, loginDetails);
expect(callbackMock).toHaveBeenCalledWith('http://mobile-redirect', { state: 'state' }, { state: 'state' });
});
}); });
describe('link', () => { describe('link', () => {