yun-tijiao

weiyy
app/controller/auth.js
app/router/auth.js
--- a/app/controller/auth.js
查看文件 @1ee493a
+++ b/app/controller/auth.js
查看文件 @1ee493a
+"use strict";
+
 const passport = require("passport");
 const urlencode = require("urlencode");
 const async = require("async");
 const crypto = require("crypto");
-const fs =require('fs')
+const fs = require("fs");
 const path = require("path");
-exports = module.exports = function (logger, rest, settings) {
-  function index(req, res, next) {
-    logger.info(req);
-    // res.redirect("https://www.baidu.com");
+const Controller = require("egg").Controller;
+// logger, rest, settings
+
+class AuthController extends Controller {
+  async index() {
+    const { ctx, logger } = this;
+    const { request } = ctx;
+
+    logger.info(request);
   }
-  function getImg(req, res, next) {
-    logger.info(req.url, "1231231231");
-    const parentdir = path.resolve(__dirname, "..")
-    const paths = parentdir+'/build/public'+urlencode.decode(req.url, 'utf8')
-    fs.readFile(paths,function(err,data){
-      console.log(err,data)
+  async getImg(req, res) {
+    const parentdir = path.resolve(__dirname, "..");
+    const paths =
+      parentdir + "/build/public" + urlencode.decode(req.url, "utf8");
+
+    fs.readFile(paths, function (err, data) {
       if (err) {
-        res.send('读取错误')
+        res.send("读取错误");
       } else {
-        res.send(data)
+        res.send(data);
       }
-    })
+    });
   }
-  function indexPrefix(req, res) {
-    // logger.info(req.csrfToken(),'req.cssadasdas');
-    res.send({data:req.csrfToken()})
-    // if (req.csrfToken) {
-    //   if (settings.prefix && settings.prefix.length > 1) {
-    //     res.redirect(settings.prefix.substring(0, settings.prefix.length - 1));
-    //   } else {
-    //     res.render("index", { csrfToken: req.csrfToken() });
-    //   }
-    // } else res.render("index", { csrfToken: "" });
+  async indexPrefix(req, res) {
+    const { ctx } = this;
+
+    ctx.body = {
+      data: req.csrfToken(),
+    };
+
+    return ctx.body;
   }
-  function productDes(req, res, next) {
-    if (req.csrfToken)
-      res.render("chat/new-chat", { csrfToken: req.csrfToken() });
-    else res.render("chat/new-chat", { csrfToken: "" });
+  async productDes(req, res) {
+    const { ctx } = this;
+
+    if (req.csrfToken) {
+      await ctx.render("chat/new-chat", { csrfToken: req.csrfToken() });
+    } else {
+      await ctx.render("chat/new-chat", { csrfToken: "" });
+    }
   }
-  function recharge(req, res) {
-    var params = JSON.parse(urlencode.decode(req.query.params));
-    console.log(params);
-    if (req.csrfToken)
-      res.render("recharge", { recharge: params, csrfToken: req.csrfToken() });
-    else res.render("recharge", { recharge: params, csrfToken: "" });
+  async recharge(req, res) {
+    const { ctx } = this;
+    let params = JSON.parse(urlencode.decode(req.query.params));
+
+    if (req.csrfToken) {
+      ctx.render("recharge", {
+        recharge: params,
+        csrfToken: req.csrfToken(),
+      });
+    } else {
+      ctx.render("recharge", {
+        recharge: params,
+        csrfToken: "",
+      });
+    }
   }
-  function register(req, res, next) {
-    if (req.csrfToken)
-      res.render("newRegister", { csrfToken: req.csrfToken() });
-    else res.render("newRegister", { csrfToken: "" });
+  async register(req, res) {
+    const { ctx } = this;
+
+    if (req.csrfToken) {
+      ctx.render("newRegister", { csrfToken: req.csrfToken() });
+    } else {
+      ctx.render("newRegister", { csrfToken: "" });
+    }
   }
-  function mobileRegister(req, res) {
-    if (req.csrfToken)
-      res.render("registerMobile", { csrfToken: req.csrfToken() });
-    else res.render("registerMobile", { csrfToken: "" });
+  async mobileRegister(req, res) {
+    const { ctx } = this;
+
+    if (req.csrfToken) {
+      ctx.render("registerMobile", { csrfToken: req.csrfToken() });
+    } else {
+      ctx.render("registerMobile", { csrfToken: "" });
+    }
   }
-  function mobileRegisterSuccess(req, res) {
-    if (req.csrfToken)
-      res.render("registerMobileSuccess", { csrfToken: req.csrfToken() });
-    else res.render("registerMobileSuccess", { csrfToken: "" });
+  async mobileRegisterSuccess(req, res) {
+    const { ctx } = this;
+
+    if (req.csrfToken) {
+      ctx.render("registerMobileSuccess", { csrfToken: req.csrfToken() });
+    } else {
+      ctx.render("registerMobileSuccess", { csrfToken: "" });
+    }
   }
-  function signIn(req, res, next) {
-    //	console.log(req);
-    if (req.csrfToken) res.render("newLogin", { csrfToken: req.csrfToken() });
-    else res.render("newLogin", { csrfToken: "" });
+  async signIn(req, res) {
+    const { ctx } = this;
+
+    if (req.csrfToken) {
+      ctx.render("newLogin", { csrfToken: req.csrfToken() });
+    } else {
+      ctx.render("newLogin", { csrfToken: "" });
+    }
   }
-  function doLogin(req, res, next) {
+  async doLogin(req, res, next) {
     passport.authenticate("local", function (err, user, info) {
-      console.log("doLogin:", err, user, info);
       if (err) {
         return next(err);
       }
+
       if (!user) {
         return res.send(info);
       }
+
       req.logIn(user, function (err) {
         if (err) {
           return next(err);
         }
+
         return res.send({
           ok: "登录成功",
           user_info: req.session.passport.user.user_info,
@@ -96,23 +132,28 @@ exports = module.exports = function (logger, rest, settings) {
     })(req, res, next);
   }
-  function signOut(req, res, next) {
+  async signOut(req, res) {
+    const { ctx, logger } = this;
+    const { session } = ctx;
+
     if (
-      req.session.passport &&
-      req.session.passport.user &&
-      req.session.passport.user.user_info &&
-      req.session.passport.user.user_info.user
-    )
+      session.passport &&
+      session.passport.user &&
+      session.passport.user.user_info &&
+      session.passport.user.user_info.user
+    ) {
       logger.info(
-        req.session.passport.user.user_info.user,
+        session.passport.user.user_info.user,
         "You have successfully logged out"
       );
+    }
+
     req.logout();
     req.flash("success", "You have successfully logged out");
     res.redirect("/");
   }
-  function smsCodes(req, res, next) {
+  async smsCodes(req, res) {
     rest.postJson({
       baseUrl: "url",
       url: "auth/smscodes",
@@ -123,8 +164,8 @@ exports = module.exports = function (logger, rest, settings) {
       options: {},
       excludeToken: true,
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       if (response.statusCode < 300) {
         res.send({ code: 200, message: "发送成功" });
       } else {
@@ -133,7 +174,7 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function tenants(req, res, next) {
+  async tenants(req, res, next) {
     rest.register({
       baseUrl: "url",
       url: "tenants",
@@ -144,13 +185,13 @@ exports = module.exports = function (logger, rest, settings) {
       options: {},
       excludeToken: true,
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       res.send(data);
     }
   }
-  function resetPass(req, res) {
+  async resetPass(req, res) {
     rest.putJson({
       baseUrl: "url",
       url: "auth/user",
@@ -164,13 +205,15 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       res.send(data);
     }
   }
-  function updatePassword(req, res) {
+  async updatePassword(req, res) {
+    const { logger } = this;
+
     rest.patchJson({
       baseUrl: "url",
       url: "users/" + req.body.userId,
@@ -182,14 +225,16 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
       logger.info("back data:", data);
       res.send(data);
     }
   }
-  function loadUserInfo(req, res) {
+  async loadUserInfo(req, res) {
     settings;
+
     if (req.session.passport.user && req.session.passport.user.user_info) {
       res.send({
         user_info: req.session.passport.user.user_info,
@@ -200,7 +245,9 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function getUploaderToken(req, res) {
+  async getUploaderToken(req, res) {
+    const { logger } = this;
+
     rest.postJson({
       baseUrl: "ossUrl",
       url: "inits",
@@ -210,13 +257,16 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
       logger.info("back data:", data);
       res.send(data);
     }
   }
-  function getObjectTokenByID(req, res) {
+  async getObjectTokenByID(req, res) {
+    const { logger } = this;
+    
     rest.get({
       baseUrl: "ossUrl",
       url: "objects/" + req.body.file_id,
@@ -226,13 +276,14 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
       logger.info("back data:", data);
       res.send(data);
     }
   }
-  function delOSSObject(req, res) {
+  async delOSSObject(req, res) {
     rest.del({
       baseUrl: "ossUrl",
       url:
@@ -248,16 +299,15 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
-      console.log(response.statusCode);
       if (response.statusCode < 300) {
         res.send({ delete: "ok" });
       }
     }
   }
-  function smsVerification(req, res) {
+  async smsVerification(req, res) {
     rest.postJson({
       baseUrl: "url",
       url: "auth/sms_verification",
@@ -268,8 +318,8 @@ exports = module.exports = function (logger, rest, settings) {
       options: {},
       excludeToken: true,
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       if (response.statusCode < 300) {
         res.send({ code: 200, message: "发送成功" });
       } else {
@@ -282,12 +332,13 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function healthMonitor(res) {
+  async healthMonitor(res) {
     res.statusCode = 200;
+
     return res.send("status ok");
   }
-  function updateUserRoles(req, res) {
+  async updateUserRoles(req, res) {
     rest.putJson({
       baseUrl: "url",
       url: "user_roles/" + req.body.user_id,
@@ -297,8 +348,8 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       if (response.statusCode < 300) {
         res.send({ back: "ok" });
       } else {
@@ -307,7 +358,7 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function getRoles(req, res) {
+  async getRoles(req, res) {
     rest.get({
       baseUrl: "url",
       url: "roles",
@@ -317,13 +368,13 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       res.send(data);
     }
   }
-  function getUserRoles(req, res) {
+  async getUserRoles(req, res) {
     rest.get({
       baseUrl: "url",
       url:
@@ -339,13 +390,13 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       res.send(data);
     }
   }
-  function getTenant(req, res) {
+  async getTenant(req, res) {
     rest.get({
       baseUrl: "url",
       url: "tenants/" + req.body.tenant_id,
@@ -355,13 +406,13 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       res.send(data);
     }
   }
-  function updateTenant(req, res) {
+  async updateTenant(req, res) {
     rest.putJson({
       baseUrl: "url",
       url: "tenants/" + req.body.tenant_id,
@@ -371,13 +422,13 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       res.send(data);
     }
   }
-  function offer(req, res) {
+  async offer(req, res) {
     rest.get({
       baseUrl: "hrUrl",
       url:
@@ -389,17 +440,15 @@ exports = module.exports = function (logger, rest, settings) {
       options: {},
       excludeToken: true,
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
-      //res.send(data);
-      console.log(data);
       data["offerId"] = req.params.requestId;
       data["tenantId"] = req.query.tenant_id;
       res.render("offer", data);
     }
   }
-  function onboardStatus(req, res) {
+  async onboardStatus(req, res) {
     rest.get({
       baseUrl: "hrUrl",
       url: "onboard-status",
@@ -410,15 +459,15 @@ exports = module.exports = function (logger, rest, settings) {
       options: {},
       useUrl: true,
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       res.send(data);
     }
   }
-  function dowloadApp(req, res) {
-    var mobileAgent = req.headers["user-agent"].toLowerCase();
-    var agent = {
+  async dowloadApp(req, res) {
+    let mobileAgent = req.headers["user-agent"].toLowerCase();
+    let agent = {
       android:
         mobileAgent.indexOf("android") > -1 || mobileAgent.indexOf("Adr") > -1,
       iPhone: mobileAgent.indexOf("iphone") > -1,
@@ -442,12 +491,12 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function softwareLicense(res) {
+  async softwareLicense(res) {
     res.render("softwareLicense");
   }
-  function changePassForRegister(req, res) {
-    var options = {
+  async changePassForRegister(req, res) {
+    let options = {
       baseUrl: "url",
       url: "users/" + req.body.user_id,
       params: {
@@ -458,27 +507,31 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     };
+
     if (req.body.access_token) {
-      console.log("@@@!!!!!!!!!!!!!!!!");
       options.options = {
         accessToken: req.body.access_token,
       };
+
       options["excludeToken"] = true;
     }
+
     rest.patchJson(options);
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       res.send(data);
     }
   }
-  function changeTenant(req, res) {
-    var params = {
+  async changeTenant(req, res) {
+    let params = {
       grant_type: "refresh_token",
       scope: "global_access:tenant_admin,tenant:" + req.body.id,
       refresh_token: req.session.passport.user.refreshToken,
     };
+
     req.session.passport.user.token = "";
+
     rest.postJson({
       baseUrl: "url",
       url:
@@ -494,9 +547,8 @@ exports = module.exports = function (logger, rest, settings) {
       options: {},
       excludeToken: true,
     });
+
     function _cb(data, response) {
-      console.log(data);
-      logger.info("back data:", data);
       if (response.statusCode < 300) {
         req.session.passport.user.token = data.access_token;
         req.session.passport.user.refreshToken = data.refresh_token;
@@ -531,11 +583,11 @@ exports = module.exports = function (logger, rest, settings) {
         });
       }
     }
+
     function _scb(data1, response) {
       if (response.statusCode < 300 && data1.items) {
         req.session.passport.user.user_info.perms = data1.items;
         req.session.save(function () {
-          // res.send({"code":200,"message":"切换租户成功"});
           rest.get({
             baseUrl: "url",
             url:
@@ -555,6 +607,7 @@ exports = module.exports = function (logger, rest, settings) {
         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;
@@ -567,7 +620,7 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function sendRejectOffer(req, res) {
+  async sendRejectOffer(req, res) {
     rest.get({
       baseUrl: "hrUrl",
       url: req.body.url, //传一个参数
@@ -579,8 +632,8 @@ exports = module.exports = function (logger, rest, settings) {
       excludeToken: true,
       useUrl: true,
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       if (response.statusCode < 300) {
         res.send({ action: "ok" });
       } else {
@@ -589,7 +642,7 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function acceptOffer(req, res) {
+  async acceptOffer(req, res) {
     rest.get({
       baseUrl: "hrUrl",
       url: req.body.url, //传一个参数
@@ -601,8 +654,8 @@ exports = module.exports = function (logger, rest, settings) {
       excludeToken: true,
       useUrl: true,
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       if (response.statusCode < 300) {
         res.send({ action: "ok" });
       } else {
@@ -611,7 +664,7 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function imTokens(req, res) {
+  async imTokens(req, res) {
     rest.post({
       url: "auth/im_tokens",
       params: req.body,
@@ -620,13 +673,13 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       res.send(data);
     }
   }
-  function listChannels(req, res) {
+  async listChannels(req, res) {
     rest.get({
       baseUrl: "chatUrl",
       url: "channels?page_size=10&page=0&status=active",
@@ -636,14 +689,14 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     });
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       res.send(data);
     }
   }
-  function filemeta(req, res) {
-    var fullPath =
+  async filemeta(req, res) {
+    let fullPath =
       settings.restful.url +
       "filemeta" +
       settings.restful.version +
@@ -655,8 +708,8 @@ exports = module.exports = function (logger, rest, settings) {
       req.query.bucket +
       "&object=" +
       encodeURIComponent(req.query.object);
-    console.info("fullPath::::::", fullPath);
-    var options = {
+
+    let options = {
       service_catalog: "",
       url: fullPath,
       useUrl: true,
@@ -666,17 +719,19 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     };
+
     rest.get(options);
+
     function _cb(data, response) {
       if (data && data.download_url) {
         if (req.query.type && "json" == req.query.type) {
           res.send(data);
         } else {
-          var url = data.download_url;
+          let url = data.download_url;
           let path = url.split("?")[0];
           let pathArray = path.split("/");
           let result = [];
-          for (var i = 0; i < pathArray.length; i++) {
+          for (let i = 0; i < pathArray.length; i++) {
             if (i == pathArray.length - 1) {
               result.push(encodeURIComponent(pathArray[i]));
             } else {
@@ -699,15 +754,15 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function getCustomerQrcode(req, res) {
-    var fullPath =
+  async getCustomerQrcode(req, res) {
+    let fullPath =
       settings.restful.url +
       "crm" +
       settings.restful.version +
       "/customers/" +
       req.query.id +
       "/qrcode";
-    var options = {
+    let options = {
       service_catalog: "",
       url: fullPath,
       useUrl: true,
@@ -717,7 +772,9 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     };
+
     rest.get(options);
+
     function _cb(data, response) {
       if (data && data.url_path) {
         res.redirect(301, data.url_path);
@@ -727,15 +784,16 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function getPositionQrcode(req, res) {
-    var fullPath =
+  async getPositionQrcode(req, res) {
+    let fullPath =
       settings.restful.url +
       "recruit" +
       settings.restful.version +
       "/positions/" +
       req.query.id +
       "/qrcode";
-    var options = {
+
+    let options = {
       service_catalog: "",
       url: fullPath,
       useUrl: true,
@@ -745,7 +803,9 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     };
+
     rest.get(options);
+
     function _cb(data, response) {
       if (data && data.url_path) {
         res.redirect(301, data.url_path);
@@ -755,10 +815,10 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function getOSSConfig(req, res) {
-    var fullPath =
+  async getOSSConfig(req, res) {
+    let fullPath =
       settings.restful.url + "filemeta" + settings.restful.version + "/config";
-    var options = {
+    let options = {
       service_catalog: "",
       url: fullPath,
       useUrl: true,
@@ -768,10 +828,13 @@ exports = module.exports = function (logger, rest, settings) {
       res: res,
       options: {},
     };
+
     rest.get(options);
+
     function _cb(data, response) {
       if (data && data.bucket) {
         req.session.passport.user.user_info.oss = data;
+
         req.session.save(function () {
           res.send({ code: 200, message: "oss配置加载成功" });
         });
@@ -781,11 +844,11 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function weidianTempLate(req, res) {
+  async weidianTempLate(req, res) {
     const { params } = req;
-    var fullPath =
+    let fullPath =
       settings.restful.url + "socialwork/internal/minishop/" + params.id;
-    var options = {
+    let options = {
       service_catalog: "",
       url: fullPath,
       useUrl: true,
@@ -796,15 +859,18 @@ exports = module.exports = function (logger, rest, settings) {
       options: {},
       excludeToken: true,
     };
+
     rest.get(options);
+
     function _cb(data, response) {
-      logger.info("back data:", data);
       if (response.statusCode < 300) {
         const { shop_logo = [], shop_name = "", shop_comment = "" } = data;
         let imgUrl = "";
+
         if (shop_logo.length > 0) {
           imgUrl = "http://oss.workai.com.cn/public/" + shop_logo[0].object;
         }
+
         res.render("template/weiDian", {
           imgUrl: imgUrl,
           shop_name: shop_name,
@@ -816,10 +882,12 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function workaiSecurityOAuth(req, res) {
-    var params = req.query;
+  async workaiSecurityOAuth(req, res) {
+    const { logger } = this;
+    let params = req.query;
+
     if (params.authorization_code) {
-      var passport = {
+      let passport = {
         user: {
           refreshToken: "",
           token: "",
@@ -828,25 +896,16 @@ exports = module.exports = function (logger, rest, settings) {
           err: null,
         },
       };
+
       async.waterfall(
         [
           function (callback) {
             //第三方登录
-            var tempParams = {
+            let tempParams = {
               grant_type: "authorization_code_v1",
               code: params.authorization_code,
             };
-            // var tempParams={
-            // 	"grant_type":"password",
-            // 	"username":"18510929499",
-            // 	"scope":"global_access:tenant_admin",
-            // 	"password":"a123456"
-            // };
-            logger.info(
-              "Third login",
-              settings.restful.url + "uaa/v1/auth/tokens",
-              tempParams
-            );
+
             rest.restful
               .postJson(
                 settings.restful.url + "uaa/v1/auth/tokens",
@@ -859,9 +918,9 @@ exports = module.exports = function (logger, rest, settings) {
                 }
               )
               .on("success", function (data) {
-                logger.info("Third login json data:", data);
                 if (data.access_token) {
-                  var scopes = data.scope.split(",");
+                  let scopes = data.scope.split(",");
+
                   passport.user.token = data.access_token;
                   passport.user.refreshToken = data.refresh_token;
                   passport.user.user_info = data.user || {};
@@ -872,35 +931,41 @@ exports = module.exports = function (logger, rest, settings) {
                   passport.user.real_auth_status = data.user.real_auth_status;
                   passport.user.credential_status = data.user.credential_status;
                   passport.user.user_info.scope = scopes[0];
+
                   callback(null, data);
                 } else {
-                  var err = new Error("Third login err");
+                  let err = new Error("Third login err");
+
                   passport.user.err = data.message;
+
                   callback(err, data);
                 }
               })
               .on("error", function (err, response) {
-                logger.error("Third login error", err);
-                var err = new Error("Third login err");
+                let err = new Error("Third login err");
+
                 callback(err, response);
               })
               .on("fail", function (data, response) {
-                logger.error("Third login fail", data);
                 callback(data, response);
               });
           },
+
           function (data, callback) {
             //获取机构列表
-            var tempHead = {};
-            var ip = req.ip.match(/\d+\.\d+\.\d+\.\d+/)[0];
-            var user_agent = req.headers["user-agent"] || "";
+            let tempHead = {};
+            let ip = req.ip.match(/\d+\.\d+\.\d+\.\d+/)[0];
+            let user_agent = req.headers["user-agent"] || "";
+
             tempHead["SXClientIP"] = ip;
             tempHead["User-Agent"] = user_agent;
+
             logger.info(
               "Third login tenants",
               settings.restful.url + "uaa/v1/tenants?all=true",
               { accessToken: data.access_token, headers: tempHead }
             );
+
             rest.restful
               .get(settings.restful.url + "uaa/v1/tenants?all=true", {
                 accessToken: data.access_token,
@@ -908,36 +973,44 @@ exports = module.exports = function (logger, rest, settings) {
               })
               .on("success", function (data1) {
                 logger.info("Third login tenants list:", data1);
+
                 if (data1 && data1.items && data1.items.length > 0) {
                   callback(null, data1.items);
                 } else {
-                  var err = new Error("Third login tenants list err");
+                  let err = new Error("Third login tenants list err");
+
                   passport.user.err = data.message;
+
                   callback(err, data);
                 }
               })
               .on("error", function (err, response) {
-                var err = new Error("Third login tenants list err");
+                let err = new Error("Third login tenants list err");
+
                 callback(err, response);
               })
               .on("fail", function (data, response) {
                 callback(data, response);
               });
           },
+
           function (data, callback) {
             //刷新token
             if (data && data.length == 1) {
-              var params = {
+              let params = {
                 grant_type: "refresh_token",
                 scope: "global_access:tenant_admin,tenant:" + data[0].id,
                 refresh_token: passport.user.refreshToken,
               };
+
               passport.user.token = "";
+
               logger.info(
                 "Third login tokens",
                 settings.restful.url + "uaa/v1/auth/tokens",
                 params
               );
+
               rest.restful
                 .postJson(settings.restful.url + "uaa/v1/auth/tokens", params, {
                   headers: {
@@ -947,8 +1020,10 @@ exports = module.exports = function (logger, rest, settings) {
                 })
                 .on("success", function (data2) {
                   logger.info("Third login json data2:", data2);
+
                   if (data2.access_token) {
-                    var scopes = data2.scope.split(",");
+                    let scopes = data2.scope.split(",");
+
                     passport.user.token = data2.access_token;
                     passport.user.refreshToken = data2.refresh_token;
                     passport.user.user_info = data2.user || {};
@@ -973,31 +1048,39 @@ exports = module.exports = function (logger, rest, settings) {
                       type: data2.type,
                       wx_open_id: data2.wx_open_id,
                     };
+
                     callback(null, data2);
                   } else {
-                    var err = new Error("Third login err");
+                    let err = new Error("Third login err");
+
                     passport.user.err = data2.message;
+
                     callback(err, data2);
                   }
                 })
                 .on("error", function (err, response) {
                   logger.error("Third login error", err);
-                  var err = new Error("Third login err");
+
+                  let err = new Error("Third login err");
+
                   callback(err, response);
                 })
                 .on("fail", function (data2, response) {
                   logger.error("Third login fail", data2);
+
                   callback(data2, response);
                 });
             } else if (data && data.length > 1) {
               //   #/login/choose-tenant
               callback(null, data);
             } else {
-              var err = new Error("Third login tenants list item error");
+              let err = new Error("Third login tenants list item error");
+
               callback(err, data);
             }
           },
         ],
+
         function (err, result) {
           if (err) {
             //登陆失败跳转失败页
@@ -1056,8 +1139,9 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function getTastLink(req, res) {
-    var url = crypto.createHash("md5").update(req.body.id).digest("hex");
+  async getTastLink(req, res) {
+    let url = crypto.createHash("md5").update(req.body.id).digest("hex");
+
     if (settings.prefix && settings.prefix.length > 1) {
       res.send(
         req.protocol +
@@ -1083,9 +1167,10 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function freedomJobsEmp(req, res) {
-    var id = req.params.id;
-    // var url = crypto.createHash('md5').update(id).digest('hex');
+  async freedomJobsEmp(req, res) {
+    const { logger } = this;
+    let id = req.params.id;
+
     if (false) {
       //验证未通过verification != url
       if (settings.prefix && settings.prefix.length > 1) {
@@ -1095,7 +1180,7 @@ exports = module.exports = function (logger, rest, settings) {
       }
     } else {
       //验证通过跳转，获取token存到session里
-      var passport = {
+      let passport = {
         user: {
           refreshToken: "",
           token: "",
@@ -1104,11 +1189,12 @@ exports = module.exports = function (logger, rest, settings) {
           err: null,
         },
       };
-      var tempParams = {
+      let tempParams = {
         grant_type: "client_credential",
         client_id: "340161778618994688", //多宝鱼环境
         client_secret: "0f8c30aa3d15332652f62c3eaf22fdea",
       };
+
       rest.restful
         .postJson(settings.restful.url + "uaa/v1/auth/tokens", tempParams, {
           headers: {
@@ -1118,7 +1204,8 @@ exports = module.exports = function (logger, rest, settings) {
         })
         .on("success", function (data) {
           if (data.access_token) {
-            var scopes = data.scope.split(",");
+            let scopes = data.scope.split(",");
+
             passport.user.token = data.access_token;
             passport.user.refreshToken = data.refresh_token;
             passport.user.user_info = data.user;
@@ -1130,6 +1217,7 @@ exports = module.exports = function (logger, rest, settings) {
             passport.user.credential_status = data.user.credential_status;
             passport.user.user_info.scope = scopes[0];
             req.session.passport = passport;
+
             req.session.save(function () {
               if (settings.prefix && settings.prefix.length > 1) {
                 res.redirect(
@@ -1148,7 +1236,9 @@ exports = module.exports = function (logger, rest, settings) {
         })
         .on("error", function (err, response) {
           logger.error("Third login error", err);
-          var err = new Error("Third login err");
+
+          let err = new Error("Third login err");
+
           callback(err, response);
         })
         .on("fail", function (data) {
@@ -1157,13 +1247,16 @@ exports = module.exports = function (logger, rest, settings) {
     }
   }
-  function getShortToken(req, res) {
-    var params = {
+  async getShortToken(req, res) {
+    const { logger } = this;
+    let params = {
       grant_type: "refresh_token",
       scope: req.session.passport.user.scope,
       refresh_token: req.session.passport.user.refreshToken,
     };
+
     logger.info("getShortToken:", params);
+
     rest.postJson({
       baseUrl: "url",
       url:
@@ -1179,61 +1272,13 @@ exports = module.exports = function (logger, rest, settings) {
       options: {},
       excludeToken: true,
     });
+
     function _cb(data, response) {
-      console.log(data);
       logger.info("back data:", data);
+
       res.send({ code: response.statusCode, access_token: data.access_token });
     }
   }
+}
-  return {
-    index: index,
-    indexPrefix,
-    register: register,
-    signIn: signIn,
-    doLogin: doLogin,
-    signOut: signOut,
-    smsCodes: smsCodes,
-    tenants: tenants,
-    productDes: productDes,
-    resetPass: resetPass,
-    updatePassword: updatePassword,
-    loadUserInfo: loadUserInfo,
-    getUploaderToken: getUploaderToken,
-    getObjectTokenByID,
-    delOSSObject: delOSSObject,
-    healthMonitor,
-    smsVerification,
-    updateUserRoles,
-    getRoles,
-    getUserRoles,
-    getTenant,
-    updateTenant,
-    offer,
-    onboardStatus,
-    dowloadApp,
-    mobileRegister,
-    mobileRegisterSuccess,
-    softwareLicense,
-    recharge,
-    changePassForRegister,
-    changeTenant,
-    sendRejectOffer,
-    acceptOffer,
-    imTokens,
-    listChannels,
-    filemeta,
-    getCustomerQrcode,
-    getPositionQrcode,
-    getOSSConfig,
-    weidianTempLate,
-    workaiSecurityOAuth,
-    getTastLink,
-    freedomJobsEmp,
-    getShortToken,
-    getImg
-  };
-};
-
-exports["@singleton"] = true;
-exports["@require"] = ["igloo/logger", "utils/rest", "igloo/settings"];
+module.exports = AuthController;
--- a/app/router/auth.js
查看文件 @1ee493a
+++ b/app/router/auth.js
查看文件 @1ee493a
-var express = require("express");
-var payRoll = require("../json/payRoll.json");
+let payRoll = require("../json/payRoll.json");
 module.exports = (app) => {
   const { router, controller } = app;
-  console.log('hhhhhhhh哈哈哈哈哈哈',app);
-  // router.get("/index", controller.index);
+
   router.get("/signOut", controller.signOut);
   router.get("/img/*", controller.getImg);
@@ -43,16 +41,6 @@ module.exports = (app) => {
   router.post("/getObjectTokenByID", controller.getObjectTokenByID);
-  // router.get(
-  // 	'/healthMonitor',
-  // 	controller.healthMonitor
-  // )
-
-  // router.head(
-  // 	'/healthMonitor',
-  // 	controller.healthMonitor
-  // )
-
   router.post("/getUserRoles", controller.getUserRoles);
   router.post("/getRoles", controller.getRoles);
@@ -111,9 +99,14 @@ module.exports = (app) => {
   router.get("/getShortToken", controller.getShortToken);
   router.get("/gainianrenli/*", controller.getImg);
+
   router.get("/waifu_img/*", controller.getImg);
+
   router.get("/my_img/*", controller.getImg);
+
   router.get("/invoice_file_icon/*", controller.getImg);
+
   router.get("/gainianrenli/*", controller.getImg);
+  
   router.get("/claim_icons/*", controller.getImg);
 };