Merge pull request #54 from rymcu/format

✨ nuxt/auth

components/common/user/list.vue

@@ -48,7 +48,7 @@ export default {
   name: "UserList",
   computed: {
     ...mapState({
-      userInfo: state => state.oauth
+      userInfo: state => state.auth.user
     })
   },
   props: {

components/layouts/mobile/header.vue

@@ -9,7 +9,7 @@
       <el-col :xs="0" :sm="12" :md="8" :xl="8" style="text-align: center;">
         <el-row type="flex" justify="center">
           <el-col>
-            <el-menu :default-active="getActiveMenu" style="margin-top: -2px;border: 0;" mode="horizontal"
+            <el-menu :default-active="activeMenu" style="margin-top: -2px;border: 0;" mode="horizontal"
                      @select="handleSelectMenu">
               <el-menu-item index="index">首页</el-menu-item>
               <el-menu-item index="topic">专题</el-menu-item>
@@ -19,8 +19,9 @@
       </el-col>
       <el-col :xs="16" :sm="8" :md="6" :xl="3" style="padding-top: 1rem;">
         <client-only>
-          <el-col v-if="user" style="text-align: right;">
+          <el-col v-if="loggedIn" style="text-align: right;">
-            <el-link rel="nofollow" :underline="false" style="padding-left: 10px;padding-right: 10px;" href="/article/post">发帖
+            <el-link rel="nofollow" :underline="false" style="padding-left: 10px;padding-right: 10px;"
+                     href="/article/post">发帖
             </el-link>
             <el-link rel="nofollow" :underline="false" style="padding-left: 10px;padding-right: 10px;">
               <el-dropdown trigger="click" @command="handleCommand">
@@ -37,15 +38,17 @@
             </el-link>
             <el-link rel="nofollow" :underline="false" style="margin-left: 10px;">
               <el-dropdown trigger="click" @command="handleCommand">
-                <el-avatar v-if="avatarURL" size="small" :src="avatarURL"></el-avatar>
+                <el-avatar v-if="loggedIn" size="small" :src="user.avatarUrl"></el-avatar>
                 <el-avatar v-else size="small" src="https://static.rymcu.com/article/1578475481946.png"></el-avatar>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="user" style="align-items: center;">
-                    <el-avatar class="mr-3" v-if="avatarURL" size="small" style="margin-top: 1rem;"
+                    <el-avatar class="mr-3" v-if="user.avatarUrl" size="small" style="margin-top: 1rem;"
-                               :src="avatarURL"></el-avatar>
+                               :src="loggedIn"></el-avatar>
                     <el-avatar class="mr-3" v-else size="small" style="margin-top: 1rem;"
                                src="https://static.rymcu.com/article/1578475481946.png"></el-avatar>
-                    <el-link rel="nofollow" :underline="false" style="margin-left: 10px;margin-bottom: 1rem;">{{ nickname }}</el-link>
+                    <el-link rel="nofollow" :underline="false" style="margin-left: 10px;margin-bottom: 1rem;">
+                      {{ user.nickname }}
+                    </el-link>
                   </el-dropdown-item>
                   <el-dropdown-item v-if="hasPermissions" command="admin-dashboard">系统管理</el-dropdown-item>
                   <el-dropdown-item command="user-info">资料与账号</el-dropdown-item>
@@ -70,56 +73,18 @@
 </template>
 
 <script>
-  import { isBrowser } from '~/environment'
+import {mapState} from 'vuex';
 
-  const Cookie = process.client ? require('js-cookie') : undefined
+export default {
-  export default {
   name: "MobileHeader",
   computed: {
-      getActiveMenu() {
+    ...mapState({
-        return this.$store.state.activeMenu;
+      activeMenu: state => state.activeMenu,
-      },
+      user: state => state.auth.user,
-      user() {
+      loggedIn: state => state.auth.loggedIn
-        return this.$store.state.oauth;
+    }),
-      },
-      avatarURL() {
-        let _ts = this;
-        if (isBrowser) {
-          if (!_ts.$store.state.userInfo) {
-            let user = localStorage.getItem('user');
-            if (user) {
-              _ts.$store.commit('setUser', JSON.parse(user))
-            }
-          }
-        }
-        return _ts.$store.state.userInfo?.avatarURL;
-      },
-      nickname() {
-        let _ts = this;
-        if (isBrowser) {
-          if (!_ts.$store.state.userInfo) {
-            let user = localStorage.getItem('user');
-            if (user) {
-              _ts.$store.commit('setUser', JSON.parse(user))
-            }
-          }
-        }
-        return _ts.$store.state.userInfo?.nickname;
-      },
-      account() {
-        let _ts = this;
-        if (isBrowser) {
-          if (!_ts.$store.state.userInfo) {
-            let user = localStorage.getItem('user');
-            if (user) {
-              _ts.$store.commit('setUser', JSON.parse(user))
-            }
-          }
-        }
-        return _ts.$store.state.userInfo?.account;
-      },
     hasPermissions() {
-        return this.$store.getters.hasPermissions('blog_admin');
+      return this.$auth.hasScope('blog_admin');
     }
   },
   data() {
@@ -166,7 +131,7 @@
       switch (item) {
         case 'user':
           _ts.$router.push({
-              path: '/user/' + _ts.account
+            path: '/user/' + _ts.user.account
           })
           break;
         case 'user-info':
@@ -175,8 +140,8 @@
           })
           break;
         case 'logout':
-            Cookie.remove('auth')
+          _ts.$auth.reset()
-            _ts.$store.commit('setAuth', null)
+          item = 'login';
           item = 'login';
           break;
         default:
@@ -205,14 +170,14 @@
       ctx.font = "14px 'Arial'";
       ctx.textBaseline = "rymcu";
       ctx.fillStyle = "#f60";
-        ctx.fillRect(125,1,62,20);
+      ctx.fillRect(125, 1, 62, 20);
       ctx.fillStyle = "#069";
       ctx.fillText(txt, 2, 15);
       ctx.fillStyle = "rgba(102, 204, 0, 0.7)";
       ctx.fillText(txt, 4, 17);
-        let b64 = canvas.toDataURL().replace("data:image/png;base64,","");
+      let b64 = canvas.toDataURL().replace("data:image/png;base64,", "");
       let bin = atob(b64);
-        let fingerprint = _ts.bin2hex(bin.slice(-16,-12));
+      let fingerprint = _ts.bin2hex(bin.slice(-16, -12));
       _ts.$store.commit('setFingerprint', fingerprint);
     },
     bin2hex(str) {
@@ -247,11 +212,11 @@
     }
   }
 
-  }
+}
 </script>
 
 <style scoped>
