Login appear to be working now

This commit is contained in:
Joseph Garrone
2021-03-04 13:56:51 +01:00
parent 21763db561
commit 6738f6f6cf
5 changed files with 85 additions and 68 deletions

View File

@ -106,7 +106,10 @@ export function generateKeycloakThemeResources(
fs.writeFileSync( fs.writeFileSync(
pathJoin(themeDirPath, "theme.properties"), pathJoin(themeDirPath, "theme.properties"),
Buffer.from(`import=common/${themeName}\n`, "utf8") Buffer.from([
`[import=common/${themeName}`,
"locales=ca,cs,de,en,es,fr,it,ja,lt,nl,no,pl,pt-BR,ru,sk,sv,tr,zh-CN"
].join("\n"), "utf8")
); );
} }

View File

@ -1,5 +1,5 @@
import { useState, useEffect, memo } from "react"; import { useState, useReducer ,useEffect, memo } from "react";
import type { ReactNode } from "react"; import type { ReactNode } from "react";
import { useKcTranslation } from "../i18n/useKcTranslation"; import { useKcTranslation } from "../i18n/useKcTranslation";
import { kcContext } from "../kcContext"; import { kcContext } from "../kcContext";
@ -9,8 +9,7 @@ import { useKcLanguageTag } from "../i18n/useKcLanguageTag";
import type { KcLanguageTag } from "../i18n/KcLanguageTag"; import type { KcLanguageTag } from "../i18n/KcLanguageTag";
import { getKcLanguageTagLabel } from "../i18n/KcLanguageTag"; import { getKcLanguageTagLabel } from "../i18n/KcLanguageTag";
import { useCallbackFactory } from "powerhooks"; import { useCallbackFactory } from "powerhooks";
import { appendLinkInHead } from "../tools/appendLinkInHead"; import { appendHead } from "../tools/appendHead";
import { appendScriptInHead } from "../tools/appendScriptInHead";
import { join as pathJoin } from "path"; import { join as pathJoin } from "path";
import { useConstCallback } from "powerhooks"; import { useConstCallback } from "powerhooks";
import type { KcTemplateProperties } from "./KcProperties"; import type { KcTemplateProperties } from "./KcProperties";
@ -69,36 +68,48 @@ export const Template = memo((props: TemplateProps) => {
kcContext kcContext
)); ));
const [isExtraCssLoaded, setExtraCssLoaded] = useReducer(() => true, false);
useEffect(() => { useEffect(() => {
kcProperties.stylesCommon?.forEach( let isUnmounted = false;
relativePath =>
appendLinkInHead(
{ "href": pathJoin(url.resourcesCommonPath, relativePath) }
)
);
kcProperties.styles?.forEach( Promise.all(
relativePath => [
appendLinkInHead( ...(kcProperties.stylesCommon ?? []).map(relativePath => pathJoin(url.resourcesCommonPath, relativePath)),
{ "href": pathJoin(url.resourcesPath, relativePath) } ...(kcProperties.styles ?? []).map(relativePath => pathJoin(url.resourcesPath, relativePath))
) ].map(href => appendHead({
); "type": "css",
href
}))).then(() => {
if (isUnmounted) {
return;
}
setExtraCssLoaded();
});
kcProperties.scripts?.forEach( kcProperties.scripts?.forEach(
relativePath => relativePath => appendHead({
appendScriptInHead( "type": "javascript",
{ "src": pathJoin(url.resourcesPath, relativePath) } "src": pathJoin(url.resourcesPath, relativePath)
) })
); );
document.getElementsByTagName("html")[0] document.getElementsByTagName("html")[0]
.classList .classList
.add(cx(kcProperties.kcHtmlClass)); .add(cx(kcProperties.kcHtmlClass));
return () => { isUnmounted = true; };
}, []); }, []);
if (!isExtraCssLoaded) {
return null;
}
return ( return (
<div className={cx(kcProperties.kcLoginClass)}> <div className={cx(kcProperties.kcLoginClass)}>
@ -108,7 +119,7 @@ export const Template = memo((props: TemplateProps) => {
</div> </div>
</div> </div>
<div className={cx("kcFormCardClass", displayWide && kcProperties.kcFormCardAccountClass)}> <div className={cx(kcProperties.kcFormCardClass, displayWide && kcProperties.kcFormCardAccountClass)}>
<header className={cx(kcProperties.kcFormHeaderClass)}> <header className={cx(kcProperties.kcFormHeaderClass)}>
{ {
( (
@ -142,7 +153,7 @@ export const Template = memo((props: TemplateProps) => {
} }
{ {
( !(
auth !== undefined && auth !== undefined &&
auth.showUsername && auth.showUsername &&
!auth.showResetCredentials !auth.showResetCredentials

View File

@ -0,0 +1,49 @@
import { Deferred } from "evt/tools/Deferred";
export function appendHead(
params: {
type: "css";
href: string;
} | {
type: "javascript";
src: string;
}
) {
const htmlElement = document.createElement(
(() => {
switch (params.type) {
case "css": return "link";
case "javascript": return "script";
}
})()
);
const dLoaded = new Deferred<void>();
htmlElement.addEventListener("load", () => dLoaded.resolve());
Object.assign(
htmlElement,
(() => {
switch (params.type) {
case "css": return {
"href": params.href,
"type": "text/css",
"rel": "stylesheet",
"media": "screen,print"
};
case "javascript": return {
"src": params.src,
"type": "text/javascript",
};
}
})()
);
document.getElementsByTagName("head")[0].appendChild(htmlElement);
return dLoaded.pr;
}

View File

@ -1,24 +0,0 @@
export function appendLinkInHead(
props: {
href: string;
}
) {
const { href } = props;
var link = document.createElement("link");
Object.assign(
link,
{
href,
"type": "text/css",
"rel": "stylesheet",
"media": "screen,print"
}
);
document.getElementsByTagName("head")[0].appendChild(link);
}

View File

@ -1,22 +0,0 @@
export function appendScriptInHead(
props: {
src: string;
}
) {
const { src } = props;
var script = document.createElement("script");
Object.assign(
script,
{
src,
"type": "text/javascript",
}
);
document.getElementsByTagName("head")[0].appendChild(script);
}