@fonoster/identity 0.7.4 → 0.7.7

package/dist/utils/getApiKeyByAccessKeyId.d.ts

@@ -3,10 +3,10 @@ declare function getApiKeyByAccessKeyId(prisma: Prisma): (accessKeyId: string) =
     ref: string;
     createdAt: Date;
     updatedAt: Date;
-    accessKeyId: string;
     role: "WORKSPACE_ADMIN";
-    workspaceRef: string;
-    accessKeySecret: string;
     expiresAt: Date;
+    accessKeyId: string;
+    accessKeySecret: string;
+    workspaceRef: string;
 }>;
 export { getApiKeyByAccessKeyId };

package/dist/utils/getUserByEmail.d.ts

@@ -6,10 +6,10 @@ declare function getUserByEmail(prisma: Prisma): (email: string) => Promise<{
     createdAt: Date;
     updatedAt: Date;
     accessKeyId: string;
-    emailVerified: boolean;
     password: string;
+    avatar: string;
+    emailVerified: boolean;
     phoneNumber: string;
     phoneNumberVerified: boolean;
-    avatar: string;
 }>;
 export { getUserByEmail };

package/dist/utils/index.d.ts

@@ -1,11 +1,11 @@
-export * from "./generateAccessKeyId";
+export * from "./createCallAccessToken";
 export * from "./decodeToken";
-export * from "./getAccessKeyIdFromToken";
+export * from "./generateAccessKeyId";
 export * from "./getAccessKeyIdFromCall";
+export * from "./getAccessKeyIdFromToken";
+export * from "./getTokenFromCall";
 export * from "./hasAccess";
+export * from "./hasAccessToResource";
 export * from "./isValidToken";
-export * from "./getTokenFromCall";
 export * from "./tokenHasAccessKeyId";
-export * from "./hasAccessToResource";
 export * from "./withAccess";
-export * from "./createCallAccessToken";

package/dist/utils/index.js

@@ -14,6 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./createCallAccessToken"), exports);
+__exportStar(require("./decodeToken"), exports);
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -33,13 +35,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 __exportStar(require("./generateAccessKeyId"), exports);
-__exportStar(require("./decodeToken"), exports);
-__exportStar(require("./getAccessKeyIdFromToken"), exports);
 __exportStar(require("./getAccessKeyIdFromCall"), exports);
+__exportStar(require("./getAccessKeyIdFromToken"), exports);
+__exportStar(require("./getTokenFromCall"), exports);
 __exportStar(require("./hasAccess"), exports);
+__exportStar(require("./hasAccessToResource"), exports);
 __exportStar(require("./isValidToken"), exports);
-__exportStar(require("./getTokenFromCall"), exports);
 __exportStar(require("./tokenHasAccessKeyId"), exports);
-__exportStar(require("./hasAccessToResource"), exports);
 __exportStar(require("./withAccess"), exports);
-__exportStar(require("./createCallAccessToken"), exports);

package/dist/utils/withAccess.js

@@ -33,44 +33,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withAccess = withAccess;
-/*
- * Copyright (C) 2024 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 grpc = __importStar(require("@grpc/grpc-js"));
 const hasAccessToResource_1 = require("./hasAccessToResource");
 function withAccess(handler, getFn) {
     return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const typedCall = call;
-            const hasAccess = yield (0, hasAccessToResource_1.hasAccessToResource)(typedCall, getFn);
-            if (!hasAccess) {
-                callback({
-                    code: grpc.status.PERMISSION_DENIED,
-                    message: "You don't have permission to access this resource"
-                });
-                return;
-            }
-            const response = yield handler(call);
-            callback(null, response);
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
+        const typedCall = call;
+        const hasAccess = yield (0, hasAccessToResource_1.hasAccessToResource)(typedCall, getFn);
+        if (!hasAccess) {
+            callback({
+                code: grpc.status.PERMISSION_DENIED,
+                message: "You don't have permission to access this resource"
+            });
+            return;
         }
+        const response = yield handler(call);
+        callback(null, response);
     });
 }

package/dist/workspaces/createWorkspace.d.ts

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

package/dist/workspaces/createWorkspace.js

@@ -30,35 +30,27 @@ exports.createWorkspace = createWorkspace;
  */
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
-const zod_1 = require("zod");
 const generateAccessKeyId_1 = require("../utils/generateAccessKeyId");
 const getTokenFromCall_1 = require("../utils/getTokenFromCall");
 const getUserRefFromToken_1 = require("../utils/getUserRefFromToken");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
