From 9199e58185d781287407ada6a340c065833d8696 Mon Sep 17 00:00:00 2001
From: Eden Wang <yociduo@vip.qq.com>
Date: Thu, 2 Jan 2020 13:59:09 +0800
Subject: [PATCH] fix(jwt): token logic not correct

---
 client/src/app.wpy      | 1 +
 server/src/util/User.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/app.wpy b/client/src/app.wpy
index ed40542..c25b975 100644
--- a/client/src/app.wpy
+++ b/client/src/app.wpy
@@ -68,6 +68,7 @@ export default class extends wepy.app {
             return data;
           case 401:
             wepy.redirectTo({ url: 'welcome' });
+            wepy.removeStorageSync(TOKEN_KEY);
             return null;
           default:
             return null;
diff --git a/server/src/util/User.ts b/server/src/util/User.ts
index d2edd44..0d7f5c5 100644
--- a/server/src/util/User.ts
+++ b/server/src/util/User.ts
@@ -34,12 +34,12 @@ export function decryptData(encryptedData: string, iv: string, sessionKey: strin
 
 export function sign({ id, nickName }: User): string {
   return jwt.sign({ id }, config.jwtSecret, {
-    expiresIn: nickName ? null : '1d',
+    expiresIn: nickName ? 10 : '1d',
   });
 }
 
 export function verify(token: string) {
-  const data = jwt.verify(token.slice(7), config.jwtSecret);
+  const data = jwt.verify(token.startsWith('Bearer ') ? token.slice(7) : token, config.jwtSecret);
   if (typeof data === 'string') {
     return Number(data);
   }