@fonoster/identity 0.9.5 → 0.9.8

package/dist/db.d.ts

@@ -1,5 +1,5 @@
 import { Prisma as DMMF } from "./generated/@prisma/client";
-declare const prisma: import("./generated/@prisma/client/runtime/library").DynamicClientExtensionThis<DMMF.TypeMap<import("./generated/@prisma/client/runtime/library").InternalArgs & {
+export declare const createPrismaClient: (dbUrl: string, cloakEncryptionKey: string) => import("./generated/@prisma/client/runtime/library").DynamicClientExtensionThis<DMMF.TypeMap<import("./generated/@prisma/client/runtime/library").InternalArgs & {
     result: {};
     model: {};
     query: {};
@@ -9,6 +9,11 @@ declare const prisma: import("./generated/@prisma/client/runtime/library").Dynam
     model: {};
     query: {};
     client: {};
-}, DMMF.PrismaClientOptions>;
-type Prisma = typeof prisma;
-export { Prisma, prisma };
+}, {
+    datasources: {
+        db: {
+            url: string;
+        };
+    };
+}>;
+export type Prisma = ReturnType<typeof createPrismaClient>;

package/dist/db.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prisma = void 0;
+exports.createPrismaClient = void 0;
 /*
  * Copyright (C) 2025 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -21,11 +21,12 @@ exports.prisma = void 0;
  */
 const client_1 = require("./generated/@prisma/client");
 const prisma_field_encryption_1 = require("prisma-field-encryption");
-const envs_1 = require("./envs");
-// Check the link for details on dmff:
-// https://www.npmjs.com/package/prisma-field-encryption#custom-prisma-client-location
-const prisma = new client_1.PrismaClient().$extends((0, prisma_field_encryption_1.fieldEncryptionExtension)({
-    encryptionKey: envs_1.CLOAK_ENCRYPTION_KEY,
-    dmmf: client_1.Prisma.dmmf
-}));
-exports.prisma = prisma;
+const createPrismaClient = (dbUrl, cloakEncryptionKey) => {
+    return new client_1.PrismaClient({
+        datasources: { db: { url: dbUrl } },
+    }).$extends((0, prisma_field_encryption_1.fieldEncryptionExtension)({
+        encryptionKey: cloakEncryptionKey,
+        dmmf: client_1.Prisma.dmmf,
+    }));
+};
+exports.createPrismaClient = createPrismaClient;

package/dist/exchanges/createExchangeCredentials.js

@@ -65,12 +65,11 @@ const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
 const grpc = __importStar(require("@grpc/grpc-js"));
 const exchangeTokens_1 = require("./exchangeTokens");
-const envs_1 = require("../envs");
 const createIsValidVerificationCode_1 = require("../utils/createIsValidVerificationCode");
 const createGetUserByEmail_1 = require("../utils/createGetUserByEmail");
 const verification_1 = require("../verification");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
-const verificationRequiredButNotProvided = (user) => envs_1.IDENTITY_USER_VERIFICATION_REQUIRED &&
+const verificationRequiredButNotProvided = (identityConfig, user) => identityConfig.userVerificationRequired &&
     (!user.emailVerified || !user.phoneNumberVerified);
 function createExchangeCredentials(prisma, identityConfig) {
     const isValidVerificationCode = (0, createIsValidVerificationCode_1.createIsValidVerificationCode)(prisma);
@@ -85,13 +84,13 @@ function createExchangeCredentials(prisma, identityConfig) {
                 message: "Invalid credentials"
             });
         }
