@oneuptime/common 12.0.13 → 12.0.14

package/build/dist/Server/API/UserEmailAPI.js

@@ -1,18 +1,36 @@
 import UserMiddleware from "../Middleware/UserAuthorization";
+import VerificationCodeRateLimit, { VerificationCodeRateLimitBucket, } from "../Middleware/VerificationCodeRateLimit";
 import UserEmailService from "../Services/UserEmailService";
-import UserNotificationRuleService from "../Services/UserNotificationRuleService";
+import ChannelVerification, { ChannelVerificationOutcome, } from "../Utils/ChannelVerification";
 import Response from "../Utils/Response";
-import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import BaseAPI from "./BaseAPI";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
 import UserEmail from "../../Models/DatabaseModels/UserEmail";
+import UserNotificationRuleService from "../Services/UserNotificationRuleService";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
+/*
+ * The verify and resend routes for this notification channel.
+ *
+ * Neither the checking of a submitted code nor the issuing of a new one lives
+ * here, on purpose. The state machine is shared by all five channels
+ * (Common/Server/Utils/ChannelVerification.ts) so that a control added for one
+ * of them cannot quietly go missing on another — which is exactly what went
+ * wrong before: five hand-written copies of "compare the column, set
+ * isVerified", none of which expired the code, counted attempts, or refused a
+ * caller running the comparison a million times against somebody else's phone
+ * number.
+ *
+ * What is left here is the HTTP shape: reject malformed bodies, run the rate
+ * limiter before anything costs a database read, and turn the outcome into a
+ * response.
+ */
 export default class UserEmailAPI extends BaseAPI {
     constructor() {
         var _a, _b;
         super(UserEmail, UserEmailService);
-        this.router.post(`${(_a = new this.entityType().getCrudApiPath()) === null || _a === void 0 ? void 0 : _a.toString()}/verify`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
-            var _a, _b, _c;
+        this.router.post(`${(_a = new this.entityType().getCrudApiPath()) === null || _a === void 0 ? void 0 : _a.toString()}/verify`, UserMiddleware.getUserMiddleware, VerificationCodeRateLimit.getMiddleware(VerificationCodeRateLimitBucket.Verify), async (req, res, next) => {
+            var _a;
             try {
                 req = req;
                 if (!req.body.itemId) {
@@ -21,45 +39,26 @@ export default class UserEmailAPI extends BaseAPI {
                 if (!req.body.code) {
                     return Response.sendErrorResponse(req, res, new BadDataException("Invalid code"));
                 }
-                // Check if the code matches and verify the email.
-                const item = await this.service.findOneById({
-                    id: req.body["itemId"],
-                    props: {
-                        isRoot: true,
-                    },
-                    select: {
-                        userId: true,
-                        projectId: true,
-                        verificationCode: true,
-                    },
-                });
-                if (!item) {
-                    return Response.sendErrorResponse(req, res, new BadDataException("Item not found"));
-                }
-                //check user id
-                if (((_a = item.userId) === null || _a === void 0 ? void 0 : _a.toString()) !==
-                    ((_c = (_b = req === null || req === void 0 ? void 0 : req.userAuthorization) === null || _b === void 0 ? void 0 : _b.userId) === null || _c === void 0 ? void 0 : _c.toString())) {
+                const userId = (_a = req === null || req === void 0 ? void 0 : req.userAuthorization) === null || _a === void 0 ? void 0 : _a.userId;
+                if (!userId) {
                     return Response.sendErrorResponse(req, res, new BadDataException("Invalid user ID"));
                 }
-                if (item.verificationCode !== req.body["code"]) {
-                    return Response.sendErrorResponse(req, res, new BadDataException("Invalid code"));
-                }
-                await this.service.updateOneById({
-                    id: item.id,
-                    props: {
-                        isRoot: true,
-                    },
-                    data: {
-                        isVerified: true,
-                    },
+                const result = await ChannelVerification.verifyCode({
+                    service: this.service,
+                    itemId: new ObjectID(req.body["itemId"].toString()),
+                    userId: userId,
+                    code: req.body["code"].toString(),
                 });
-                // Create default notification rules for this verified email
+                if (result.outcome !== ChannelVerificationOutcome.Verified) {
+                    return Response.sendErrorResponse(req, res, ChannelVerification.getFailureException(result.outcome));
+                }
+                /* Create default notification rules for this verified email */
                 try {
                     await UserNotificationRuleService.addDefaultNotificationRulesForVerifiedMethod({
-                        projectId: new ObjectID(item.projectId.toString()),
-                        userId: new ObjectID(item.userId.toString()),
+                        projectId: new ObjectID(result.projectId.toString()),
+                        userId: new ObjectID(result.userId.toString()),
                         notificationMethod: {
-                            userEmailId: item.id,
+                            userEmailId: result.itemId,
                         },
                     });
                 }
@@ -73,7 +72,7 @@ export default class UserEmailAPI extends BaseAPI {
             }
         });
         this.router.post(`${(_b = new this.entityType()
-            .getCrudApiPath()) === null || _b === void 0 ? void 0 : _b.toString()}/resend-verification-code`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
+            .getCrudApiPath()) === null || _b === void 0 ? void 0 : _b.toString()}/resend-verification-code`, UserMiddleware.getUserMiddleware, VerificationCodeRateLimit.getMiddleware(VerificationCodeRateLimitBucket.Resend), async (req, res, next) => {
             var _a, _b, _c;
             try {
                 req = req;
@@ -92,6 +91,11 @@ export default class UserEmailAPI extends BaseAPI {
                 if (!item) {
                     return Response.sendErrorResponse(req, res, new BadDataException("Item not found"));
                 }
+                /*
+                 * A caller may only ask for a code to be sent to a row they own.
+                 * Without this the resend route is a way to make somebody else's
+                 * device ring on demand.
+                 */
                 if (((_a = item.userId) === null || _a === void 0 ? void 0 : _a.toString()) !==
                     ((_c = (_b = req === null || req === void 0 ? void 0 : req.userAuthorization) === null || _b === void 0 ? void 0 : _b.userId) === null || _c === void 0 ? void 0 : _c.toString())) {
                     return Response.sendErrorResponse(req, res, new BadDataException("Invalid user ID"));

package/build/dist/Server/API/UserEmailAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserEmailAPI.js","sourceRoot":"","sources":["../../../../Server/API/UserEmailAPI.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"UserEmailAPI.js","sourceRoot":"","sources":["../../../../Server/API/UserEmailAPI.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/API/UserIncomingCallNumberAPI.js

@@ -1,14 +1,33 @@
 import UserMiddleware from "../Middleware/UserAuthorization";
+import VerificationCodeRateLimit, { VerificationCodeRateLimitBucket, } from "../Middleware/VerificationCodeRateLimit";
 import UserIncomingCallNumberService from "../Services/UserIncomingCallNumberService";
+import ChannelVerification, { ChannelVerificationOutcome, } from "../Utils/ChannelVerification";
 import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
 import BadDataException from "../../Types/Exception/BadDataException";
+import ObjectID from "../../Types/ObjectID";
 import UserIncomingCallNumber from "../../Models/DatabaseModels/UserIncomingCallNumber";
+/*
+ * The verify and resend routes for this notification channel.
+ *
+ * Neither the checking of a submitted code nor the issuing of a new one lives
+ * here, on purpose. The state machine is shared by all five channels
+ * (Common/Server/Utils/ChannelVerification.ts) so that a control added for one
+ * of them cannot quietly go missing on another — which is exactly what went
+ * wrong before: five hand-written copies of "compare the column, set
+ * isVerified", none of which expired the code, counted attempts, or refused a
+ * caller running the comparison a million times against somebody else's phone
+ * number.
+ *
+ * What is left here is the HTTP shape: reject malformed bodies, run the rate
+ * limiter before anything costs a database read, and turn the outcome into a
+ * response.
+ */
 export default class UserIncomingCallNumberAPI extends BaseAPI {
     constructor() {
         super(UserIncomingCallNumber, UserIncomingCallNumberService);
-        this.router.post(`/user-incoming-call-number/verify`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
-            var _a, _b, _c;
+        this.router.post(`/user-incoming-call-number/verify`, UserMiddleware.getUserMiddleware, VerificationCodeRateLimit.getMiddleware(VerificationCodeRateLimitBucket.Verify), async (req, res, next) => {
+            var _a;
             try {
                 req = req;
                 if (!req.body.itemId) {
@@ -17,44 +36,26 @@ export default class UserIncomingCallNumberAPI extends BaseAPI {
                 if (!req.body.code) {
                     return Response.sendErrorResponse(req, res, new BadDataException("Invalid code"));
                 }
-                // Check if the code matches and verify the phone number
-                const item = await this.service.findOneById({
-                    id: req.body["itemId"],
-                    props: {
-                        isRoot: true,
-                    },
-                    select: {
-                        userId: true,
-                        verificationCode: true,
-                    },
-                });
-                if (!item) {
-                    return Response.sendErrorResponse(req, res, new BadDataException("Item not found"));
-                }
-                // Check user ID
-                if (((_a = item.userId) === null || _a === void 0 ? void 0 : _a.toString()) !==
-                    ((_c = (_b = req === null || req === void 0 ? void 0 : req.userAuthorization) === null || _b === void 0 ? void 0 : _b.userId) === null || _c === void 0 ? void 0 : _c.toString())) {
+                const userId = (_a = req === null || req === void 0 ? void 0 : req.userAuthorization) === null || _a === void 0 ? void 0 : _a.userId;
+                if (!userId) {
                     return Response.sendErrorResponse(req, res, new BadDataException("Invalid user ID"));
                 }
-                if (item.verificationCode !== req.body["code"]) {
-                    return Response.sendErrorResponse(req, res, new BadDataException("Invalid code"));
-                }
-                await this.service.updateOneById({
-                    id: item.id,
-                    props: {
-                        isRoot: true,
-                    },
-                    data: {
-                        isVerified: true,
-                    },
+                const result = await ChannelVerification.verifyCode({
+                    service: this.service,
+                    itemId: new ObjectID(req.body["itemId"].toString()),
+                    userId: userId,
+                    code: req.body["code"].toString(),
                 });
+                if (result.outcome !== ChannelVerificationOutcome.Verified) {
+                    return Response.sendErrorResponse(req, res, ChannelVerification.getFailureException(result.outcome));
+                }
                 return Response.sendEmptySuccessResponse(req, res);
             }
             catch (err) {
                 return next(err);
             }
         });
-        this.router.post(`/user-incoming-call-number/resend-verification-code`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
+        this.router.post(`/user-incoming-call-number/resend-verification-code`, UserMiddleware.getUserMiddleware, VerificationCodeRateLimit.getMiddleware(VerificationCodeRateLimitBucket.Resend), async (req, res, next) => {
             var _a, _b, _c;
             try {
                 req = req;
@@ -73,7 +74,11 @@ export default class UserIncomingCallNumberAPI extends BaseAPI {
                 if (!item) {
                     return Response.sendErrorResponse(req, res, new BadDataException("Item not found"));
                 }
-                // Check user ID
+                /*
+                 * A caller may only ask for a code to be sent to a row they own.
+                 * Without this the resend route is a way to make somebody else's
+                 * device ring on demand.
+                 */
                 if (((_a = item.userId) === null || _a === void 0 ? void 0 : _a.toString()) !==
                     ((_c = (_b = req === null || req === void 0 ? void 0 : req.userAuthorization) === null || _b === void 0 ? void 0 : _b.userId) === null || _c === void 0 ? void 0 : _c.toString())) {
                     return Response.sendErrorResponse(req, res, new BadDataException("Invalid user ID"));

package/build/dist/Server/API/UserIncomingCallNumberAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserIncomingCallNumberAPI.js","sourceRoot":"","sources":["../../../../Server/API/UserIncomingCallNumberAPI.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"UserIncomingCallNumberAPI.js","sourceRoot":"","sources":["../../../../Server/API/UserIncomingCallNumberAPI.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/API/UserNotificationMethodAdminAPI.js

@@ -0,0 +1,341 @@
+import UserMiddleware from "../Middleware/UserAuthorization";
+import UserNotificationMethodAdminService from "../Services/UserNotificationMethodAdminService";
+import TeamMemberService from "../Services/TeamMemberService";
+import Express from "../Utils/Express";
+import Response from "../Utils/Response";
+import CommonAPI from "./CommonAPI";
+import DatabaseCommonInteractionPropsUtil, { PermissionType, } from "../../Types/BaseDatabase/DatabaseCommonInteractionPropsUtil";
+import BadDataException from "../../Types/Exception/BadDataException";
+import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+/*
+ * Managing another project member's notification methods over HTTP.
+ *
+ * Everything this router does is done by UserNotificationMethodAdminService,
+ * which holds the whole of the reasoning about masking, verification and the
+ * owner's mail. This file is transport and AUTHORISATION, and the authorisation
+ * is the part worth reading, because the usual reasoning does not apply here.
+ *
+ * The seven notification method models are scoped to the person who owns the
+ * device, and they stay that way — see the essay at the top of UserEmail.ts.
+ * The service therefore does its reads and writes with `isRoot: true`, which
+ * means the model's own TableAccessControl never runs on this path AND THESE
+ * HANDLERS ARE THE ONLY GATE UNDERNEATH. UserMiddleware.getUserMiddleware is
+ * not that gate: it admits anonymous callers as UserType.Public and calls
+ * next(), and the tenant id it attaches comes straight off the caller-supplied
+ * `tenantid` header before any authorisation runs.
+ *
+ * So every route below asserts, itself, in this order:
+ *
+ *   1. the caller is a signed-in member of the project they named
+ *      (CommonAPI.assertAuthenticatedProjectMember, which checks the caller
+ *      against that same header);
+ *   2. the caller holds a permission that lets them act on other people's
+ *      accounts in it (assertCanManageUserNotificationMethods below), EXCEPT on
+ *      the read, which additionally lets a person read their own; and
+ *   3. the user named in the path is a member of that same project — enforced
+ *      again inside the service, on purpose, so the service is safe for any
+ *      caller and not only for this router.
+ *
+ * WHY THE READ IS SEPARATELY GATED FROM THE WRITES. Reading the masked list is
+ * a disclosure ("this person has an unverified SMS"), and the readiness surface
+ * already discloses exactly that to every project member. Writing is an ACTION
+ * on somebody else's account. Those are different questions and the router does
+ * not answer them with one permission.
+ */
+const router = Express.getRouter();
+/*
+ * Who may LOOK at another member's notification methods.
+ *
+ * The same triple the admin rules page uses, and for the same reason: existing
+ * project teams are seeded with ROLES, never with individual granular
+ * permissions, so a permission introduced in this release is held by nobody at
+ * all until an administrator explicitly grants it. A gate naming only the
+ * granular permission would ship a feature that is dead on arrival for every
+ * project that already exists — the owner of a project would open the page and
+ * be told they may not look at it.
+ */
+const READ_PERMISSIONS = [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ReadProjectUserNotificationRule,
+];
+/*
+ * Who may ADD or REMOVE one.
+ *
+ * Deliberately NOT EditProjectUserNotificationRule. Repairing somebody's rules
+ * and putting a new address on their account are different powers with
+ * different blast radii: the first re-points pages between devices that person
+ * has already proved they hold, the second introduces a device nobody has
+ * proved anything about. An installation that wants to hand out the first
+ * without the second must be able to, so this is its own permission.
+ */
+const MANAGE_PERMISSIONS = [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ManageProjectUserNotificationMethod,
+];
+/*
+ * The permission check, read the way the rest of the API reads permissions.
+ *
+ * getUserPermissions(Allow) rather than indexing userTenantAccessPermission
+ * directly, and that is not a stylistic preference. That dictionary's entries
+ * hold GRANTS AND DENIALS in one array, discriminated only by
+ * `isBlockPermission`, so mapping it raw would count a team's explicit BLOCK of
+ * ProjectAdmin as a grant of it — the admin action that restricts a team would
+ * be the thing that handed it this endpoint.
+ *
+ * Every refusal in this file reuses one sentence, so an under-privileged member
+ * cannot tell "you may not do this" apart from "you are not in this project"
+ * and use the difference to probe.
+ */
+function assertHasAnyPermission(databaseProps, allowed) {
+    if (databaseProps.isMasterAdmin) {
+        return;
+    }
+    const permissions = DatabaseCommonInteractionPropsUtil.getUserPermissions(databaseProps, PermissionType.Allow).map((userPermission) => {
+        return userPermission.permission;
+    });
+    const isAllowed = permissions.some((permission) => {
+        return allowed.includes(permission);
+    });
+    if (!isAllowed) {
+        throw new NotAuthorizedException("You are not authorized to access this project's data.");
+    }
+}
+/*
+ * Project membership for the user NAMED IN THE PATH, not the caller.
+ *
+ * Without it these routes are a cross-project probe: the service's reads are
+ * projectId-scoped and would come back empty for a stranger, but a write path
+ * that skipped this would let somebody holding ProjectAdmin on one throwaway
+ * project act on a user id belonging to any other.
+ *
+ * The rejection reuses the router's single refusal sentence so a caller cannot
+ * tell "this user exists but is in another project" apart from "this user does
+ * not exist", and therefore cannot enumerate users through it. The service
+ * repeats the check with its own wording once the caller is past this point.
+ */
+async function assertUserBelongsToProject(userId, projectId) {
+    const memberships = await TeamMemberService.findBy({
+        query: {
+            userId: userId,
+            projectId: projectId,
+        },
+        select: {
+            _id: true,
+        },
+        limit: 1,
+        skip: 0,
+        props: {
+            isRoot: true,
+        },
+    });
+    if (memberships.length === 0) {
+        throw new NotAuthorizedException("You are not authorized to access this project's data.");
+    }
+}
+/*
+ * ObjectID's constructor accepts any string, so an unvalidated path segment
+ * would travel all the way to a query that matches nothing and read as "this
+ * user has no notification methods" rather than as "you sent nonsense".
+ */
+function readObjectIdParam(req, name) {
+    const raw = req.params[name] || "";
+    ObjectID.validateUUID(raw);
+    return new ObjectID(raw);
+}
+function readStringFromBody(req, name) {
+    const body = (req.body || {});
+    const raw = body[name];
+    if (typeof raw !== "string" || !raw.trim()) {
+        throw new BadDataException(`${name} is required.`);
+    }
+    return raw.trim();
+}
+/*
+ * ObjectID.toJSON() serialises to `{ _type: "ObjectID", value: "..." }`, which
+ * is right for model payloads the client parses back through JSONFunctions but
+ * wrong for a hand-rolled response body. Ids are flattened to plain strings, the
+ * same way OnCallReadinessAPI does it, so the browser can read `methodId`
+ * without knowing about ObjectID at all.
+ *
+ * `maskedIdentifier` is copied and nothing else is: there is no raw field on
+ * the service's view type to leak, which is deliberate — a future change would
+ * have to widen that contract in the open rather than slip a phone number
+ * through a boolean flag here.
+ */
+function serializeMethod(method) {
+    return {
+        methodId: method.methodId.toString(),
+        methodType: method.methodType,
+        maskedIdentifier: method.maskedIdentifier,
+        isVerified: method.isVerified,
+        isAdminAddable: method.isAdminAddable,
+        createdAt: method.createdAt ? method.createdAt.toISOString() : undefined,
+    };
+}
+/*
+ * Every notification method this user has, masked.
+ *
+ * A member reading their OWN row is allowed through without the admin
+ * permission. The page behind this is reachable from the project's user list,
+ * and a person looking at themselves there is reading rows the self-serve
+ * settings pages already show them in full.
+ */
+router.get("/user-notification-method-admin/user/:userId", UserMiddleware.getUserMiddleware, async (req, res, next) => {
+    try {
+        const databaseProps = await CommonAPI.getDatabaseCommonInteractionProps(req);
+        const projectId = CommonAPI.assertAuthenticatedProjectMember(databaseProps);
+        const userId = readObjectIdParam(req, "userId");
+        const isSelf = Boolean(databaseProps.userId) &&
+            databaseProps.userId.toString() === userId.toString();
+        if (!isSelf) {
+            assertHasAnyPermission(databaseProps, READ_PERMISSIONS);
+        }
+        await assertUserBelongsToProject(userId, projectId);
+        const methods = await UserNotificationMethodAdminService.listMethodsForUser({
+            projectId: projectId,
+            userId: userId,
+        });
+        return Response.sendJsonObjectResponse(req, res, {
+            methods: methods.map(serializeMethod),
+        });
+    }
+    catch (err) {
+        next(err);
+    }
+});
+/*
+ * Add a notification method to this user's account.
+ *
+ * The row lands UNVERIFIED and a verification code goes to the address itself,
+ * which is what keeps this from being a way to redirect somebody's pages: the
+ * verify endpoints refuse anybody but the row's owner, so the administrator who
+ * just typed the value in cannot complete it. See the service header.
+ */
+router.post("/user-notification-method-admin/user/:userId", UserMiddleware.getUserMiddleware, async (req, res, next) => {
+    try {
+        const databaseProps = await CommonAPI.getDatabaseCommonInteractionProps(req);
+        const projectId = CommonAPI.assertAuthenticatedProjectMember(databaseProps);
+        /*
+         * Both gates run before the body is read. A route that validates a
+         * payload for a caller it is about to refuse has told that caller
+         * something about the payload format.
+         */
+        assertHasAnyPermission(databaseProps, MANAGE_PERMISSIONS);
+        const userId = readObjectIdParam(req, "userId");
+        await assertUserBelongsToProject(userId, projectId);
+        const methodType = readStringFromBody(req, "methodType");
+        const value = readStringFromBody(req, "value");
+        const created = await UserNotificationMethodAdminService.addMethodForUser({
+            projectId: projectId,
+            targetUserId: userId,
+            /*
+             * The actor the SERVER resolved, never anything from the body. This
+             * value names somebody in an audit entry and in a mail to the account
+             * holder, so a body-supplied one would let a caller sign their own
+             * change with a colleague's name.
+             */
+            actorUserId: databaseProps.userId,
+            methodType: methodType,
+            value: value,
+            props: databaseProps,
+        });
+        return Response.sendJsonObjectResponse(req, res, serializeMethod(created));
+    }
+    catch (err) {
+        next(err);
+    }
+});
+/*
+ * What removing this method would cost, before anybody confirms it.
+ *
+ * Read-only, and gated as a WRITE rather than as a read: the numbers it returns
+ * are about this user's rule coverage, and the only reason to ask for them is
+ * that you are about to delete something.
+ */
+router.get("/user-notification-method-admin/user/:userId/:methodType/:methodId/deletion-impact", UserMiddleware.getUserMiddleware, async (req, res, next) => {
+    try {
+        const databaseProps = await CommonAPI.getDatabaseCommonInteractionProps(req);
+        const projectId = CommonAPI.assertAuthenticatedProjectMember(databaseProps);
+        assertHasAnyPermission(databaseProps, MANAGE_PERMISSIONS);
+        const userId = readObjectIdParam(req, "userId");
+        await assertUserBelongsToProject(userId, projectId);
+        const methodId = readObjectIdParam(req, "methodId");
+        const preview = await UserNotificationMethodAdminService.getDeletionPreview({
+            projectId: projectId,
+            targetUserId: userId,
+            methodType: req.params["methodType"] || "",
+            methodId: methodId,
+        });
+        return Response.sendJsonObjectResponse(req, res, preview);
+    }
+    catch (err) {
+        next(err);
+    }
+});
+/*
+ * Send the verification code again, to the device.
+ *
+ * Discloses nothing — the code goes to the address on the row, which is the one
+ * thing on it the administrator cannot read — and it is the lever that makes
+ * adding a method on somebody's behalf actually finish: "I added your work
+ * mobile, here is another code" rather than re-typing the number.
+ */
+router.post("/user-notification-method-admin/user/:userId/:methodType/:methodId/resend-verification-code", UserMiddleware.getUserMiddleware, async (req, res, next) => {
+    try {
+        const databaseProps = await CommonAPI.getDatabaseCommonInteractionProps(req);
+        const projectId = CommonAPI.assertAuthenticatedProjectMember(databaseProps);
+        assertHasAnyPermission(databaseProps, MANAGE_PERMISSIONS);
+        const userId = readObjectIdParam(req, "userId");
+        await assertUserBelongsToProject(userId, projectId);
+        const methodId = readObjectIdParam(req, "methodId");
+        await UserNotificationMethodAdminService.resendVerificationCodeForUser({
+            projectId: projectId,
+            targetUserId: userId,
+            methodType: req.params["methodType"] || "",
+            methodId: methodId,
+        });
+        return Response.sendEmptySuccessResponse(req, res);
+    }
+    catch (err) {
+        next(err);
+    }
+});
+/*
+ * Remove one of this user's notification methods.
+ *
+ * DELETE rather than a POST to a /delete path, because it is one, and because
+ * the id it names is the only thing that identifies the row — there is no body
+ * to get out of step with the URL.
+ *
+ * Every rule pointing at this method goes with it (the foreign keys are all
+ * onDelete: "CASCADE"), which is why the preview route above exists and why the
+ * owner is always mailed about this one.
+ */
+router.delete("/user-notification-method-admin/user/:userId/:methodType/:methodId", UserMiddleware.getUserMiddleware, async (req, res, next) => {
+    try {
+        const databaseProps = await CommonAPI.getDatabaseCommonInteractionProps(req);
+        const projectId = CommonAPI.assertAuthenticatedProjectMember(databaseProps);
+        assertHasAnyPermission(databaseProps, MANAGE_PERMISSIONS);
+        const userId = readObjectIdParam(req, "userId");
+        await assertUserBelongsToProject(userId, projectId);
+        const methodId = readObjectIdParam(req, "methodId");
+        await UserNotificationMethodAdminService.deleteMethodForUser({
+            projectId: projectId,
+            targetUserId: userId,
+            actorUserId: databaseProps.userId,
+            methodType: req.params["methodType"] || "",
+            methodId: methodId,
+            props: databaseProps,
+        });
+        return Response.sendEmptySuccessResponse(req, res);
+    }
+    catch (err) {
+        next(err);
+    }
+});
+export default router;
+//# sourceMappingURL=UserNotificationMethodAdminAPI.js.map

package/build/dist/Server/API/UserNotificationMethodAdminAPI.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserNotificationMethodAdminAPI.js","sourceRoot":"","sources":["../../../../Server/API/UserNotificationMethodAdminAPI.ts"],"names":[],"mappings":"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"}