@waline/vercel 1.13.2 → 1.13.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "description": "vercel server for waline comment system",
   "repository": "https://github.com/walinejs/waline",
   "license": "MIT",

package/src/config/extend.js

@@ -5,6 +5,12 @@ module.exports = [
   Model(think.app),
   Mongo(think.app),
   {
+    context: {
+      get serverURL() {
+        const { protocol, host, path, controller } = this;
+        return `${protocol}://${host}${path.slice(0, -controller.length)}`;
+      },
+    },
     controller: {
       fail(...args) {
         if (this.ctx.status === 200) {

package/src/controller/comment.js

@@ -375,10 +375,9 @@ module.exports = class extends BaseRest {
       think.logger.debug(`Comment initial status is ${data.status}`);
 
       if (data.status === 'approved') {
-        const spam = await akismet(
-          data,
-          this.ctx.protocol + '://' + this.ctx.host
-        ).catch((e) => console.log(e)); // ignore akismet error
+        const spam = await akismet(data, this.ctx.serverURL).catch((e) =>
+          console.log(e)
+        ); // ignore akismet error
 
         if (spam === true) {
           data.status = 'spam';

package/src/controller/oauth.js

@@ -18,8 +18,8 @@ module.exports = class extends think.Controller {
     const hasCode =
       type === 'twitter' ? oauth_token && oauth_verifier : Boolean(code);
     if (!hasCode) {
-      const { protocol, host } = this.ctx;
-      const redirectUrl = `${protocol}://${host}/oauth?${qs.stringify({
+      const { serverURL } = this.ctx;
+      const redirectUrl = `${serverURL}/oauth?${qs.stringify({
         redirect,
         type,
       })}`;
@@ -36,8 +36,8 @@ module.exports = class extends think.Controller {
      */
     const params = { code, oauth_verifier, oauth_token };
     if (type === 'facebook') {
-      const { protocol, host } = this.ctx;
-      const redirectUrl = `${protocol}://${host}/oauth?${qs.stringify({
+      const { serverURL } = this.ctx;
+      const redirectUrl = `${serverURL}/oauth?${qs.stringify({
         redirect,
         type,
       })}`;

package/src/controller/user/password.js

@@ -27,9 +27,8 @@ module.exports = class extends BaseRest {
     }
 
     const notify = this.service('notify');
-    const { protocol, host } = this.ctx;
     const token = jwt.sign(user[0].email, this.config('jwtKey'));
-    const profileUrl = `${protocol}://${host}/ui/profile?token=${token}`;
+    const profileUrl = `${this.ctx.serverURL}/ui/profile?token=${token}`;
 
     await notify.transporter.sendMail({
       from:

package/src/controller/user.js

@@ -58,9 +58,7 @@ module.exports = class extends BaseRest {
 
     const notify = this.service('notify');
     const apiUrl =
-      this.ctx.protocol +
-      '://' +
-      this.ctx.host +
+      this.ctx.serverURL +
       '/verification?' +
       qs.stringify({ token, email: data.email });