-const CreateWorkspaceRequestSchema = zod_1.z.object({
-    name: zod_1.z.string().min(3, "Name must contain at least 3 characters").max(50)
-});
 function createWorkspace(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const validatedRequest = CreateWorkspaceRequestSchema.parse(call.request);
-            const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
-            const ownerRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
-            const { name } = validatedRequest;
-            logger.verbose("call to createWorkspace", { name, ownerRef });
-            const workspace = yield prisma.workspace.create({
-                data: {
-                    name,
-                    accessKeyId: (0, generateAccessKeyId_1.generateAccessKeyId)(generateAccessKeyId_1.AccessKeyIdType.WORKSPACE),
-                    ownerRef
-                }
-            });
-            callback(null, {
-                ref: workspace.ref
-            });
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
-        }
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { request } = call;
+        const { name } = request;
+        const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
+        const ownerRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
+        const accessKeyId = (0, generateAccessKeyId_1.generateAccessKeyId)(generateAccessKeyId_1.AccessKeyIdType.WORKSPACE);
+        logger.verbose("call to createWorkspace", { name, ownerRef });
+        const workspace = yield prisma.workspace.create({
+            data: {
+                name,
+                accessKeyId,
+                ownerRef
+            }
+        });
+        const { ref } = workspace;
+        callback(null, { ref });
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.createWorkspaceRequestSchema);
 }

package/dist/workspaces/deleteWorkspace.d.ts

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

package/dist/workspaces/deleteWorkspace.js

@@ -34,22 +34,19 @@ const getTokenFromCall_1 = require("../utils/getTokenFromCall");
 const getUserRefFromToken_1 = require("../utils/getUserRefFromToken");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
 function deleteWorkspace(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const { ref } = call.request;
-            const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
-            const ownerRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
-            logger.verbose("deleting workspace from the system", { ref, ownerRef });
-            yield prisma.workspace.delete({
-                where: {
-                    ref,
-                    ownerRef
-                }
-            });
-            callback(null, { ref });
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
-        }
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { request } = call;
+        const { ref } = request;
+        const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
+        const ownerRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
+        logger.verbose("deleting workspace from the system", { ref, ownerRef });
+        yield prisma.workspace.delete({
+            where: {
+                ref,
+                ownerRef
+            }
+        });
+        callback(null, { ref });
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.baseApiObjectSchema);
 }

package/dist/workspaces/getWorkspace.d.ts

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

package/dist/workspaces/getWorkspace.js

@@ -35,30 +35,27 @@ const getTokenFromCall_1 = require("../utils/getTokenFromCall");
 const getUserRefFromToken_1 = require("../utils/getUserRefFromToken");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
 function getWorkspace(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const { ref } = call.request;
-            const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
-            const ownerRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
-            logger.verbose("getting workspace by id", { ref, ownerRef });
-            const workspace = yield prisma.workspace.findUnique({
-                where: {
-                    ref,
-                    ownerRef
-                }
-            });
-            if (!workspace) {
-                callback({
-                    code: grpc_js_1.status.NOT_FOUND,
-                    message: "Workspace not found"
-                });
-                return;
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { request } = call;
+        const { ref } = request;
+        const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
+        const ownerRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
+        logger.verbose("getting workspace by id", { ref, ownerRef });
+        const workspace = yield prisma.workspace.findUnique({
+            where: {
+                ref,
+                ownerRef
             }
-            const response = (0, common_1.datesMapper)(workspace);
-            callback(null, response);
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
+        });
+        if (!workspace) {
+            callback({
+                code: grpc_js_1.status.NOT_FOUND,
+                message: "Workspace not found"
+            });
+            return;
         }
+        const response = (0, common_1.datesMapper)(workspace);
+        callback(null, response);
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.baseApiObjectSchema);
 }

