habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: pre-hydrate config into templates to directly load correct assets

Browse Source 
closes #3228

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer
2022-07-29 00:02:48 +02:00
parent d4af47f576
commit cada292e00
8 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
web/src/api/Config.ts
View File

@ -1,4 +1,5 @@
import { VERSION } from "@goauthentik/web/constants";
import { globalAK } from "@goauthentik/web/api/Global";
import { EVENT_REFRESH, VERSION } from "@goauthentik/web/constants";
import { MessageMiddleware } from "@goauthentik/web/elements/messages/Middleware";
import { APIMiddleware } from "@goauthentik/web/elements/notifications/APIDrawer";
import { activateLocale } from "@goauthentik/web/interfaces/locale";
@ -6,9 +7,11 @@ import { getCookie } from "@goauthentik/web/utils";
import {
Config,
ConfigFromJSON,
Configuration,
CoreApi,
CurrentTenant,
CurrentTenantFromJSON,
FetchParams,
Middleware,
RequestContext,
@ -27,7 +30,9 @@ export class LoggingMiddleware implements Middleware {
}
}
let globalConfigPromise: Promise<Config>;
let globalConfigPromise: Promise<Config> | undefined = Promise.resolve(
ConfigFromJSON(globalAK()?.config),
);
export function config(): Promise<Config> {
if (!globalConfigPromise) {
globalConfigPromise = new RootApi(DEFAULT_CONFIG).rootConfigRetrieve();
@ -60,7 +65,9 @@ export function tenantSetLocale(tenant: CurrentTenant) {
activateLocale(tenant.defaultLocale);
}
let globalTenantPromise: Promise<CurrentTenant>;
let globalTenantPromise: Promise<CurrentTenant> | undefined = Promise.resolve(
CurrentTenantFromJSON(globalAK()?.tenant),
);
export function tenant(): Promise<CurrentTenant> {
if (!globalTenantPromise) {
globalTenantPromise = new CoreApi(DEFAULT_CONFIG)
@ -108,4 +115,13 @@ export function AndNext(url: string): string {
return `?next=${encodeURIComponent(url)}`;
}
window.addEventListener(EVENT_REFRESH, () => {
// Upon global refresh, disregard whatever was pre-hydrated and
// actually load info from API
globalConfigPromise = undefined;
globalTenantPromise = undefined;
config();
tenant();
});
console.debug(`authentik(early): version ${VERSION}, apiBase ${DEFAULT_CONFIG.basePath}`);

4
web/src/api/Global.ts
View File

@ -1,8 +1,12 @@
import { Config, CurrentTenant } from "@goauthentik/api";
export interface GlobalAuthentik {
locale?: string;
flow?: {
layout: string;
};
config: Config;
tenant: CurrentTenant;
}
export interface AuthentikWindow {