fix(comment): fix comments

Author: hewenguang

src/auth/social.service.ts

@@ -29,8 +29,8 @@ export class SocialService {
     }
   }
 
-  protected setState(type: string) {
-    const state = generateId();
+  protected setState(type: string, prefix: string = '') {
+    const state = `${prefix ? prefix + '' : ''}${generateId()}`;
     this.states.set(state, {
       type,
       createdAt: Date.now(),

src/auth/wechat/wechat.service.ts

@@ -203,7 +203,7 @@ export class WechatService extends SocialService {
 
   migrationQrCode(type: 'new' | 'old' = 'new') {
     const isOld = type === 'old';
-    const state = this.setState('open_weixin');
+    const state = this.setState('open_weixin', type);
     this.cleanExpiresState();
     return {
       state,
@@ -215,7 +215,7 @@ export class WechatService extends SocialService {
 
   migrationAuthUrl(type: 'new' | 'old' = 'new'): string {
     const isOld = type === 'old';
-    const state = this.setState('weixin');
+    const state = this.setState('weixin', type);
     this.cleanExpiresState();
     return `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${isOld ? this.oldAppId : this.appId}&redirect_uri=${encodeURIComponent(this.migrationRedirectUri)}&response_type=code&scope=snsapi_userinfo&state=${state}#wechat_redirect`;
   }
@@ -228,9 +228,14 @@ export class WechatService extends SocialService {
     if (!stateInfo) {
       throw new UnauthorizedException('Invalid state identifier');
     }
+    const isOld = state.startsWith('old_');
     const isWeixin = stateInfo.type === 'weixin';
-    const appId = isWeixin ? this.oldAppId : this.oldOpenAppId;
-    const appSecret = isWeixin ? this.oldAppSecret : this.oldOpenAppSecret;
+    const rawAppid = isOld ? this.oldAppId : this.appId;
+    const rawAppsecret = isOld ? this.oldAppSecret : this.appSecret;
+    const rawOpenAppid = isOld ? this.oldOpenAppId : this.openAppId;
+    const rawOpenAppsecret = isOld ? this.oldOpenAppSecret : this.openAppSecret;
+    const appId = isWeixin ? rawAppid : rawOpenAppid;
+    const appSecret = isWeixin ? rawAppsecret : rawOpenAppsecret;
     const accessTokenResponse = await fetch(
       `https://api.weixin.qq.com/sns/oauth2/access_token?appid=${appId}&secret=${appSecret}&code=${code}&grant_type=authorization_code`,
     );