Skip to content

Commit 95d288f

Browse files
committed
fix: remove circular dependency on handle length constants
1 parent d9adb5b commit 95d288f

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

apps/web/src/pages/api/auth-hackatime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { generateJWT } from "@/server/auth";
55
import { env } from "@/server/env";
66
import { logError, logNextRequest } from "@/server/serverCommon";
77
import { database } from "@/server/db";
8-
import { MAX_HANDLE_LENGTH, MIN_HANDLE_LENGTH } from "@/server/routers/api/user";
8+
import { MAX_HANDLE_LENGTH, MIN_HANDLE_LENGTH } from "@/shared/constants";
99

1010
// GET /api/auth-hackatime
1111
// Meant to be used as a callback URL - the user will be redirected to this API endpoint when

apps/web/src/server/routers/api/user.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import "@/server/allow-only-server";
33
import { z } from "zod";
44

55
import { apiResult, assert, descending, apiErr, when, apiOk } from "@/shared/common";
6+
import { MIN_HANDLE_LENGTH, MAX_HANDLE_LENGTH } from "@/shared/constants";
67

78
import { procedure, router, protectedProcedure } from "@/server/trpc";
89
import { logError, logRequest } from "@/server/serverCommon";
@@ -38,15 +39,7 @@ export const KnownDeviceSchema = z.object({
3839
name: z.string()
3940
});
4041

41-
/**
42-
* The minimum length of a user handle.
43-
*/
44-
export const MIN_HANDLE_LENGTH = 3;
45-
46-
/**
47-
* The maximum length of a user handle.
48-
*/
49-
export const MAX_HANDLE_LENGTH = 16;
42+
export { MIN_HANDLE_LENGTH, MAX_HANDLE_LENGTH };
5043

5144
export const UserHandle = z.string().min(MIN_HANDLE_LENGTH).max(MAX_HANDLE_LENGTH);
5245
export const UserDisplayName = z.string().min(1).max(24);

apps/web/src/shared/constants.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ export const MAX_VIDEO_UPLOAD_SIZE = 384 * 1024 * 1024; // 384 MiB
99
export const MAX_THUMBNAIL_UPLOAD_SIZE = 6 * 1024 * 1024; // 6 MiB
1010
export const UPLOAD_TOKEN_LIFETIME_MS = 20 * 60 * 1000;
1111

12+
export const MIN_HANDLE_LENGTH = 3;
13+
export const MAX_HANDLE_LENGTH = 16;
14+

0 commit comments

Comments
 (0)