lendry/IdP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix and update

Browse Source
This commit is contained in:
lendry
2026-06-29 15:08:26 +03:00
parent 01e4917acf
commit e127df3d6d
8 changed files with 57 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/frontend/lib/oauth-url.ts
View File

@@ -1,8 +1,14 @@
import {
DEFAULT_PUBLIC_API_URL,
DEFAULT_PUBLIC_FRONTEND_URL,
inferApiBaseFromProjectDomain
} from './project-domains';
export function normalizeBaseUrl(url: string) {
return url.trim().replace(/\/+$/, '');
}
export function resolveOAuthApiBase(settings: Record<string, string>, fallback = 'http://localhost:3002/idp-api') {
export function resolveOAuthApiBase(settings: Record<string, string>, fallback = DEFAULT_PUBLIC_API_URL) {
const publicApi = settings.PUBLIC_API_URL?.trim();
if (publicApi) {
return normalizeBaseUrl(publicApi);
@@ -10,16 +16,22 @@ export function resolveOAuthApiBase(settings: Record<string, string>, fallback =
const domain = settings.PROJECT_DOMAIN?.trim();
if (domain) {
const inferred = inferApiBaseFromProjectDomain(domain);
if (inferred) {
return inferred;
}
if (domain.startsWith('http://') || domain.startsWith('https://')) {
return normalizeBaseUrl(domain);
}
return `https://${domain.replace(/^\/+/, '')}/idp-api`;
}
return normalizeBaseUrl(fallback);
}
export function resolveFrontendBase(settings: Record<string, string>, fallback = 'http://localhost:3002') {
export function resolveFrontendBase(settings: Record<string, string>, fallback = DEFAULT_PUBLIC_FRONTEND_URL) {
const publicFrontend = settings.PUBLIC_FRONTEND_URL?.trim();
if (publicFrontend) {
return normalizeBaseUrl(publicFrontend);