@shun-js/user 0.4.6 → 0.4.7

package/package.json

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

package/server/model/UserInfoModel.js

@@ -22,15 +22,15 @@ exports.isUserInfoExists = async (req, res, id) => {
 };
 
 /**
- * addUserInfo
+ * addUserInfoByGithub
  * @param {*} req
  * @param {*} res
  * @param {*} userItemId
  * @param {*} githubUserinfo
  * @returns
  */
-exports.addUserInfo = async (req, res, userItemId, githubUserinfo) => {
-  const methodName = 'addUserInfo';
+exports.addUserInfoByGithub = async (req, res, userItemId, githubUserinfo) => {
+  const methodName = 'addUserInfoByGithub';
 
   // add user item
   try {
@@ -47,6 +47,32 @@ exports.addUserInfo = async (req, res, userItemId, githubUserinfo) => {
   }
 };
 
+/**
+ * addUserInfoByGoogle
+ * @param {*} req
+ * @param {*} res
+ * @param {*} userItemId
+ * @param {*} googleUserinfo
+ * @returns
+ */
+exports.addUserInfoByGoogle = async (req, res, userItemId, googleUserinfo) => {
+  const methodName = 'addUserInfoByGoogle';
+
+  // add user item
+  try {
+    // add user
+    const params = [userItemId, googleUserinfo.name, googleUserinfo.picture, googleUserinfo.email];
+    await req.db.query(sql.addUserInfo, params);
+
+    // r
+    return true;
+  } catch (error) {
+    const msg = '添加用户失败！';
+    req.logger.error(methodName, msg, error.name, error.message);
+    res.jsonFail(msg);
+  }
+};
+
 /**
  * getUserInfoById
  * @param {*} req

package/server/service/UserGithubService.js

@@ -1,5 +1,5 @@
 // model
-const { addUserInfo, isUserInfoExists } = require('../model/UserInfoModel.js');
+const { addUserInfoByGithub, isUserInfoExists } = require('../model/UserInfoModel.js');
 
 // github
 const { getGithubUserinfo } = require('../util/github.js');
@@ -45,7 +45,7 @@ exports.userGithub = async (req, res) => {
   const isUserInfoExistsRes = await isUserInfoExists(req, res, userItem.id);
   if (!isUserInfoExistsRes) return;
   if (isUserInfoExistsRes.length === 0) {
-    const addUserInfoRes = await addUserInfo(req, res, userItem.id, githubUserinfo);
+    const addUserInfoRes = await addUserInfoByGithub(req, res, userItem.id, githubUserinfo);
     if (!addUserInfoRes) return;
   }
 

package/server/service/UserGoogleService.js

@@ -1,5 +1,5 @@
 // model
-const { addUserInfo, isUserInfoExists } = require('../model/UserInfoModel.js');
+const { addUserInfoByGoogle, isUserInfoExists } = require('../model/UserInfoModel.js');
 
 // google
 const { getGoogleUserinfo } = require('../util/google.js');
@@ -45,7 +45,7 @@ exports.userGoogle = async (req, res) => {
   const isUserInfoExistsRes = await isUserInfoExists(req, res, userItem.id);
   if (!isUserInfoExistsRes) return;
   if (isUserInfoExistsRes.length === 0) {
-    const addUserInfoRes = await addUserInfo(req, res, userItem.id, googleUserinfo);
+    const addUserInfoRes = await addUserInfoByGoogle(req, res, userItem.id, googleUserinfo);
     if (!addUserInfoRes) return;
   }
 

package/server/util/google.js

@@ -76,50 +76,11 @@ exports.getGoogleUserinfo = async (req, code) => {
 };
 
 // {
-//   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
-//   }
+//   sub: '113888573080949768314',
+//   name: 'vincent v',
+//   given_name: 'vincent',
+//   family_name: 'v',
+//   picture: 'https://lh3.googleusercontent.com/a/ACg8ocIeChCoXJwZ4Yqsa9g3wn7iw54hF1qEg6Aqm4p3QiBjBRJV5mD6=s96-c',
+//   email: 'uikoo9@gmail.com',
+//   email_verified: true
 // }