-  .navbar-brand {
+.navbar-brand {
   color: inherit;
   margin-right: 1rem;
   font-size: 1.25rem;
@@ -260,13 +225,13 @@
   padding: 0;
   transition: .3s opacity;
   line-height: 2rem;
-  }
+}
 
-  .navbar-brand-img {
+.navbar-brand-img {
   height: 2rem;
   line-height: 2rem;
   vertical-align: bottom;
   margin-right: .5rem;
   width: auto;
-  }
+}
 </style>

components/layouts/pc/header.vue

@@ -20,7 +20,7 @@
 
     <el-col :md="10" :span="10" :xs="16" style="line-height: 60px">
       <client-only>
-        <el-col style="text-align: right;" v-if="user">
+        <el-col style="text-align: right;" v-if="loggedIn">
           <el-popover
             @show="handleShowPopover"
             placement="bottom"
@@ -76,17 +76,17 @@
           </el-link>
           <el-link :underline="false" rel="nofollow" style="margin-left: 10px;">
             <el-dropdown @command="handleCommand" trigger="click">
-              <el-avatar :src="avatarURL" size="small" v-if="avatarURL"></el-avatar>
+              <el-avatar :src="user.avatarUrl" size="small" v-if="user.avatarUrl"></el-avatar>
               <el-avatar size="small" src="https://static.rymcu.com/article/1578475481946.png" v-else></el-avatar>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item style="align-items: center;">
-                  <el-avatar :src="avatarURL" class="mr-3" size="small" style="margin-top: 1rem;"
+                  <el-avatar :src="user.avatarUrl" class="mr-3" size="small" style="margin-top: 1rem;"
-                             v-if="avatarURL"></el-avatar>
+                             v-if="user.avatarUrl"></el-avatar>
                   <el-avatar class="mr-3" size="small" src="https://static.rymcu.com/article/1578475481946.png"
                              style="margin-top: 1rem;"
                              v-else></el-avatar>
                   <el-link :underline="false" rel="nofollow" style="margin-left: 10px;margin-bottom: 1rem;">
-                    {{ nickname }}
+                    {{ user.nickname }}
                   </el-link>
                 </el-dropdown-item>
                 <el-dropdown-item command="user">个人中心</el-dropdown-item>
@@ -138,56 +138,19 @@
 </template>
 
 <script>
-  import {mapState} from 'vuex';
+import {mapState} from 'vuex';
-  import {isBrowser} from '~/environment';
+// import sockClient from '~/plugins/sockjs';
-  // import sockClient from '~/plugins/sockjs';
 
