Browse Source

suit reomte

Starink 6 years ago
parent
commit
c53c90a095
4 changed files with 13 additions and 11 deletions
  1. 4 4
      middleware/auth.js
  2. 3 1
      plugins/api.js
  3. 4 4
      server/controller/auth.js
  4. 2 2
      server/controller/user.js

+ 4 - 4
middleware/auth.js

@@ -7,7 +7,7 @@ export default function (context) {
 
   token = store.state.token;
 
-  console.log('token', token);
+  // console.log('token', token);
 
   // console.log("cookies", cook);
   //在服务端
@@ -19,9 +19,9 @@ export default function (context) {
     path = route.path;
   }
 
-  console.log("path:"+path);
+  // console.log("path:"+path);
   let mainPath = path.split("?")[0];
-  console.log('mainPath', mainPath);
+  // console.log('mainPath', mainPath);
 
   if(mainPath === "/setToken"){
     try{
@@ -40,7 +40,7 @@ export default function (context) {
           obj[params[i].split("=")[0]] = params[i].split("=")[1];
 
         }
-        console.log('obj', obj);
+        // console.log('obj', obj);
         let new_token = obj['token'];
         let origin_path = obj['origin_path'];
         let user = {id: obj['id'], name: obj['name'], phone: obj['phone']};

+ 3 - 1
plugins/api.js

@@ -11,7 +11,9 @@ export default function ({ $axios, redirect, app, store }, inject) {
 
   $axios.onResponse(response =>{
     if(response.status === 401){
-      this.$router.push('/login');
+      app.$cookies.removeAll();
+      store.commit('setToken', null);
+      store.commit('setUser', {});
       this.$message({
         showClose: true,
         message: '未授权,请先登录',

+ 4 - 4
server/controller/auth.js

@@ -3,7 +3,7 @@ const jwt = require('jsonwebtoken');
 
 class AuthController{
     static checkClient(ctx){
-        const allowed_client_ids = ['seec-portal', 'seec-seec', 'seec-mooc', 'seec-portal'];
+        const allowed_client_ids = ['seec-portal', 'seec-seec', 'seec-mooc', 'seec-helper'];
         const allowed_redirect_domains = ['localhost:3000', 'localhost:8000', 'seec.seecoder.cn', 'mooc.seecoder.cn', 'helper.seecoder.cn' ];
 
         const query = ctx.query;
@@ -54,7 +54,7 @@ class AuthController{
           if(!iss || !sub || !aud || !auth_time || !iat || !exp){
             ctx.redirect("/error");
           }
-          else if(iss !== "http://localhost" || aud!=='seec-portal' ){
+          else if(iss !== "p.seecoder.cn" || aud!=='seec-portal' ){
             ctx.redirect("/error");
           }
           else{
@@ -98,8 +98,8 @@ class AuthController{
     const query = ctx.query;
     const {path} = query;
 
-    let return_uri = encodeURIComponent("http://localhost:3000/api/receiveIDToken");
-    let url = 'http://localhost:3000/api/interaction?'+
+    let return_uri = encodeURIComponent(ctx.origin+"/api/receiveIDToken");
+    let url = ctx.origin+'/api/interaction?'+
       'client_id='+ 'seec-portal' +
       '&scope=openid' +
       '&redirect_uri=' + return_uri +

+ 2 - 2
server/controller/user.js

@@ -20,11 +20,11 @@ class UserController {
                 ctx.body = Response.failed('密码错误,请重试')
             }else{
                 // console.log('ctx',ctx);
-              console.log('ctx.cookies.redirect_uri',ctx.cookies.get('redirect_uri'));
+              // console.log('ctx.cookies.redirect_uri',ctx.cookies.get('redirect_uri'));
               let redirect_uri = ctx.cookies.get('redirect_uri');
 
               let data = {
-                iss : 'http://'+ (process.env.HOST || "localhost"),
+                iss : 'p.seecoder.cn',
                 sub: encodeURIComponent(user.id + "&" + user.name + "&" + user.phone),
                 aud: ctx.cookies.get('client_id'),
                 auth_time: Math.floor(new Date().getTime() / 1000),