@fonoster/identity 0.7.4 → 0.7.7

package/dist/workspaces/resendWorkspaceMembershipInvitation.d.ts

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

package/dist/workspaces/resendWorkspaceMembershipInvitation.js

@@ -38,60 +38,57 @@ const getTokenFromCall_1 = require("../utils/getTokenFromCall");
 const getUserRefFromToken_1 = require("../utils/getUserRefFromToken");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
 function resendWorkspaceMembershipInvitation(prisma, identityConfig, sendInvite) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const { userRef: inviteeRef } = call.request;
-            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;
-            logger.verbose("resending workspace membership invitation", {
-                workspaceRef,
-                inviteeRef,
-                adminRef
-            });
-            const isAdmin = yield (0, isAdminMember_1.isAdminMember)(prisma)(workspace.ref, adminRef);
-            if (!isAdmin) {
-                return callback({
-                    code: grpc_js_1.status.PERMISSION_DENIED,
-                    message: "Only admins and owners can resend workspace invitations"
-                });
-            }
-            const member = yield prisma.workspaceMember.findFirst({
-                where: {
-                    workspaceRef,
-                    userRef: inviteeRef
-                },
-                include: {
-                    user: true,
-                    workspace: true
-                }
-            });
-            if (!member) {
-                return callback({
-                    code: grpc_js_1.status.NOT_FOUND,
-                    message: `Original invitation not found for userRef: ${inviteeRef}`
-                });
+    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
             }
-            yield sendInvite((0, createSendEmail_1.createSendEmail)(identityConfig), {
-                recipient: member.user.email,
-                oneTimePassword: member.user.password,
-                workspaceName: member.workspace.name,
-                isExistingUser: true,
-                // TODO: Create inviteUrl with invite token
-                inviteUrl: "https://placehold.it?token=jwt"
+        });
+        const { ref: workspaceRef } = workspace;
+        const { request } = call;
+        const { userRef: inviteeRef } = request;
+        logger.verbose("resending workspace membership invitation", {
+            workspaceRef,
+            inviteeRef,
+            adminRef
+        });
+        const isAdmin = yield (0, isAdminMember_1.isAdminMember)(prisma)(workspace.ref, adminRef);
+        if (!isAdmin) {
+            return callback({
+                code: grpc_js_1.status.PERMISSION_DENIED,
+                message: "Only admins and owners can resend workspace invitations"
             });
-            callback(null, {
+        }
+        const member = yield prisma.workspaceMember.findFirst({
+            where: {
+                workspaceRef,
                 userRef: inviteeRef
+            },
+            include: {
+                user: true,
+                workspace: true
+            }
+        });
+        if (!member) {
+            return callback({
+                code: grpc_js_1.status.NOT_FOUND,
+                message: `Original invitation not found for userRef: ${inviteeRef}`
             });
         }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
-        }
+        yield sendInvite((0, createSendEmail_1.createSendEmail)(identityConfig), {
+            recipient: member.user.email,
+            oneTimePassword: member.user.password,
+            workspaceName: member.workspace.name,
+            isExistingUser: true,
+            // TODO: Create inviteUrl with invite token
+            inviteUrl: "https://placehold.it?token=jwt"
+        });
+        callback(null, {
+            userRef: inviteeRef
+        });
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.resendWorkspaceMembershipInvitationRequestSchema);
 }

package/dist/workspaces/updateWorkspace.d.ts

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

package/dist/workspaces/updateWorkspace.js

@@ -31,42 +31,33 @@ exports.updateWorkspace = updateWorkspace;
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
 const grpc_js_1 = require("@grpc/grpc-js");
-const zod_1 = require("zod");
 const isWorkspaceMember_1 = require("./isWorkspaceMember");
 const getTokenFromCall_1 = require("../utils/getTokenFromCall");
 const getUserRefFromToken_1 = require("../utils/getUserRefFromToken");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
-const UpdateWorkspaceRequestSchema = zod_1.z.object({
-    ref: zod_1.z.string(),
-    name: zod_1.z.string().min(3).max(50).or(zod_1.z.string().optional().nullable())
-});
 function updateWorkspace(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const validatedRequest = UpdateWorkspaceRequestSchema.parse(call.request);
-            const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
-            const userRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
-            const { ref, name } = validatedRequest;
-            logger.verbose("call to updateWorkspace", { ref, userRef });
-            const isMember = yield (0, isWorkspaceMember_1.isWorkspaceMember)(prisma)(ref, userRef);
-            if (!isMember) {
-                callback({
-                    code: grpc_js_1.status.PERMISSION_DENIED,
-                    message: "User is not a member of the workspace"
-                });
-            }
-            yield prisma.workspace.update({
-                where: {
-                    ref
-                },
-                data: {
-                    name
-                }
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
+        const userRef = (0, getUserRefFromToken_1.getUserRefFromToken)(token);
+        const { request } = call;
+        const { ref, name } = request;
+        logger.verbose("call to updateWorkspace", { ref, userRef });
+        const isMember = yield (0, isWorkspaceMember_1.isWorkspaceMember)(prisma)(ref, userRef);
+        if (!isMember) {
+            callback({
+                code: grpc_js_1.status.PERMISSION_DENIED,
+                message: "User is not a member of the workspace"
             });
-            callback(null, { ref });
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
         }
+        yield prisma.workspace.update({
+            where: {
+                ref
+            },
+            data: {
+                name
+            }
+        });
+        callback(null, { ref });
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.updateWorkspaceRequestSchema);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/identity",
-  "version": "0.7.4",
+  "version": "0.7.7",
   "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.7.4",
-    "@fonoster/logger": "^0.7.4",
-    "@fonoster/types": "^0.7.4",
+    "@fonoster/common": "^0.7.7",
+    "@fonoster/logger": "^0.7.5",
+    "@fonoster/types": "^0.7.5",
     "@grpc/grpc-js": "~1.10.6",
     "@prisma/client": "^5.14.0",
     "jsonwebtoken": "^9.0.2",
@@ -47,5 +47,5 @@
   "devDependencies": {
     "@types/jsonwebtoken": "^9.0.6"
   },
-  "gitHead": "e550aa46c1a9087a70157496365b64afd5aea11d"
+  "gitHead": "f1cfa987ec4221dad9900bc377cccee49221164a"
 }