@shun-js/user 0.4.4 → 0.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/user",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "user",
   "keywords": [
     "shun.js",
@@ -34,5 +34,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "2defaa9089506eb53bcae4d248d281b98465e6ad"
+  "gitHead": "a3707c20f4632d54ba051ff2431e667128bc9782"
 }

package/server/controller/UserGoogleController.js

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

package/server/service/UserGoogleService.js

@@ -0,0 +1,58 @@
+// model
+const { addUserInfo, isUserInfoExists } = require('../model/UserInfoModel.js');
+
+// google
+const { getGoogleUserinfo } = require('../util/google.js');
+
+// util
+const { loginORRegUser } = require('../util/user.js');
+
+/**
+ * userGoogle
+ * @param {*} req
+ * @param {*} res
+ * @returns
+ */
+exports.userGoogle = async (req, res) => {
+  const methodName = 'userGoogle';
+
+  // fallback url
+  const fallbackUrl = global.QZ_CONFIG.google.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 googleUserinfo = await getGoogleUserinfo(req, code);
+  if (!googleUserinfo) {
+    req.logger.error(methodName, 'googleUserinfo is null');
+    res.redirect(fallbackUrl);
+    return;
+  }
+
+  // user item
+  const userItem = await loginORRegUser(req, res, googleUserinfo.email);
+  if (!userItem) return;
+  req.logger.info(methodName, 'github login or reg ok');
+
+  // user info
+  const isUserInfoExistsRes = await isUserInfoExists(req, res, userItem.id);
+  if (!isUserInfoExistsRes) return;
+  if (isUserInfoExistsRes.length === 0) {
+    const addUserInfoRes = await addUserInfo(req, res, userItem.id, googleUserinfo);
+    if (!addUserInfoRes) return;
+  }
+
+  // r
+  const finalUser = {
+    userid: userItem.id,
+    usertoken: userItem.usertoken,
+  };
+  res.jsonSuccess('登录成功！', finalUser);
+};

package/server/service/UserInfoService.js

@@ -2,7 +2,7 @@
 const { getUserInfoById } = require('../model/UserInfoModel.js');
 
 // util
-const { getUserAccessToken } = require('../util/user.js');
+const { getUserAccessToken, setUserAccessToken } = require('../util/user.js');
 
 /**
  * userInfo
@@ -28,6 +28,7 @@ exports.userInfo = async (req, res) => {
 
   // access token
   const accessToken = await getUserAccessToken(req, userid);
+  await setUserAccessToken(req, userid, accessToken);
   getUserInfoByIdRes.accessToken = accessToken;
 
   // r

package/server/util/google.js

@@ -0,0 +1,125 @@
+// ajax
+const { get, post } = require('qiao-ajax');
+
+/**
+ * getGoogleUserinfo
+ * @param {*} req
+ * @param {*} code
+ */
+exports.getGoogleUserinfo = async (req, code) => {
+  const methodName = 'getGoogleUserinfo';
+
+  try {
+    // get token
+    const tokenUrl = global.QZ_CONFIG.google.tokenUrl;
+    const tokenConfig = {
+      params: {
+        client_id: global.QZ_CONFIG.google.clientID,
+        client_secret: global.QZ_CONFIG.google.clientSecret,
+        redirect_uri: global.QZ_CONFIG.google.callbackUrl,
+        grant_type: 'authorization_code',
+        code: code,
+      },
+      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    };
+    const tokenResponse = await post(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.google.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

@@ -78,3 +78,17 @@ exports.getUserAccessToken = async (req, userid) => {
   await req.redis.set(acKey, newAccessToken);
   return newAccessToken;
 };
+
+/**
+ * setUserAccessToken
+ * @param {*} req
+ * @param {*} userid
+ * @param {*} token
+ */
+exports.setUserAccessToken = async (req, userid, token) => {
+  const tokenKey = `token-${token}`;
+  const tokenValue = await req.redis.get(tokenKey);
+  if (tokenValue) return;
+
+  await req.redis.set(tokenKey, userid);
+};