package/dist/workspaces/index.d.ts

@@ -1,8 +1,8 @@
 export * from "./createWorkspace";
 export * from "./deleteWorkspace";
 export * from "./getWorkspace";
-export * from "./updateWorkspace";
-export * from "./listWorkspaces";
 export * from "./inviteUserToWorkspace";
+export * from "./listWorkspaces";
 export * from "./removeUserFromWorkspace";
 export * from "./resendWorkspaceMembershipInvitation";
+export * from "./updateWorkspace";

package/dist/workspaces/index.js

@@ -35,8 +35,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./createWorkspace"), exports);
 __exportStar(require("./deleteWorkspace"), exports);
 __exportStar(require("./getWorkspace"), exports);
-__exportStar(require("./updateWorkspace"), exports);
-__exportStar(require("./listWorkspaces"), exports);
 __exportStar(require("./inviteUserToWorkspace"), exports);
+__exportStar(require("./listWorkspaces"), exports);
 __exportStar(require("./removeUserFromWorkspace"), exports);
 __exportStar(require("./resendWorkspaceMembershipInvitation"), exports);
+__exportStar(require("./updateWorkspace"), exports);

package/dist/workspaces/inviteUserToWorkspace.d.ts

@@ -1,9 +1,8 @@
 import { GrpcErrorMessage } from "@fonoster/common";
-import { InviteUserToWorkspaceRequest, InviteUserToWorkspaceResponse } from "@fonoster/types";
 import { Prisma } from "../db";
 import { IdentityConfig } from "../exchanges/types";
 import { SendInvite } from "../invites/sendInvite";
 declare function inviteUserToWorkspace(prisma: Prisma, identityConfig: IdentityConfig, sendInvite: SendInvite): (call: {
-    request: InviteUserToWorkspaceRequest;
-}, callback: (error: GrpcErrorMessage, response?: InviteUserToWorkspaceResponse) => void) => Promise<void>;
+    request: unknown;
+}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
 export { inviteUserToWorkspace };

package/dist/workspaces/inviteUserToWorkspace.js

@@ -33,7 +33,6 @@ const logger_1 = require("@fonoster/logger");
 const types_1 = require("@fonoster/types");
 const grpc_js_1 = require("@grpc/grpc-js");
 const nanoid_1 = require("nanoid");
-const zod_1 = require("zod");
 const createSendEmail_1 = require("./createSendEmail");
 const isAdminMember_1 = require("./isAdminMember");
 const isWorkspaceMember_1 = require("./isWorkspaceMember");
@@ -41,15 +40,6 @@ const utils_1 = require("../utils");
 const getTokenFromCall_1 = require("../utils/getTokenFromCall");
 const getUserRefFromToken_1 = require("../utils/getUserRefFromToken");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
-const InviteUserToWorkspaceRequestSchema = zod_1.z.object({
-    email: zod_1.z.string().email(),
-    name: zod_1.z.string().min(3, "Name must contain at least 3 characters").max(50),
-    role: zod_1.z.enum([types_1.WorkspaceRoleEnum.ADMIN, types_1.WorkspaceRoleEnum.USER]),
-    password: zod_1.z
-        .string()
-        .min(6, "Password must contain at least 8 characters")
-        .or(zod_1.z.undefined())
-});
 const userIsMemberError = {
     code: grpc_js_1.status.ALREADY_EXISTS,
     message: "User is already a member of this workspace"
@@ -79,69 +69,66 @@ const createUser = (prisma) => {
     });
 };
 function inviteUserToWorkspace(prisma, identityConfig, sendInvite) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
