refactor: move handler out from passport.verify

Author: thonatos

app.js

@@ -7,76 +7,72 @@ module.exports = app => {
     app.config.coreMiddleware.unshift('less');
   }
 
-  app.passport.verify(async (ctx, user) => {
-    ctx.logger.debug('passport.verify', user);
-
-    const localHandler = async ({ username, password }) => {
-      const getUser = username => {
-        if (username.indexOf('@') > 0) {
-          return ctx.service.user.getUserByMail(username);
-        }
-        return ctx.service.user.getUserByLoginName(username);
-      };
-      const existUser = await getUser(username);
-
-      // 用户不存在
-      if (!existUser) {
-        return null;
+  const localHandler = async (ctx, { username, password }) => {
+    const getUser = username => {
+      if (username.indexOf('@') > 0) {
+        return ctx.service.user.getUserByMail(username);
       }
+      return ctx.service.user.getUserByLoginName(username);
+    };
+    const existUser = await getUser(username);
 
-      const passhash = user.pass;
-      const equal = tools.compare(passhash, password);
+    // 用户不存在
+    if (!existUser) {
+      return null;
+    }
 
-      // 密码不匹配
-      if (!equal) {
-        return null;
-      }
+    const passhash = existUser.pass;
+    const equal = tools.compare(passhash, password);
 
-      // 用户未激活
-      if (!existUser.active) {
-        // 发送激活邮件
-        return null;
-      }
+    // 密码不匹配
+    if (!equal) {
+      return null;
+    }
 
-      // 验证通过
-      return existUser;
-    };
+    // 用户未激活
+    if (!existUser.active) {
+      // 发送激活邮件
+      return null;
+    }
 
-    const githubHandler = async ({ profile }) => {
-      const email = profile.emails && profile.emails[0] && profile.emails[0].value;
-      const existUser = await ctx.service.user.getUsersByQuery({
-        githubId: profile.id,
-      });
+    // 验证通过
+    return existUser;
+  };
 
-      // 用户不存在则创建
-      // TODO
-      if (!existUser) {
-        return null;
-      }
+  const githubHandler = async (ctx, { profile }) => {
+    const email = profile.emails && profile.emails[0] && profile.emails[0].value;
+    const existUser = await ctx.service.user.getUsersByQuery({
+      githubId: profile.id,
+    });
 
-      // 用户存在，更新字段
-      // existUser.loginname = profile.username;
-      existUser.githubId = profile.id;
-      existUser.email = email || existUser.email;
-      existUser.avatar = profile._json.avatar_url;
-      existUser.githubUsername = profile.username;
-      existUser.githubAccessToken = profile.accessToken;
-      await existUser.save();
+    // 用户不存在则创建
+    // TODO
+    if (!existUser) {
+      return null;
+    }
 
-      return existUser;
-    };
+    // 用户存在，更新字段
+    // existUser.loginname = profile.username;
+    existUser.githubId = profile.id;
+    existUser.email = email || existUser.email;
+    existUser.avatar = profile._json.avatar_url;
+    existUser.githubUsername = profile.username;
+    existUser.githubAccessToken = profile.accessToken;
+    await existUser.save();
 
-    const handle = user => {
-      let handler;
-      switch (user.provider) {
-        case 'github':
-          handler = githubHandler;
-          break;
-        default:
-          handler = localHandler;
-      }
-      return handler(user);
-    };
-    return handle(user);
+    return existUser;
+  };
+
+  app.passport.verify(async (ctx, user) => {
+    ctx.logger.debug('passport.verify', user);
+    let handler;
+    switch (user.provider) {
+      case 'github':
+        handler = githubHandler;
+        break;
+      default:
+        handler = localHandler;
+    }
+    return handler(ctx, user);
   });
 };