@shun-js/webcc-server 0.6.9 → 0.7.1

package/app.js

@@ -23,6 +23,9 @@ const { parseServerConfig } = require('@shun-js/shun-config');
   options.log = require('qiao-log');
   options.logOptions = require('./server/log-options.js')();
 
+  // options modules
+  options.modules = [require('qiao-z-nuser').initGithub];
+
   // go
   const app = await require('qiao-z')(options);
   app.listen(config.port);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/webcc-server",
-  "version": "0.6.9",
+  "version": "0.7.1",
   "description": "webcc.dev server",
   "keywords": [
     "web claude code"
@@ -26,11 +26,12 @@
     "qiao-ajax": "^5.2.4",
     "qiao-encode": "^5.0.6",
     "qiao-log": "^5.1.9",
-    "qiao-z": "^5.8.9"
+    "qiao-z": "^5.8.9",
+    "qiao-z-nuser": "^5.9.1"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "2e16481e703d73845eac724b043e641a56346041"
+  "gitHead": "b797c5d6b2b8a8dd4175fa32eb59c396eeb80333"
 }

package/server/controller/IndexController.js

@@ -10,10 +10,10 @@ module.exports = (app) => {
     service.index(req, res);
   });
 
-  // github auth
-  app.get('/github/auth', (req, res) => {
-    service.githubAuth(req, res);
-  });
+  // // github auth
+  // app.get('/github/auth', (req, res) => {
+  //   service.githubAuth(req, res);
+  // });
 
   // github callback
   app.get('/github/callback', (req, res) => {

package/server/service/IndexService.js

@@ -1,5 +1,8 @@
 // github
-const { getGitHubAuthUrl, getGithubUserinfo } = require('../util/github.js');
+const {
+  // getGitHubAuthUrl,
+  getGithubUserinfo,
+} = require('../util/github.js');
 
 /**
  * index
@@ -10,21 +13,21 @@ exports.index = async (req, res) => {
   res.send('1');
 };
 
-/**
- * githubAuth
- * @param {*} req
- * @param {*} res
- */
-exports.githubAuth = async (req, res) => {
-  // auth
-  const authObj = getGitHubAuthUrl();
+// /**
+//  * githubAuth
+//  * @param {*} req
+//  * @param {*} res
+//  */
+// exports.githubAuth = async (req, res) => {
+//   // auth
+//   const authObj = getGitHubAuthUrl();
 
-  // set cookie
-  res.setCookie('state', authObj.state);
+//   // set cookie
+//   res.setCookie('state', authObj.state);
 
-  // redirect
-  res.redirect(authObj.finalUrl);
-};
+//   // redirect
+//   res.redirect(authObj.finalUrl);
+// };
 
 /**
  * githubCallback
@@ -69,6 +72,11 @@ exports.githubCallback = async (req, res) => {
   }
 
   // userinfo
-  await getGithubUserinfo(queryCode);
+  const githubUserinfo = await getGithubUserinfo(req, queryCode);
+  if (!githubUserinfo) {
+    req.logger.error(methodName, 'githubUserinfo is null');
+    res.redirect(fallbackUrl);
+    return;
+  }
   res.send('1');
 };

package/server/util/github.js

@@ -24,9 +24,12 @@ exports.getGitHubAuthUrl = () => {
 
 /**
  * getGithubUserinfo
+ * @param {*} req
  * @param {*} code
  */
-exports.getGithubUserinfo = async (code) => {
+exports.getGithubUserinfo = async (req, code) => {
+  const methodName = 'getGithubUserinfo';
+
   try {
     // get token
     const tokenUrl = global.QZ_CONFIG.github.tokenUrl;
@@ -41,10 +44,104 @@ exports.getGithubUserinfo = async (code) => {
         Accept: 'application/json',
       },
     };
-    console.log(tokenConfig);
     const tokenResponse = await get(tokenUrl, tokenConfig);
-    console.log(tokenResponse);
+
+    // 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) {
-    console.log(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
+//   }
+// }