-            const adminRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
-            const accessKeyId = (0, utils_1.getAccessKeyIdFromCall)(call);
-            const workspace = yield prisma.workspace.findUnique({
-                where: {
-                    accessKeyId
-                }
-            });
-            const workspaceRef = workspace.ref;
-            const { email, name, role } = InviteUserToWorkspaceRequestSchema.parse(call.request);
-            logger.verbose("inviting user to workspace", {
-                workspaceRef,
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
+        const adminRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
+        const accessKeyId = (0, utils_1.getAccessKeyIdFromCall)(call);
+        const workspace = yield prisma.workspace.findUnique({
+            where: {
+                accessKeyId
+            }
+        });
+        const { ref: workspaceRef } = workspace;
+        const { request } = call;
+        const { email, name, role } = request;
+        logger.verbose("inviting user to workspace", {
+            workspaceRef,
+            email,
+            role
+        });
+        const isAdmin = yield (0, isAdminMember_1.isAdminMember)(prisma)(workspaceRef, adminRef);
+        if (!isAdmin) {
+            return callback(inviterIsNotAdminError);
+        }
+        let user = yield findUserByEmail(prisma, email);
+        const isMember = yield (0, isWorkspaceMember_1.isWorkspaceMember)(prisma)(workspaceRef, user === null || user === void 0 ? void 0 : user.ref);
+        if (isMember) {
+            return callback(userIsMemberError);
+        }
+        const oneTimePassword = (0, nanoid_1.customAlphabet)("1234567890abcdef", 10)();
+        let isExistingUser = true;
+        if (!user) {
+            isExistingUser = false;
+            user = yield createUser(prisma)({
+                name,
                 email,
+                password: oneTimePassword,
                 role
             });
-            const isAdmin = yield (0, isAdminMember_1.isAdminMember)(prisma)(workspaceRef, adminRef);
-            if (!isAdmin) {
-                return callback(inviterIsNotAdminError);
-            }
-            let user = yield findUserByEmail(prisma, email);
-            const isMember = yield (0, isWorkspaceMember_1.isWorkspaceMember)(prisma)(workspaceRef, user === null || user === void 0 ? void 0 : user.ref);
-            if (isMember) {
-                return callback(userIsMemberError);
-            }
-            const oneTimePassword = (0, nanoid_1.customAlphabet)("1234567890abcdef", 10)();
-            let isExistingUser = true;
-            if (!user) {
-                isExistingUser = false;
-                user = yield createUser(prisma)({
-                    name,
-                    email,
-                    password: oneTimePassword,
-                    role
-                });
-            }
-            const newMember = yield prisma.workspaceMember.create({
-                data: {
-                    userRef: user.ref,
-                    workspaceRef,
-                    role: role,
-                    status: types_1.WorkspaceMemberStatus.PENDING
-                },
-                include: {
-                    workspace: true
-                }
-            });
-            yield sendInvite((0, createSendEmail_1.createSendEmail)(identityConfig), {
-                recipient: email,
-                oneTimePassword,
-                workspaceName: newMember.workspace.name,
-                isExistingUser,
-                // TODO: Create inviteUrl with invite token
-                inviteUrl: "https://placehold.it?token=jwt"
-            });
-            callback(null, {
-                userRef: user === null || user === void 0 ? void 0 : user.ref,
-                workspaceRef
-            });
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
         }
+        const newMember = yield prisma.workspaceMember.create({
+            data: {
+                userRef: user.ref,
+                workspaceRef,
+                role: role,
+                status: types_1.WorkspaceMemberStatus.PENDING
+            },
+            include: {
+                workspace: true
+            }
+        });
+        yield sendInvite((0, createSendEmail_1.createSendEmail)(identityConfig), {
+            recipient: email,
+            oneTimePassword,
+            workspaceName: newMember.workspace.name,
+            isExistingUser,
+            // TODO: Create inviteUrl with invite token
+            inviteUrl: "https://placehold.it?token=jwt"
+        });
+        callback(null, {
+            userRef: user === null || user === void 0 ? void 0 : user.ref,
+            workspaceRef
+        });
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.inviteUserToWorkspaceRequestSchema);
 }

