@shun-js/user 0.3.2 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/user",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "user",
   "keywords": [
     "shun.js",
@@ -23,6 +23,7 @@
   "dependencies": {
     "@shun-js/shun-config": "^0.3.1",
     "@shun-js/shun-service": "^0.3.1",
+    "qiao-ajax": "^5.2.4",
     "qiao-encode": "^5.0.6",
     "qiao-log": "^5.1.9",
     "qiao-mysql": "^5.8.6",
@@ -33,5 +34,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "4fa47fe5cf1b00acfe54f47af836101291093f06"
+  "gitHead": "ff2465fb870eea80a1447911e3bfbe8121b5ed28"
 }

package/server/controller/UserGithubController.js

@@ -0,0 +1,12 @@
+// service
+const service = require('../service/UserGithubService.js');
+
+/**
+ * controller
+ */
+module.exports = (app) => {
+  // user github
+  app.post('/user/github', (req, res) => {
+    service.userGithub(req, res);
+  });
+};

package/server/service/UserGithubService.js

@@ -0,0 +1,36 @@
+// github
+const { getGithubUserinfo } = require('../util/github.js');
+
+/**
+ * userGithub
+ * @param {*} req
+ * @param {*} res
+ * @returns
+ */
+exports.userGithub = async (req, res) => {
+  const methodName = 'userGithub';
+
+  // fallback url
+  const fallbackUrl = global.QZ_CONFIG.github.fallbackUrl;
+
+  // const
+  const code = req.body.code;
+  if (!code) {
+    const msg = 'need code';
+    req.logger.warn(methodName, msg, req.body);
+    res.jsonFail(msg);
+    return;
+  }
+
+  // userinfo
+  const githubUserinfo = await getGithubUserinfo(req, code);
+  if (!githubUserinfo) {
+    req.logger.error(methodName, 'githubUserinfo is null');
+    res.redirect(fallbackUrl);
+    return;
+  }
+  req.logger.info(methodName, 'githubUserinfo', githubUserinfo);
+
+  // r
+  res.jsonSuccess('登录成功！');
+};

package/server/service/UserItemService.js

@@ -2,10 +2,10 @@
 const { AESEncrypt } = require('qiao-encode');
 
 // model
-const { getUserItemByName, addUserItem, getUserItemById } = require('../model/UserItemModel.js');
+const { getUserItemById } = require('../model/UserItemModel.js');
 
-// feishu
-const { feishuBot } = require('@shun-js/shun-service');
+// util
+const { loginORRegUser } = require('../util/user.js');
 
 /**
  * userLogin
@@ -48,45 +48,8 @@ exports.userLogin = async (req, res) => {
   }
 
   // user item
-  const getUserItemRes = await getUserItemByName(req, res, mobile);
-  if (!getUserItemRes) return;
-
-  // reg
-  if (getUserItemRes.length !== 1) {
-    // add user
-    const addUserItemRes = await addUserItem(req, res, mobile);
-    if (!addUserItemRes) return;
-
-    // feishu
-    const finalMsg = `【提醒】success - ${methodName} - new user reg - ${addUserItemRes.id}`;
-    const feishuBotRes = await feishuBot({
-      url: global.QZ_CONFIG.feishu.url,
-      feishuUrl: global.QZ_CONFIG.feishu.feishuUrl,
-      feishuMsg: finalMsg,
-    });
-    req.logger.warn(methodName, 'feishuBotRes', feishuBotRes);
-
-    // r
-    res.jsonSuccess('登录成功！', addUserItemRes);
-    return;
-  }
-
-  // login
-  const user = getUserItemRes[0];
-  const userItem = {
-    id: user.id,
-    usertoken: AESEncrypt(mobile + user.user_item_password, global.QZ_CONFIG.encryptKey),
-    usermobile: mobile,
-  };
-
-  // feishu
-  const finalMsg = `【提醒】success - ${methodName} - user login - ${userItem.id}`;
-  const feishuBotRes = await feishuBot({
-    url: global.QZ_CONFIG.feishu.url,
-    feishuUrl: global.QZ_CONFIG.feishu.feishuUrl,
-    feishuMsg: finalMsg,
-  });
-  req.logger.warn(methodName, 'feishuBotRes', feishuBotRes);
+  const userItem = await loginORRegUser(mobile);
+  if (!userItem) return;
 
   // r
   res.jsonSuccess('登录成功！', userItem);

package/server/util/github.js

@@ -0,0 +1,126 @@
+// ajax
+const { get } = require('qiao-ajax');
+
+/**
+ * getGithubUserinfo
+ * @param {*} req
+ * @param {*} code
+ */
+exports.getGithubUserinfo = async (req, code) => {
+  const methodName = 'getGithubUserinfo';
+
+  try {
+    // get token
+    const tokenUrl = global.QZ_CONFIG.github.tokenUrl;
+    const tokenConfig = {
+      params: {
+        client_id: global.QZ_CONFIG.github.clientID,
+        client_secret: global.QZ_CONFIG.github.clientSecret,
+        redirect_uri: global.QZ_CONFIG.github.callbackUrl,
+        code: code,
+      },
+      headers: {
+        Accept: 'application/json',
+      },
+    };
+    const tokenResponse = await get(tokenUrl, tokenConfig);
+
+    // check
+    if (!tokenResponse) {
+      req.logger.error(methodName, 'tokenResponse is null');
+      return;
+    }
+    if (tokenResponse.status !== 200) {
+      req.logger.error(methodName, 'tokenResponse.status !== 200', tokenResponse.status);
+      return;
+    }
+    if (!tokenResponse.data) {
+      req.logger.error(methodName, 'tokenResponse.data is null');
+      return;
+    }
+    if (!tokenResponse.data.access_token || !tokenResponse.data.token_type) {
+      req.logger.error(methodName, 'tokenResponse.data.access_token is null or tokenResponse.data.token_type is null');
+      return;
+    }
+
+    // get user
+    req.logger.info(methodName, 'get token success');
+    const userUrl = global.QZ_CONFIG.github.userUrl;
+    const userConfig = {
+      headers: {
+        Authorization: `${tokenResponse.data.token_type} ${tokenResponse.data.access_token}`,
+        Accept: 'application/json',
+      },
+    };
+    const userResponse = await get(userUrl, userConfig);
+
+    // check
+    if (!userResponse) {
+      req.logger.error(methodName, 'userResponse is null');
+      return;
+    }
+    if (userResponse.status !== 200) {
+      req.logger.error(methodName, 'userResponse.status !== 200', userResponse.status);
+      return;
+    }
+    if (!userResponse.data) {
+      req.logger.error(methodName, 'userResponse.data is null');
+      return;
+    }
+    req.logger.info(methodName, 'get user success');
+
+    // r
+    return userResponse.data;
+  } catch (error) {
+    req.logger.error(methodName, 'error', error);
+  }
+};
+
+// {
+//   login: 'uikoo9',
+//   id: 10345351,
+//   node_id: 'MDQ6VXNlcjEwMzQ1MzUx',
+//   avatar_url: 'https://avatars.githubusercontent.com/u/10345351?v=4',
+//   gravatar_id: '',
+//   url: 'https://api.github.com/users/uikoo9',
+//   html_url: 'https://github.com/uikoo9',
+//   followers_url: 'https://api.github.com/users/uikoo9/followers',
+//   following_url: 'https://api.github.com/users/uikoo9/following{/other_user}',
+//   gists_url: 'https://api.github.com/users/uikoo9/gists{/gist_id}',
+//   starred_url: 'https://api.github.com/users/uikoo9/starred{/owner}{/repo}',
+//   subscriptions_url: 'https://api.github.com/users/uikoo9/subscriptions',
+//   organizations_url: 'https://api.github.com/users/uikoo9/orgs',
+//   repos_url: 'https://api.github.com/users/uikoo9/repos',
+//   events_url: 'https://api.github.com/users/uikoo9/events{/privacy}',
+//   received_events_url: 'https://api.github.com/users/uikoo9/received_events',
+//   type: 'User',
+//   user_view_type: 'private',
+//   site_admin: false,
+//   name: null,
+//   company: null,
+//   blog: '',
+//   location: null,
+//   email: 'uikoo9@qq.com',
+//   hireable: null,
+//   bio: null,
+//   twitter_username: null,
+//   notification_email: 'uikoo9@qq.com',
+//   public_repos: 27,
+//   public_gists: 0,
+//   followers: 91,
+//   following: 4,
+//   created_at: '2014-12-30T03:11:05Z',
+//   updated_at: '2026-01-29T09:08:41Z',
+//   private_gists: 0,
+//   total_private_repos: 33,
+//   owned_private_repos: 33,
+//   disk_usage: 1026748,
+//   collaborators: 4,
+//   two_factor_authentication: true,
+//   plan: {
+//     name: 'free',
+//     space: 976562499,
+//     collaborators: 0,
+//     private_repos: 10000
+//   }
+// }

package/server/util/user.js

@@ -0,0 +1,62 @@
+// qiao
+const { AESEncrypt } = require('qiao-encode');
+
+// model
+const { getUserItemByName, addUserItem } = require('../model/UserItemModel.js');
+
+// feishu
+const { feishuBot } = require('@shun-js/shun-service');
+
+/**
+ * loginORRegUser
+ * @param {*} req
+ * @param {*} res
+ * @param {*} mobileOREmail
+ * @returns
+ */
+exports.loginORRegUser = async (req, res, mobileOREmail) => {
+  const methodName = 'loginORRegUser';
+
+  // user item
+  const getUserItemRes = await getUserItemByName(req, res, mobileOREmail);
+  if (!getUserItemRes) return;
+
+  // reg
+  if (getUserItemRes.length !== 1) {
+    // add user
+    const addUserItemRes = await addUserItem(req, res, mobileOREmail);
+    if (!addUserItemRes) return;
+
+    // feishu
+    const finalMsg = `【提醒】success - ${methodName} - new user reg - ${addUserItemRes.id}`;
+    const feishuBotRes = await feishuBot({
+      url: global.QZ_CONFIG.feishu.url,
+      feishuUrl: global.QZ_CONFIG.feishu.feishuUrl,
+      feishuMsg: finalMsg,
+    });
+    req.logger.warn(methodName, 'feishuBotRes', feishuBotRes);
+
+    // r
+    return addUserItemRes;
+  }
+
+  // login
+  const user = getUserItemRes[0];
+  const userItem = {
+    id: user.id,
+    usertoken: AESEncrypt(mobileOREmail + user.user_item_password, global.QZ_CONFIG.encryptKey),
+    usermobile: mobileOREmail,
+  };
+
+  // feishu
+  const finalMsg = `【提醒】success - ${methodName} - user login - ${userItem.id}`;
+  const feishuBotRes = await feishuBot({
+    url: global.QZ_CONFIG.feishu.url,
+    feishuUrl: global.QZ_CONFIG.feishu.feishuUrl,
+    feishuMsg: finalMsg,
+  });
+  req.logger.warn(methodName, 'feishuBotRes', feishuBotRes);
+
+  // r
+  return userItem;
+};