mirror of
https://github.com/kmc7468/arkvault.git
synced 2025-12-14 22:08:45 +00:00
/api/client/status Endpoint 추가
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import { and, eq, gt, lte } from "drizzle-orm";
|
import { and, eq, gt, lte, count } from "drizzle-orm";
|
||||||
import db from "./drizzle";
|
import db from "./drizzle";
|
||||||
import { client, userClient, userClientChallenge } from "./schema";
|
import { client, userClient, userClientChallenge } from "./schema";
|
||||||
|
|
||||||
@@ -25,6 +25,15 @@ export const getAllUserClients = async (userId: number) => {
|
|||||||
return await db.select().from(userClient).where(eq(userClient.userId, userId)).execute();
|
return await db.select().from(userClient).where(eq(userClient.userId, userId)).execute();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const countActiveUserClients = async (userId: number) => {
|
||||||
|
const userClients = await db
|
||||||
|
.select({ count: count() })
|
||||||
|
.from(userClient)
|
||||||
|
.where(and(eq(userClient.userId, userId), eq(userClient.state, "active")))
|
||||||
|
.execute();
|
||||||
|
return userClients[0]?.count ?? null;
|
||||||
|
};
|
||||||
|
|
||||||
export const getUserClient = async (userId: number, clientId: number) => {
|
export const getUserClient = async (userId: number, clientId: number) => {
|
||||||
const userClients = await db
|
const userClients = await db
|
||||||
.select()
|
.select()
|
||||||
|
|||||||
@@ -7,11 +7,13 @@ import {
|
|||||||
getClientByPubKey,
|
getClientByPubKey,
|
||||||
createUserClient,
|
createUserClient,
|
||||||
getAllUserClients,
|
getAllUserClients,
|
||||||
|
countActiveUserClients,
|
||||||
getUserClient,
|
getUserClient,
|
||||||
createUserClientChallenge,
|
createUserClientChallenge,
|
||||||
getUserClientChallenge,
|
getUserClientChallenge,
|
||||||
setUserClientStateToPending,
|
setUserClientStateToPending,
|
||||||
} from "$lib/server/db/client";
|
} from "$lib/server/db/client";
|
||||||
|
import { getActiveMek } from "$lib/server/db/mek";
|
||||||
import env from "$lib/server/loadenv";
|
import env from "$lib/server/loadenv";
|
||||||
|
|
||||||
export const getUserClientList = async (userId: number) => {
|
export const getUserClientList = async (userId: number) => {
|
||||||
@@ -65,6 +67,22 @@ export const registerUserClient = async (userId: number, ip: string, pubKey: str
|
|||||||
return await generateChallenge(userId, ip, clientId, pubKey);
|
return await generateChallenge(userId, ip, clientId, pubKey);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getUserClientStatus = async (userId: number, clientId: number) => {
|
||||||
|
const userClient = await getUserClient(userId, clientId);
|
||||||
|
if (!userClient) {
|
||||||
|
error(500, "Invalid access token");
|
||||||
|
}
|
||||||
|
|
||||||
|
const activeMek = await getActiveMek(userId);
|
||||||
|
const activeUserClientCount = await countActiveUserClients(userId);
|
||||||
|
const isInitialMekNeeded = !activeMek && activeUserClientCount === 0;
|
||||||
|
|
||||||
|
return {
|
||||||
|
state: userClient.state,
|
||||||
|
isInitialMekNeeded,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
export const verifyUserClient = async (userId: number, ip: string, answer: string) => {
|
export const verifyUserClient = async (userId: number, ip: string, answer: string) => {
|
||||||
const challenge = await getUserClientChallenge(answer, ip);
|
const challenge = await getUserClientChallenge(answer, ip);
|
||||||
if (!challenge) {
|
if (!challenge) {
|
||||||
|
|||||||
14
src/routes/api/client/status/+server.ts
Normal file
14
src/routes/api/client/status/+server.ts
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import { error, json } from "@sveltejs/kit";
|
||||||
|
import { authenticate } from "$lib/server/modules/auth";
|
||||||
|
import { getUserClientStatus } from "$lib/server/services/client";
|
||||||
|
import type { RequestHandler } from "@sveltejs/kit";
|
||||||
|
|
||||||
|
export const GET: RequestHandler = async ({ cookies }) => {
|
||||||
|
const { userId, clientId } = authenticate(cookies);
|
||||||
|
if (!clientId) {
|
||||||
|
error(403, "Forbidden");
|
||||||
|
}
|
||||||
|
|
||||||
|
const { state, isInitialMekNeeded } = await getUserClientStatus(userId, clientId);
|
||||||
|
return json({ id: clientId, state, isInitialMekNeeded });
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user