diff --git a/src/core/ConfigManager.ts b/src/core/ConfigManager.ts index 9ef3b82..d23c0db 100644 --- a/src/core/ConfigManager.ts +++ b/src/core/ConfigManager.ts @@ -4,7 +4,7 @@ import { z } from "zod"; export const ProviderConfigSchema = z.object({ clientId: z.string(), clientSecret: z.string(), - redirectUri: z.string().url(), + redirectUri: z.string().url().optional(), authUrl: z.string().url(), tokenUrl: z.string().url(), scope: z.string(), diff --git a/src/providers/GenericProvider.ts b/src/providers/GenericProvider.ts index d7b6339..3f3dfdc 100644 --- a/src/providers/GenericProvider.ts +++ b/src/providers/GenericProvider.ts @@ -14,17 +14,18 @@ export class GenericProvider implements OAuthProvider { private config: ProviderConfig, ) {} - getAuthUrl(): string { + getAuthUrl(state: string, redirectUri: string): string { const params = new URLSearchParams({ response_type: "code", client_id: this.config.clientId, - redirect_uri: this.config.redirectUri, + redirect_uri: redirectUri, scope: this.config.scope, + state, }); return `${this.config.authUrl}?${params.toString()}`; } - async exchangeCode(code: string): Promise { + async exchangeCode(code: string, redirectUri: string): Promise { const response = await fetch(this.config.tokenUrl, { method: "POST", headers: { @@ -35,7 +36,7 @@ export class GenericProvider implements OAuthProvider { code, client_id: this.config.clientId, client_secret: this.config.clientSecret, - redirect_uri: this.config.redirectUri, + redirect_uri: redirectUri, grant_type: "authorization_code", }), }); diff --git a/src/providers/interface.ts b/src/providers/interface.ts index 27b2e22..6549897 100644 --- a/src/providers/interface.ts +++ b/src/providers/interface.ts @@ -6,7 +6,7 @@ export interface TokenResponse { export interface OAuthProvider { name: string; - getAuthUrl(): string; - exchangeCode(code: string): Promise; + getAuthUrl(state: string, redirectUri: string): string; + exchangeCode(code: string, redirectUri: string): Promise; refreshToken(refreshToken: string): Promise; } diff --git a/src/routes/auth.ts b/src/routes/auth.ts index 81c057f..24463e1 100644 --- a/src/routes/auth.ts +++ b/src/routes/auth.ts @@ -15,25 +15,29 @@ authRoutes.get("/:provider/login", async (c) => { return c.json( { error: "Configuration Not Found", - message: `Provider '${providerName}' is not configured in the registry. Please add it via the dashboard first.`, + message: `Provider '${providerName}' is not configured.`, }, 404, ); } const provider = new GenericProvider(providerName, providerConfig); - return c.redirect(provider.getAuthUrl()); + + const url = new URL(c.req.url); + const redirectUri = providerConfig.redirectUri || `${url.origin}/auth/callback`; + + return c.redirect(provider.getAuthUrl(providerName, redirectUri)); }); -authRoutes.get("/:provider/callback", async (c) => { - const providerName = c.req.param("provider"); +authRoutes.get("/callback", async (c) => { + const providerName = c.req.query("state"); const code = c.req.query("code"); - if (!code) { + if (!providerName || !code) { return c.json( { - error: "Authorization Code Missing", - message: "The provider did not return an authorization code.", + error: "Invalid Request", + message: "Missing state (provider) or authorization code.", }, 400, ); @@ -46,17 +50,20 @@ authRoutes.get("/:provider/callback", async (c) => { return c.json( { error: "Configuration Not Found", - message: `Provider '${providerName}' was configured during login but its configuration is missing now.`, + message: `Provider '${providerName}' is not configured.`, }, 404, ); } + const url = new URL(c.req.url); + const redirectUri = providerConfig.redirectUri || `${url.origin}/auth/callback`; + const provider = new GenericProvider(providerName, providerConfig); const tokenManager = new TokenManager(redis, provider); try { - const tokens = await provider.exchangeCode(code); + const tokens = await provider.exchangeCode(code, redirectUri); await tokenManager.saveTokens(providerName, tokens); return c.html(` @@ -76,7 +83,6 @@ authRoutes.get("/:provider/callback", async (c) => {

Authenticated!

Successfully connected to ${providerName}.

-

You can now safely close this window and return to the dashboard.

Go to Dashboard
@@ -86,10 +92,7 @@ authRoutes.get("/:provider/callback", async (c) => { `); } catch (error) { - const errorMessage = - error instanceof Error - ? error.message - : "An unexpected error occurred during token exchange."; + const errorMessage = error instanceof Error ? error.message : "An unexpected error occurred."; console.error(`[OAuth Error] ${errorMessage}`); return c.json( { diff --git a/src/views/dashboard.html b/src/views/dashboard.html index af8b8e0..a279610 100644 --- a/src/views/dashboard.html +++ b/src/views/dashboard.html @@ -10,14 +10,8 @@ @@ -25,12 +19,10 @@
-
+
- Auth Server v1.0 + Auth Server v1.0
@@ -55,8 +47,7 @@
- +
@@ -64,48 +55,45 @@
Credentials
- - + +
- - + +
Endpoints
- +
- +
- - + + +
- - + +
@@ -132,12 +120,9 @@ - + - + @@ -167,6 +152,11 @@ const apiKeyInput = document.getElementById('apiKey'); const configForm = document.getElementById('configForm'); const providerTableBody = document.getElementById('providerTableBody'); + const defaultRedirectUriHint = document.getElementById('defaultRedirectUriHint'); + + if (defaultRedirectUriHint) { + defaultRedirectUriHint.textContent = `Default: ${window.location.origin}/auth/callback`; + } let providerData = {}; @@ -175,7 +165,7 @@ const alert = toast.querySelector('.alert'); const msgSpan = document.getElementById('notificationMessage'); - alert.className = `alert alert-${type}`; + alert.className = `alert alert-${type} shadow-lg`; msgSpan.textContent = message; toast.style.display = 'block'; @@ -186,46 +176,46 @@ async function fetchProviders() { const apiKey = apiKeyInput.value.trim(); - if (!apiKey) { - return; - } + if (!apiKey) return; try { const response = await fetch('/api/config', { - headers: { - 'Authorization': `Bearer ${apiKey}` - } + headers: { 'Authorization': `Bearer ${apiKey}` } }); if (!response.ok) throw new Error(await response.text()); const providers = await response.json(); providerData = providers; providerTableBody.innerHTML = ''; - const entries = Object.entries(providers); + if (entries.length === 0) { - providerTableBody.innerHTML = ''; + providerTableBody.innerHTML = ''; return; } for (const [name, config] of entries) { const row = document.createElement('tr'); - row.className = "hover"; + row.className = "hover:bg-base-200/50 transition-colors"; row.innerHTML = ` - - - - `; + + + + `; providerTableBody.appendChild(row); - }; + } } catch (error) { console.error('Error fetching providers:', error); - providerTableBody.innerHTML = ``; + providerTableBody.innerHTML = ``; } } @@ -238,17 +228,18 @@ document.getElementById('clientSecret').value = config.clientSecret; document.getElementById('authUrl').value = config.authUrl; document.getElementById('tokenUrl').value = config.tokenUrl; - document.getElementById('redirectUri').value = config.redirectUri; + document.getElementById('redirectUri').value = config.redirectUri || ''; document.getElementById('scope').value = config.scope; document.getElementById('configForm').scrollIntoView({ behavior: 'smooth' }); - document.getElementById('providerName').focus(); - } configForm.addEventListener('submit', async (e) => { + }; + + configForm.addEventListener('submit', async (e) => { e.preventDefault(); const apiKey = apiKeyInput.value.trim(); if (!apiKey) { - showNotification('Please enter your API Key in the top right corner', 'error'); + showNotification('Please enter your Master API Key', 'error'); return; } @@ -258,7 +249,7 @@ clientSecret: document.getElementById('clientSecret').value.trim(), authUrl: document.getElementById('authUrl').value.trim(), tokenUrl: document.getElementById('tokenUrl').value.trim(), - redirectUri: document.getElementById('redirectUri').value.trim(), + redirectUri: document.getElementById('redirectUri').value.trim() || undefined, scope: document.getElementById('scope').value.trim(), }; @@ -272,10 +263,7 @@ body: JSON.stringify(config) }); - if (!response.ok) { - const errorText = await response.text(); - throw new Error(errorText || 'Failed to save config'); - } + if (!response.ok) throw new Error(await response.text()); showNotification('Configuration saved successfully!'); fetchProviders();
- ProviderProvider Client ID - ActionsActions
No providers configured yet.
No providers configured.
${name}${config.clientId} -
- Connect - -
- 		${name}${config.clientId} +
+ + Connect + + +
+
Failed to load: ${error.message}
Failed to load: ${error.message}