@shun-js/webcc-server 0.6.8 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/webcc-server",
-  "version": "0.6.8",
+  "version": "0.7.0",
   "description": "webcc.dev server",
   "keywords": [
     "web claude code"
@@ -32,5 +32,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "b8d8674e7676cd3d152db0bd6e35c706e87d4c00"
+  "gitHead": "7b00c44a58b64b17d54327820cf1d44fa00464dd"
 }

package/server/service/IndexService.js

@@ -35,8 +35,7 @@ exports.githubCallback = async (req, res) => {
   const methodName = 'githubCallback';
 
   // fallback url
-  // const fallbackUrl = global.QZ_CONFIG.github.fallbackUrl;
-  const fallbackUrl = 'http://localhost:7008';
+  const fallbackUrl = global.QZ_CONFIG.github.fallbackUrl;
 
   // check
   if (!req.cookies) {
@@ -70,6 +69,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

@@ -12,8 +12,7 @@ exports.getGitHubAuthUrl = () => {
   const state = uuid();
   const params = new URLSearchParams({
     client_id: global.QZ_CONFIG.github.clientID,
-    // redirect_uri: global.QZ_CONFIG.github.callbackUrl,
-    redirect_uri: 'http://localhost:7008/github/callback',
+    redirect_uri: global.QZ_CONFIG.github.callbackUrl,
     scope: global.QZ_CONFIG.github.scope,
     state: state,
   });
@@ -25,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;
@@ -35,18 +37,111 @@ exports.getGithubUserinfo = async (code) => {
       params: {
         client_id: global.QZ_CONFIG.github.clientID,
         client_secret: global.QZ_CONFIG.github.clientSecret,
-        // redirect_uri: global.QZ_CONFIG.github.callbackUrl,
-        redirect_uri: 'http://localhost:7008/github/callback',
+        redirect_uri: global.QZ_CONFIG.github.callbackUrl,
         code: code,
       },
       headers: {
         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
+//   }
+// }