Skip to content

High performance self-hosted photo and video management solution.

fix(server): oauth linking error message (#10287)

Jason Rasmussenc6ab0471671e
diff --git a/server/src/services/auth.service.spec.ts b/server/src/services/auth.service.spec.ts
index f9c3ed08cf..7aa03e6bdd 100644
--- a/server/src/services/auth.service.spec.ts
+++ b/server/src/services/auth.service.spec.ts
@@ -395,12 +395,12 @@ describe('AuthService', () => {
userMock.getAdmin.mockResolvedValue(userStub.user1);
userMock.create.mockResolvedValue(userStub.user1);
- await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual(
- loginResponseStub.user1oauth,
+ await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).rejects.toThrow(
+ BadRequestException,
);
expect(userMock.update).not.toHaveBeenCalled();
- expect(userMock.create).toHaveBeenCalled();
+ expect(userMock.create).not.toHaveBeenCalled();
});
it('should allow auto registering by default', async () => {
diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
index 0f2add4337..182933de1a 100644
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -198,8 +198,12 @@ export class AuthService {
// link existing user
if (!user) {
const emailUser = await this.userRepository.getByEmail(profile.email);
- if (emailUser && !emailUser.oauthId) {
- user = await this.userRepository.update(emailUser.id, { oauthId: profile.sub });
+ if (emailUser) {
+ if (emailUser.oauthId) {
+ throw new BadRequestException('User already exists, but is linked to another account.');
+ } else {
+ user = await this.userRepository.update(emailUser.id, { oauthId: profile.sub });
+ }
}
}