@fonoster/identity 0.7.4 → 0.7.7

package/dist/exchanges/exchangeRefreshToken.js

@@ -34,28 +34,20 @@ exports.exchangeRefreshToken = exchangeRefreshToken;
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const zod_1 = require("zod");
 const exchangeTokens_1 = require("./exchangeTokens");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
-const ExchangeRefreshTokenRequestSchema = zod_1.z.object({
-    refreshToken: zod_1.z.string()
-});
 const SIGN_ALGORITHM = "RS256";
 function exchangeRefreshToken(prisma, identityConfig) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const validatedRequest = ExchangeRefreshTokenRequestSchema.parse(call.request);
-            const { refreshToken: oldRefreshToken } = validatedRequest;
-            const { privateKey } = identityConfig;
-            const oldRefreshTokenDecoded = jsonwebtoken_1.default.verify(oldRefreshToken, privateKey, {
-                algorithms: [SIGN_ALGORITHM]
-            });
-            const { accessKeyId } = oldRefreshTokenDecoded;
-            logger.verbose("call to exchangeRefreshToken", { accessKeyId });
-            return callback(null, yield (0, exchangeTokens_1.exchangeTokens)(prisma, identityConfig)(accessKeyId));
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
-        }
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { privateKey } = identityConfig;
+        const { request } = call;
+        const { refreshToken: oldRefreshToken } = request;
+        const oldRefreshTokenDecoded = jsonwebtoken_1.default.verify(oldRefreshToken, privateKey, {
+            algorithms: [SIGN_ALGORITHM]
+        });
+        const { accessKeyId } = oldRefreshTokenDecoded;
+        logger.verbose("call to exchangeRefreshToken", { accessKeyId });
+        callback(null, yield (0, exchangeTokens_1.exchangeTokens)(prisma, identityConfig)(accessKeyId));
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.exchangeRefreshTokenRequestSchema);
 }

package/dist/exchanges/index.d.ts

@@ -1,5 +1,5 @@
+export * from "./TokenUseEnum";
 export * from "./exchangeApiKey";
 export * from "./exchangeCredentials";
 export * from "./exchangeRefreshToken";
-export * from "./TokenUseEnum";
 export * from "./types";

package/dist/exchanges/index.js

@@ -14,6 +14,7 @@ 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("./TokenUseEnum"), exports);
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -35,5 +36,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./exchangeApiKey"), exports);
 __exportStar(require("./exchangeCredentials"), exports);
 __exportStar(require("./exchangeRefreshToken"), exports);
-__exportStar(require("./TokenUseEnum"), exports);
 __exportStar(require("./types"), exports);

package/dist/exchanges/payloads/users/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./getIdTokenPayload";
 export * from "./getAccessTokenPayload";
+export * from "./getIdTokenPayload";
 export * from "./getRefreshTokenPayload";

package/dist/exchanges/payloads/users/index.js

@@ -14,6 +14,7 @@ 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("./getAccessTokenPayload"), exports);
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -33,5 +34,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 __exportStar(require("./getIdTokenPayload"), exports);
-__exportStar(require("./getAccessTokenPayload"), exports);
 __exportStar(require("./getRefreshTokenPayload"), exports);

package/dist/exchanges/types.d.ts

@@ -1,4 +1,6 @@
+import { Validators as V } from "@fonoster/common";
 import { WorkspaceRoleEnum } from "@fonoster/types";
+import { z } from "zod";
 import { TokenUseEnum } from "./TokenUseEnum";
 type Role = {
     name: string;
@@ -53,4 +55,12 @@ type IdentityConfig = {
     };
 };
 type DecodedToken<T extends TokenUseEnum> = T extends TokenUseEnum.ID ? IdToken : T extends TokenUseEnum.ACCESS ? AccessToken : T extends TokenUseEnum.REFRESH ? TokenUseEnum : never;
-export { Role, IdToken, Access, AccessToken, RefreshToken, DecodedToken, IdentityConfig };
+type ExchangeApiKeysRequest = z.infer<typeof V.exchangeApiKeysRequestSchema>;
+type ExchangeCredentialsRequest = z.infer<typeof V.exchangeCredentialsRequestSchema>;
+type ExchangeResponse = {
+    idToken: string;
+    accessToken: string;
+    refreshToken: string;
+};
+type ExchangeRefreshTokenRequest = z.infer<typeof V.exchangeRefreshTokenRequestSchema>;
+export { Access, AccessToken, DecodedToken, ExchangeApiKeysRequest, ExchangeCredentialsRequest, ExchangeRefreshTokenRequest, ExchangeResponse, IdToken, IdentityConfig, RefreshToken, Role };

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 export * from "./apikeys";
+export * from "./createAuthInterceptor";
 export * from "./exchanges";