-  const Cookie = process.client ? require('js-cookie') : undefined
+export default {
-  export default {
   name: "PcHeader",
   computed: {
     ...mapState({
       activeMenu: state => state.activeMenu,
-        user: state => state.oauth
+      user: state => state.auth.user,
+      loggedIn: state => state.auth.loggedIn
     }),
-      avatarURL() {
-        let _ts = this;
-        if (isBrowser) {
-          if (!_ts.$store.state.userInfo) {
-            let user = localStorage.getItem('user');
-            if (user) {
-              _ts.$store.commit('setUser', JSON.parse(user))
-            }
-          }
-        }
-        return _ts.$store.state.userInfo?.avatarURL;
-      },
-      nickname() {
-        let _ts = this;
-        if (isBrowser) {
-          if (!_ts.$store.state.userInfo) {
-            let user = localStorage.getItem('user');
-            if (user) {
-              _ts.$store.commit('setUser', JSON.parse(user))
-            }
-          }
-        }
-        return _ts.$store.state.userInfo?.nickname;
-      },
-      account() {
-        let _ts = this;
-        if (isBrowser) {
-          if (!_ts.$store.state.userInfo) {
-            let user = localStorage.getItem('user');
-            if (user) {
-              _ts.$store.commit('setUser', JSON.parse(user))
-            }
-          }
-        }
-        return _ts.$store.state.userInfo?.account;
-      },
     hasPermissions() {
-        return this.$store.getters.hasPermissions('blog_admin');
+      return this.$auth.hasScope('admin') || this.$auth.hasScope('blog_admin');
     }
   },
   data() {
@@ -264,7 +227,7 @@
       switch (item) {
         case 'user':
           _ts.$router.push({
-              path: '/user/' + _ts.account
+            path: '/user/' + _ts.user.account
           })
           break;
         case 'user-info':
@@ -273,8 +236,7 @@
           })
           break;
         case 'logout':
-            Cookie.remove('auth')
+          _ts.$auth.logout()
-            _ts.$store.commit('setAuth', null)
           item = 'login';
           break;
         default:
@@ -348,7 +310,7 @@
       _ts.getUnreadNotifications();
       _ts.$store.dispatch('follow/fetchUserFollowerList');
       _ts.$store.dispatch('follow/fetchUserFollowingList');
-        // sockClient.initSocket(this.$store.state.userInfo);
+      // sockClient.initSocket(this.$store.state.auth.user);
     }
     let fingerprint = _ts.$store.state.fingerprint
     if (!fingerprint) {
@@ -356,11 +318,11 @@
     }
   }
 
-  }
+}
 </script>
 
 <style scoped>
-  .navbar-brand {
+.navbar-brand {
   color: inherit;
   margin-right: 1rem;
   font-size: 1.25rem;
@@ -369,20 +331,20 @@
   padding: 0;
   transition: .3s opacity;
   line-height: 3rem;
-  }
+}
 
-  .navbar-brand-img {
+.navbar-brand-img {
   height: 3rem;
   line-height: 3rem;
   vertical-align: top;
   width: auto;
-  }
+}
 
-  .search-result-box {
+.search-result-box {
   min-width: 20vw !important;
-  }
+}
 
-  .search-result-type {
+.search-result-type {
   padding-right: 5px;
-  }
+}
 </style>

middleware/authenticated.js

@@ -1,6 +0,0 @@
-export default function ({ store, redirect }) {
-  // If the user is not authenticated
-  if (!store.state.oauth) {
-    return redirect('/login')
-  }
-}

middleware/notAuthenticated.js

@@ -1,6 +0,0 @@
-export default function ({ store, redirect }) {
-  // If the user is authenticated redirect to home page
-  if (store.state.oauth) {
-    return redirect('/')
-  }
-}

nuxt.config.js

