f2c356f288
Swap the logo/favicon URL constants from the inline
`${trimTrailingSlash(import.meta.env.BASE_URL)}/public/res/...` form to the
repo's existing `withOriginBaseUrl(getOriginBaseUrl(), '/public/res/...')`
helper (already used here for the OIDC callback URL). Functionally equivalent —
same /public/res/ target, resolves in dev and the static-copied prod build — and
it keeps the logo URL absolute and consistent with clientUri for the OIDC
logoUri. No build-config change (publicDir stays false).
Co-authored-by: Nathan Vititoe <nathanvititoe@gmail.com>
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
39 lines
1.5 KiB
TypeScript
39 lines
1.5 KiB
TypeScript
import type { OidcRegistrationClientMetadata } from 'matrix-js-sdk';
|
|
import { OIDC_CALLBACK_PATH } from '../../paths';
|
|
import { getOriginBaseUrl, withOriginBaseUrl } from '../../pathUtils';
|
|
|
|
const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/Lotus.png');
|
|
|
|
/**
|
|
* Absolute URL the OIDC provider redirects back to after authorization.
|
|
*
|
|
* It MUST be a real (non-hash) path on our origin: OAuth redirect_uris cannot
|
|
* contain a fragment, and with hashRouter the app's routes live after `#`. We
|
|
* therefore always build it against the plain origin base — `getOriginBaseUrl()`
|
|
* with NO hashRouter arg returns `${origin}${BASE_URL}` (no `#`) — and App.tsx
|
|
* short-circuits this path before the router mounts.
|
|
*/
|
|
export const getOidcCallbackUrl = (): string =>
|
|
withOriginBaseUrl(getOriginBaseUrl(), OIDC_CALLBACK_PATH);
|
|
|
|
/**
|
|
* Client metadata sent during MSC2966 dynamic client registration.
|
|
*
|
|
* `registerOidcClient` drops any URI that doesn't share `clientUri` as a common
|
|
* base, so every URI here lives under our origin base.
|
|
*/
|
|
export const getOidcClientMetadata = (): OidcRegistrationClientMetadata => {
|
|
// `${origin}${BASE_URL}` (with trailing slash) — the common base for all URIs.
|
|
const clientUri = getOriginBaseUrl();
|
|
return {
|
|
clientName: 'Lotus Chat',
|
|
clientUri,
|
|
logoUri: new URL(LotusLogo, window.location.origin).href,
|
|
applicationType: 'web',
|
|
contacts: ['support@lotusguild.org'],
|
|
tosUri: clientUri,
|
|
policyUri: clientUri,
|
|
redirectUris: [getOidcCallbackUrl()],
|
|
};
|
|
};
|