+export * from "./getPublicKeyClient";
 export * from "./invites";
+export * from "./service";
 export * from "./users";
-export * from "./workspaces";
 export * from "./utils";
-export * from "./service";
-export * from "./createAuthInterceptor";
-export * from "./getPublicKeyClient";
+export * from "./workspaces";

package/dist/index.js

@@ -34,11 +34,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 __exportStar(require("./apikeys"), exports);
+__exportStar(require("./createAuthInterceptor"), exports);
 __exportStar(require("./exchanges"), exports);
+__exportStar(require("./getPublicKeyClient"), exports);
 __exportStar(require("./invites"), exports);
+__exportStar(require("./service"), exports);
 __exportStar(require("./users"), exports);
-__exportStar(require("./workspaces"), exports);
 __exportStar(require("./utils"), exports);
-__exportStar(require("./service"), exports);
-__exportStar(require("./createAuthInterceptor"), exports);
-__exportStar(require("./getPublicKeyClient"), exports);
+__exportStar(require("./workspaces"), exports);

package/dist/invites/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./createInviteBody";
 export * from "./EmailTemplatesEnum";
+export * from "./createInviteBody";
 export * from "./sendInvite";

package/dist/invites/index.js

@@ -14,6 +14,7 @@ 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("./EmailTemplatesEnum"), exports);
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -33,5 +34,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 __exportStar(require("./createInviteBody"), exports);
-__exportStar(require("./EmailTemplatesEnum"), exports);
 __exportStar(require("./sendInvite"), exports);

package/dist/invites/sendInvite.d.ts

@@ -8,4 +8,4 @@ type InviteParams = {
 };
 type SendInvite = (sendEmail: (params: EmailParams) => Promise<void>, request: InviteParams) => Promise<void>;
 declare function sendInvite(sendEmail: (params: EmailParams) => Promise<void>, request: InviteParams): Promise<void>;
-export { sendInvite, SendInvite, InviteParams };
+export { InviteParams, SendInvite, sendInvite };

package/dist/roles.d.ts

@@ -2,4 +2,4 @@ import { Role } from "./exchanges/types";
 declare const VOICE_SERVICE_ROLE = "VOICE_SERVICE";
 declare const workspaceAccess: string[];
 declare const roles: Role[];
-export { roles, workspaceAccess, VOICE_SERVICE_ROLE };
+export { VOICE_SERVICE_ROLE, roles, workspaceAccess };

package/dist/roles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VOICE_SERVICE_ROLE = exports.workspaceAccess = exports.roles = void 0;
+exports.workspaceAccess = exports.roles = exports.VOICE_SERVICE_ROLE = void 0;
 /* eslint-disable sonarjs/no-duplicate-string */
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)

package/dist/service.d.ts

