add my-device and force login

server/routers/auth/login.ts

@@ -1,7 +1,9 @@
 import {
     createSession,
     generateSessionToken,
-    serializeSessionCookie
+    invalidateSession,
+    serializeSessionCookie,
+    SESSION_COOKIE_NAME
 } from "@server/auth/sessions/app";
 import { db, resources } from "@server/db";
 import { users, securityKeys } from "@server/db";
@@ -21,11 +23,11 @@ import { UserType } from "@server/types/UserTypes";
 import { logAccessAudit } from "#dynamic/lib/logAccessAudit";
 
 export const loginBodySchema = z.strictObject({
-        email: z.email().toLowerCase(),
-        password: z.string(),
-        code: z.string().optional(),
-        resourceGuid: z.string().optional()
-    });
+    email: z.email().toLowerCase(),
+    password: z.string(),
+    code: z.string().optional(),
+    resourceGuid: z.string().optional()
+});
 
 export type LoginBody = z.infer<typeof loginBodySchema>;
 
@@ -41,6 +43,21 @@ export async function login(
     res: Response,
     next: NextFunction
 ): Promise<any> {
+    const { forceLogin } = req.query;
+    const { session: existingSession } = await verifySession(
+        req,
+        forceLogin === "true"
+    );
+    if (existingSession) {
+        return response<null>(res, {
+            data: null,
+            success: true,
+            error: false,
+            message: "Already logged in",
+            status: HttpCode.OK
+        });
+    }
+
     const parsedBody = loginBodySchema.safeParse(req.body);
 
     if (!parsedBody.success) {
@@ -55,17 +72,6 @@ export async function login(
     const { email, password, code, resourceGuid } = parsedBody.data;
 
     try {
-        const { session: existingSession } = await verifySession(req);
-        if (existingSession) {
-            return response<null>(res, {
-                data: null,
-                success: true,
-                error: false,
-                message: "Already logged in",
-                status: HttpCode.OK
-            });
-        }
-
         let resourceId: number | null = null;
         let orgId: string | null = null;
         if (resourceGuid) {
@@ -225,6 +231,12 @@ export async function login(
             }
         }
 
+        // check for previous cookie value and expire it
+        const previousCookie = req.cookies[SESSION_COOKIE_NAME];
+        if (previousCookie) {
+            await invalidateSession(previousCookie);
+        }
+
         const token = generateSessionToken();
         const sess = await createSession(token, existingUser.userId);
         const isSecure = req.protocol === "https";

server/routers/auth/verifyDeviceWebAuth.ts

@@ -9,17 +9,18 @@ import { db, deviceWebAuthCodes } from "@server/db";
 import { eq, and, gt } from "drizzle-orm";
 import { encodeHexLowerCase } from "@oslojs/encoding";
 import { sha256 } from "@oslojs/crypto/sha2";
+import { unauthorized } from "@server/auth/unauthorizedResponse";
 
-const bodySchema = z.object({
-    code: z.string().min(1, "Code is required"),
-    verify: z.boolean().optional().default(false) // If false, just check and return metadata
-}).strict();
+const bodySchema = z
+    .object({
+        code: z.string().min(1, "Code is required"),
+        verify: z.boolean().optional().default(false) // If false, just check and return metadata
+    })
+    .strict();
 
 // Helper function to hash device code before querying database
 function hashDeviceCode(code: string): string {
-    return encodeHexLowerCase(
-        sha256(new TextEncoder().encode(code))
-    );
+    return encodeHexLowerCase(sha256(new TextEncoder().encode(code)));
 }
 
 export type VerifyDeviceWebAuthBody = z.infer<typeof bodySchema>;
@@ -41,6 +42,24 @@ export async function verifyDeviceWebAuth(
     res: Response,
     next: NextFunction
 ): Promise<any> {
+    const { user, session } = req;
+    if (!user || !session) {
+        logger.debug("Unauthorized attempt to verify device web auth code");
+        return next(unauthorized());
+    }
+
+    if (!session.issuedAt) {
+        logger.debug("Session missing issuedAt timestamp");
+        return next(unauthorized());
+    }
+
+    // make sure sessions is not older than 5 minutes
+    const now = Date.now();
+    if (now - session.issuedAt > 3 * 60 * 1000) {
+        logger.debug("Session is too old to verify device web auth code");
+        return next(unauthorized());
+    }
+
     const parsedBody = bodySchema.safeParse(req.body);
 
     if (!parsedBody.success) {
@@ -135,4 +154,3 @@ export async function verifyDeviceWebAuth(
         );
     }
 }
-

server/routers/external.ts

@@ -712,6 +712,7 @@ unauthenticated.get(
 // );
 
 unauthenticated.get("/user", verifySessionMiddleware, user.getUser);
+unauthenticated.get("/my-device", verifySessionMiddleware, user.myDevice);
 
 authenticated.get("/users", verifyUserIsServerAdmin, user.adminListUsers);
 authenticated.get("/user/:userId", verifyUserIsServerAdmin, user.adminGetUser);
@@ -816,6 +817,13 @@ authenticated.delete(
     olm.deleteUserOlm
 );
 
+authenticated.get(
+    "/user/:userId/olm/:olmId",
+    verifyIsLoggedInUser,
+    verifyOlmAccess,
+    olm.getUserOlm
+);
+
 authenticated.put(
     "/idp/oidc",
     verifyUserIsServerAdmin,

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<{

server/routers/user/index.ts

@@ -14,3 +14,4 @@ export * from "./createOrgUser";
 export * from "./adminUpdateUser2FA";
 export * from "./adminGetUser";
 export * from "./updateOrgUser";
+export * from "./myDevice";

server/routers/user/myDevice.ts

@@ -0,0 +1,114 @@
+import { Request, Response, NextFunction } from "express";
+import { db, Olm, olms, orgs, userOrgs } from "@server/db";
+import { idp, users } from "@server/db";
+import { and, eq } from "drizzle-orm";
+import response from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import createHttpError from "http-errors";
+import logger from "@server/logger";
+import { GetUserResponse } from "./getUser";
+import { z } from "zod";
+import { fromError } from "zod-validation-error";
+
+const querySchema = z.object({
+    olmId: z.string()
+});
+
+type ResponseOrg = {
+    orgId: string;
+    orgName: string;
+    roleId: number;
+};
+
+export type MyDeviceResponse = {
+    user: GetUserResponse;
+    orgs: ResponseOrg[];
+    olm: Olm | null;
+};
+
+export async function myDevice(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const parsedQuery = querySchema.safeParse(req.query);
+        if (!parsedQuery.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedQuery.error)
+                )
+            );
+        }
+
+        const { olmId } = parsedQuery.data;
+
+        const userId = req.user?.userId;
+
+        if (!userId) {
+            return next(
+                createHttpError(HttpCode.UNAUTHORIZED, "User not found")
+            );
+        }
+
+        const [user] = await db
+            .select({
+                userId: users.userId,
+                email: users.email,
+                username: users.username,
+                name: users.name,
+                type: users.type,
+                twoFactorEnabled: users.twoFactorEnabled,
+                emailVerified: users.emailVerified,
+                serverAdmin: users.serverAdmin,
+                idpName: idp.name,
+                idpId: users.idpId
+            })
+            .from(users)
+            .leftJoin(idp, eq(users.idpId, idp.idpId))
+            .where(eq(users.userId, userId))
+            .limit(1);
+
+        if (!user) {
+            return next(
+                createHttpError(
+                    HttpCode.NOT_FOUND,
+                    `User with ID ${userId} not found`
+                )
+            );
+        }
+
+        const [olm] = await db
+            .select()
+            .from(olms)
+            .where(and(eq(olms.userId, userId), eq(olms.olmId, olmId)));
+
+        const userOrganizations = await db
+            .select({
+                orgId: userOrgs.orgId,
+                orgName: orgs.name,
+                roleId: userOrgs.roleId
+            })
+            .from(userOrgs)
+            .where(eq(userOrgs.userId, userId))
+            .innerJoin(orgs, eq(userOrgs.orgId, orgs.orgId));
+
+        return response<MyDeviceResponse>(res, {
+            data: {
+                user,
+                orgs: userOrganizations,
+                olm
+            },
+            success: true,
+            error: false,
+            message: "My device retrieved successfully",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        logger.error(error);
+        return next(
+            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
+        );
+    }
+}