kmc7468/arkvault
1
0
Fork 0
mirror of https://github.com/kmc7468/arkvault.git synced 2025-12-16 15:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

loadenv에서 수명 관련 환경 변수의 값을 미리 밀리초 단위로 변환해놓도록 변경

Browse Source
This commit is contained in:
static
2025-01-08 22:21:21 +09:00
parent d7396945df
commit 1699d985ac
8 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/server/db/token.ts
View File

@@ -1,12 +1,10 @@
import { SqliteError } from "better-sqlite3";
import { and, eq, gt, lte } from "drizzle-orm";
import ms from "ms";
import env from "$lib/server/loadenv";
import db from "./drizzle";
import { refreshToken, tokenUpgradeChallenge } from "./schema";
const expiresIn = ms(env.jwt.refreshExp);
const expiresAt = () => new Date(Date.now() + expiresIn);
const expiresAt = () => new Date(Date.now() + env.jwt.refreshExp);
export const registerRefreshToken = async (
userId: number,

9
src/lib/server/loadenv.ts
View File

@@ -1,3 +1,4 @@
import ms from "ms";
import { building } from "$app/environment";
import { env } from "$env/dynamic/private";
@@ -9,12 +10,12 @@ export default {
databaseUrl: env.DATABASE_URL || "local.db",
jwt: {
secret: env.JWT_SECRET,
accessExp: env.JWT_ACCESS_TOKEN_EXPIRES || "5m",
refreshExp: env.JWT_REFRESH_TOKEN_EXPIRES || "14d",
accessExp: ms(env.JWT_ACCESS_TOKEN_EXPIRES || "5m"),
refreshExp: ms(env.JWT_REFRESH_TOKEN_EXPIRES || "14d"),
},
challenge: {
userClientExp: env.USER_CLIENT_CHALLENGE_EXPIRES || "5m",
tokenUpgradeExp: env.TOKEN_UPGRADE_CHALLENGE_EXPIRES || "5m",
userClientExp: ms(env.USER_CLIENT_CHALLENGE_EXPIRES || "5m"),
tokenUpgradeExp: ms(env.TOKEN_UPGRADE_CHALLENGE_EXPIRES || "5m"),
},
libraryPath: env.LIBRARY_PATH || "library",
};

2
src/lib/server/modules/auth.ts
View File

@@ -23,7 +23,7 @@ type Permission = "pendingClient" | "activeClient";
export const issueToken = (payload: TokenPayload) => {
return jwt.sign(payload, env.jwt.secret, {
expiresIn: payload.type === "access" ? env.jwt.accessExp : env.jwt.refreshExp,
expiresIn: (payload.type === "access" ? env.jwt.accessExp : env.jwt.refreshExp) / 1000,
});
};

4
src/lib/server/services/auth.ts
View File

@@ -1,6 +1,5 @@
import { error } from "@sveltejs/kit";
import argon2 from "argon2";
import ms from "ms";
import { v4 as uuidv4 } from "uuid";
import { getClient, getClientByPubKeys, getUserClient } from "$lib/server/db/client";
import { getUserByEmail } from "$lib/server/db/user";
@@ -86,8 +85,7 @@ export const refreshToken = async (refreshToken: string) => {
};
};
const expiresIn = ms(env.challenge.tokenUpgradeExp);
const expiresAt = () => new Date(Date.now() + expiresIn);
const expiresAt = () => new Date(Date.now() + env.challenge.tokenUpgradeExp);
const createChallenge = async (
ip: string,

4
src/lib/server/services/client.ts
View File

@@ -1,5 +1,4 @@
import { error } from "@sveltejs/kit";
import ms from "ms";
import {
createClient,
getClient,
@@ -27,8 +26,7 @@ export const getUserClientList = async (userId: number) => {
};
};
const expiresIn = ms(env.challenge.userClientExp);
const expiresAt = () => new Date(Date.now() + expiresIn);
const expiresAt = () => new Date(Date.now() + env.challenge.userClientExp);
const createUserClientChallenge = async (
userId: number,