@@ -14,82 +14,62 @@ declare function buildIdentityService(identityConfig: IdentityConfig): {
     };
     handlers: {
         createWorkspace: (call: {
-            request: import("@fonoster/types").CreateWorkspaceRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         deleteWorkspace: (call: {
-            request: import("@fonoster/types").BaseApiObject;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         getWorkspace: (call: {
-            request: import("@fonoster/types").BaseApiObject;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").Workspace) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         updateWorkspace: (call: {
-            request: import("@fonoster/types").UpdateWorkspaceRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         listWorkspaces: (call: {
             request: unknown;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").ListWorkspacesResponse) => void) => Promise<void>;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         inviteUserToWorkspace: (call: {
-            request: import("@fonoster/types").InviteUserToWorkspaceRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").InviteUserToWorkspaceResponse) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         resendWorkspaceMembershipInvitation: (call: {
-            request: import("@fonoster/types").ResendWorkspaceMembershipInvitationRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").ResendWorkspaceMembershipInvitationResponse) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         removeUserFromWorkspace: (call: {
-            request: import("@fonoster/types").RemoveUserFromWorkspaceRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").RemoveUserFromWorkspaceResponse) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         createUser: (call: {
-            request: import("@fonoster/types").CreateUserRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         getUser: (call: {
-            request: import("@fonoster/types").BaseApiObject;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").User) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         deleteUser: (call: {
-            request: import("@fonoster/common").BaseApiObject;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/common").BaseApiObject) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         updateUser: (call: {
-            request: import("@fonoster/types").UpdateUserRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         createApiKey: (call: {
-            request: import("@fonoster/types/dist/identity.types").CreateApiKeyRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types/dist/identity.types").CreateApiKeyResponse) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         deleteApiKey: (call: {
-            request: import("@fonoster/types").BaseApiObject;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         listApiKeys: (call: {
-            request: import("@fonoster/types").ListApiKeysRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").ListApiKeysResponse) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         regenerateApiKey: (call: {
-            request: import("@fonoster/types").BaseApiObject;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").RegenerateApiKeyResponse) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         exchangeApiKey: (call: {
-            request: {
-                accessKeyId?: string;
-                accessKeySecret?: string;
-            };
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: {
-            idToken: string;
-            accessToken: string;
-            refreshToken: string;
-        }) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         exchangeCredentials: (call: {
-            request: {
-                username?: string;
-                password?: string;
-            };
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: {
-            idToken: string;
-            accessToken: string;
-            refreshToken: string;
-        }) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         exchangeRefreshToken: (call: {
-            request: {
-                refreshToken?: string;
-            };
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: {
-            idToken: string;
-            accessToken: string;
-            refreshToken: string;
-        }) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         getPublicKey: (_: unknown, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: {
             publicKey: string;
         }) => void) => Promise<void>;

package/dist/users/createUser.d.ts

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

package/dist/users/createUser.js

@@ -30,36 +30,24 @@ exports.createUser = createUser;
  */
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
-const zod_1 = require("zod");
 const generateAccessKeyId_1 = require("../utils/generateAccessKeyId");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
-const CreateUserRequestSchema = zod_1.z.object({
-    name: zod_1.z.string().min(3, "Name must contain at least 3 characters").max(50),
-    email: zod_1.z.string().email(),
-    password: zod_1.z.string().min(8).max(100),
-    avatar: zod_1.z.string().url()
-});
 function createUser(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const validatedRequest = CreateUserRequestSchema.parse(call.request);
-            const { name, email, password, avatar } = validatedRequest;
-            logger.verbose("call to createUser", { email });
-            const user = yield prisma.user.create({
-                data: {
-                    name,
-                    email,
-                    accessKeyId: (0, generateAccessKeyId_1.generateAccessKeyId)(generateAccessKeyId_1.AccessKeyIdType.USER),
-                    password,
-                    avatar
-                }
-            });
-            callback(null, {
-                ref: user.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, email, password, avatar } = request;
+        logger.verbose("call to createUser", { email });
+        const user = yield prisma.user.create({
+            data: {
+                name,
+                email,
+                accessKeyId: (0, generateAccessKeyId_1.generateAccessKeyId)(generateAccessKeyId_1.AccessKeyIdType.USER),
+                password,
+                avatar
+            }
+        });
+        const { ref } = user;
+        callback(null, { ref });
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.createUserRequestSchema);
 }

package/dist/users/deleteUser.d.ts

@@ -1,6 +1,6 @@
-import { BaseApiObject, GrpcErrorMessage } from "@fonoster/common";
+import { GrpcErrorMessage } from "@fonoster/common";
 import { Prisma } from "../db";
 declare function deleteUser(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 { deleteUser };

package/dist/users/deleteUser.js

@@ -34,25 +34,19 @@ const utils_1 = require("../utils");
 const getTokenFromCall_1 = require("../utils/getTokenFromCall");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
 function deleteUser(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const { ref } = call.request;
-            const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
-            const accessKeyId = (0, utils_1.getAccessKeyIdFromToken)(token);
-            logger.verbose("deleting user from the system", { ref, accessKeyId });
-            yield prisma.user.delete({
-                where: {
-                    ref,
-                    accessKeyId
-                }
-            });
-            const response = {
-                ref
-            };
-            callback(null, response);
-        }
-        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 accessKeyId = (0, utils_1.getAccessKeyIdFromToken)(token);
+        logger.verbose("deleting user from the system", { ref, accessKeyId });
+        yield prisma.user.delete({
+            where: {
+                ref,
+                accessKeyId
+            }
+        });
+        callback(null, { ref });
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.baseApiObjectSchema);
 }

package/dist/users/getUser.d.ts

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

package/dist/users/getUser.js

@@ -35,32 +35,29 @@ const utils_1 = require("../utils");
 const getTokenFromCall_1 = require("../utils/getTokenFromCall");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
 function getUser(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const { ref } = call.request;
-            const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
-            const accessKeyId = (0, utils_1.getAccessKeyIdFromToken)(token);
-            logger.verbose("getting user with ref and accessKeyId", {
+    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 accessKeyId = (0, utils_1.getAccessKeyIdFromToken)(token);
+        logger.verbose("getting user with ref and accessKeyId", {
+            ref,
+            accessKeyId
+        });
+        const user = yield prisma.user.findUnique({
+            where: {
                 ref,
                 accessKeyId
-            });
-            const user = yield prisma.user.findUnique({
-                where: {
-                    ref,
-                    accessKeyId
-                }
-            });
-            if (!user) {
-                callback({
-                    code: grpc_js_1.status.NOT_FOUND,
-                    message: `User not found: ${ref}`
-                });
-                return;
             }
-            callback(null, (0, common_1.datesMapper)(user));
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
+        });
+        if (!user) {
+            callback({
+                code: grpc_js_1.status.NOT_FOUND,
+                message: `User not found: ${ref}`
+            });
+            return;
         }
+        callback(null, (0, common_1.datesMapper)(user));
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.baseApiObjectSchema);
 }

package/dist/users/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./createUser";
-export * from "./getUser";
 export * from "./deleteUser";
+export * from "./getUser";
 export * from "./updateUser";
 export * from "./upsertDefaultUser";

package/dist/users/index.js

@@ -33,7 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 __exportStar(require("./createUser"), exports);
-__exportStar(require("./getUser"), exports);
 __exportStar(require("./deleteUser"), exports);
+__exportStar(require("./getUser"), exports);
 __exportStar(require("./updateUser"), exports);
 __exportStar(require("./upsertDefaultUser"), exports);

package/dist/users/updateUser.d.ts

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

package/dist/users/updateUser.js

@@ -30,43 +30,32 @@ exports.updateUser = updateUser;
  */
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
-const zod_1 = require("zod");
 const utils_1 = require("../utils");
 const getTokenFromCall_1 = require("../utils/getTokenFromCall");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
-const UpdateUserRequestSchema = 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()),
-    password: zod_1.z.string().min(8).max(50).or(zod_1.z.string().optional().nullable()),
-    avatar: zod_1.z.string().url().or(zod_1.z.string().optional().nullable())
-});
 function updateUser(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const validatedRequest = UpdateUserRequestSchema.parse(call.request);
-            const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
-            const accessKeyId = (0, utils_1.getAccessKeyIdFromToken)(token);
-            const { ref, name, avatar, password } = validatedRequest;
-            logger.verbose("call to updateUser", { ref, password });
-            yield prisma.user.update({
-                where: {
-                    ref,
-                    accessKeyId
-                },
-                data: {
-                    name,
-                    avatar,
-                    password: password || undefined,
-                    updatedAt: new Date()
-                }
-            });
-            const response = {
-                ref
-            };
-            callback(null, response);
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
-        }
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { request } = call;
+        const { ref, name, avatar, password } = request;
+        const token = (0, getTokenFromCall_1.getTokenFromCall)(call);
+        const accessKeyId = (0, utils_1.getAccessKeyIdFromToken)(token);
+        logger.verbose("call to updateUser", { ref, password });
+        yield prisma.user.update({
+            where: {
+                ref,
+                accessKeyId
+            },
+            data: {
+                name,
+                avatar,
+                password: password || undefined,
+                updatedAt: new Date()
+            }
+        });
+        const response = {
+            ref
+        };
+        callback(null, response);
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.updateUserRequestSchema);
 }

package/dist/users/upsertDefaultUser.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-declare const CreateUserRequestSchema: z.ZodObject<{
+declare const createUserRequestSchema: z.ZodObject<{
     name: z.ZodString;
     email: z.ZodString;
     password: z.ZodUnion<[z.ZodString, z.ZodNullable<z.ZodOptional<z.ZodString>>]>;
@@ -12,6 +12,6 @@ declare const CreateUserRequestSchema: z.ZodObject<{
     email?: string;
     password?: string;
 }>;
-type CreateUserRequest = z.infer<typeof CreateUserRequestSchema>;
+type CreateUserRequest = z.infer<typeof createUserRequestSchema>;
 declare function upsertDefaultUser(request: CreateUserRequest): Promise<void>;
 export { upsertDefaultUser };

package/dist/users/upsertDefaultUser.js

@@ -32,7 +32,7 @@ const logger_1 = require("@fonoster/logger");
 const zod_1 = require("zod");
 const db_1 = require("../db");
 const logger = (0, logger_1.getLogger)({ service: "identity", filePath: __filename });
-const CreateUserRequestSchema = zod_1.z.object({
+const createUserRequestSchema = zod_1.z.object({
     name: zod_1.z.string().min(3).max(50),
     email: zod_1.z.string().email(),
     password: zod_1.z.string().min(8).max(50).or(zod_1.z.string().optional().nullable())
@@ -44,7 +44,7 @@ const WORKSPACE_ACCESS_KEY_ID = "WO00000000000000000000000000000000";
 function upsertDefaultUser(request) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const validatedRequest = CreateUserRequestSchema.parse(request);
+            const validatedRequest = createUserRequestSchema.parse(request);
             const { name, email, password } = validatedRequest;
             logger.verbose("call to upsertDefaultUser", {
                 email,

package/dist/utils/generateAccessKeyId.d.ts

@@ -5,4 +5,4 @@ declare enum AccessKeyIdType {
     API_KEY = 3
 }
 declare function generateAccessKeyId(type: AccessKeyIdType): string;
-export { generateAccessKeyId, AccessKeyIdType };
+export { AccessKeyIdType, generateAccessKeyId };