代码提交

@@ -7,12 +7,12 @@ const path = require("path");
 const Controller = require("egg").Controller;
 
 class AuthController extends Controller {
-  index(req, res, next) {
+  index(req) {
     logger.info(req);
     // res.redirect("https://www.baidu.com");
   }
 
-  getImg(req, res, next) {
+  getImg(req, res) {
     logger.info(req.url, "1231231231");
     const parentdir = path.resolve(__dirname, "..");
     const paths =
@@ -41,7 +41,7 @@ class AuthController extends Controller {
     // } else res.render("index", { csrfToken: "" });
   }
 
-  productDes(req, res, next) {
+  productDes(req, res) {
     if (req.csrfToken)
       res.render("chat/new-chat", { csrfToken: req.csrfToken() });
     else res.render("chat/new-chat", { csrfToken: "" });
@@ -55,7 +55,7 @@ class AuthController extends Controller {
     else res.render("recharge", { recharge: params, csrfToken: "" });
   }
 
-  register(req, res, next) {
+  register(req, res) {
     if (req.csrfToken)
       res.render("newRegister", { csrfToken: req.csrfToken() });
     else res.render("newRegister", { csrfToken: "" });
@@ -73,7 +73,7 @@ class AuthController extends Controller {
     else res.render("registerMobileSuccess", { csrfToken: "" });
   }
 
-  signIn(req, res, next) {
+  signIn(req, res) {
     //	console.log(req);
     if (req.csrfToken) res.render("newLogin", { csrfToken: req.csrfToken() });
     else res.render("newLogin", { csrfToken: "" });
@@ -130,7 +130,7 @@ class AuthController extends Controller {
 
   signOut() {
     const { ctx, logger } = this;
-    const { req, res, session } = ctx;
+    const { req, session } = ctx;
     if (
       session.passport &&
       session.passport.user &&
@@ -148,7 +148,7 @@ class AuthController extends Controller {
     ctx.redirect("/");
   }
 
-  smsCodes(req, res, next) {
+  smsCodes(req, res) {
     rest.postJson({
       baseUrl: "url",
       url: "auth/smscodes",
@@ -169,7 +169,7 @@ class AuthController extends Controller {
     }
   }
 
-  tenants(req, res, next) {
+  tenants(req, res) {
     rest.register({
       baseUrl: "url",
       url: "tenants",
@@ -512,101 +512,78 @@ class AuthController extends Controller {
     }
   }
 
-  changeTenant(req, res) {
+ async changeTenant() {
+    const {ctx ,logger,config} =this
+    const {req, session,service} = ctx
+    const { restful = {} } = config;
+    const { tokenUrl, host,port } = restful;
+    const { access_token } = session.user_info;
     var params = {
       grant_type: "refresh_token",
       scope: "global_access:tenant_admin,tenant:" + req.body.id,
-      refresh_token: req.session.passport.user.refreshToken,
+      refresh_token: req.session.user_info.refresh_token,
     };
-
-    req.session.passport.user.token = "";
-
-    rest.postJson({
-      baseUrl: "url",
-      url:
-        settings.restful.url +
-        "uaa" +
-        settings.restful.version +
-        "/auth/tokens",
-      useUrl: true,
-      params: params,
-      callback: _cb,
-      req: req,
-      res: res,
-      options: {},
-      excludeToken: true,
-    });
-
-    function _cb(data, response) {
-      if (response.statusCode < 300) {
-        req.session.passport.user.token = data.access_token;
-        req.session.passport.user.refreshToken = data.refresh_token;
-        req.session.passport.user.user_info = {
-          user: data.user,
-          perms: [],
-          tenant: data.tenant,
-          scope: data.scope,
-          oss: req.session.passport.user.user_info.oss,
-        };
-        req.session.save(function () {
-          rest.get({
-            baseUrl: "url",
-            url:
-              settings.restful.url +
-              "uaa" +
-              settings.restful.version +
-              "/perms/detail",
-            useUrl: true,
-            params: {},
-            callback: _scb,
-            req: req,
-            res: res,
-            options: {},
-          });
-        });
-      } else {
-        res.send({
-          code: response.statusCode,
-          message: data.message,
-          initialize_done: "n",
-        });
-      }
-    }
-
-    function _scb(data1, response) {
-      if (response.statusCode < 300 && data1.items) {
-        req.session.passport.user.user_info.perms = data1.items;
-        req.session.save(function () {
-          rest.get({
-            baseUrl: "url",
-            url:
-              settings.restful.url +
-              "filemeta" +
-              settings.restful.version +
-              "/config",
-            useUrl: true,
-            params: {},
-            callback: _scb1,
-            req: req,
-            res: res,
-            options: {},
-          });
-        });
-      } else {
-        res.send({ code: response.statusCode, message: data1.message });
-      }
-    }
-
-    function _scb1(data2, response) {
-      if (response.statusCode < 300 && data2 && data2.bucket) {
-        req.session.passport.user.user_info.oss = data2;
-        req.session.save(function () {
-          res.send({ code: 200, message: "切换租户成功" });
-        });
-      } else {
-        res.send({ code: 200, message: "切换租户失败" });
+    let result  = await service.login.changeTant( params);
+    if (result && result.code >= 300) {
+      ctx.status = result.status;
+      ctx.body = result.data;
+    }else {
+      ctx.status = result.status
+      ctx.body = {
+        code:200,
+        message:'切换租户成功'
       }
     }
+    return ctx.body
+    // req.session.passport.user.token = "";
+    // const result = await curl(`${host}/${port}${tokenUrl}`, {
+    //   method: "POST",
+    //   dataType: "json",
+    //   data: JSON.stringify(params),
+    //   headers: {
+    //     'authorization': `Bearer ${access_token}`,
+    //     accept: "application/json",
+    //     "content-type": "application/json",
+    //   },
+    // });
+    // logger.info(result,'resulpt')
+
+
+
+    // function _scb(data1, response) {
+    //   if (response.statusCode < 300 && data1.items) {
+    //     req.session.passport.user.user_info.perms = data1.items;
+    //     req.session.save(function () {
+    //       rest.get({
+    //         baseUrl: "url",
+    //         url:
+    //           settings.restful.url +
+    //           "filemeta" +
+    //           settings.restful.version +
+    //           "/config",
+    //         useUrl: true,
+    //         params: {},
+    //         callback: _scb1,
+    //         req: req,
+    //         res: res,
+    //         options: {},
+    //       });
+    //     });
+    //   } else {
+    //     res.send({ code: response.statusCode, message: data1.message });
+    //   }
+    // }
+
+    // function _scb1(data2, response) {
+    //   if (response.statusCode < 300 && data2 && data2.bucket) {
+    //     req.session.passport.user.user_info.oss = data2;
+    //     req.session.save(function () {
+    //       res.send({ code: 200, message: "切换租户成功" });
+    //     });
+    //   } else {
+    //     res.send({ code: 200, message: "切换租户失败" });
+    //   }
+    // }
   }
 
   sendRejectOffer(req, res) {

@@ -94,16 +94,10 @@ class ProxyController extends Controller {
     const url = this.splitUrl(originalUrl);
     const options = this.getOptions(url, 'GET');
     const {host ,port,path,...rest} = options
-    logger.info(`${host}:${port}${path}`, {
-      ...rest,
-      timeout: [5000, 60000],
-    },12312321)
     const result = await ctx.curl(`${host}:${port}${path}`, {
       ...rest,
       timeout: [5000, 60000],
     });
-    logger.info("result:", result);
-
     ctx.body = result.data|| {};
 
     return ctx.body;

@@ -35,12 +35,10 @@ module.exports = (app) => {
 
   // 序列化与反序列化，序列化存储到session中只保存用户id
   app.passport.serializeUser(async (ctx, user) => {
-    console.log(user, "user");
     return user;
   });
 
   app.passport.deserializeUser(async (ctx, user) => {
-      console.log(user,'kncvkxznkcxlklasdjfajdfldkasjflkasdnvkasdnmklasndvldnsa');
     return user;
   });
 };

@@ -6,6 +6,7 @@ module.exports = app => {
 
   // 给proxy设置token 
   router.get(/^\/api\/[\w/]+/, 'proxy.get');
+  router.get(/^\/auth_api\/[\w/]+/, 'proxy.get');
   router.post(/^\/api\/[\w/]+/, 'proxy.post');
   router.put(/^\/api\/[\w/]+/, 'proxy.put');
   router.head(/^\/api\/[\w/]+/, 'proxy.head');

@@ -19,6 +19,27 @@ class LoginService extends Service {
         ctx.session.user_info = result.data;
         return result;
     }
+
+    async changeTant(params) {
+        const { ctx, config={}, logger } = this;
+        const {session} = ctx
+        const { restful={} } = config;
+        const { access_token } = session.user_info;
+        const {  host, port, tokenUrl,tokenMethod} = restful;
+        const result = await ctx.curl(`${host}:${port}${tokenUrl}`, {
+            method: `${tokenMethod}`,
+            dataType: 'json',
+            data: JSON.stringify(params),
+            headers: {
+                'authorization': `Bearer ${access_token}`,
+                'accept': 'application/json',
+                'content-type': 'application/json'
+            },
+            timeout: [5000, 60000]
+        });
+        ctx.session.user_info = result.data;
+        return result;
+    }
  
 }