node-easywechat 3.7.0 → 3.7.2

package/dist/OpenWork/Application.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -110,12 +101,12 @@ class Application {
     getServer() {
         if (!this.server) {
             this.server = new Server_1.default(this.getSuiteEncryptor(), this.getEncryptor(), this.getRequest());
-            this.server.withDefaultSuiteTicketHandler((message, next) => __awaiter(this, void 0, void 0, function* () {
+            this.server.withDefaultSuiteTicketHandler(async (message, next) => {
                 if (message.SuiteId === this.getAccount().getSuiteId()) {
-                    yield this.getSuiteTicket().setTicket(message.SuiteTicket);
+                    await this.getSuiteTicket().setTicket(message.SuiteTicket);
                 }
                 return next(message);
-            }));
+            });
         }
         else {
             this.server.setRequest(this.getRequest());
@@ -184,24 +175,22 @@ class Application {
      * @param suiteAccessToken
      * @returns
      */
-    getAuthorization(corpId_1, permanentCode_1) {
-        return __awaiter(this, arguments, void 0, function* (corpId, permanentCode, suiteAccessToken = null) {
-            if (!suiteAccessToken)
-                suiteAccessToken = this.getSuiteAccessToken();
-            let response = (yield this.getClient().request('post', 'cgi-bin/service/get_auth_info', {
-                params: {
-                    suite_access_token: yield suiteAccessToken.getToken(),
-                },
-                json: {
-                    auth_corpid: corpId,
-                    permanent_code: permanentCode,
-                }
-            })).toObject();
-            if (!response['auth_corp_info']) {
-                throw new Error('Failed to get auth_corp_info: ' + JSON.stringify(response));
+    async getAuthorization(corpId, permanentCode, suiteAccessToken = null) {
+        if (!suiteAccessToken)
+            suiteAccessToken = this.getSuiteAccessToken();
+        let response = (await this.getClient().request('post', 'cgi-bin/service/get_auth_info', {
+            params: {
+                suite_access_token: await suiteAccessToken.getToken(),
+            },
+            json: {
+                auth_corpid: corpId,
+                permanent_code: permanentCode,
             }
-            return new Authorization_1.default(response);
-        });
+        })).toObject();
+        if (!response['auth_corp_info']) {
+            throw new Error('Failed to get auth_corp_info: ' + JSON.stringify(response));
+        }
+        return new Authorization_1.default(response);
     }
     /**
      * 获取预授权码
@@ -209,20 +198,18 @@ class Application {
      * @param suiteAccessToken
      * @returns
      */
-    createPreAuthorizationCode() {
-        return __awaiter(this, arguments, void 0, function* (suiteAccessToken = null) {
-            if (!suiteAccessToken)
-                suiteAccessToken = this.getSuiteAccessToken();
-            let response = (yield this.getClient().request('get', 'cgi-bin/service/get_pre_auth_code', {
-                params: {
-                    suite_access_token: yield suiteAccessToken.getToken(),
-                }
-            })).toObject();
-            if (!response['pre_auth_code']) {
-                throw new Error('Failed to get pre_auth_code: ' + JSON.stringify(response));
+    async createPreAuthorizationCode(suiteAccessToken = null) {
+        if (!suiteAccessToken)
+            suiteAccessToken = this.getSuiteAccessToken();
+        let response = (await this.getClient().request('get', 'cgi-bin/service/get_pre_auth_code', {
+            params: {
+                suite_access_token: await suiteAccessToken.getToken(),
             }
-            return response;
-        });
+        })).toObject();
+        if (!response['pre_auth_code']) {
+            throw new Error('Failed to get pre_auth_code: ' + JSON.stringify(response));
+        }
+        return response;
     }
     /**
      * 获取企业授权令牌
@@ -231,55 +218,45 @@ class Application {
      * @param suiteAccessToken
      * @returns
      */
-    getAuthorizerAccessToken(corpId_1, permanentCode_1) {
-        return __awaiter(this, arguments, void 0, function* (corpId, permanentCode, suiteAccessToken = null) {
-            if (!suiteAccessToken)
-                suiteAccessToken = this.getSuiteAccessToken();
-            return new AuthorizerAccessToken_1.default(corpId, permanentCode, suiteAccessToken, null, this.getCache(), this.getHttpClient());
-        });
+    async getAuthorizerAccessToken(corpId, permanentCode, suiteAccessToken = null) {
+        if (!suiteAccessToken)
+            suiteAccessToken = this.getSuiteAccessToken();
+        return new AuthorizerAccessToken_1.default(corpId, permanentCode, suiteAccessToken, null, this.getCache(), this.getHttpClient());
     }
     createClient() {
-        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), this.getProviderAccessToken(), (response) => { var _a; return (_a = response.toObject()['errcode']) !== null && _a !== void 0 ? _a : 0; }, this.getConfig().get('http.throw', true)))
+        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), this.getProviderAccessToken(), (response) => response.toObject()['errcode'] ?? 0, this.getConfig().get('http.throw', true)))
             .setPresets(this.getConfig().all());
     }
-    getAuthorizerClient(corpId_1, permanentCode_1) {
-        return __awaiter(this, arguments, void 0, function* (corpId, permanentCode, suiteAccessToken = null) {
-            return (new AccessTokenAwareClient_1.default(this.getHttpClient(), yield this.getAuthorizerAccessToken(corpId, permanentCode, suiteAccessToken), (response) => { var _a; return (_a = response.toObject()['errcode']) !== null && _a !== void 0 ? _a : 0; }, this.getConfig().get('http.throw', true)))
-                .setPresets(this.getConfig().all());
-        });
+    async getAuthorizerClient(corpId, permanentCode, suiteAccessToken = null) {
+        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), await this.getAuthorizerAccessToken(corpId, permanentCode, suiteAccessToken), (response) => response.toObject()['errcode'] ?? 0, this.getConfig().get('http.throw', true)))
+            .setPresets(this.getConfig().all());
     }
-    getJsApiTicket(corpId_1, permanentCode_1) {
-        return __awaiter(this, arguments, void 0, function* (corpId, permanentCode, suiteAccessToken = null) {
-            return new JsApiTicket_1.default(corpId, null, this.getCache(), yield this.getAuthorizerClient(corpId, permanentCode, suiteAccessToken));
-        });
+    async getJsApiTicket(corpId, permanentCode, suiteAccessToken = null) {
+        return new JsApiTicket_1.default(corpId, null, this.getCache(), await this.getAuthorizerClient(corpId, permanentCode, suiteAccessToken));
     }
-    getOAuth(suiteId_1) {
-        return __awaiter(this, arguments, void 0, function* (suiteId, suiteAccessToken = null) {
-            if (!suiteAccessToken)
-                suiteAccessToken = this.getSuiteAccessToken();
-            return (new OpenWeWork_1.default({
-                client_id: suiteId,
-                client_secret: '',
-                redirect: this.getConfig().get('oauth.redirect_url'),
-            }))
-                .withSuiteTicket(yield this.getSuiteTicket().getTicket())
-                .withSuiteAccessToken(yield suiteAccessToken.getToken())
-                .scopes(this.getConfig().get('oauth.scopes', 'snsapi_base'));
-        });
+    async getOAuth(suiteId, suiteAccessToken = null) {
+        if (!suiteAccessToken)
+            suiteAccessToken = this.getSuiteAccessToken();
+        return (new OpenWeWork_1.default({
+            client_id: suiteId,
+            client_secret: '',
+            redirect: this.getConfig().get('oauth.redirect_url'),
+        }))
+            .withSuiteTicket(await this.getSuiteTicket().getTicket())
+            .withSuiteAccessToken(await suiteAccessToken.getToken())
+            .scopes(this.getConfig().get('oauth.scopes', 'snsapi_base'));
     }
-    getCorpOAuth(corpId_1) {
-        return __awaiter(this, arguments, void 0, function* (corpId, suiteAccessToken = null) {
-            if (!suiteAccessToken)
-                suiteAccessToken = this.getSuiteAccessToken();
-            return (new OpenWeWork_1.default({
-                client_id: corpId,
-                client_secret: '',
-                redirect: this.getConfig().get('oauth.redirect_url'),
-            }))
-                .withSuiteTicket(yield this.getSuiteTicket().getTicket())
-                .withSuiteAccessToken(yield suiteAccessToken.getToken())
-                .scopes(this.getConfig().get('oauth.scopes', 'snsapi_base'));
-        });
+    async getCorpOAuth(corpId, suiteAccessToken = null) {
+        if (!suiteAccessToken)
+            suiteAccessToken = this.getSuiteAccessToken();
+        return (new OpenWeWork_1.default({
+            client_id: corpId,
+            client_secret: '',
+            redirect: this.getConfig().get('oauth.redirect_url'),
+        }))
+            .withSuiteTicket(await this.getSuiteTicket().getTicket())
+            .withSuiteAccessToken(await suiteAccessToken.getToken())
+            .scopes(this.getConfig().get('oauth.scopes', 'snsapi_base'));
     }
     /**
      * 获取请求默认配置

package/dist/OpenWork/AuthorizerAccessToken.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -52,47 +43,41 @@ class AuthorizerAccessToken {
         this.key = key;
         return this;
     }
-    getToken() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.suiteAccessToken) {
-                return this.permanentCodeOrAccessToken;
-            }
-            let token = '';
-            if (this.cache) {
-                token = yield this.cache.get(this.getKey());
-            }
-            if (!!token && typeof token === 'string') {
-                return token;
-            }
-            return this.refresh();
-        });
+    async getToken() {
+        if (!this.suiteAccessToken) {
+            return this.permanentCodeOrAccessToken;
+        }
+        let token = '';
+        if (this.cache) {
+            token = await this.cache.get(this.getKey());
+        }
+        if (!!token && typeof token === 'string') {
+            return token;
+        }
+        return this.refresh();
     }
-    toQuery() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                access_token: yield this.getToken(),
-            };
-        });
+    async toQuery() {
+        return {
+            access_token: await this.getToken(),
+        };
     }
-    refresh() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let response = (yield this.httpClient.request('post', 'cgi-bin/service/get_corp_token', {
-                params: {
-                    suite_access_token: yield this.suiteAccessToken.getToken(),
-                },
-                json: {
-                    auth_corpid: this.corpId,
-                    permanent_code: this.permanentCodeOrAccessToken,
-                }
-            })).toObject();
-            if (!response['access_token']) {
-                throw new Error('Failed to get access_token: ' + JSON.stringify(response));
-            }
-            if (this.cache) {
-                yield this.cache.set(this.getKey(), response['access_token'], parseInt(response['expires_in']) - 100);
+    async refresh() {
+        let response = (await this.httpClient.request('post', 'cgi-bin/service/get_corp_token', {
+            params: {
+                suite_access_token: await this.suiteAccessToken.getToken(),
+            },
+            json: {
+                auth_corpid: this.corpId,
+                permanent_code: this.permanentCodeOrAccessToken,
             }
-            return response['access_token'];
-        });
+        })).toObject();
+        if (!response['access_token']) {
+            throw new Error('Failed to get access_token: ' + JSON.stringify(response));
+        }
+        if (this.cache) {
+            await this.cache.set(this.getKey(), response['access_token'], parseInt(response['expires_in']) - 100);
+        }
+        return response['access_token'];
     }
     /**
      * 转为字符串

package/dist/OpenWork/JsApiTicket.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -32,22 +23,20 @@ class JsApiTicket {
      * @param timestamp 时间长，默认：当前时间
      * @returns
      */
-    createConfigSignature(url_1) {
-        return __awaiter(this, arguments, void 0, function* (url, nonce = null, timestamp = null, jsApiList = [], debug = false, beta = true) {
-            nonce = nonce || (0, Utils_1.randomString)(10);
-            timestamp = timestamp || (0, Utils_1.getTimestamp)();
-            let ticket = yield this.getTicket();
-            return {
-                appId: this.corpId,
-                nonceStr: nonce,
-                timestamp,
-                url,
-                signature: this.getTicketSignature(ticket, nonce, timestamp, url),
-                jsApiList,
-                debug,
-                beta,
-            };
-        });
+    async createConfigSignature(url, nonce = null, timestamp = null, jsApiList = [], debug = false, beta = true) {
+        nonce = nonce || (0, Utils_1.randomString)(10);
+        timestamp = timestamp || (0, Utils_1.getTimestamp)();
+        let ticket = await this.getTicket();
+        return {
+            appId: this.corpId,
+            nonceStr: nonce,
+            timestamp,
+            url,
+            signature: this.getTicketSignature(ticket, nonce, timestamp, url),
+            jsApiList,
+            debug,
+            beta,
+        };
     }
     getTicketSignature(ticket, nonce, timestamp, url) {
         return (0, Utils_1.createHash)(`jsapi_ticket=${ticket}&noncestr=${nonce}&timestamp=${timestamp}&url=${url}`, 'sha1');
@@ -66,25 +55,23 @@ class JsApiTicket {
      * 获取签名凭证jsapi_ticket
      * @returns
      */
-    getTicket() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let key = this.getKey();
-            let ticket = '';
-            if (this.cache) {
-                ticket = yield this.cache.get(key);
-            }
-            if (!!ticket && typeof ticket === 'string') {
-                return ticket;
-            }
-            let response = (yield this.httpClient.request('get', '/cgi-bin/get_jsapi_ticket', {})).toObject();
-            if (!response['ticket']) {
-                throw new Error('Failed to get jssdk_ticket: ' + JSON.stringify(response));
-            }
-            if (this.cache) {
-                yield this.cache.set(key, response['ticket'], parseInt(response['expires_in']));
-            }
-            return response['ticket'];
-        });
+    async getTicket() {
+        let key = this.getKey();
+        let ticket = '';
+        if (this.cache) {
+            ticket = await this.cache.get(key);
+        }
+        if (!!ticket && typeof ticket === 'string') {
+            return ticket;
+        }
+        let response = (await this.httpClient.request('get', '/cgi-bin/get_jsapi_ticket', {})).toObject();
+        if (!response['ticket']) {
+            throw new Error('Failed to get jssdk_ticket: ' + JSON.stringify(response));
+        }
+        if (this.cache) {
+            await this.cache.set(key, response['ticket'], parseInt(response['expires_in']));
+        }
+        return response['ticket'];
     }
     /**
      * 获取代理应用的签名配置
@@ -94,50 +81,46 @@ class JsApiTicket {
      * @param timestamp 时间长，默认：当前时间
      * @returns
      */
-    createAgentConfigSignature(agentId_1, url_1) {
-        return __awaiter(this, arguments, void 0, function* (agentId, url, nonce = null, timestamp = null, jsApiList = []) {
-            nonce = nonce || (0, Utils_1.randomString)(10);
-            timestamp = timestamp || (0, Utils_1.getTimestamp)();
-            let ticket = yield this.getTicket();
-            return {
-                corpid: this.corpId,
-                agentid: agentId,
-                url,
-                nonceStr: nonce,
-                timestamp,
-                signature: this.getTicketSignature(ticket, nonce, timestamp, url),
-                jsApiList,
-            };
-        });
+    async createAgentConfigSignature(agentId, url, nonce = null, timestamp = null, jsApiList = []) {
+        nonce = nonce || (0, Utils_1.randomString)(10);
+        timestamp = timestamp || (0, Utils_1.getTimestamp)();
+        let ticket = await this.getTicket();
+        return {
+            corpid: this.corpId,
+            agentid: agentId,
+            url,
+            nonceStr: nonce,
+            timestamp,
+            signature: this.getTicketSignature(ticket, nonce, timestamp, url),
+            jsApiList,
+        };
     }
     /**
      * 获取代理应用的签名凭证jsapi_ticket
      * @param agentId 代理应用的id
      * @returns
      */
-    getAgentTicket(agentId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let key = this.getAgentKey(agentId);
-            let ticket = '';
-            if (this.cache) {
-                ticket = yield this.cache.get(key);
-            }
-            if (!!ticket && typeof ticket === 'string') {
-                return ticket;
-            }
-            let response = (yield this.httpClient.request('get', '/cgi-bin/ticket/get', {
-                params: {
-                    type: 'agent_config',
-                }
-            })).toObject();
-            if (!response['ticket']) {
-                throw new Error('Failed to get jssdk agentTicket: ' + JSON.stringify(response));
-            }
-            if (this.cache) {
-                yield this.cache.set(key, response['ticket'], parseInt(response['expires_in']));
+    async getAgentTicket(agentId) {
+        let key = this.getAgentKey(agentId);
+        let ticket = '';
+        if (this.cache) {
+            ticket = await this.cache.get(key);
+        }
+        if (!!ticket && typeof ticket === 'string') {
+            return ticket;
+        }
+        let response = (await this.httpClient.request('get', '/cgi-bin/ticket/get', {
+            params: {
+                type: 'agent_config',
             }
-            return response['ticket'];
-        });
+        })).toObject();
+        if (!response['ticket']) {
+            throw new Error('Failed to get jssdk agentTicket: ' + JSON.stringify(response));
+        }
+        if (this.cache) {
+            await this.cache.set(key, response['ticket'], parseInt(response['expires_in']));
+        }
+        return response['ticket'];
     }
     /**
      * 获取代理应用的jsapi_ticket的缓存名称

package/dist/OpenWork/ProviderAccessToken.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -44,41 +35,35 @@ class ProviderAccessToken {
         this.key = key;
         return this;
     }
-    getToken() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let token = '';
-            if (this.cache) {
-                token = yield this.cache.get(this.getKey());
-            }
-            if (!!token && typeof token === 'string') {
-                return token;
-            }
-            return this.refresh();
-        });
+    async getToken() {
+        let token = '';
+        if (this.cache) {
+            token = await this.cache.get(this.getKey());
+        }
+        if (!!token && typeof token === 'string') {
+            return token;
+        }
+        return this.refresh();
     }
-    toQuery() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                provider_access_token: yield this.getToken(),
-            };
-        });
+    async toQuery() {
+        return {
+            provider_access_token: await this.getToken(),
+        };
     }
-    refresh() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let response = (yield this.httpClient.request('post', 'cgi-bin/service/get_provider_token', {
-                json: {
-                    corpid: this.corpId,
-                    provider_secret: this.providerSecret,
-                }
-            })).toObject();
-            if (!response['provider_access_token']) {
-                throw new Error('Failed to get provider_access_token: ' + JSON.stringify(response));
-            }
-            if (this.cache) {
-                yield this.cache.set(this.getKey(), response['provider_access_token'], parseInt(response['expires_in']) - 100);
+    async refresh() {
+        let response = (await this.httpClient.request('post', 'cgi-bin/service/get_provider_token', {
+            json: {
+                corpid: this.corpId,
+                provider_secret: this.providerSecret,
             }
-            return response['provider_access_token'];
-        });
+        })).toObject();
+        if (!response['provider_access_token']) {
+            throw new Error('Failed to get provider_access_token: ' + JSON.stringify(response));
+        }
+        if (this.cache) {
+            await this.cache.set(this.getKey(), response['provider_access_token'], parseInt(response['expires_in']) - 100);
+        }
+        return response['provider_access_token'];
     }
 }
 module.exports = ProviderAccessToken;