package/dist/workspaces/listWorkspaces.d.ts

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

package/dist/workspaces/listWorkspaces.js

@@ -10,13 +10,32 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listWorkspaces = listWorkspaces;
+/*
+ * Copyright (C) 2024 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 utils_1 = require("../utils");
 const getTokenFromCall_1 = require("../utils/getTokenFromCall");
 const getUserRefFromToken_1 = require("../utils/getUserRefFromToken");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
 function listWorkspaces(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
         const userRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
@@ -52,4 +71,5 @@ function listWorkspaces(prisma) {
             nextPageToken: (_b = items[items.length - 1]) === null || _b === void 0 ? void 0 : _b.ref
         });
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.listRequestSchema);
 }

package/dist/workspaces/removeUserFromWorkspace.d.ts

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

package/dist/workspaces/removeUserFromWorkspace.js

@@ -37,47 +37,44 @@ const getTokenFromCall_1 = require("../utils/getTokenFromCall");
 const getUserRefFromToken_1 = require("../utils/getUserRefFromToken");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
 function removeUserFromWorkspace(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const { userRef } = call.request;
-            const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
-            const accessKeyId = (0, utils_1.getAccessKeyIdFromCall)(call);
-            const adminRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
-            const workspace = yield prisma.workspace.findUnique({
-                where: {
-                    accessKeyId
-                }
-            });
-            const workspaceRef = workspace === null || workspace === void 0 ? void 0 : workspace.ref;
-            logger.verbose("removing user from workspace", { workspaceRef, userRef });
-            const isAdmin = yield (0, isAdminMember_1.isAdminMember)(prisma)(workspaceRef, adminRef);
-            if (!isAdmin && adminRef !== userRef) {
-                return callback({
-                    code: grpc_js_1.status.PERMISSION_DENIED,
-                    message: "Only admins or owners can remove users from a workspace"
-                });
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { request } = call;
+        const { userRef } = request;
+        const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
+        const accessKeyId = (0, utils_1.getAccessKeyIdFromCall)(call);
+        const adminRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
+        const workspace = yield prisma.workspace.findUnique({
+            where: {
+                accessKeyId
             }
-            const memberRef = yield prisma.workspaceMember.findFirst({
-                where: {
-                    workspaceRef,
-                    userRef
-                }
+        });
+        const { ref: workspaceRef } = workspace;
+        logger.verbose("removing user from workspace", { workspaceRef, userRef });
+        const isAdmin = yield (0, isAdminMember_1.isAdminMember)(prisma)(workspaceRef, adminRef);
+        if (!isAdmin && adminRef !== userRef) {
+            return callback({
+                code: grpc_js_1.status.PERMISSION_DENIED,
+                message: "Only admins or owners can remove users from a workspace"
             });
-            if (!memberRef) {
-                return callback({
-                    code: grpc_js_1.status.NOT_FOUND,
-                    message: "User not found in workspace"
-                });
+        }
+        const memberRef = yield prisma.workspaceMember.findFirst({
+            where: {
+                workspaceRef,
+                userRef
             }
-            const response = yield prisma.workspaceMember.delete({
-                where: {
-                    ref: memberRef === null || memberRef === void 0 ? void 0 : memberRef.ref
-                }
+        });
+        if (!memberRef) {
+            return callback({
+                code: grpc_js_1.status.NOT_FOUND,
+                message: "User not found in workspace"
             });
-            callback(null, response);
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
         }
+        const response = yield prisma.workspaceMember.delete({
+            where: {
+                ref: memberRef === null || memberRef === void 0 ? void 0 : memberRef.ref
+            }
+        });
+        callback(null, response);
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.removeUserFromWorkspaceRequestSchema);
 }