@shun-js/webcc-server 0.6.7 → 0.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/webcc-server",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "description": "webcc.dev server",
   "keywords": [
     "web claude code"
@@ -23,7 +23,8 @@
   "dependencies": {
     "@shun-js/shun-config": "^0.3.1",
     "@shun-js/shun-service": "^0.3.1",
-    "qiao-file": "^5.0.6",
+    "qiao-ajax": "^5.2.4",
+    "qiao-encode": "^5.0.6",
     "qiao-log": "^5.1.9",
     "qiao-z": "^5.8.9"
   },
@@ -31,5 +32,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "a43c95c66e0f7dc0a8cfed413baf2ccc5699c373"
+  "gitHead": "b8d8674e7676cd3d152db0bd6e35c706e87d4c00"
 }

package/server/controller/IndexController.js

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

package/server/service/IndexService.js

@@ -1,5 +1,5 @@
 // github
-const { getGitHubAuthUrl } = require('../util/github.js');
+const { getGitHubAuthUrl, getGithubUserinfo } = require('../util/github.js');
 
 /**
  * index
@@ -7,19 +7,69 @@ const { getGitHubAuthUrl } = require('../util/github.js');
  * @param {*} res
  */
 exports.index = async (req, res) => {
-  const url = getGitHubAuthUrl('1');
-  console.log(url);
   res.send('1');
 };
 
+/**
+ * githubAuth
+ * @param {*} req
+ * @param {*} res
+ */
+exports.githubAuth = async (req, res) => {
+  // auth
+  const authObj = getGitHubAuthUrl();
+
+  // set cookie
+  res.setCookie('state', authObj.state);
+
+  // redirect
+  res.redirect(authObj.finalUrl);
+};
+
 /**
  * githubCallback
  * @param {*} req
  * @param {*} res
  */
 exports.githubCallback = async (req, res) => {
-  console.log(req.params);
-  console.log(req.body);
-  console.log(req.query);
+  const methodName = 'githubCallback';
+
+  // fallback url
+  // const fallbackUrl = global.QZ_CONFIG.github.fallbackUrl;
+  const fallbackUrl = 'http://localhost:7008';
+
+  // check
+  if (!req.cookies) {
+    req.logger.error(methodName, 'req.cookies is null');
+    res.redirect(fallbackUrl);
+    return;
+  }
+  if (!req.query) {
+    req.logger.error(methodName, 'req.query is null');
+    res.redirect(fallbackUrl);
+    return;
+  }
+
+  // check state
+  const cookieState = req.cookies.state;
+  const queryState = req.query.state;
+  if (cookieState !== queryState) {
+    req.logger.info(methodName, 'cookieState', cookieState);
+    req.logger.info(methodName, 'queryState', queryState);
+    req.logger.error(methodName, 'cookieState !== queryState');
+    res.redirect(fallbackUrl);
+    return;
+  }
+
+  // check code
+  const queryCode = req.query.code;
+  if (!queryCode) {
+    req.logger.error(methodName, 'queryCode is null');
+    res.redirect(fallbackUrl);
+    return;
+  }
+
+  // userinfo
+  await getGithubUserinfo(queryCode);
   res.send('1');
 };

package/server/util/github.js

@@ -1,15 +1,52 @@
+// encode
+const { uuid } = require('qiao-encode');
+
+// ajax
+const { get } = require('qiao-ajax');
+
 /**
  * getGitHubAuthUrl
- * @param {*} state
  * @returns
  */
-exports.getGitHubAuthUrl = (state) => {
+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: global.QZ_CONFIG.github.callbackUrl,
+    redirect_uri: 'http://localhost:7008/github/callback',
     scope: global.QZ_CONFIG.github.scope,
     state: state,
   });
+  const finalUrl = `${global.QZ_CONFIG.github.authUrl}?${params.toString()}`;
+
+  // r
+  return { state, finalUrl };
+};
 
-  return `${global.QZ_CONFIG.github.authUrl}?${params.toString()}`;
+/**
+ * getGithubUserinfo
+ * @param {*} code
+ */
+exports.getGithubUserinfo = async (code) => {
+  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,
+        redirect_uri: 'http://localhost:7008/github/callback',
+        code: code,
+      },
+      headers: {
+        Accept: 'application/json',
+      },
+    };
+    console.log(tokenConfig);
+    const tokenResponse = await get(tokenUrl, tokenConfig);
+    console.log(tokenResponse);
+  } catch (error) {
+    console.log(error);
+  }
 };