fix(jwt): token logic not correct

yociduo · Jan 2, 2020 · 9199e58 · 9199e58
1 parent 91e49b6
commit 9199e58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
   }