@waline/vercel 1.39.1 → 1.39.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.39.1",
+  "version": "1.39.3",
   "description": "vercel server for waline comment system",
   "keywords": [
     "blog",

package/src/controller/oauth.js

@@ -7,12 +7,10 @@ module.exports = class extends think.Controller {
   }
 
   async indexAction() {
-    const { code, oauth_verifier, oauth_token, type, redirect } = this.get();
+    const { code, state, type, redirect } = this.get();
     const { oauthUrl } = this.config();
 
-    const hasCode = type === 'twitter' ? oauth_token && oauth_verifier : Boolean(code);
-
-    if (!hasCode) {
+    if (!code) {
       const { serverURL } = this.ctx;
       const redirectUrl = think.buildUrl(`${serverURL}/api/oauth`, {
         redirect,
@@ -31,7 +29,7 @@ module.exports = class extends think.Controller {
     /**
      * user = { id, name, email, avatar,url };
      */
-    const params = { code, oauth_verifier, oauth_token };
+    const params = { code, state };
 
     if (type === 'facebook') {
       const { serverURL } = this.ctx;
@@ -102,14 +100,14 @@ module.exports = class extends think.Controller {
       type: think.isEmpty(count) ? 'administrator' : 'guest',
     };
 
-    await this.modelInstance.add(data);
+    const cmtUser = await this.modelInstance.add(data);
 
     if (!redirect) {
       return this.success();
     }
 
     // and then generate token!
-    const token = jwt.sign(user.objectId, this.config('jwtKey'));
+    const token = jwt.sign(cmtUser.objectId, this.config('jwtKey'));
 
     this.redirect(redirect + (redirect.includes('?') ? '&' : '?') + 'token=' + token);
   }

package/src/logic/base.js

@@ -129,16 +129,14 @@ module.exports = class BaseLogic extends think.Logic {
       think.isFunction(domain.test) ? domain.test(checking) : domain === checking,
     );
 
-    if (!isSafe) {
-      return this.ctx.throw(403);
-    }
+    return isSafe;
   }
 
   getResource() {
     const filename = this.__filename || __filename;
     const last = filename.lastIndexOf(path.sep);
 
-    return filename.slice(last + 1, - 3);
+    return filename.slice(last + 1, -3);
   }
 
   getId() {

package/src/service/markdown/xss.js

@@ -3,6 +3,13 @@ const { JSDOM } = require('jsdom');
 
 const DOMPurify = createDOMPurify(new JSDOM('').window);
 
+// try to fix https://github.com/walinejs/waline/issues/3238
+DOMPurify.addHook('uponSanitizeElement', (node, data) => {
+  if (data.tagName === 'annotation') {
+    node.remove();
+  }
+});
+
 /**
  * Add a hook to make all links open a new window
  * and force their rel to be 'nofollow noreferrer noopener'