add my-device and force login

server/routers/olm/createUserOlm.ts

@@ -28,23 +28,23 @@ export type CreateOlmResponse = {
     secret: string;
 };
 
-registry.registerPath({
-    method: "put",
-    path: "/user/{userId}/olm",
-    description: "Create a new olm for a user.",
-    tags: [OpenAPITags.User, OpenAPITags.Client],
-    request: {
-        body: {
-            content: {
-                "application/json": {
-                    schema: bodySchema
-                }
-            }
-        },
-        params: paramsSchema
-    },
-    responses: {}
-});
+// registry.registerPath({
+//     method: "put",
+//     path: "/user/{userId}/olm",
+//     description: "Create a new olm for a user.",
+//     tags: [OpenAPITags.User, OpenAPITags.Client],
+//     request: {
+//         body: {
+//             content: {
+//                 "application/json": {
+//                     schema: bodySchema
+//                 }
+//             }
+//         },
+//         params: paramsSchema
+//     },
+//     responses: {}
+// });
 
 export async function createUserOlm(
     req: Request,

server/routers/olm/deleteUserOlm.ts

@@ -17,16 +17,16 @@ const paramsSchema = z
     })
     .strict();
 
-registry.registerPath({
-    method: "delete",
-    path: "/user/{userId}/olm/{olmId}",
-    description: "Delete an olm for a user.",
-    tags: [OpenAPITags.User, OpenAPITags.Client],
-    request: {
-        params: paramsSchema
-    },
-    responses: {}
-});
+// registry.registerPath({
+//     method: "delete",
+//     path: "/user/{userId}/olm/{olmId}",
+//     description: "Delete an olm for a user.",
+//     tags: [OpenAPITags.User, OpenAPITags.Client],
+//     request: {
+//         params: paramsSchema
+//     },
+//     responses: {}
+// });
 
 export async function deleteUserOlm(
     req: Request,

server/routers/olm/getUserOlm.ts

@@ -0,0 +1,70 @@
+import { NextFunction, Request, Response } from "express";
+import { db } from "@server/db";
+import { olms, clients, clientSites } from "@server/db";
+import { eq, and } from "drizzle-orm";
+import HttpCode from "@server/types/HttpCode";
+import createHttpError from "http-errors";
+import response from "@server/lib/response";
+import { z } from "zod";
+import { fromError } from "zod-validation-error";
+import logger from "@server/logger";
+import { OpenAPITags, registry } from "@server/openApi";
+
+const paramsSchema = z
+    .object({
+        userId: z.string(),
+        olmId: z.string()
+    })
+    .strict();
+
+// registry.registerPath({
+//     method: "get",
+//     path: "/user/{userId}/olm/{olmId}",
+//     description: "Get an olm for a user.",
+//     tags: [OpenAPITags.User, OpenAPITags.Client],
+//     request: {
+//         params: paramsSchema
+//     },
+//     responses: {}
+// });
+
+export async function getUserOlm(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const parsedParams = paramsSchema.safeParse(req.params);
+        if (!parsedParams.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedParams.error).toString()
+                )
+            );
+        }
+
+        const { olmId, userId } = parsedParams.data;
+
+        const [olm] = await db
+            .select()
+            .from(olms)
+            .where(and(eq(olms.userId, userId), eq(olms.olmId, olmId)));
+
+        return response(res, {
+            data: olm,
+            success: true,
+            error: false,
+            message: "Successfully retrieved olm",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        logger.error(error);
+        return next(
+            createHttpError(
+                HttpCode.INTERNAL_SERVER_ERROR,
+                "Failed to retrieve olm"
+            )
+        );
+    }
+}

server/routers/olm/index.ts

@@ -6,3 +6,4 @@ export * from "./handleOlmPingMessage";
 export * from "./deleteUserOlm";
 export * from "./listUserOlms";
 export * from "./deleteUserOlm";
+export * from "./getUserOlm";

server/routers/olm/listUserOlms.ts

@@ -31,17 +31,17 @@ const paramsSchema = z
     })
     .strict();
 
-registry.registerPath({
-    method: "delete",
-    path: "/user/{userId}/olms",
-    description: "List all olms for a user.",
-    tags: [OpenAPITags.User, OpenAPITags.Client],
-    request: {
-        query: querySchema,
-        params: paramsSchema
-    },
-    responses: {}
-});
+// registry.registerPath({
+//     method: "delete",
+//     path: "/user/{userId}/olms",
+//     description: "List all olms for a user.",
+//     tags: [OpenAPITags.User, OpenAPITags.Client],
+//     request: {
+//         query: querySchema,
+//         params: paramsSchema
+//     },
+//     responses: {}
+// });
 
 export type ListUserOlmsResponse = {
     olms: Array<{