awesome-wechat-sdk - npm Package Compare versions

Comparing version 1.2.0 to 1.3.0

lib/wechat.d.ts

@@ -30,9 +30,10 @@ import { UrlLibOptions } from './types/urllib';
     openid: string;
-    nickname: string;
-    sex: '1' | '2';
-    province: string;
-    city: string;
-    country: string;
-    headimgurl: string;
-    privilege: string[];
+    scope: string;
+    nickname?: string;
+    sex?: '1' | '2';
+    province?: string;
+    city?: string;
+    country?: string;
+    headimgurl?: string;
+    privilege?: string[];
     unionid?: string;
@@ -100,5 +101,4 @@ }
     getAuthUser(openid: string, lang?: 'zh_CN' | 'zh_TW' | 'en'): Promise<UserInfo>;
-    getOpenidByCode(code: string): Promise<string>;
     getAuthUserByCode(code: string, lang?: 'zh_CN' | 'zh_TW' | 'en'): Promise<UserInfo>;
     private verifyToken(openid, accessToken);
 }

lib/wechat.js

@@ -237,5 +237,5 @@ "use strict";
     _getAuthUser(openid, token, lang) {
-        const url = `${this.endpoint}/sns/userinfo?access_token=${token}&openid=${openid}&lang=${lang}`;
+        const url = `${this.endpoint}/sns/userinfo?access_token=${token.accessToken}&openid=${openid}&lang=${lang}`;
         return this.request(url, { dataType: 'json' }).then((response) => {
-            return processWechatResponse(response.data);
+            return Object.assign({ scope: token.scope }, processWechatResponse(response.data));
         });
@@ -250,8 +250,14 @@ }
             }
-            if (token.isValid()) {
-                return this._getAuthUser(openid, token.accessToken, lang);
+            if (token.scope.indexOf('snsapi_userinfo') >= 0) {
+                return {
+                    openid,
+                    scope: token.scope
+                };
             }
+            else if (token.isValid()) {
+                return this._getAuthUser(openid, token, lang);
+            }
             else {
                 return this.refreshAuthAccessToken(token.refreshToken).then((token) => {
-                    return this._getAuthUser(openid, token.accessToken, lang);
+                    return this._getAuthUser(openid, token, lang);
                 });
@@ -261,7 +267,2 @@ }
     }
-    getOpenidByCode(code) {
-        return this.getAuthAccessToken(code).then((token) => {
-            return token.openid;
-        });
-    }
     getAuthUserByCode(code, lang = 'zh_CN') {
@@ -268,0 +269,0 @@ return this.getAuthAccessToken(code).then((token) => {

package.json

 {
   "name": "awesome-wechat-sdk",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "an awesome sdk for wechat oauth and api",
@@ -5,0 +5,0 @@ "scripts": {

src/wechat.ts

@@ -64,9 +64,10 @@ import * as urllib from 'urllib';
   openid: string;
-  nickname: string;
-  sex: '1' | '2';
-  province: string;
-  city: string;
-  country: string;
-  headimgurl: string;
-  privilege: string[];
+  scope: string;
+  nickname?: string;
+  sex?: '1' | '2';
+  province?: string;
+  city?: string;
+  country?: string;
+  headimgurl?: string;
+  privilege?: string[];
   unionid?: string;
@@ -292,6 +293,6 @@ }
 
-  private _getAuthUser(openid: string, token: string, lang: 'zh_CN' | 'zh_TW' | 'en'): Promise<UserInfo> {
-    const url = `${this.endpoint}/sns/userinfo?access_token=${token}&openid=${openid}&lang=${lang}`;
+  private _getAuthUser(openid: string, token: AuthAccessToken, lang: 'zh_CN' | 'zh_TW' | 'en'): Promise<UserInfo> {
+    const url = `${this.endpoint}/sns/userinfo?access_token=${token.accessToken}&openid=${openid}&lang=${lang}`;
     return this.request(url, {dataType: 'json'}).then((response) => {
-      return processWechatResponse(response.data);
+      return Object.assign({scope: token.scope}, processWechatResponse(response.data));
     });
@@ -307,7 +308,12 @@ }
       }
-      if (token.isValid()) {
-        return this._getAuthUser(openid, token.accessToken, lang);
+      if (token.scope.indexOf('snsapi_userinfo') >= 0) {
+        return {
+          openid,
+          scope: token.scope
+        };
+      } else if (token.isValid()) {
+        return this._getAuthUser(openid, token, lang);
       } else {
         return this.refreshAuthAccessToken(token.refreshToken).then((token) => {
-          return this._getAuthUser(openid, token.accessToken, lang);
+          return this._getAuthUser(openid, token, lang);
         });
@@ -318,8 +324,2 @@ }
 
-  getOpenidByCode(code: string): Promise<string> {
-    return this.getAuthAccessToken(code).then((token) => {
-      return token.openid;
-    });
-  }
-
   getAuthUserByCode(code: string, lang: 'zh_CN' | 'zh_TW' | 'en' = 'zh_CN'): Promise<UserInfo> {
@@ -326,0 +326,0 @@ return this.getAuthAccessToken(code).then((token) => {

No alert changes

Improved metrics

Total package byte prevSize

66721

increased by0.15%

Lines of code

786

increased by0.26%

No dependency changes