Skip to content

fix(auth): fix social media account binding errors #232

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

Merged
merged 1 commit into from
Nov 5, 2025
Merged

fix(auth): fix social media account binding errors #232

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
33 changes: 22 additions & 11 deletions src/auth/google/google.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,17 +173,28 @@ export class GoogleService {
}

if (userId) {
const wechatUser = await this.userService.findByLoginId(userData.sub);
if (wechatUser && wechatUser.id !== userId) {
const providerName = this.i18n.t('auth.providers.google');
const message = this.i18n.t('auth.errors.invalidProviderData', {
args: { provider: providerName },
});
throw new AppException(
message,
'ACCOUNT_ALREADY_BOUND',
HttpStatus.BAD_REQUEST,
);
const googleUser = await this.userService.findByLoginId(userData.sub);
if (googleUser) {
if (googleUser.id !== userId) {
const providerName = this.i18n.t('auth.providers.google');
const message = this.i18n.t('auth.errors.invalidProviderData', {
args: { provider: providerName },
});
throw new AppException(
message,
'ACCOUNT_ALREADY_BOUND',
HttpStatus.BAD_REQUEST,
);
}
const returnValue = {
id: googleUser.id,
access_token: this.jwtService.sign({
sub: googleUser.id,
}),
};
stateInfo.userInfo = returnValue;
await this.socialService.updateState(state, stateInfo);
return returnValue;
}
const existingUser = await this.userService.bindingExistUser({
userId,
Expand Down
31 changes: 21 additions & 10 deletions src/auth/wechat/wechat.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,16 +174,27 @@ export class WechatService {

if (userId) {
const wechatUser = await this.userService.findByLoginId(userData.unionid);
if (wechatUser && wechatUser.id !== userId) {
const providerName = this.i18n.t('auth.providers.wechat');
const message = this.i18n.t('auth.errors.invalidProviderData', {
args: { provider: providerName },
});
throw new AppException(
message,
'ACCOUNT_ALREADY_BOUND',
HttpStatus.BAD_REQUEST,
);
if (wechatUser) {
if (wechatUser.id !== userId) {
const providerName = this.i18n.t('auth.providers.wechat');
const message = this.i18n.t('auth.errors.invalidProviderData', {
args: { provider: providerName },
});
throw new AppException(
message,
'ACCOUNT_ALREADY_BOUND',
HttpStatus.BAD_REQUEST,
);
}
const returnValue = {
id: wechatUser.id,
access_token: this.jwtService.sign({
sub: wechatUser.id,
}),
};
stateInfo.userInfo = returnValue;
await this.socialService.updateState(state, stateInfo);
return returnValue;
}
const existingUser = await this.userService.bindingExistUser({
userId,
Expand Down