@fonoster/identity 0.9.19 → 0.9.20

package/dist/exchanges/createExchangeOauth2Code.js

@@ -66,32 +66,18 @@ const logger_1 = require("@fonoster/logger");
 const grpc = __importStar(require("@grpc/grpc-js"));
 const exchangeTokens_1 = require("./exchangeTokens");
 const createGetUserByEmail_1 = require("../utils/createGetUserByEmail");
+const getGitHubUserWithOauth2Code_1 = require("../utils/getGitHubUserWithOauth2Code");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
 function createExchangeOauth2Code(prisma, identityConfig) {
     const exchangeOauth2Code = (call, callback) => __awaiter(this, void 0, void 0, function* () {
         const { request } = call;
         const { provider, code } = request;
         logger.verbose("call to exchangeOauth2Code", { provider });
-        const tokenResponse = yield fetch("https://github.com/login/oauth/access_token", {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-                Accept: "application/json"
-            },
-            body: JSON.stringify({
-                client_id: identityConfig.githubOauth2Config.clientId,
-                client_secret: identityConfig.githubOauth2Config.clientSecret,
-                code
-            })
+        const userData = yield (0, getGitHubUserWithOauth2Code_1.getGitHubUserWithOauth2Code)({
+            clientId: identityConfig.githubOauth2Config.clientId,
+            clientSecret: identityConfig.githubOauth2Config.clientSecret,
+            code
         });
-        const tokenData = yield tokenResponse.json();
-        const accessToken = tokenData === null || tokenData === void 0 ? void 0 : tokenData.access_token;
-        const userResponse = yield fetch("https://api.github.com/user", {
-            headers: {
-                Authorization: `token ${accessToken}`
-            }
-        });
-        const userData = yield userResponse.json();
         const user = yield (0, createGetUserByEmail_1.createGetUserByEmail)(prisma)(userData.email);
         if (!user) {
             return callback({

package/dist/service.d.ts

@@ -44,6 +44,9 @@ declare function buildIdentityService(identityConfig: IdentityConfig): {
         createUser: (call: {
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+        createUserWithOauth2Code: (call: {
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         getUser: (call: {
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;

package/dist/service.js

@@ -49,6 +49,7 @@ function buildIdentityService(identityConfig) {
             removeUserFromWorkspace: (0, _1.createRemoveUserFromWorkspace)(prisma),
             // User operations
             createUser: (0, _1.createCreateUser)(prisma),
+            createUserWithOauth2Code: (0, _1.createCreateUserWithOauth2Code)(prisma, identityConfig),
             getUser: (0, _1.createGetUser)(prisma),
             deleteUser: (0, _1.createDeleteUser)(prisma),
             updateUser: (0, _1.createUpdateUser)(prisma),

package/dist/users/createCreateUserWithOauth2Code.d.ts

@@ -0,0 +1,7 @@
+import { GrpcErrorMessage } from "@fonoster/common";
+import { Prisma } from "../db";
+import { IdentityConfig } from "../exchanges/types";
+declare function createCreateUserWithOauth2Code(prisma: Prisma, identityConfig: IdentityConfig): (call: {
+    request: unknown;
+}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+export { createCreateUserWithOauth2Code };

package/dist/users/createCreateUserWithOauth2Code.js

@@ -0,0 +1,109 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCreateUserWithOauth2Code = createCreateUserWithOauth2Code;
+/*
+ * Copyright (C) 2025 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/fonoster
+ *
+ * This file is part of Fonoster
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const common_1 = require("@fonoster/common");
+const logger_1 = require("@fonoster/logger");
+const generateAccessKeyId_1 = require("../utils/generateAccessKeyId");
+const getGitHubUserWithOauth2Code_1 = require("../utils/getGitHubUserWithOauth2Code");
+const createGetUserByEmail_1 = require("../utils/createGetUserByEmail");
+const grpc = __importStar(require("@grpc/grpc-js"));
+const nanoid_1 = require("nanoid");
+const exchangeTokens_1 = require("../exchanges/exchangeTokens");
+const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
+function createCreateUserWithOauth2Code(prisma, identityConfig) {
+    const createUserWithOauth2Code = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { request } = call;
+        const { code } = request;
+        logger.verbose("call to createCreateUserWithOauth2Code");
+        const userData = yield (0, getGitHubUserWithOauth2Code_1.getGitHubUserWithOauth2Code)({
+            clientId: identityConfig.githubOauth2Config.clientId,
+            clientSecret: identityConfig.githubOauth2Config.clientSecret,
+            code
+        });
+        if (!userData.email) {
+            return callback({
+                code: grpc.status.PERMISSION_DENIED,
+                message: "Failed to get user data from GitHub"
+            });
+        }
+        const userFromDB = yield (0, createGetUserByEmail_1.createGetUserByEmail)(prisma)(userData === null || userData === void 0 ? void 0 : userData.email);
+        if (userFromDB) {
+            return callback({
+                code: grpc.status.ALREADY_EXISTS,
+                message: "User already exists"
+            });
+        }
+        const user = yield prisma.user.create({
+            data: {
+                name: userData.name,
+                email: userData.email,
+                accessKeyId: (0, generateAccessKeyId_1.generateAccessKeyId)(generateAccessKeyId_1.AccessKeyIdType.USER),
+                emailVerified: true,
+                password: (0, nanoid_1.customAlphabet)("1234567890abcdef", 10)(),
+                avatar: userData.avatar_url
+            }
+        });
+        callback(null, yield (0, exchangeTokens_1.exchangeTokens)(prisma, identityConfig)(user.accessKeyId));
+    });
+    return (0, common_1.withErrorHandlingAndValidation)(createUserWithOauth2Code, common_1.Validators.createUserWithOauth2CodeRequestSchema);
+}

package/dist/users/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./createCreateUser";
+export * from "./createCreateUserWithOauth2Code";
 export * from "./createDeleteUser";
 export * from "./createGetUser";
 export * from "./createUpdateUser";

package/dist/users/index.js

@@ -33,6 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 __exportStar(require("./createCreateUser"), exports);
+__exportStar(require("./createCreateUserWithOauth2Code"), exports);
 __exportStar(require("./createDeleteUser"), exports);
 __exportStar(require("./createGetUser"), exports);
 __exportStar(require("./createUpdateUser"), exports);

package/dist/utils/getGitHubUserWithOauth2Code.d.ts

@@ -0,0 +1,6 @@
+declare function getGitHubUserWithOauth2Code(params: {
+    clientId: string;
+    clientSecret: string;
+    code: string;
+}): Promise<any>;
+export { getGitHubUserWithOauth2Code };

package/dist/utils/getGitHubUserWithOauth2Code.js

@@ -0,0 +1,57 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGitHubUserWithOauth2Code = getGitHubUserWithOauth2Code;
+/*
+ * Copyright (C) 2025 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/fonoster
+ *
+ * This file is part of Fonoster
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const GITHUB_API_URL = "https://github.com/login/oauth/access_token";
+const GITHUB_USER_API_URL = "https://api.github.com/user";
+function getGitHubUserWithOauth2Code(params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { clientId, clientSecret, code } = params;
+        const tokenResponse = yield fetch(GITHUB_API_URL, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json"
+            },
+            body: JSON.stringify({
+                client_id: clientId,
+                client_secret: clientSecret,
+                code
+            })
+        });
+        const tokenData = yield tokenResponse.json();
+        const accessToken = tokenData === null || tokenData === void 0 ? void 0 : tokenData.access_token;
+        const userResponse = yield fetch(GITHUB_USER_API_URL, {
+            headers: {
+                Authorization: `token ${accessToken}`
+            }
+        });
+        return userResponse.json();
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/identity",
-  "version": "0.9.19",
+  "version": "0.9.20",
   "description": "Identity service for Fonoster",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -20,9 +20,9 @@
     "fonoster": "./dist/index.js"
   },
   "dependencies": {
-    "@fonoster/common": "^0.9.19",
+    "@fonoster/common": "^0.9.20",
     "@fonoster/logger": "^0.9.12",
-    "@fonoster/types": "^0.9.19",
+    "@fonoster/types": "^0.9.20",
     "@grpc/grpc-js": "~1.10.6",
     "@prisma/client": "^6.4.1",
     "jsonwebtoken": "^9.0.2",
@@ -48,5 +48,5 @@
   "devDependencies": {
     "@types/jsonwebtoken": "^9.0.6"
   },
-  "gitHead": "b1798a2fdd50288ae37024fc6bf341d66d0f7d12"
+  "gitHead": "d48ba5f00cf72b81a1ed6d9fcc34036a99e3cc8e"
 }