Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1d417d672c | |||
| 9d6df8a8df |
@@ -1,6 +0,0 @@
|
|||||||
import { API_VERSION, APP_VERSION } from "./version";
|
|
||||||
|
|
||||||
export { API_VERSION, APP_VERSION };
|
|
||||||
export const API_PREFIX = `/api/${API_VERSION}`;
|
|
||||||
export const AUTH_PREFIX = `/${API_VERSION}/auth`;
|
|
||||||
export const DOCS_PREFIX = `/docs/${API_VERSION}`;
|
|
||||||
@@ -40,13 +40,4 @@ export class ConfigManager {
|
|||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
async deleteProviderConfig(provider: string): Promise<void> {
|
|
||||||
await this.redis.del(`config:${provider}`);
|
|
||||||
// Also clean up tokens
|
|
||||||
const tokenKeys = await this.redis.keys(`provider:${provider}:*`);
|
|
||||||
if (tokenKeys.length > 0) {
|
|
||||||
await this.redis.del(...tokenKeys);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
+19
-11
@@ -4,9 +4,7 @@ import { serveStatic } from "hono/bun";
|
|||||||
import { logger } from "hono/logger";
|
import { logger } from "hono/logger";
|
||||||
import { prettyJSON } from "hono/pretty-json";
|
import { prettyJSON } from "hono/pretty-json";
|
||||||
import { config } from "./config";
|
import { config } from "./config";
|
||||||
import { API_PREFIX, AUTH_PREFIX, DOCS_PREFIX } from "./constants";
|
|
||||||
import { redis } from "./core/RedisClient";
|
import { redis } from "./core/RedisClient";
|
||||||
import { openApiSpec, securityScheme } from "./openapi";
|
|
||||||
import { apiRoutes } from "./routes/api";
|
import { apiRoutes } from "./routes/api";
|
||||||
import { authRoutes } from "./routes/auth";
|
import { authRoutes } from "./routes/auth";
|
||||||
import { configRoutes } from "./routes/config";
|
import { configRoutes } from "./routes/config";
|
||||||
@@ -15,19 +13,29 @@ import { dashboardRoutes } from "./routes/dashboard";
|
|||||||
const app = new OpenAPIHono({ strict: false });
|
const app = new OpenAPIHono({ strict: false });
|
||||||
|
|
||||||
// OpenAPI specs
|
// OpenAPI specs
|
||||||
app.doc(`${DOCS_PREFIX}/openapi.json`, openApiSpec);
|
app.doc("/doc", {
|
||||||
app.openAPIRegistry.registerComponent("securitySchemes", "API_KEY", securityScheme);
|
openapi: "3.0.0",
|
||||||
|
info: {
|
||||||
|
version: "1.0.0",
|
||||||
|
title: "toknd — Auth Broker API",
|
||||||
|
description: "Centralized token management and OAuth2 broker service.",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
app.openAPIRegistry.registerComponent("securitySchemes", "API_KEY", {
|
||||||
|
type: "http",
|
||||||
|
scheme: "bearer",
|
||||||
|
});
|
||||||
|
|
||||||
// Scalar API Reference
|
// Scalar API Reference
|
||||||
app.get(
|
app.get(
|
||||||
DOCS_PREFIX,
|
"/api",
|
||||||
Scalar({
|
Scalar({
|
||||||
theme: "solarized",
|
theme: "solarized",
|
||||||
url: `${DOCS_PREFIX}/openapi.json`,
|
url: "/doc",
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
app.get("/docs", (c) => c.redirect(DOCS_PREFIX));
|
app.get("/docs", (c) => c.redirect("/api"));
|
||||||
app.get("/api", (c) => c.redirect(DOCS_PREFIX));
|
|
||||||
|
|
||||||
app.use("*", logger());
|
app.use("*", logger());
|
||||||
app.use("*", prettyJSON());
|
app.use("*", prettyJSON());
|
||||||
@@ -35,9 +43,9 @@ app.use("*", prettyJSON());
|
|||||||
app.get("/", (c) => c.redirect("/app"));
|
app.get("/", (c) => c.redirect("/app"));
|
||||||
|
|
||||||
app.get("/app/dashboard.js", serveStatic({ path: "./src/views/dashboard.js" }));
|
app.get("/app/dashboard.js", serveStatic({ path: "./src/views/dashboard.js" }));
|
||||||
app.route(AUTH_PREFIX, authRoutes);
|
app.route("/auth", authRoutes);
|
||||||
app.route(`${API_PREFIX}/config`, configRoutes);
|
app.route("/api/config", configRoutes);
|
||||||
app.route(API_PREFIX, apiRoutes);
|
app.route("/api", apiRoutes);
|
||||||
app.route("/app", dashboardRoutes);
|
app.route("/app", dashboardRoutes);
|
||||||
|
|
||||||
app.notFound((c) => {
|
app.notFound((c) => {
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
import { API_VERSION, APP_VERSION } from "./constants";
|
|
||||||
|
|
||||||
export const openApiSpec = {
|
|
||||||
openapi: "3.0.0",
|
|
||||||
info: {
|
|
||||||
version: `${API_VERSION}.${APP_VERSION}`,
|
|
||||||
title: "toknd Auth Broker API",
|
|
||||||
description:
|
|
||||||
"A high-performance OAuth2 broker and token management service. Designed to centralize provider configurations and automate token lifecycle management across distributed systems.",
|
|
||||||
},
|
|
||||||
tags: [
|
|
||||||
{
|
|
||||||
name: "Tokens",
|
|
||||||
description: "Endpoint operations for accessing and force-refreshing active provider tokens.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Management",
|
|
||||||
description: "Administrative operations for provider lifecycle and configuration.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Auth (Internal)",
|
|
||||||
description: "System-level OAuth2 handshake and callback processing.",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
security: [{ API_KEY: [] }],
|
|
||||||
};
|
|
||||||
|
|
||||||
export const securityScheme = {
|
|
||||||
type: "http",
|
|
||||||
scheme: "bearer",
|
|
||||||
} as const;
|
|
||||||
@@ -47,7 +47,6 @@ const statusRoute = createRoute({
|
|||||||
method: "get",
|
method: "get",
|
||||||
path: "/status",
|
path: "/status",
|
||||||
security: [{ API_KEY: [] }],
|
security: [{ API_KEY: [] }],
|
||||||
tags: ["Tokens"],
|
|
||||||
responses: {
|
responses: {
|
||||||
200: {
|
200: {
|
||||||
content: { "application/json": { schema: StatusResponseSchema } },
|
content: { "application/json": { schema: StatusResponseSchema } },
|
||||||
@@ -60,7 +59,6 @@ const tokenRoute = createRoute({
|
|||||||
method: "get",
|
method: "get",
|
||||||
path: "/token/{provider}",
|
path: "/token/{provider}",
|
||||||
security: [{ API_KEY: [] }],
|
security: [{ API_KEY: [] }],
|
||||||
tags: ["Tokens"],
|
|
||||||
request: {
|
request: {
|
||||||
params: z.object({
|
params: z.object({
|
||||||
provider: z.string().openapi({ example: "trakt" }),
|
provider: z.string().openapi({ example: "trakt" }),
|
||||||
@@ -82,7 +80,6 @@ const refreshRoute = createRoute({
|
|||||||
method: "post",
|
method: "post",
|
||||||
path: "/refresh/{provider}",
|
path: "/refresh/{provider}",
|
||||||
security: [{ API_KEY: [] }],
|
security: [{ API_KEY: [] }],
|
||||||
tags: ["Tokens"],
|
|
||||||
request: {
|
request: {
|
||||||
params: z.object({
|
params: z.object({
|
||||||
provider: z.string().openapi({ example: "trakt" }),
|
provider: z.string().openapi({ example: "trakt" }),
|
||||||
|
|||||||
@@ -17,8 +17,6 @@ const AuthErrorResponse = z
|
|||||||
const loginRoute = createRoute({
|
const loginRoute = createRoute({
|
||||||
method: "get",
|
method: "get",
|
||||||
path: "/{provider}/login",
|
path: "/{provider}/login",
|
||||||
tags: ["Auth (Internal)"],
|
|
||||||
summary: "Start OAuth2 flow (Managed by System)",
|
|
||||||
request: {
|
request: {
|
||||||
params: z.object({
|
params: z.object({
|
||||||
provider: z.string().openapi({ example: "trakt" }),
|
provider: z.string().openapi({ example: "trakt" }),
|
||||||
@@ -38,8 +36,6 @@ const loginRoute = createRoute({
|
|||||||
const callbackRoute = createRoute({
|
const callbackRoute = createRoute({
|
||||||
method: "get",
|
method: "get",
|
||||||
path: "/callback",
|
path: "/callback",
|
||||||
tags: ["Auth (Internal)"],
|
|
||||||
summary: "OAuth2 callback handler (Managed by System)",
|
|
||||||
request: {
|
request: {
|
||||||
query: z.object({
|
query: z.object({
|
||||||
state: z
|
state: z
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ const listConfigRoute = createRoute({
|
|||||||
method: "get",
|
method: "get",
|
||||||
path: "/",
|
path: "/",
|
||||||
security: [{ API_KEY: [] }],
|
security: [{ API_KEY: [] }],
|
||||||
tags: ["Management"],
|
|
||||||
responses: {
|
responses: {
|
||||||
200: {
|
200: {
|
||||||
content: { "application/json": { schema: AllProvidersResponse } },
|
content: { "application/json": { schema: AllProvidersResponse } },
|
||||||
@@ -51,7 +50,6 @@ const setConfigRoute = createRoute({
|
|||||||
method: "post",
|
method: "post",
|
||||||
path: "/{provider}",
|
path: "/{provider}",
|
||||||
security: [{ API_KEY: [] }],
|
security: [{ API_KEY: [] }],
|
||||||
tags: ["Management"],
|
|
||||||
request: {
|
request: {
|
||||||
params: z.object({
|
params: z.object({
|
||||||
provider: z.string().openapi({ example: "trakt" }),
|
provider: z.string().openapi({ example: "trakt" }),
|
||||||
@@ -72,24 +70,6 @@ const setConfigRoute = createRoute({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const deleteConfigRoute = createRoute({
|
|
||||||
method: "delete",
|
|
||||||
path: "/{provider}",
|
|
||||||
security: [{ API_KEY: [] }],
|
|
||||||
tags: ["Management"],
|
|
||||||
request: {
|
|
||||||
params: z.object({
|
|
||||||
provider: z.string().openapi({ example: "trakt" }),
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
responses: {
|
|
||||||
200: {
|
|
||||||
content: { "application/json": { schema: SuccessMessage } },
|
|
||||||
description: "Delete a provider configuration and its tokens",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// Implementations
|
// Implementations
|
||||||
configRoutes.use("*", authMiddleware);
|
configRoutes.use("*", authMiddleware);
|
||||||
|
|
||||||
@@ -108,12 +88,4 @@ configRoutes.openapi(setConfigRoute, async (c) => {
|
|||||||
return c.json({ message: `Config for ${provider} saved successfully` }, 200);
|
return c.json({ message: `Config for ${provider} saved successfully` }, 200);
|
||||||
});
|
});
|
||||||
|
|
||||||
configRoutes.openapi(deleteConfigRoute, async (c) => {
|
|
||||||
const provider = c.req.valid("param").provider;
|
|
||||||
const configManager = new ConfigManager(redis);
|
|
||||||
|
|
||||||
await configManager.deleteProviderConfig(provider);
|
|
||||||
return c.json({ message: `Config for ${provider} deleted successfully` }, 200);
|
|
||||||
});
|
|
||||||
|
|
||||||
export { configRoutes };
|
export { configRoutes };
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { deleteCookie, getCookie, setCookie } from "hono/cookie";
|
|||||||
import { html } from "hono/html";
|
import { html } from "hono/html";
|
||||||
import type { Child } from "hono/jsx";
|
import type { Child } from "hono/jsx";
|
||||||
import { config } from "../config";
|
import { config } from "../config";
|
||||||
import { API_PREFIX, API_VERSION, APP_VERSION, AUTH_PREFIX, DOCS_PREFIX } from "../constants";
|
|
||||||
|
|
||||||
const dashboardRoutes = new Hono({ strict: false });
|
const dashboardRoutes = new Hono({ strict: false });
|
||||||
|
|
||||||
@@ -40,14 +39,7 @@ export const Layout = (props: { title: string; children: Child; isUnlocked?: boo
|
|||||||
</head>
|
</head>
|
||||||
<body
|
<body
|
||||||
class="bg-base-200/50 min-h-screen font-['DM_Sans',sans-serif] antialiased text-base-content tracking-tight"
|
class="bg-base-200/50 min-h-screen font-['DM_Sans',sans-serif] antialiased text-base-content tracking-tight"
|
||||||
x-data={`dashboard({
|
x-data={`dashboard({ initialIsUnlocked: ${props.isUnlocked || false} })`}
|
||||||
initialIsUnlocked: ${props.isUnlocked || false},
|
|
||||||
apiVersion: '${API_VERSION}',
|
|
||||||
appVersion: '${APP_VERSION}',
|
|
||||||
apiPrefix: '${API_PREFIX}',
|
|
||||||
authPrefix: '${AUTH_PREFIX}',
|
|
||||||
docsPrefix: '${DOCS_PREFIX}'
|
|
||||||
})`}
|
|
||||||
>
|
>
|
||||||
{props.children}
|
{props.children}
|
||||||
<script src="/app/dashboard.js"></script>
|
<script src="/app/dashboard.js"></script>
|
||||||
@@ -60,7 +52,7 @@ export const Layout = (props: { title: string; children: Child; isUnlocked?: boo
|
|||||||
export const Dashboard = (props: { isUnlocked: boolean }) => (
|
export const Dashboard = (props: { isUnlocked: boolean }) => (
|
||||||
<Layout title="toknd — Auth Broker Dashboard" isUnlocked={props.isUnlocked}>
|
<Layout title="toknd — Auth Broker Dashboard" isUnlocked={props.isUnlocked}>
|
||||||
<div class="navbar bg-base-100 shadow-sm px-4 md:px-8 border-b border-base-300">
|
<div class="navbar bg-base-100 shadow-sm px-4 md:px-8 border-b border-base-300">
|
||||||
<div class="flex-1 flex items-center gap-6">
|
<div class="flex-1">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<div class="w-8 h-8 bg-primary rounded-lg flex items-center justify-center text-primary-content font-semibold text-lg">
|
<div class="w-8 h-8 bg-primary rounded-lg flex items-center justify-center text-primary-content font-semibold text-lg">
|
||||||
<i class="ph-duotone ph-fingerprint"></i>
|
<i class="ph-duotone ph-fingerprint"></i>
|
||||||
@@ -69,26 +61,8 @@ export const Dashboard = (props: { isUnlocked: boolean }) => (
|
|||||||
toknd <span class="text-xs font-normal opacity-50 ml-1">auth broker</span>
|
toknd <span class="text-xs font-normal opacity-50 ml-1">auth broker</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<nav class="hidden md:flex items-center gap-1">
|
|
||||||
<a
|
|
||||||
href={DOCS_PREFIX}
|
|
||||||
target="_blank"
|
|
||||||
class="btn btn-ghost btn-sm text-base-content/60 hover:text-primary gap-2 px-3"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<i class="ph-duotone ph-book-open text-lg"></i>
|
|
||||||
<span class="font-bold uppercase tracking-widest text-xs">
|
|
||||||
API Reference{" "}
|
|
||||||
<sup class="text-[8px] opacity-50 ml-0.5">
|
|
||||||
{API_VERSION}.{APP_VERSION}
|
|
||||||
</sup>
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
</nav>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-none hidden sm:flex">
|
<div class="flex-none hidden sm:flex">
|
||||||
<template x-if="!isUnlocked">
|
|
||||||
<div class="join border border-base-200/50 bg-base-200/50 rounded-xl overflow-hidden focus-within:border-primary transition-colors">
|
<div class="join border border-base-200/50 bg-base-200/50 rounded-xl overflow-hidden focus-within:border-primary transition-colors">
|
||||||
<div class="join-item flex items-center px-4 bg-base-200">
|
<div class="join-item flex items-center px-4 bg-base-200">
|
||||||
<i class="ph-duotone ph-key text-secondary text-lg"></i>
|
<i class="ph-duotone ph-key text-secondary text-lg"></i>
|
||||||
@@ -119,25 +93,17 @@ export const Dashboard = (props: { isUnlocked: boolean }) => (
|
|||||||
>
|
>
|
||||||
<i class="ph-duotone ph-lock-key-open text-lg" x-show="!loading"></i>
|
<i class="ph-duotone ph-lock-key-open text-lg" x-show="!loading"></i>
|
||||||
<span class="loading loading-spinner loading-xs" x-show="loading"></span>
|
<span class="loading loading-spinner loading-xs" x-show="loading"></span>
|
||||||
<span
|
<span class="ml-1 hidden md:inline" x-text="loading ? 'Unlocking...' : 'Unlock'"></span>
|
||||||
class="ml-1 hidden md:inline"
|
|
||||||
x-text="loading ? 'Unlocking...' : 'Unlock'"
|
|
||||||
></span>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<template x-if="isUnlocked">
|
|
||||||
<button
|
<button
|
||||||
|
x-show="isUnlocked"
|
||||||
x-on:click="logout()"
|
x-on:click="logout()"
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-ghost btn-sm text-error hover:bg-error/10 gap-2 px-4"
|
class="btn btn-ghost btn-sm join-item text-error hover:bg-error/10"
|
||||||
x-bind:disabled="loading"
|
|
||||||
>
|
>
|
||||||
<i class="ph-bold ph-power text-lg"></i>
|
<i class="ph-bold ph-power text-lg"></i>
|
||||||
<span class="font-bold uppercase tracking-wider text-xs">Logout</span>
|
|
||||||
</button>
|
</button>
|
||||||
</template>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -342,20 +308,10 @@ export const Dashboard = (props: { isUnlocked: boolean }) => (
|
|||||||
<div class="card bg-base-200/50 border border-base-300 shadow-sm hover:shadow-md transition-all group">
|
<div class="card bg-base-200/50 border border-base-300 shadow-sm hover:shadow-md transition-all group">
|
||||||
<div class="card-body p-5">
|
<div class="card-body p-5">
|
||||||
<div class="flex flex-col mb-4">
|
<div class="flex flex-col mb-4">
|
||||||
<div class="flex justify-between items-start">
|
|
||||||
<span
|
<span
|
||||||
x-text="provider.name"
|
x-text="provider.name"
|
||||||
class="text-lg font-black text-base-content/90 uppercase"
|
class="text-lg font-black text-base-content/90 uppercase"
|
||||||
></span>
|
></span>
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
x-on:click="deleteProvider(provider.name)"
|
|
||||||
class="btn btn-error btn-xs mt-1 opacity-0 group-hover:opacity-100 transition-all duration-300"
|
|
||||||
title="Delete Provider"
|
|
||||||
>
|
|
||||||
<i class="ph-bold ph-trash text-lg"></i>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<span
|
<span
|
||||||
x-text="provider.config.clientId"
|
x-text="provider.config.clientId"
|
||||||
x-bind:title="provider.config.clientId"
|
x-bind:title="provider.config.clientId"
|
||||||
@@ -456,7 +412,7 @@ export const Dashboard = (props: { isUnlocked: boolean }) => (
|
|||||||
<div class="grid grid-cols-2 gap-2">
|
<div class="grid grid-cols-2 gap-2">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
x-on:click={`window.open('${AUTH_PREFIX}/' + provider.name + '/login', '_blank')`}
|
x-on:click="window.open('/auth/' + provider.name + '/login', '_blank')"
|
||||||
class="btn btn-primary btn-sm"
|
class="btn btn-primary btn-sm"
|
||||||
>
|
>
|
||||||
<i class="ph-bold ph-link"></i> Connect
|
<i class="ph-bold ph-link"></i> Connect
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
export const API_VERSION = "v1";
|
|
||||||
export const APP_VERSION = "1.0";
|
|
||||||
+9
-45
@@ -10,16 +10,9 @@ document.addEventListener("alpine:init", () => {
|
|||||||
return date.toLocaleDateString();
|
return date.toLocaleDateString();
|
||||||
};
|
};
|
||||||
|
|
||||||
window.Alpine.data(
|
window.Alpine.data("dashboard", ({ initialIsUnlocked }) => ({
|
||||||
"dashboard",
|
|
||||||
({ initialIsUnlocked, apiPrefix, authPrefix, docsPrefix, apiVersion, appVersion }) => ({
|
|
||||||
apiKey: "",
|
apiKey: "",
|
||||||
isUnlocked: initialIsUnlocked,
|
isUnlocked: initialIsUnlocked,
|
||||||
apiPrefix,
|
|
||||||
authPrefix,
|
|
||||||
docsPrefix,
|
|
||||||
apiVersion,
|
|
||||||
appVersion,
|
|
||||||
loading: false,
|
loading: false,
|
||||||
providers: [],
|
providers: [],
|
||||||
form: {
|
form: {
|
||||||
@@ -83,8 +76,8 @@ document.addEventListener("alpine:init", () => {
|
|||||||
this.loading = true;
|
this.loading = true;
|
||||||
try {
|
try {
|
||||||
const [configRes, statusRes] = await Promise.all([
|
const [configRes, statusRes] = await Promise.all([
|
||||||
fetch(`${this.apiPrefix}/config`),
|
fetch("/api/config"),
|
||||||
fetch(`${this.apiPrefix}/status`),
|
fetch("/api/status"),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (configRes.status === 401 || statusRes.status === 401) {
|
if (configRes.status === 401 || statusRes.status === 401) {
|
||||||
@@ -119,7 +112,7 @@ document.addEventListener("alpine:init", () => {
|
|||||||
async saveConfig() {
|
async saveConfig() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`${this.apiPrefix}/config/${this.form.providerName}`, {
|
const res = await fetch(`/api/config/${this.form.providerName}`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify(this.form),
|
body: JSON.stringify(this.form),
|
||||||
@@ -153,12 +146,13 @@ document.addEventListener("alpine:init", () => {
|
|||||||
async forceRefresh(name) {
|
async forceRefresh(name) {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`${this.apiPrefix}/refresh/${name}`, {
|
const res = await fetch(`/api/refresh/${name}`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
});
|
});
|
||||||
|
|
||||||
if (res.status === 401) {
|
if (res.status === 401) {
|
||||||
return this.handleSessionExpired();
|
this.isUnlocked = false;
|
||||||
|
throw new Error("Session expired");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!res.ok) throw new Error("Refresh failed");
|
if (!res.ok) throw new Error("Refresh failed");
|
||||||
@@ -172,35 +166,6 @@ document.addEventListener("alpine:init", () => {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
async deleteProvider(name) {
|
|
||||||
if (
|
|
||||||
!confirm(
|
|
||||||
`Are you sure you want to delete ${name}? This will also remove all associated tokens.`,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
return;
|
|
||||||
|
|
||||||
this.loading = true;
|
|
||||||
try {
|
|
||||||
const res = await fetch(`${this.apiPrefix}/config/${name}`, {
|
|
||||||
method: "DELETE",
|
|
||||||
});
|
|
||||||
|
|
||||||
if (res.status === 401) {
|
|
||||||
return this.handleSessionExpired();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!res.ok) throw new Error("Delete failed");
|
|
||||||
|
|
||||||
this.showNotification(`Deleted ${name}`);
|
|
||||||
await this.fetchProviders();
|
|
||||||
} catch (err) {
|
|
||||||
this.showNotification(err.message, "error");
|
|
||||||
} finally {
|
|
||||||
this.loading = false;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
editProvider(provider) {
|
editProvider(provider) {
|
||||||
this.form = {
|
this.form = {
|
||||||
providerName: provider.name,
|
providerName: provider.name,
|
||||||
@@ -214,7 +179,7 @@ document.addEventListener("alpine:init", () => {
|
|||||||
},
|
},
|
||||||
|
|
||||||
getRedirectUri() {
|
getRedirectUri() {
|
||||||
return `${window.location.origin}${this.authPrefix}/${this.form.providerName || "{provider}"}/callback`;
|
return `${window.location.origin}/auth/${this.form.providerName || "{provider}"}/callback`;
|
||||||
},
|
},
|
||||||
|
|
||||||
copyToClipboard(text) {
|
copyToClipboard(text) {
|
||||||
@@ -234,6 +199,5 @@ document.addEventListener("alpine:init", () => {
|
|||||||
formatTime(timestamp) {
|
formatTime(timestamp) {
|
||||||
return formatTime(timestamp);
|
return formatTime(timestamp);
|
||||||
},
|
},
|
||||||
}),
|
}));
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,10 +1,16 @@
|
|||||||
// @ts-nocheck
|
// @ts-nocheck
|
||||||
import { describe, expect, it, spyOn } from "bun:test";
|
import { afterEach, describe, expect, it, mock, spyOn } from "bun:test";
|
||||||
import { API_PREFIX } from "../../src/constants";
|
|
||||||
import { redis } from "../../src/core/RedisClient";
|
import { redis } from "../../src/core/RedisClient";
|
||||||
import { app } from "../../src/index";
|
import { app } from "../../src/index";
|
||||||
|
|
||||||
describe("API Integration", () => {
|
describe("API Integration", () => {
|
||||||
|
afterEach(() => {
|
||||||
|
mock.restore();
|
||||||
|
redis.get.mockImplementation(() => Promise.resolve(null));
|
||||||
|
redis.set.mockImplementation(() => Promise.resolve());
|
||||||
|
redis.keys.mockImplementation(() => Promise.resolve([]));
|
||||||
|
});
|
||||||
|
|
||||||
const mockTraktConfig = JSON.stringify({
|
const mockTraktConfig = JSON.stringify({
|
||||||
clientId: "trakt-client-id",
|
clientId: "trakt-client-id",
|
||||||
clientSecret: "trakt-client-secret",
|
clientSecret: "trakt-client-secret",
|
||||||
@@ -14,7 +20,7 @@ describe("API Integration", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("should return 401 if API Key is missing", async () => {
|
it("should return 401 if API Key is missing", async () => {
|
||||||
const res = await app.request(`${API_PREFIX}/status`);
|
const res = await app.request("/api/status");
|
||||||
|
|
||||||
expect(res.status).toBe(401);
|
expect(res.status).toBe(401);
|
||||||
const body = await res.json();
|
const body = await res.json();
|
||||||
@@ -49,7 +55,7 @@ describe("API Integration", () => {
|
|||||||
return Promise.resolve(null);
|
return Promise.resolve(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
const res = await app.request(`${API_PREFIX}/status`, {
|
const res = await app.request("/api/status", {
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: "Bearer test-api-key",
|
Authorization: "Bearer test-api-key",
|
||||||
},
|
},
|
||||||
@@ -69,7 +75,7 @@ describe("API Integration", () => {
|
|||||||
return Promise.resolve(null);
|
return Promise.resolve(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
const res = await app.request(`${API_PREFIX}/status`, {
|
const res = await app.request("/api/status", {
|
||||||
headers: {
|
headers: {
|
||||||
Cookie: "toknd_api_key=test-api-key",
|
Cookie: "toknd_api_key=test-api-key",
|
||||||
},
|
},
|
||||||
@@ -81,7 +87,7 @@ describe("API Integration", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("should return 404 for unknown provider token", async () => {
|
it("should return 404 for unknown provider token", async () => {
|
||||||
const res = await app.request(`${API_PREFIX}/token/unconfigured-provider`, {
|
const res = await app.request("/api/token/unconfigured-provider", {
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: "Bearer test-api-key",
|
Authorization: "Bearer test-api-key",
|
||||||
},
|
},
|
||||||
@@ -97,7 +103,7 @@ describe("API Integration", () => {
|
|||||||
return Promise.resolve(null);
|
return Promise.resolve(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
const res = await app.request(`${API_PREFIX}/token/trakt`, {
|
const res = await app.request("/api/token/trakt", {
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: "Bearer test-api-key",
|
Authorization: "Bearer test-api-key",
|
||||||
},
|
},
|
||||||
@@ -114,7 +120,7 @@ describe("API Integration", () => {
|
|||||||
return Promise.resolve(null);
|
return Promise.resolve(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
const res = await app.request(`${API_PREFIX}/token/trakt`, {
|
const res = await app.request("/api/token/trakt", {
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: "Bearer test-api-key",
|
Authorization: "Bearer test-api-key",
|
||||||
},
|
},
|
||||||
@@ -144,7 +150,7 @@ describe("API Integration", () => {
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
const res = await app.request(`${API_PREFIX}/refresh/trakt`, {
|
const res = await app.request("/api/refresh/trakt", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: "Bearer test-api-key",
|
Authorization: "Bearer test-api-key",
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
// @ts-nocheck
|
// @ts-nocheck
|
||||||
import { describe, expect, it, spyOn } from "bun:test";
|
import { afterEach, describe, expect, it, mock, spyOn } from "bun:test";
|
||||||
import { AUTH_PREFIX } from "../../src/constants";
|
|
||||||
import { redis } from "../../src/core/RedisClient";
|
import { redis } from "../../src/core/RedisClient";
|
||||||
import { app } from "../../src/index";
|
import { app } from "../../src/index";
|
||||||
|
|
||||||
describe("Auth Integration", () => {
|
describe("Auth Integration", () => {
|
||||||
|
afterEach(() => {
|
||||||
|
mock.restore();
|
||||||
|
redis.get.mockImplementation(() => Promise.resolve(null));
|
||||||
|
});
|
||||||
|
|
||||||
const mockProviderConfig = JSON.stringify({
|
const mockProviderConfig = JSON.stringify({
|
||||||
clientId: "trakt-client-id",
|
clientId: "trakt-client-id",
|
||||||
clientSecret: "trakt-client-secret",
|
clientSecret: "trakt-client-secret",
|
||||||
@@ -19,7 +23,7 @@ describe("Auth Integration", () => {
|
|||||||
return Promise.resolve(null);
|
return Promise.resolve(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
const res = await app.request(`${AUTH_PREFIX}/trakt/login`);
|
const res = await app.request("/auth/trakt/login");
|
||||||
|
|
||||||
expect(res.status).toBe(302);
|
expect(res.status).toBe(302);
|
||||||
expect(res.headers.get("Location")).toContain("trakt.tv/oauth/authorize");
|
expect(res.headers.get("Location")).toContain("trakt.tv/oauth/authorize");
|
||||||
@@ -44,7 +48,7 @@ describe("Auth Integration", () => {
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
const res = await app.request(`${AUTH_PREFIX}/callback?state=trakt&code=temporary-auth-code`);
|
const res = await app.request("/auth/callback?state=trakt&code=temporary-auth-code");
|
||||||
|
|
||||||
expect(res.status).toBe(302);
|
expect(res.status).toBe(302);
|
||||||
expect(res.headers.get("Location")).toBe("/app/success?provider=trakt");
|
expect(res.headers.get("Location")).toBe("/app/success?provider=trakt");
|
||||||
@@ -53,13 +57,13 @@ describe("Auth Integration", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("should return 404 if provider not configured during login", async () => {
|
it("should return 404 if provider not configured during login", async () => {
|
||||||
const res = await app.request(`${AUTH_PREFIX}/unknown-provider/login`);
|
const res = await app.request("/auth/unknown-provider/login");
|
||||||
|
|
||||||
expect(res.status).toBe(404);
|
expect(res.status).toBe(404);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should return 400 if callback is missing state or code", async () => {
|
it("should return 400 if callback is missing state or code", async () => {
|
||||||
const res = await app.request(`${AUTH_PREFIX}/callback?code=some-code`);
|
const res = await app.request("/auth/callback?code=some-code");
|
||||||
|
|
||||||
expect(res.status).toBe(400);
|
expect(res.status).toBe(400);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,10 +1,16 @@
|
|||||||
// @ts-nocheck
|
// @ts-nocheck
|
||||||
import { describe, expect, it } from "bun:test";
|
import { afterEach, describe, expect, it, mock } from "bun:test";
|
||||||
import { API_PREFIX } from "../../src/constants";
|
|
||||||
import { redis } from "../../src/core/RedisClient";
|
import { redis } from "../../src/core/RedisClient";
|
||||||
import { app } from "../../src/index";
|
import { app } from "../../src/index";
|
||||||
|
|
||||||
describe("Config Integration", () => {
|
describe("Config Integration", () => {
|
||||||
|
afterEach(() => {
|
||||||
|
mock.restore();
|
||||||
|
redis.get.mockImplementation(() => Promise.resolve(null));
|
||||||
|
redis.set.mockImplementation(() => Promise.resolve());
|
||||||
|
redis.keys.mockImplementation(() => Promise.resolve([]));
|
||||||
|
});
|
||||||
|
|
||||||
it("should list all configured providers", async () => {
|
it("should list all configured providers", async () => {
|
||||||
redis.keys.mockReturnValue(Promise.resolve(["config:trakt"]));
|
redis.keys.mockReturnValue(Promise.resolve(["config:trakt"]));
|
||||||
redis.get.mockImplementation(() =>
|
redis.get.mockImplementation(() =>
|
||||||
@@ -19,7 +25,7 @@ describe("Config Integration", () => {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
const res = await app.request(`${API_PREFIX}/config`, {
|
const res = await app.request("/api/config", {
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: "Bearer test-api-key",
|
Authorization: "Bearer test-api-key",
|
||||||
},
|
},
|
||||||
@@ -40,7 +46,7 @@ describe("Config Integration", () => {
|
|||||||
scope: "user:email",
|
scope: "user:email",
|
||||||
};
|
};
|
||||||
|
|
||||||
const res = await app.request(`${API_PREFIX}/config/github`, {
|
const res = await app.request("/api/config/github", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: "Bearer test-api-key",
|
Authorization: "Bearer test-api-key",
|
||||||
@@ -61,7 +67,7 @@ describe("Config Integration", () => {
|
|||||||
clientId: "missing-other-required-fields",
|
clientId: "missing-other-required-fields",
|
||||||
};
|
};
|
||||||
|
|
||||||
const res = await app.request(`${API_PREFIX}/config/invalid`, {
|
const res = await app.request("/api/config/invalid", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: "Bearer test-api-key",
|
Authorization: "Bearer test-api-key",
|
||||||
@@ -72,16 +78,4 @@ describe("Config Integration", () => {
|
|||||||
|
|
||||||
expect(res.status).toBe(400);
|
expect(res.status).toBe(400);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should delete a provider configuration", async () => {
|
|
||||||
const res = await app.request(`${API_PREFIX}/config/trakt`, {
|
|
||||||
method: "DELETE",
|
|
||||||
headers: {
|
|
||||||
Authorization: "Bearer test-api-key",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(res.status).toBe(200);
|
|
||||||
expect(redis.del).toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
// @ts-nocheck
|
// @ts-nocheck
|
||||||
import { describe, expect, it } from "bun:test";
|
import { describe, expect, it } from "bun:test";
|
||||||
import { API_PREFIX } from "../../src/constants";
|
|
||||||
import { redis } from "../../src/core/RedisClient";
|
import { redis } from "../../src/core/RedisClient";
|
||||||
import { app } from "../../src/index";
|
import { app } from "../../src/index";
|
||||||
|
|
||||||
@@ -27,7 +26,7 @@ describe("Dashboard & Common Integration", () => {
|
|||||||
throw new Error("Redis Crash");
|
throw new Error("Redis Crash");
|
||||||
});
|
});
|
||||||
|
|
||||||
const res = await app.request(`${API_PREFIX}/status`, {
|
const res = await app.request("/api/status", {
|
||||||
headers: { Authorization: "Bearer test-api-key" },
|
headers: { Authorization: "Bearer test-api-key" },
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+3
-23
@@ -1,38 +1,18 @@
|
|||||||
// @ts-nocheck
|
import { mock } from "bun:test";
|
||||||
|
|
||||||
|
// Global test setup to stub environment variables
|
||||||
process.env.API_KEY = "test-api-key";
|
process.env.API_KEY = "test-api-key";
|
||||||
process.env.REDIS_HOST = "localhost";
|
process.env.REDIS_HOST = "localhost";
|
||||||
process.env.REDIS_PORT = "6379";
|
process.env.REDIS_PORT = "6379";
|
||||||
process.env.APP_PORT = "3000";
|
process.env.APP_PORT = "3000";
|
||||||
|
|
||||||
import { afterEach, mock } from "bun:test";
|
|
||||||
|
|
||||||
// Global config mock
|
|
||||||
mock.module("../src/config", () => ({
|
|
||||||
config: {
|
|
||||||
API_KEY: "test-api-key",
|
|
||||||
REDIS_HOST: "localhost",
|
|
||||||
REDIS_PORT: 6379,
|
|
||||||
APP_PORT: "3000",
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
// Global Redis mock
|
// Global Redis mock
|
||||||
mock.module("../src/core/RedisClient", () => ({
|
mock.module("../src/core/RedisClient", () => ({
|
||||||
redis: {
|
redis: {
|
||||||
status: "ready",
|
status: "ready",
|
||||||
get: mock(() => Promise.resolve(null)),
|
get: mock(() => Promise.resolve(null)),
|
||||||
set: mock(() => Promise.resolve()),
|
set: mock(() => Promise.resolve()),
|
||||||
del: mock(() => Promise.resolve(1)),
|
|
||||||
keys: mock(() => Promise.resolve([])),
|
keys: mock(() => Promise.resolve([])),
|
||||||
on: mock(() => {}),
|
on: mock(() => {}),
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
|
|
||||||
afterEach(async () => {
|
|
||||||
const { redis } = await import("../src/core/RedisClient");
|
|
||||||
mock.restore();
|
|
||||||
redis.get.mockImplementation(() => Promise.resolve(null));
|
|
||||||
redis.set.mockImplementation(() => Promise.resolve());
|
|
||||||
redis.del.mockImplementation(() => Promise.resolve(1));
|
|
||||||
redis.keys.mockImplementation(() => Promise.resolve([]));
|
|
||||||
});
|
|
||||||
|
|||||||
Reference in New Issue
Block a user