@waline/vercel 1.33.0 → 1.34.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.33.0",
+  "version": "1.34.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -18,7 +18,7 @@
     "dev": "node development.js 9090"
   },
   "dependencies": {
-    "@cloudbase/node-sdk": "^3.14.1",
+    "@cloudbase/node-sdk": "^3.14.2",
     "@koa/cors": "^5.0.0",
     "@mdit/plugin-katex": "0.23.4-cjs.0",
     "@mdit/plugin-mathjax": "0.23.4-cjs.0",
@@ -29,7 +29,7 @@
     "dompurify": "^3.3.0",
     "dy-node-ip2region": "^1.0.1",
     "fast-csv": "^5.0.5",
-    "form-data": "^4.0.4",
+    "form-data": "^4.0.5",
     "jsdom": "^19.0.0",
     "jsonwebtoken": "^9.0.2",
     "koa-compose": "^4.1.0",
@@ -37,7 +37,7 @@
     "markdown-it": "^14.1.0",
     "markdown-it-emoji": "^3.0.0",
     "mathjax-full": "^3.2.2",
-    "nodemailer": "^7.0.10",
+    "nodemailer": "^7.0.11",
     "nunjucks": "^3.2.4",
     "phpass": "^0.1.1",
     "prismjs": "^1.30.0",

package/src/config/middleware.js

@@ -10,6 +10,9 @@ const isAliyunFC =
   think.env === 'aliyun-fc' || Boolean(process.env.FC_RUNTIME_VERSION);
 
 module.exports = [
+  {
+    handle: 'fetch-oauth-service',
+  },
   {
     handle: 'dashboard',
     match: isNetlify ? new RegExp(`${netlifyFunctionPrefix}/ui`, 'i') : /^\/ui/,

package/src/controller/user.js

@@ -159,7 +159,7 @@ module.exports = class extends BaseRest {
       updateData['2fa'] = twoFactorAuth;
     }
 
-    const socials = ['github', 'twitter', 'facebook', 'google', 'weibo', 'qq'];
+    const socials = this.ctx.state.oauthServices.map(({ name }) => name);
 
     socials.forEach((social) => {
       const nextSocial = this.post(social);

package/src/logic/base.js

@@ -32,14 +32,18 @@ module.exports = class extends think.Logic {
       secureDomains = think.isArray(secureDomains)
         ? secureDomains
         : [secureDomains];
+
       secureDomains.push(
         'localhost',
         '127.0.0.1',
-        'github.com',
-        'api.twitter.com',
-        'www.facebook.com',
-        'api.weibo.com',
-        'graph.qq.com',
+        // 'github.com',
+        // 'api.twitter.com',
+        // 'www.facebook.com',
+        // 'api.weibo.com',
+        // 'graph.qq.com',
+      );
+      secureDomains = secureDomains.concat(
+        this.ctx.state.oauthServices.map(({ origin }) => origin),
       );
 
       // 转换可能的正则表达式字符串为正则表达式对象
@@ -110,15 +114,10 @@ module.exports = class extends think.Logic {
           'url',
           'display_name',
           'type',
-          'github',
-          'twitter',
-          'facebook',
-          'google',
-          'weibo',
-          'qq',
           'avatar',
           '2fa',
           'label',
+          ...this.ctx.state.oauthServices.map(({ name }) => name),
         ],
       },
     );

package/src/middleware/dashboard.js

@@ -14,6 +14,7 @@ module.exports = function () {
     window.SITE_NAME = ${JSON.stringify(process.env.SITE_NAME)};
     window.recaptchaV3Key = ${JSON.stringify(process.env.RECAPTCHA_V3_KEY)};
     window.turnstileKey = ${JSON.stringify(process.env.TURNSTILE_KEY)};
+    window.oauthServices = ${JSON.stringify(ctx.state.oauthServices || [])};
     window.serverURL = '${ctx.serverURL}/api/';
     </script>
     <script src="${

package/src/middleware/fetch-oauth-service.js

@@ -0,0 +1,16 @@
+module.exports = () => async (ctx, next) => {
+  const { oauthUrl } = think.config();
+  const oauthResp = await fetch(oauthUrl, {
+    method: 'GET',
+    headers: {
+      'user-agent': '@waline',
+    },
+  }).then((resp) => resp.json());
+
+  if (!oauthResp || !Array.isArray(oauthResp.services)) {
+    ctx.throw(502);
+  }
+  ctx.state.oauthServices = oauthResp.services || [];
+
+  next();
+};

package/src/service/notify.js

@@ -532,8 +532,8 @@ module.exports = class extends think.Service {
       }
     }
 
-    const disallowList = ['github', 'twitter', 'facebook', 'qq', 'weibo'].map(
-      (social) => 'mail.' + social,
+    const disallowList = this.ctx.state.oauthServices.map(
+      ({ name }) => 'mail.' + name,
     );
     const fakeMail = new RegExp(`@(${disallowList.join('|')})$`, 'i');
 

package/src/service/storage/github.js

@@ -38,6 +38,7 @@ const CSV_HEADERS = {
     'google',
     'weibo',
     'qq',
+    'oidc',
     'createdAt',
     'updatedAt',
   ],