node-easywechat 3.7.9 → 3.7.10

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
 
+## v3.7.10 (2025-08-06)
+
+- Fix: 更新node-socialite，并调整使用方法
+
 ## v3.7.9 (2025-07-24)
 
 - Fix: 更新依赖包，修复安全漏洞

package/dist/OfficialAccount/Application.d.ts

@@ -1,4 +1,4 @@
-import ProviderInterface from 'node-socialite/dist/Core/ProviderInterface';
+import { WeChat } from 'node-socialite/dist/Providers/WeChat';
 import ConfigInterface from '../Core/Contracts/ConfigInterface';
 import Encryptor from '../Core/Encryptor';
 import AccessTokenAwareClient from '../Core/HttpClient/AccessTokenAwareClient';
@@ -55,7 +55,7 @@ declare class Application implements ApplicationInterface {
      */
     setAccessToken(accessToken: AccessTokenInterface): this;
     setOAuthFactory(oauthFactory: OfficialAccountOAuthFactory): this;
-    getOAuth(): ProviderInterface;
+    getOAuth(): WeChat;
     getTicket(): JsApiTicket;
     /**
      * 设置JsApiTicket实例

package/dist/OfficialAccount/Application.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const merge_1 = __importDefault(require("merge"));
-const ProviderInterface_1 = __importDefault(require("node-socialite/dist/Core/ProviderInterface"));
-const WeChat_1 = __importDefault(require("node-socialite/dist/Providers/WeChat"));
+const WeChat_1 = require("node-socialite/dist/Providers/WeChat");
 const Config_1 = __importDefault(require("./Config"));
 const ConfigInterface_1 = __importDefault(require("../Core/Contracts/ConfigInterface"));
 const Encryptor_1 = __importDefault(require("../Core/Encryptor"));
@@ -114,7 +113,7 @@ class Application {
     getOAuth() {
         if (!this.oauthFactory) {
             this.oauthFactory = ((app) => {
-                return (new WeChat_1.default({
+                return (new WeChat_1.WeChat({
                     client_id: app.getAccount().getAppId(),
                     client_secret: app.getAccount().getSecret(),
                     redirect: app.getConfig().get('oauth.redirect_url'),
@@ -122,8 +121,8 @@ class Application {
             });
         }
         let provider = this.oauthFactory.call(null, this);
-        if (!(provider instanceof ProviderInterface_1.default)) {
-            throw new Error(`The factory must return a \`ProviderInterface\` instance.`);
+        if (!(provider instanceof WeChat_1.WeChat)) {
+            throw new Error(`The factory must return a \`BaseProvider\` instance.`);
         }
         return provider;
     }

package/dist/OfficialAccount/Contracts/ApplicationInterface.d.ts

@@ -1,4 +1,3 @@
-import ProviderInterface from "node-socialite/dist/Core/ProviderInterface";
 import CacheInterface from "../../Core/Contracts/CacheInterface";
 import ConfigInterface from "../../Core/Contracts/ConfigInterface";
 import AccessTokenAwareClient from "../../Core/HttpClient/AccessTokenAwareClient";
@@ -11,6 +10,7 @@ import { OfficialAccountOAuthFactory } from "../../Types/global";
 import JsApiTicket from "../JsApiTicket";
 import Utils from "../Utils";
 import AccessTokenInterface from "../../Core/Contracts/AccessTokenInterface";
+import { WeChat } from "node-socialite/dist/Providers/WeChat";
 declare abstract class ApplicationInterface {
     /**
      * 获取当前账户实例
@@ -66,7 +66,7 @@ declare abstract class ApplicationInterface {
      * 获取OAuth实例
      * @returns
      */
-    getOAuth(): ProviderInterface;
+    getOAuth(): WeChat;
     /**
      * 获取JsApiTicket实例
      * @returns

package/dist/OpenPlatform/Application.d.ts

@@ -1,4 +1,4 @@
-import ProviderInterface from 'node-socialite/dist/Core/ProviderInterface';
+import { WeChat } from 'node-socialite/dist/Providers/WeChat';
 import ConfigInterface from '../Core/Contracts/ConfigInterface';
 import Encryptor from '../Core/Encryptor';
 import AccessTokenAwareClient from '../Core/HttpClient/AccessTokenAwareClient';
@@ -105,7 +105,7 @@ declare class Application implements ApplicationInterface {
     createPreAuthorizationUrl(callbackUrl: string, optional?: string | {
         pre_auth_code: string;
     }): Promise<string>;
-    getOAuth(): ProviderInterface;
+    getOAuth(): WeChat;
     /**
      * 根据刷新令牌获取公众号实例
      * @param appId

package/dist/OpenPlatform/Application.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const merge_1 = __importDefault(require("merge"));
-const ProviderInterface_1 = __importDefault(require("node-socialite/dist/Core/ProviderInterface"));
-const WeChat_1 = __importDefault(require("node-socialite/dist/Providers/WeChat"));
+const WeChat_1 = require("node-socialite/dist/Providers/WeChat");
 const Config_1 = __importDefault(require("./Config"));
 const ConfigInterface_1 = __importDefault(require("../Core/Contracts/ConfigInterface"));
 const Encryptor_1 = __importDefault(require("../Core/Encryptor"));
@@ -209,15 +208,15 @@ class Application {
     }
     getOAuth() {
         let oauthFactory = ((app) => {
-            return (new WeChat_1.default({
+            return (new WeChat_1.WeChat({
                 client_id: app.getAccount().getAppId(),
                 client_secret: app.getAccount().getSecret(),
                 redirect: app.getConfig().get('oauth.redirect_url'),
             })).scopes(this.getConfig().get('oauth.scopes', 'snsapi_userinfo'));
         });
         let provider = oauthFactory.call(null, this);
-        if (!(provider instanceof ProviderInterface_1.default)) {
-            throw new Error(`The factory must return a \`ProviderInterface\` instance.`);
+        if (!(provider instanceof WeChat_1.WeChat)) {
+            throw new Error(`The factory must return a \`WeChat\` instance.`);
         }
         return provider;
     }
@@ -277,7 +276,7 @@ class Application {
      */
     createAuthorizerOAuthFactory(authorizerAppId, config) {
         return ((app) => {
-            return (new WeChat_1.default({
+            return (new WeChat_1.WeChat({
                 client_id: authorizerAppId,
                 component: {
                     component_app_id: this.getAccount().getSecret(),

package/dist/OpenPlatform/Contracts/ApplicationInterface.d.ts

@@ -1,4 +1,3 @@
-import ProviderInterface from "node-socialite/dist/Core/ProviderInterface";
 import CacheInterface from "../../Core/Contracts/CacheInterface";
 import ConfigInterface from "../../Core/Contracts/ConfigInterface";
 import AccessTokenAwareClient from "../../Core/HttpClient/AccessTokenAwareClient";
@@ -8,6 +7,7 @@ import ServerRequestInterface from "../../Core/Http/Contracts/ServerRequestInter
 import Encryptor from "../../Core/Encryptor";
 import AccountInterface from "./AccountInterface";
 import AccessTokenInterface from "../../Core/Contracts/AccessTokenInterface";
+import { WeChat } from "node-socialite/dist/Providers/WeChat";
 declare abstract class ApplicationInterface {
     /**
      * 获取当前账户实例
@@ -63,6 +63,6 @@ declare abstract class ApplicationInterface {
      * 获取OAuth实例
      * @returns
      */
-    getOAuth(): ProviderInterface;
+    getOAuth(): WeChat;
 }
 export = ApplicationInterface;

package/dist/OpenWork/Application.d.ts

@@ -1,4 +1,4 @@
-import ProviderInterface from 'node-socialite/dist/Core/ProviderInterface';
+import { OpenWeWork } from 'node-socialite/dist/Providers/OpenWeWork';
 import ConfigInterface from '../Core/Contracts/ConfigInterface';
 import Encryptor from './Encryptor';
 import AccessTokenAwareClient from '../Core/HttpClient/AccessTokenAwareClient';
@@ -124,8 +124,8 @@ declare class Application implements ApplicationInterface {
     createClient(): AccessTokenAwareClient;
     getAuthorizerClient(corpId: string, permanentCode: string, suiteAccessToken?: SuiteAccessToken): Promise<AccessTokenAwareClient>;
     getJsApiTicket(corpId: string, permanentCode: string, suiteAccessToken?: SuiteAccessToken): Promise<JsApiTicket>;
-    getOAuth(suiteId: string, suiteAccessToken?: SuiteAccessToken): Promise<ProviderInterface>;
-    getCorpOAuth(corpId: string, suiteAccessToken?: SuiteAccessToken): Promise<ProviderInterface>;
+    getOAuth(suiteId: string, suiteAccessToken?: SuiteAccessToken): Promise<OpenWeWork>;
+    getCorpOAuth(corpId: string, suiteAccessToken?: SuiteAccessToken): Promise<OpenWeWork>;
     /**
      * 获取请求默认配置
      * @returns

package/dist/OpenWork/Application.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const merge_1 = __importDefault(require("merge"));
-const OpenWeWork_1 = __importDefault(require("node-socialite/dist/Providers/OpenWeWork"));
+const OpenWeWork_1 = require("node-socialite/dist/Providers/OpenWeWork");
 const Config_1 = __importDefault(require("./Config"));
 const ConfigInterface_1 = __importDefault(require("../Core/Contracts/ConfigInterface"));
 const Encryptor_1 = __importDefault(require("./Encryptor"));
@@ -280,7 +280,7 @@ class Application {
     async getOAuth(suiteId, suiteAccessToken = null) {
         if (!suiteAccessToken)
             suiteAccessToken = this.getSuiteAccessToken();
-        return (new OpenWeWork_1.default({
+        return (new OpenWeWork_1.OpenWeWork({
             client_id: suiteId,
             client_secret: '',
             redirect: this.getConfig().get('oauth.redirect_url'),
@@ -292,7 +292,7 @@ class Application {
     async getCorpOAuth(corpId, suiteAccessToken = null) {
         if (!suiteAccessToken)
             suiteAccessToken = this.getSuiteAccessToken();
-        return (new OpenWeWork_1.default({
+        return (new OpenWeWork_1.OpenWeWork({
             client_id: corpId,
             client_secret: '',
             redirect: this.getConfig().get('oauth.redirect_url'),

package/dist/OpenWork/Contracts/ApplicationInterface.d.ts

@@ -1,4 +1,3 @@
-import ProviderInterface from "node-socialite/dist/Core/ProviderInterface";
 import CacheInterface from "../../Core/Contracts/CacheInterface";
 import ConfigInterface from "../../Core/Contracts/ConfigInterface";
 import AccessTokenAwareClient from "../../Core/HttpClient/AccessTokenAwareClient";
@@ -12,6 +11,7 @@ import AccessTokenInterface from "../../Core/Contracts/AccessTokenInterface";
 import SuiteTicketInterface from "./SuiteTicketInterface";
 import SuiteAccessToken from "../SuiteAccessToken";
 import JsApiTicket from "../JsApiTicket";
+import { OpenWeWork } from "node-socialite/dist/Providers/OpenWeWork";
 declare abstract class ApplicationInterface {
     /**
      * 获取当前账户实例
@@ -95,7 +95,7 @@ declare abstract class ApplicationInterface {
      * @https://developer.work.weixin.qq.com/document/path/91120#构造第三方应用oauth2链接
      * @returns
      */
-    getOAuth(suiteId: string, suiteAccessToken?: SuiteAccessToken): Promise<ProviderInterface>;
+    getOAuth(suiteId: string, suiteAccessToken?: SuiteAccessToken): Promise<OpenWeWork>;
     /**
      * 获取企业的OAuth实例
      * @param corpId
@@ -103,6 +103,6 @@ declare abstract class ApplicationInterface {
      * @see https://developer.work.weixin.qq.com/document/path/91120#构造企业oauth2链接
      * @returns
      */
-    getCorpOAuth(corpId: string, suiteAccessToken?: SuiteAccessToken): Promise<ProviderInterface>;
+    getCorpOAuth(corpId: string, suiteAccessToken?: SuiteAccessToken): Promise<OpenWeWork>;
 }
 export = ApplicationInterface;

package/dist/Types/global.d.ts

@@ -1,5 +1,5 @@
 import { AxiosRequestConfig, AxiosResponse } from 'axios';
-import ProviderInterface from 'node-socialite/dist/Core/ProviderInterface';
+import { BaseProvider } from 'node-socialite';
 import OfficialAccountApplicationInterface from '../OfficialAccount/Contracts/ApplicationInterface';
 import WorkApplicationInterface from '../Work/Contracts/ApplicationInterface';
 import Message from '../Core/Message';
@@ -304,14 +304,14 @@ export interface OpenWorkConfig extends BaseConfig {
  * @param app 公众号应用实例
  * @returns OAuth服务供应商实例
  */
-export type OfficialAccountOAuthFactory = (app: OfficialAccountApplicationInterface) => ProviderInterface;
+export type OfficialAccountOAuthFactory = (app: OfficialAccountApplicationInterface) => BaseProvider;
 
 /**
  * 企业微信OAuth工厂方法
  * @param app 企业微信应用实例
  * @returns OAuth服务供应商实例
  */
-export type WorkOAuthFactory = (app: WorkApplicationInterface) => ProviderInterface;
+export type WorkOAuthFactory = (app: WorkApplicationInterface) => BaseProvider;
 
 /**
  * 服务端通知处理项

package/dist/Work/Application.d.ts

@@ -1,4 +1,4 @@
-import ProviderInterface from 'node-socialite/dist/Core/ProviderInterface';
+import { WeWork } from 'node-socialite/dist/Providers/WeWork';
 import ConfigInterface from '../Core/Contracts/ConfigInterface';
 import Encryptor from './Encryptor';
 import AccessTokenAwareClient from '../Core/HttpClient/AccessTokenAwareClient';
@@ -55,7 +55,7 @@ declare class Application implements ApplicationInterface {
      */
     setAccessToken(accessToken: AccessTokenInterface): this;
     setOAuthFactory(oauthFactory: WorkOAuthFactory): this;
-    getOAuth(): Promise<ProviderInterface>;
+    getOAuth(): Promise<WeWork>;
     getTicket(): JsApiTicket;
     /**
      * 设置JsApiTicket实例

package/dist/Work/Application.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const merge_1 = __importDefault(require("merge"));
-const WeWork_1 = __importDefault(require("node-socialite/dist/Providers/WeWork"));
+const WeWork_1 = require("node-socialite/dist/Providers/WeWork");
 const Config_1 = __importDefault(require("./Config"));
 const ConfigInterface_1 = __importDefault(require("../Core/Contracts/ConfigInterface"));
 const Encryptor_1 = __importDefault(require("./Encryptor"));
@@ -113,7 +113,7 @@ class Application {
     async getOAuth() {
         if (!this.oauthFactory) {
             this.oauthFactory = ((app) => {
-                return new WeWork_1.default({
+                return new WeWork_1.WeWork({
                     client_id: app.getAccount().getCorpId(),
                     client_secret: app.getAccount().getSecret(),
                     redirect: app.getConfig().get('oauth.redirect_url'),
@@ -121,8 +121,8 @@ class Application {
             });
         }
         let provider = this.oauthFactory.call(null, this);
-        if (!(provider instanceof WeWork_1.default)) {
-            throw new Error(`The factory must return a \`ProviderInterface\` instance.`);
+        if (!(provider instanceof WeWork_1.WeWork)) {
+            throw new Error(`The factory must return a \`WeWork\` instance.`);
         }
         provider.withApiAccessToken(await this.getAccessToken().getToken());
         provider.scopes(this.getConfig().get('oauth.scopes', 'snsapi_userinfo'));

package/dist/Work/Contracts/ApplicationInterface.d.ts

@@ -1,4 +1,3 @@
-import ProviderInterface from "node-socialite/dist/Core/ProviderInterface";
 import CacheInterface from "../../Core/Contracts/CacheInterface";
 import ConfigInterface from "../../Core/Contracts/ConfigInterface";
 import AccessTokenAwareClient from "../../Core/HttpClient/AccessTokenAwareClient";
@@ -11,6 +10,7 @@ import { WorkOAuthFactory } from "../../Types/global";
 import JsApiTicket from "../JsApiTicket";
 import Utils from "../Utils";
 import AccessTokenInterface from "../../Core/Contracts/AccessTokenInterface";
+import { WeWork } from "node-socialite/dist/Providers/WeWork";
 declare abstract class ApplicationInterface {
     /**
      * 获取当前账户实例
@@ -66,7 +66,7 @@ declare abstract class ApplicationInterface {
      * 获取OAuth实例
      * @returns
      */
-    getOAuth(): Promise<ProviderInterface>;
+    getOAuth(): Promise<WeWork>;
     /**
      * 获取JsApiTicket实例
      * @returns

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-easywechat",
-  "version": "3.7.9",
+  "version": "3.7.10",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {
@@ -33,7 +33,7 @@
     "axios-retry": "^4.5.0",
     "form-data": "^4.0.4",
     "merge": "^2.1.1",
-    "node-socialite": "^1.4.3",
+    "node-socialite": "^1.5.1",
     "qs": "^6.14.0",
     "raw-body": "^2.5.2",
     "xml2js": "^0.6.2"

package/.github/workflows/build-2.yml

@@ -1,21 +0,0 @@
-# 2.x 所有提交自动构建并测试
-
-name: Build 2.x
-
-on:
-  push:
-    branches:
-      - '2.x'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      - run: npm install
-      - run: npm run build
-      - run: npm test
-

package/.github/workflows/publish-npm-2.yml

@@ -1,26 +0,0 @@
-# 构建、测试并发布2.x分支
-
-name: Publish 2.x to npm
-
-on:
-  push:
-    tags:
-      - v2.*
-
-jobs:
-  publish-npm:
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 22
-          registry-url: https://registry.npmjs.org/
-      - run: npm install
-      - run: npm run build
-      - run: npm test
-      - run: npm publish --tag second --provenance --access public
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}