kmc7468/arkvault
1
0
Fork 0
mirror of https://github.com/kmc7468/arkvault.git synced 2026-02-04 16:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

DB 입출력시의 타입 가드 추가

Browse Source
This commit is contained in:
static
2024-12-29 16:54:48 +09:00
parent 516375142d
commit 46938ef700
6 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@ import {
upgradeRefreshToken,
revokeRefreshToken,
} from "$lib/server/db/token";
import { UserClientState } from "$lib/server/db/schema";
import { issueToken, verifyToken, TokenError } from "$lib/server/modules/auth";
const verifyPassword = async (hash: string, password: string) => {
@@ -41,7 +40,7 @@ export const login = async (email: string, password: string, pubKey?: string) =>
const userClient = client ? await getUserClient(user.id, client.id) : undefined;
if (client === null) {
error(401, "Invalid public key");
} else if (client && (!userClient || userClient.state === UserClientState.Challenging)) {
} else if (client && (!userClient || userClient.state === "challenging")) {
error(401, "Unregistered public key");
}
@@ -99,7 +98,7 @@ export const upgradeTokens = async (refreshToken: string, pubKey: string) => {
const userClient = client ? await getUserClient(userId, client.id) : undefined;
if (!client) {
error(401, "Invalid public key");
} else if (client && (!userClient || userClient.state === UserClientState.Challenging)) {
} else if (client && (!userClient || userClient.state === "challenging")) {
error(401, "Unregistered public key");
}

2
src/lib/server/services/key.ts
View File

@@ -14,7 +14,7 @@ import {
import env from "$lib/server/loadenv";
const expiresIn = ms(env.challenge.pubKeyExp);
const expiresAt = () => Date.now() + expiresIn;
const expiresAt = () => new Date(Date.now() + expiresIn);
const generateChallenge = async (userId: number, ip: string, clientId: number, pubKey: string) => {
const challenge = await promisify(randomBytes)(32);