@@ -70,9 +70,44 @@ export default {
   modules: [
     '@nuxtjs/axios',
     '@nuxtjs/proxy',
-    'js-cookie',
+    '@nuxtjs/auth-next'
-    'cookieparser'
   ],
+  auth: {
+    redirect: {
+      login: '/login',
+      logout: false,
+      home: false
+    },
+    strategies: {
+      local: {
+        // scope: true,
+        scheme: 'refresh',
+        token: {
+          property: 'token',
+          global: true,
+          maxAge: 60 * 15,
+          // required: true,
+          type: false
+        },
+        refreshToken: {
+          property: 'refreshToken',
+          data: 'refreshToken',
+          maxAge: 60 * 60 * 2
+        },
+        user: {
+          property: 'user',
+          autoFetch: false
+        },
+        endpoints: {
+          login: { url: '/api/auth/login', method: 'post' },
+          logout: { url: '/api/auth/logout', method: 'post' },
+          refresh: { url: '/api/auth/refresh-token', method: 'post' },
+          user: { url: '/api/auth/user', method: 'get' }
+        },
+        autoLogout: false
+      }
+    }
+  },
   axios: {
     proxy: true  // 开启proxy
   },

package.json

@@ -11,13 +11,12 @@
   },
   "dependencies": {
     "@chenfengyuan/vue-qrcode": "^1.0.2",
+    "@nuxtjs/auth-next": "^5.0.0-1648802546.c9880dc",
     "@nuxtjs/axios": "^5.13.1",
     "babel-plugin-lodash": "^3.3.4",
-    "cookieparser": "^0.1.0",
     "echarts": "^4.9.0",
     "element-ui": "^2.15.8",
     "express": "^4.18.1",
-    "js-cookie": "^2.2.1",
     "lodash": "^4.17.21",
     "net": "^1.0.2",
     "nuxt": "^2.15.8",

pages/admin.vue

@@ -45,6 +45,7 @@ import _ from 'lodash'
 
 export default {
   name: "Admin",
+  middleware: 'auth',
   data() {
     return {
       menus: [
@@ -144,7 +145,7 @@ export default {
       return this.$store.state.activeMenu;
     },
     hasPermissions() {
-      return this.$store.getters.hasPermissions('blog_admin');
+      return this.$auth.hasScope('admin') || this.$auth.hasScope('blog_admin');
     }
   },
   methods: {

pages/admin/articles.vue

@@ -107,6 +107,7 @@ import EditTags from '~/components/widget/tags';
 
 export default {
   name: "articles",
+  middleware: 'auth',
   components: {
     EditTags
   },

pages/admin/bank-accounts.vue

@@ -75,6 +75,7 @@ import Records from "../../components/common/bank/account/records";
 
 export default {
   name: "bank-accounts",
+  middleware: 'auth',
   components: {Records},
   fetch() {
     let {store, params, error} = this.$nuxt.context

pages/admin/banks.vue

@@ -87,6 +87,7 @@ import {mapState} from 'vuex';
 
 export default {
   name: "banks",
+  middleware: 'auth',
   fetch() {
     let {store, params, error} = this.$nuxt.context
     return Promise.all([

pages/admin/comments.vue

@@ -97,6 +97,7 @@ import {mapState} from 'vuex';
 
 export default {
   name: "comments",
+  middleware: 'auth',
   fetch() {
     let {store, params, error} = this.$nuxt.context
     return Promise.all([

pages/admin/currency-rules.vue

@@ -81,6 +81,7 @@ import {mapState} from 'vuex';
 
 export default {
   name: "currency-rules",
+  middleware: 'auth',
   fetch() {
     let {store, params, error} = this.$nuxt.context
     return Promise.all([

pages/admin/dashboard.vue

@@ -248,6 +248,7 @@ import EditTags from '~/components/widget/tags';
 Vue.prototype.$echarts = echarts;
 export default {
   name: "Dashboard",
+  middleware: 'auth',
   components: {
     EditTags
   },

pages/admin/products.vue

@@ -80,6 +80,7 @@ import {mapState} from 'vuex';
 
 export default {
   name: "products",
+  middleware: 'auth',
   fetch() {
     let {store, params, error} = this.$nuxt.context
     return Promise.all([

pages/admin/roles.vue

@@ -91,6 +91,7 @@
 
   export default {
     name: "roles",
+    middleware: 'auth',
     fetch() {
       let {store, params, error} = this.$nuxt.context
       return Promise.all([

pages/admin/tag/post/_tag_id.vue

@@ -126,6 +126,7 @@ import apiConfig from '~/config/api.config';
 
 export default {
   name: "PostTag",
+  middleware: 'auth',
   components: {
     VueCropper
   },

pages/admin/tags.vue

@@ -48,6 +48,7 @@
 
   export default {
     name: "tags",
+    middleware: 'auth',
     fetch() {
       let {store, params, error} = this.$nuxt.context
       return Promise.all([

pages/admin/topic/_topic_uri.vue

@@ -71,6 +71,7 @@ import {mapState} from 'vuex';
 
 export default {
   name: "adminTopicDetail",
+  middleware: 'auth',
   validate({params, store}) {
     if (typeof params.topic_uri === 'undefined') {
       return true;
@@ -94,7 +95,7 @@ export default {
       tags: state => state.topic.tags.data
     }),
     hasPermissions() {
-      return this.$store.getters.hasPermissions('topic');
+      return this.$auth.hasScope('topic');
     }
   },
   methods: {

pages/admin/topic/bind/_topic_id.vue

@@ -53,6 +53,7 @@ import {mapState} from 'vuex';
 
 export default {
   name: "adminTopicBindTag",
+  middleware: 'auth',
   fetch({store, params, error}) {
     let _ts = this;
     return Promise.all([

pages/admin/topic/post/_topic_id.vue

@@ -124,6 +124,7 @@ import apiConfig from '~/config/api.config';
 
 export default {
   name: "adminTopicPost",
+  middleware: 'auth',
   components: {
     VueCropper
   },

pages/admin/topics.vue

@@ -39,6 +39,7 @@
 
   export default {
     name: "topics",
+    middleware: 'auth',
     fetch() {
       let {store, params, error} = this.$nuxt.context
       return Promise.all([

pages/admin/users.vue

@@ -119,6 +119,7 @@ import {mapState} from 'vuex';
 
 export default {
   name: "users",
+  middleware: 'auth',
   fetch() {
     let {store, params, error} = this.$nuxt.context
     return Promise.all([

pages/answer.vue

@@ -62,6 +62,7 @@ import {mapState} from 'vuex';
 
 export default {
   name: "answer",
+  middleware: 'auth',
   fetch({store, params, error}) {
     return Promise.all([
       store

pages/article/_article_id.vue

@@ -82,7 +82,7 @@
             <el-col v-if="article.portfolios && article.portfolios.length > 0">
               <portfolios-widget :portfolios="article.portfolios"></portfolios-widget>
             </el-col>
-            <el-col v-if="user">
+            <el-col v-if="loggedIn">
               <el-tooltip class="item" effect="dark" content="酷" placement="top-start">
                 <el-button type="text" style="font-size: 1.2rem;" @click="thumbsUp">
                   <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"
@@ -192,11 +192,12 @@ export default {
       article: state => state.article.detail.data,
       isFetching: state => state.article.detail.fetching,
       isMobile: state => state.global.isMobile,
-      user: state => state.oauth,
+      loggedIn: state => state.auth.loggedIn,
-      avatar: state => state.userInfo?.avatarURL
+      user: state => state.auth.user,
+      avatar: state => state.auth.user.avatarUrl
     }),
     hasPermissions() {
-      let account = this.$store.state.userInfo?.nickname;
+      let account = this.$store.state.auth.user?.nickname;
       if (account) {
         if (account === this.article.articleAuthor.userNickname) {
           return true;
@@ -205,7 +206,7 @@ export default {
       return false;
     },
     isAdmin() {
-      return this.$store.getters.hasPermissions('blog_admin');
+      return this.$auth.hasScope('admin') || this.$auth.hasScope('blog_admin');
     },
     routeArticleId() {
       return Number(this.$route.params.article_id);

pages/article/post/_article_id.vue

@@ -63,6 +63,7 @@
 
   export default {
     name: "PostArticle",
+    middleware: 'auth',
     validate({params, store}) {
       if (typeof params.article_id === 'undefined') {
         return true;
@@ -80,7 +81,7 @@
         article: state => state.article.detail.data
       }),
       hasPermissions() {
-        let account = this.$store.state.userInfo?.nickname;
+        let account = this.$store.state.auth.user?.nickname;
         if (account) {
           if (this.$route.params.article_id) {
             if (account === this.article.articleAuthor.userNickname) {
@@ -90,7 +91,7 @@
             return true;
           }
         }
-        return this.$store.getters.hasPermissions('blog_admin');
+        return this.$auth.hasScope('blog_admin');
       }
     },
     data() {

pages/chats/_account.vue

@@ -45,7 +45,7 @@ export default {
   name: "Chat",
   computed: {
     ...mapState({
-      user: state => state.userInfo
+      user: state => state.auth.user
     })
   },
   data() {

pages/draft/_draft_id.vue

@@ -71,6 +71,7 @@
 
   export default {
     name: "DraftDetail",
+    middleware: 'auth',
     validate({params, store}) {
       return params.draft_id && !isNaN(Number(params.draft_id))
     },
@@ -86,17 +87,17 @@
         article: state => state.draft.detail.data,
         isFetching: state => state.draft.detail.fetching,
         isMobile: state => state.global.isMobile,
-        user: state => state.oauth,
+        user: state => state.auth.user,
-        avatar: state => state.userInfo?.avatarURL
+        avatar: state => state.auth.user?.avatarURL
       }),
       hasPermissions() {
-        let account = this.$store.state.userInfo?.nickname;
+        let account = this.$store.state.auth.user?.nickname;
         if (account) {
           if (account === this.article?.articleAuthor?.userNickname) {
             return true;
           }
         }
-        return this.$store.getters.hasPermissions('blog_admin');
+        return this.$auth.hasScope('blog_admin');
       },
       routeArticleId() {
         return Number(this.$route.params.draft_id)

pages/drafts.vue

@@ -13,6 +13,7 @@
 
   export default {
     name: "Drafts",
+    middleware: 'auth',
     components: {
       DraftList
     },
@@ -27,7 +28,7 @@
     computed: {
       ...mapState({
         articles: state => state.draft.list.data,
-        user: state => state.oauth
+        user: state => state.auth.user
       })
     },
     mounted() {

pages/login.vue

@@ -54,10 +54,9 @@
 <script>
 import {mapState} from 'vuex';
 
-const Cookie = process.client ? require('js-cookie') : undefined
 export default {
   name: "login",
-  middleware: 'notAuthenticated',
+  middleware: 'auth',
   data() {
     return {
       user: {
@@ -81,40 +80,17 @@ export default {
   methods: {
     login() {
       let _ts = this;
-      _ts.$refs.user.validate((valid) => {
+      _ts.$refs.user.validate(async (valid) => {
         if (valid) {
           _ts.$set(_ts, 'loginLoading', true);
-          setTimeout(function () {
-            _ts.$set(_ts, 'loginLoading', false);
-          }, 10000);
-
           let data = {
             account: _ts.user.account,
             password: _ts.user.password
           }
-
+          try {
-          _ts.$axios.$post('/api/console/login', data).then(function (res) {
+            let response = await _ts.$auth.loginWith('local', {data: data})
-            _ts.$set(_ts, 'loginLoading', false);
+            if (response.success) {
-            if (res) {
+              _ts.$auth.setUserToken(response.data.token, response.data.refreshToken);
-              if (res.message) {
-                _ts.$message(res.message);
-                return false;
-              }
-              let auth = {
-                accessToken: res.token,
-                idUser: res.idUser,
-                role: res.weights
-              }
-
-              let user = {
-                nickname: res.nickname,
-                avatarURL: res.avatarUrl || 'https://static.rymcu.com/article/1578475481946.png',
-                account: res.account
-              }
-              _ts.$store.commit('setAuth', auth) // mutating to store for client rendering
-              localStorage.setItem('user', JSON.stringify(user))
-              _ts.$store.commit('setUser', user) // mutating to store for client rendering
-              Cookie.set('auth', auth, { expires: 7 })
               if (_ts.historyUrl) {
                 window.location.href = _ts.historyUrl
               } else {
@@ -123,9 +99,11 @@ export default {
                 })
               }
             }
-          },function(error) {
             _ts.$set(_ts, 'loginLoading', false);
-          })
+          } catch (err) {
+            _ts.$set(_ts, 'loginLoading', false);
+            console.log(err)
+          }
         } else {
           return false;
         }

pages/notification.vue

@@ -13,7 +13,7 @@
 
   export default {
     name: "Notification",
-    middleware: 'authenticated',
+    middleware: 'auth',
     components: {
       NotificationList
     },
@@ -33,7 +33,7 @@
     computed: {
       ...mapState({
         notifications: state => state.notification.list.data,
-        user: state => state.oauth
+        user: state => state.auth.user
       })
     },
     methods: {

pages/portfolio/_portfolio_id.vue

@@ -83,11 +83,11 @@ export default {
       articles: state => state.portfolio.articles,
       isFetching: state => state.portfolio.detail.fetching,
       isMobile: state => state.global.isMobile,
-      user: state => state.oauth,
+      user: state => state.auth.user,
-      avatar: state => state.userInfo?.avatarURL
+      avatar: state => state.auth.user?.avatarURL
     }),
     isAuthor() {
-      let account = this.$store.state.userInfo?.nickname;
+      let account = this.$store.state.auth.user?.nickname;
       if (account) {
         if (account === this.portfolio.portfolioAuthor.userNickname) {
           return true;

pages/portfolio/manager/_portfolio_id.vue

@@ -78,7 +78,7 @@
         portfolio: state => state.portfolio.detail.data
       }),
       isAuthor() {
-        let account = this.$store.state.userInfo?.nickname;
+        let account = this.$store.state.auth.user?.nickname;
         if (account) {
           if (account === this.portfolio.portfolioAuthorName) {
             return true;

pages/portfolio/post/_portfolio_id.vue

@@ -125,7 +125,7 @@ export default {
         return {'X-Upload-Token': state.uploadHeaders}
       },
       isAuthor() {
-        let account = this.$store.state.userInfo?.nickname;
+        let account = this.$store.state.auth.user?.nickname;
         if (account) {
           if (this.$route.params.portfolio_id) {
             if (account === this.portfolioDetail.portfolioAuthorName) {
@@ -334,7 +334,7 @@ export default {
           if (res) {
             _ts.$set(_ts, 'notificationFlag', false);
             _ts.$router.push({
-              path: '/user/' + _ts.$store.state.userInfo?.account
+              path: '/user/' + _ts.$store.state.auth.user?.account
             })
           }
         })

pages/user/_account.vue

@@ -61,8 +61,8 @@
               </el-link>
             </el-popover>
           </div>
-          <div v-if="oauth">
+          <div v-if="auth.user">
-            <div v-if="oauth.idUser !== user.idUser">
+            <div v-if="auth.user.idUser !== user.idUser">
               <el-button type="primary" v-if="isFollow" @click="cancelFollowUser(user.idUser)" plain>取消关注</el-button>
               <el-button type="primary" v-else @click="followUser(user.idUser)" plain>关注</el-button>
               <el-button v-show="false" @click="gotoChats" plain>聊天</el-button>
@@ -176,7 +176,7 @@ export default {
       portfolios: state => state.user.portfolios,
       followers: state => state.user.followers,
       followings: state => state.user.followings,
-      oauth: state => state.oauth
+      auth: state => state.auth.user
     })
   },
   data() {
@@ -227,7 +227,7 @@ export default {
     },
     followUser(idUser) {
       let _ts = this;
-      if (_ts.oauth) {
+      if (_ts.auth) {
         _ts.$axios.$post('/api/follow', {
           followingId: idUser,
           followingType: 0
@@ -241,7 +241,7 @@ export default {
     },
     cancelFollowUser(idUser) {
       let _ts = this;
-      if (_ts.oauth) {
+      if (_ts.auth) {
         _ts.$axios.$post('/api/follow/cancel-follow', {
           followingId: idUser,
           followingType: 0
@@ -265,7 +265,7 @@ export default {
   mounted() {
     let _ts = this;
     this.$store.commit('setActiveMenu', 'user');
-    if (_ts.oauth) {
+    if (_ts.auth) {
       _ts.$axios.$get('/api/follow/is-follow', {
         params: {
           followingId: _ts.user.idUser,

pages/user/settings.vue

@@ -47,12 +47,13 @@
 <script>
   export default {
     name: "Settings",
+    middleware: 'auth',
     computed: {
       getActiveMenu () {
         return this.$store.state.activeMenu;
       },
       isLogin () {
-        return this.$store.state.oauth;
+        return this.$store.state.auth.user;
       }
     },
     data() {

pages/user/settings/account.vue

@@ -65,9 +65,10 @@
 
   export default {
     name: "account",
+    middleware: 'auth',
     computed: {
       ...mapState({
-        idUser: state => state.oauth.idUser
+        idUser: state => state.auth.user.idUser
       })
     },
     data() {

pages/user/settings/avatar.vue

@@ -81,6 +81,7 @@ import 'cropperjs/dist/cropper.css';
 const {generateRandomAvatar} = require('~/plugins/avataaars/generator/generateAvatar');
 export default {
   name: "avatar",
+  middleware: 'auth',
   components: {
     Avataaars,
     VueCropper
@@ -90,7 +91,7 @@ export default {
       uploadHeaders: state => {
         return {'X-Upload-Token': state.uploadHeaders}
       },
-      idUser: state => state.oauth.idUser
+      idUser: state => state.auth.user.idUser
     })
   },
   data() {

pages/user/settings/login-record.vue

@@ -12,10 +12,11 @@ import LoginRecords from "@/components/common/user/login-records";
 
 export default {
   name: "loginRecord",
+  middleware: 'auth',
   components: {LoginRecords},
   computed: {
     ...mapState({
-      idUser: state => state.oauth.idUser
+      idUser: state => state.auth.user.idUser
     })
   },
   data() {

pages/user/settings/security.vue

@@ -79,7 +79,7 @@ export default {
   name: "security",
   computed: {
     ...mapState({
-      idUser: state => state.oauth.idUser
+      idUser: state => state.auth.user.idUser
     })
   },
   data() {

pages/wallet.vue

@@ -1,5 +1,6 @@
 <template>
   <el-row class="wrapper">
+    <el-col v-if="bankAccount">
       <el-col>
         <h1>账户信息</h1>
       </el-col>
@@ -13,6 +14,10 @@
       <el-col>
         <records :records="records" :bankAccount="bankAccount.bankAccount" @currentChange="handleCurrentChange" @searchTransactionRecord="searchTransactionRecord"></records>
       </el-col>
+    </el-col>
+    <el-col v-else style="text-align: center;margin-top: 10vh;">
+      <el-button type="primary">开通钱包账号</el-button>
+    </el-col>
   </el-row>
 </template>
 
@@ -26,10 +31,10 @@ export default {
   fetch({store, error}) {
     return Promise.all([
       store
-        .dispatch('wallet/fetchDetail', {idUser: store.state.oauth.idUser})
+        .dispatch('wallet/fetchDetail')
         .catch(err => error({statusCode: 404})),
       store
-        .dispatch('wallet/fetchTransactionRecordList', {idUser: store.state.oauth.idUser})
+        .dispatch('wallet/fetchTransactionRecordList')
         .catch(err => error({statusCode: 404}))
     ])
   },
@@ -47,7 +52,7 @@ export default {
     handleCurrentChange(search) {
       let _ts = this;
       _ts.$store.dispatch('wallet/fetchTransactionRecordList', {
-        idUser: _ts.$store.state.oauth.idUser,
+        idUser: _ts.$store.state.auth.user.idUser,
         startDate: search.startDate,
         endDate: search.endDate,
         page: search.page
@@ -58,7 +63,7 @@ export default {
       let startDate = dates[0]
       let endDate = dates[1]
       _ts.$store.dispatch('wallet/fetchTransactionRecordList', {
-        idUser: _ts.$store.state.oauth.idUser,
+        idUser: _ts.$store.state.auth.user.idUser,
         startDate: startDate,
         endDate: endDate
       })

plugins/axios.js

@@ -1,18 +1,11 @@
 import {Message} from 'element-ui'
 
-const Cookie = process.client ? require('js-cookie') : undefined
 export default function ({app, $axios, store, redirect}) {
   $axios.onRequest(config => {
     let fingerprint = store.state.fingerprint;
     if (fingerprint) {
       config.headers['fingerprint'] = fingerprint
     }
-    let token = store.state.oauth?.accessToken;
-    if (token) {
-      // if (!(config.url.indexOf('console') > -1 || config.url.indexOf('comments') > -1)) {
-      // }
-      config.headers['Authorization'] = token
-    }
   })
   $axios.onResponse(response => {
     return new Promise((resolve, reject) => {
@@ -29,13 +22,9 @@ export default function ({app, $axios, store, redirect}) {
         if (response.data.code === 0) {
           Message.error(message ? message : '服务异常')
         } else if (response.data.code === 401) {
-          Cookie.remove('auth');
+          app.$auth.logout()
-          store.commit('setAuth', null);
-          window.location.reload()
         } else if (response.data.code === 402) {
-          Cookie.remove('auth');
+          app.$auth.strategy.token.reset()
-          store.commit('setAuth', null);
-          window.location.reload()
         } else if (response.data.code === 404) {
           Message.error('操作失败，请稍后再试......')
         } else if (response.data.code === 500) {
@@ -47,6 +36,7 @@ export default function ({app, $axios, store, redirect}) {
       reject(response);
     })
   });
+
   $axios.onError(error => {
     const code = parseInt(error.response && error.response.status)
     if (code === 400) {

store/draft.js

@@ -26,7 +26,6 @@ export const mutations = {
     state.list.fetching = action
   },
   updateListData(state, action) {
-    console.log(action)
     state.list.data = action
   },
   // 文章详情

store/index.js

@@ -1,7 +1,5 @@
 import { isServer } from '~/environment'
 
-const cookieParser = isServer ? require('cookieparser') : undefined
-
 export const state = () => {
   return {
     activeMenu: 'index',
@@ -14,28 +12,12 @@ export const state = () => {
 }
 
 export const mutations = {
-  setAuth (state, auth) {
-    state.oauth = auth
-  },
-  setUser (state, data) {
-    state.userInfo = data
-  },
   setActiveMenu (state, activeMenu) {
     state.activeMenu = activeMenu
   },
   setUploadHeaders(state, data){
     state.uploadHeaders = data
   },
-  setUserInfo(state, data) {
-    state.userInfo.avatarURL = data.avatarUrl;
-    state.userInfo.nickname = data.nickname;
-    let user = {
-      nickname: data.nickname,
-      avatarURL: data.avatarUrl,
-      account: this.state.userInfo.account
-    }
-    localStorage.setItem('user', JSON.stringify(user))
-  },
   setFingerprint (state, fingerprint) {
     state.fingerprint = fingerprint
   }
@@ -65,17 +47,6 @@ export const actions = {
         // 移动端
         store.commit('global/updateMobileState', true)
     }
-    let auth = null
-    if (req.headers.cookie) {
-      const parsed = cookieParser.parse(req.headers.cookie)
-      try {
-        auth = JSON.parse(parsed.auth)
-      } catch (err) {
-        // No valid cookie found
-        console.log(err);
-      }
-      store.commit('setAuth', auth)
-    }
 
     const initFetchAppData = [
       // 内容数据
@@ -86,36 +57,3 @@ export const actions = {
     return Promise.all(initFetchAppData)
   }
 }
-
-export const getters = {
-  hasPermissions: (state) => (scenes) => {
-    let hasPermissions = false;
-    const role = state.oauth?.role
-    if (role) {
-      switch (scenes) {
-        case 'user':
-          hasPermissions = role < 5;
-          break;
-        case 'role':
-          hasPermissions = role < 2;
-          break;
-        case 'topic':
-          hasPermissions = role < 3;
-          break;
-        case 'tag':
-          hasPermissions = role < 3;
-          break;
-        case 'admin':
-          hasPermissions = role < 2;
-          break;
-        case 'blog_admin':
-          hasPermissions = role < 3;
-          break;
-        default:
-          hasPermissions = false;
-          this.commit('logout');
-      }
-    }
-    return hasPermissions;
-  }
-}

store/wallet.js

@@ -39,10 +39,10 @@ export const mutations = {
 
 export const actions = {
   // 获取账户详情
-  fetchDetail({commit}, params = {}) {
+  fetchDetail({commit}) {
     commit('updateDetailFetching', true)
     return this.$axios
-      .$get(`${WALLET_API_PATH}/${params.idUser}`)
+      .$get(`${WALLET_API_PATH}/detail`)
       .then(response => {
         return new Promise(resolve => {
           commit('updateDetailData', response)
@@ -64,7 +64,6 @@ export const actions = {
     return this.$axios
       .$get(`${WALLET_API_PATH}/transaction-records`, {
         params: {
-          idUser: params.idUser,
           startDate: params.startDate,
           endDate: params.endDate,
           page: params.page || 1