-        if (verificationRequiredButNotProvided(user)) {
+        if (verificationRequiredButNotProvided(identityConfig, user)) {
             return callback({
                 code: grpc.status.PERMISSION_DENIED,
                 message: "User contact information not verified"
             });
         }
-        if (envs_1.IDENTITY_USER_VERIFICATION_REQUIRED) {
+        if (identityConfig.userVerificationRequired) {
             const isValid = yield isValidVerificationCode({
                 type: verification_1.ContactType.EMAIL,
                 value: email,

package/dist/exchanges/types.d.ts

@@ -1,6 +1,7 @@
 import { Validators as V } from "@fonoster/common";
 import { z } from "zod";
 type IdentityConfig = {
+    dbUrl: string;
     issuer: string;
     audience: string;
     privateKey: string;
@@ -9,6 +10,10 @@ type IdentityConfig = {
     accessTokenExpiresIn: number | string;
     refreshTokenExpiresIn: number | string;
     idTokenExpiresIn: number | string;
+    workspaceInviteExpiration: string;
+    workspaceInviteUrl: string;
+    workspaceInviteFailUrl: string;
+    userVerificationRequired: boolean;
     smtpConfig: {
         sender: string;
         host: string;

package/dist/service.js

@@ -21,7 +21,6 @@ exports.buildIdentityService = buildIdentityService;
  * limitations under the License.
  */
 const db_1 = require("./db");
-const envs_1 = require("./envs");
 const createExchangeOauth2Code_1 = require("./exchanges/createExchangeOauth2Code");
 const getPublicKey_1 = require("./getPublicKey");
 const verification_1 = require("./verification");
@@ -34,42 +33,43 @@ const serviceDefinitionParams = {
 };
 exports.serviceDefinitionParams = serviceDefinitionParams;
 function buildIdentityService(identityConfig) {
+    const prisma = (0, db_1.createPrismaClient)(identityConfig.dbUrl, identityConfig.encryptionKey);
     const service = {
         definition: serviceDefinitionParams,
         handlers: {
             // Workspace operations
-            createWorkspace: (0, _1.createCreateWorkspace)(db_1.prisma),
-            deleteWorkspace: (0, _1.createDeleteWorkspace)(db_1.prisma),
-            getWorkspace: (0, _1.createGetWorkspace)(db_1.prisma),
-            updateWorkspace: (0, _1.createUpdateWorkspace)(db_1.prisma),
-            listWorkspaces: (0, _1.createListWorkspaces)(db_1.prisma),
-            inviteUserToWorkspace: (0, _1.createInviteUserToWorkspace)(db_1.prisma, identityConfig, _1.sendInvite),
-            resendWorkspaceMembershipInvitation: (0, _1.createResendWorkspaceMembershipInvitation)(db_1.prisma, identityConfig, _1.sendInvite),
-            removeUserFromWorkspace: (0, _1.createRemoveUserFromWorkspace)(db_1.prisma),
+            createWorkspace: (0, _1.createCreateWorkspace)(prisma),
+            deleteWorkspace: (0, _1.createDeleteWorkspace)(prisma),
+            getWorkspace: (0, _1.createGetWorkspace)(prisma),
+            updateWorkspace: (0, _1.createUpdateWorkspace)(prisma),
+            listWorkspaces: (0, _1.createListWorkspaces)(prisma),
+            inviteUserToWorkspace: (0, _1.createInviteUserToWorkspace)(prisma, identityConfig, _1.sendInvite),
+            resendWorkspaceMembershipInvitation: (0, _1.createResendWorkspaceMembershipInvitation)(prisma, identityConfig, _1.sendInvite),
+            removeUserFromWorkspace: (0, _1.createRemoveUserFromWorkspace)(prisma),
             // User operations
-            createUser: (0, _1.createCreateUser)(db_1.prisma),
-            getUser: (0, _1.createGetUser)(db_1.prisma),
-            deleteUser: (0, _1.createDeleteUser)(db_1.prisma),
-            updateUser: (0, _1.createUpdateUser)(db_1.prisma),
+            createUser: (0, _1.createCreateUser)(prisma),
+            getUser: (0, _1.createGetUser)(prisma),
+            deleteUser: (0, _1.createDeleteUser)(prisma),
+            updateUser: (0, _1.createUpdateUser)(prisma),
             // ApiKey operations
-            createApiKey: (0, _1.createCreateApiKey)(db_1.prisma),
-            deleteApiKey: (0, _1.createDeleteApiKey)(db_1.prisma),
-            listApiKeys: (0, _1.createListApiKeys)(db_1.prisma),
-            regenerateApiKey: (0, _1.createRegenerateApiKey)(db_1.prisma),
+            createApiKey: (0, _1.createCreateApiKey)(prisma),
+            deleteApiKey: (0, _1.createDeleteApiKey)(prisma),
+            listApiKeys: (0, _1.createListApiKeys)(prisma),
+            regenerateApiKey: (0, _1.createRegenerateApiKey)(prisma),
             // Exchanges
-            exchangeApiKey: (0, _1.createExchangeApiKey)(db_1.prisma, identityConfig),
-            exchangeCredentials: (0, _1.createExchangeCredentials)(db_1.prisma, identityConfig),
-            exchangeOauth2Code: (0, createExchangeOauth2Code_1.createExchangeOauth2Code)(db_1.prisma, identityConfig),
-            exchangeRefreshToken: (0, _1.createExchangeRefreshToken)(db_1.prisma, identityConfig),
+            exchangeApiKey: (0, _1.createExchangeApiKey)(prisma, identityConfig),
+            exchangeCredentials: (0, _1.createExchangeCredentials)(prisma, identityConfig),
+            exchangeOauth2Code: (0, createExchangeOauth2Code_1.createExchangeOauth2Code)(prisma, identityConfig),
+            exchangeRefreshToken: (0, _1.createExchangeRefreshToken)(prisma, identityConfig),
             getPublicKey: (0, getPublicKey_1.createGetPublicKey)(identityConfig.publicKey),
             // Placeholders for conditional handlers
             sendVerificationCode: undefined,
             verifyCode: undefined
         }
     };
-    if (envs_1.IDENTITY_USER_VERIFICATION_REQUIRED) {
-        service.handlers.sendVerificationCode = (0, verification_1.createSendVerificationCode)(db_1.prisma, identityConfig);
-        service.handlers.verifyCode = (0, verification_1.createVerifyCode)(db_1.prisma);
+    if (identityConfig.userVerificationRequired) {
+        service.handlers.sendVerificationCode = (0, verification_1.createSendVerificationCode)(prisma, identityConfig);
+        service.handlers.verifyCode = (0, verification_1.createVerifyCode)(prisma);
     }
     return service;
 }

package/dist/users/upsertDefaultUser.d.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { IdentityConfig } from "../exchanges";
 declare const createUserRequestSchema: z.ZodObject<{
     name: z.ZodString;
     email: z.ZodString;
@@ -13,5 +14,5 @@ declare const createUserRequestSchema: z.ZodObject<{
     password?: string;
 }>;
 type CreateUserRequest = z.infer<typeof createUserRequestSchema>;
-declare function upsertDefaultUser(request: CreateUserRequest): Promise<void>;
+declare function upsertDefaultUser(identityConfig: IdentityConfig, request: CreateUserRequest): Promise<void>;
 export { upsertDefaultUser };

package/dist/users/upsertDefaultUser.js

@@ -45,8 +45,9 @@ const USER_REF = "00000000-0000-0000-0000-000000000000";
 const WORKSPACE_REF = "00000000-0000-0000-0000-000000000000";
 const USER_ACCESS_KEY_ID = "US00000000000000000000000000000000";
 const WORKSPACE_ACCESS_KEY_ID = "WO00000000000000000000000000000000";
-function upsertDefaultUser(request) {
+function upsertDefaultUser(identityConfig, request) {
     return __awaiter(this, void 0, void 0, function* () {
+        const prisma = (0, db_1.createPrismaClient)(identityConfig.dbUrl, identityConfig.encryptionKey);
         try {
             const validatedRequest = createUserRequestSchema.parse(request);
             const { name, email, password } = validatedRequest;
@@ -54,7 +55,7 @@ function upsertDefaultUser(request) {
                 email,
                 accessKeyId: USER_ACCESS_KEY_ID
             });
-            yield db_1.prisma.user.upsert({
+            yield prisma.user.upsert({
                 where: { ref: USER_REF },
                 update: {
                     name,
@@ -71,7 +72,7 @@ function upsertDefaultUser(request) {
                     accessKeyId: USER_ACCESS_KEY_ID
                 }
             });
-            yield db_1.prisma.workspace.upsert({
+            yield prisma.workspace.upsert({
                 where: { ref: WORKSPACE_REF },
                 update: {},
                 create: {

package/dist/utils/createGetApiKeyByAccessKeyId.d.ts

@@ -1,12 +1,12 @@
 import { Prisma } from "../db";
 declare function createGetApiKeyByAccessKeyId(prisma: Prisma): (accessKeyId: string) => Promise<{
-    role: import("../generated/@prisma/client").$Enums.ApiKeyRole;
-    expiresAt: Date | null;
     ref: string;
     accessKeyId: string;
     createdAt: Date;
     updatedAt: Date;
-    accessKeySecret: string;
+    role: import("../generated/@prisma/client").$Enums.ApiKeyRole;
     workspaceRef: string;
+    accessKeySecret: string;
+    expiresAt: Date | null;
 }>;
 export { createGetApiKeyByAccessKeyId };

package/dist/utils/createGetUserByAccessKeyId.d.ts

@@ -4,18 +4,24 @@ declare function createGetUserByAccessKeyId(prisma: Prisma): (accessKeyId: strin
     model: {};
     query: {};
     client: {};
-}, import("../generated/@prisma/client").Prisma.PrismaClientOptions>, "User", "findFirst", null, import("../generated/@prisma/client").Prisma.PrismaClientOptions> & import("../generated/@prisma/client/runtime/library").PrismaPromise<{
+}, import("../generated/@prisma/client").Prisma.PrismaClientOptions>, "User", "findFirst", null, {
+    datasources: {
+        db: {
+            url: string;
+        };
+    };
+}> & import("../generated/@prisma/client/runtime/library").PrismaPromise<{
     name: string;
     ref: string;
     accessKeyId: string;
-    createdAt: Date;
-    updatedAt: Date;
     email: string;
     emailVerified: boolean;
     password: string;
     phoneNumber: string | null;
     phoneNumberVerified: boolean;
     avatar: string | null;
+    createdAt: Date;
+    updatedAt: Date;
     extended: import("../generated/@prisma/client/runtime/library").JsonValue | null;
 }>;
 export { createGetUserByAccessKeyId };

package/dist/utils/createGetUserByEmail.d.ts

@@ -3,14 +3,14 @@ declare function createGetUserByEmail(prisma: Prisma): (email: string) => Promis
     name: string;
     ref: string;
     accessKeyId: string;
-    createdAt: Date;
-    updatedAt: Date;
     email: string;
     emailVerified: boolean;
     password: string;
     phoneNumber: string | null;
     phoneNumberVerified: boolean;
     avatar: string | null;
+    createdAt: Date;
+    updatedAt: Date;
     extended: import("../generated/@prisma/client/runtime/library").JsonValue | null;
 }>;
 export { createGetUserByEmail };

package/dist/utils/createGetUserByWorkspaceAccessKeyId.d.ts

@@ -3,14 +3,14 @@ declare function createGetUserByWorkspaceAccessKeyId(prisma: Prisma): (accessKey
     name: string;
     ref: string;
     accessKeyId: string;
-    createdAt: Date;
-    updatedAt: Date;
     email: string;
     emailVerified: boolean;
     password: string;
     phoneNumber: string | null;
     phoneNumberVerified: boolean;
     avatar: string | null;
+    createdAt: Date;
+    updatedAt: Date;
     extended: import("../generated/@prisma/client/runtime/library").JsonValue | null;
 }>;
 export { createGetUserByWorkspaceAccessKeyId };

package/dist/utils/createUpdateMembershipStatus.js

@@ -33,13 +33,14 @@ const jwt_decode_1 = require("jwt-decode");
 const common_1 = require("@fonoster/common");
 const db_1 = require("../db");
 function createUpdateMembershipStatus(identityConfig) {
+    const prisma = (0, db_1.createPrismaClient)(identityConfig.dbUrl, identityConfig.encryptionKey);
     return function pdateMembershipStatus(token) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!(0, common_1.isValidToken)(token, identityConfig.privateKey)) {
                 throw new Error("Invalid token");
             }
             const { memberRef } = (0, jwt_decode_1.jwtDecode)(token);
-            yield db_1.prisma.workspaceMember.update({
+            yield prisma.workspaceMember.update({
                 where: {
                     ref: memberRef
                 },

package/dist/workspaces/createInviteUserToWorkspace.js

@@ -35,7 +35,6 @@ const grpc_js_1 = require("@grpc/grpc-js");
 const nanoid_1 = require("nanoid");
 const createIsAdminMember_1 = require("./createIsAdminMember");
 const createIsWorkspaceMember_1 = require("./createIsWorkspaceMember");
-const envs_1 = require("../envs");
 const utils_1 = require("../utils");
 const createGenerateWorkspaceInviteToken_1 = require("../utils/createGenerateWorkspaceInviteToken");
 const getUserRefFromToken_1 = require("../utils/getUserRefFromToken");
@@ -123,14 +122,14 @@ function createInviteUserToWorkspace(prisma, identityConfig, sendInvite) {
             userRef: user.ref,
             memberRef: newMember.ref,
             accessKeyId: user.accessKeyId,
-            expiresIn: envs_1.IDENTITY_WORKSPACE_INVITE_EXPIRATION
+            expiresIn: identityConfig.workspaceInviteExpiration
         });
         yield sendInvite((0, utils_1.createSendEmail)(identityConfig), {
             recipient: email,
             oneTimePassword,
             workspaceName: newMember.workspace.name,
             isExistingUser,
-            inviteUrl: `${envs_1.IDENTITY_WORKSPACE_INVITATION_URL}?token=${inviteeToken}`
+            inviteUrl: `${identityConfig.workspaceInviteUrl}?token=${inviteeToken}`
         });
         callback(null, {
             userRef: user === null || user === void 0 ? void 0 : user.ref,

package/dist/workspaces/createResendWorkspaceMembershipInvitation.js

@@ -32,7 +32,6 @@ const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
 const grpc_js_1 = require("@grpc/grpc-js");
 const createIsAdminMember_1 = require("./createIsAdminMember");
-const envs_1 = require("../envs");
 const utils_1 = require("../utils");
 const createGenerateWorkspaceInviteToken_1 = require("../utils/createGenerateWorkspaceInviteToken");
 const getUserRefFromToken_1 = require("../utils/getUserRefFromToken");
@@ -82,14 +81,14 @@ function createResendWorkspaceMembershipInvitation(prisma, identityConfig, sendI
             userRef: member.user.ref,
             memberRef: member.ref,
             accessKeyId: member.user.accessKeyId,
-            expiresIn: envs_1.IDENTITY_WORKSPACE_INVITE_EXPIRATION
+            expiresIn: identityConfig.workspaceInviteExpiration
         });
         yield sendInvite((0, utils_1.createSendEmail)(identityConfig), {
             recipient: member.user.email,
             oneTimePassword: member.user.password,
             workspaceName: member.workspace.name,
             isExistingUser: true,
-            inviteUrl: `${envs_1.IDENTITY_WORKSPACE_INVITATION_URL}?token=${inviteeToken}`
+            inviteUrl: `${identityConfig.workspaceInviteUrl}?token=${inviteeToken}`
         });
         callback(null, {
             userRef: inviteeRef

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/identity",
-  "version": "0.9.5",
+  "version": "0.9.8",
   "description": "Identity service for Fonoster",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -20,8 +20,8 @@
     "fonoster": "./dist/index.js"
   },
   "dependencies": {
-    "@fonoster/common": "^0.9.5",
-    "@fonoster/logger": "^0.9.0",
+    "@fonoster/common": "^0.9.7",
+    "@fonoster/logger": "^0.9.7",
     "@fonoster/types": "^0.9.0",
     "@grpc/grpc-js": "~1.10.6",
     "@prisma/client": "^6.3.1",
@@ -48,5 +48,5 @@
   "devDependencies": {
     "@types/jsonwebtoken": "^9.0.6"
   },
-  "gitHead": "c2c7c641b52b1ec85375484104b9e150a6b3afd9"
+  "gitHead": "ce8a2ea35fa85d494b158ddb8e61bd92ff2af00b"
 }

package/dist/envs.d.ts

@@ -1,7 +0,0 @@
-export declare const CLOAK_ENCRYPTION_KEY: string;
-export declare const IDENTITY_MFA_REQUIRED: boolean;
-export declare const IDENTITY_OAUTH2_GITHUB_CLIENT_ID: string;
-export declare const IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET: string;
-export declare const IDENTITY_USER_VERIFICATION_REQUIRED: boolean;
-export declare const IDENTITY_WORKSPACE_INVITATION_URL: string;
-export declare const IDENTITY_WORKSPACE_INVITE_EXPIRATION: string;

package/dist/envs.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IDENTITY_WORKSPACE_INVITE_EXPIRATION = exports.IDENTITY_WORKSPACE_INVITATION_URL = exports.IDENTITY_USER_VERIFICATION_REQUIRED = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_ID = exports.IDENTITY_MFA_REQUIRED = exports.CLOAK_ENCRYPTION_KEY = void 0;
-/*
- * 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 getEnvString = (moduleKey, serverKey, defaultValue) => {
-    return process.env[moduleKey] || process.env[serverKey] || defaultValue || "";
-};
-const getEnvBoolean = (moduleKey, serverKey, defaultValue = false) => {
-    const moduleValue = process.env[moduleKey];
-    const serverValue = process.env[serverKey];
-    return moduleValue === "true" || serverValue === "true" || defaultValue;
-};
-exports.CLOAK_ENCRYPTION_KEY = getEnvString("CLOAK_ENCRYPTION_KEY", "APISERVER_CLOAK_ENCRYPTION_KEY");
-exports.IDENTITY_MFA_REQUIRED = getEnvBoolean("IDENTITY_MFA_REQUIRED", "APISERVER_IDENTITY_MFA_REQUIRED");
-exports.IDENTITY_OAUTH2_GITHUB_CLIENT_ID = getEnvString("IDENTITY_OAUTH2_GITHUB_CLIENT_ID", "APISERVER_IDENTITY_OAUTH2_GITHUB_CLIENT_ID");
-exports.IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET = getEnvString("IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET", "APISERVER_IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET");
-exports.IDENTITY_USER_VERIFICATION_REQUIRED = getEnvBoolean("IDENTITY_USER_VERIFICATION_REQUIRED", "APISERVER_IDENTITY_USER_VERIFICATION_REQUIRED");
-exports.IDENTITY_WORKSPACE_INVITATION_URL = getEnvString("IDENTITY_WORKSPACE_INVITATION_URL", "APISERVER_IDENTITY_WORKSPACE_INVITATION_URL");
-exports.IDENTITY_WORKSPACE_INVITE_EXPIRATION = getEnvString("IDENTITY_WORKSPACE_INVITE_EXPIRATION", "APISERVER_IDENTITY_WORKSPACE_INVITE_EXPIRATION", "1d");