Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
055b15bd46 | |||
0e70b0b0de | |||
8faf9a3eed | |||
075d9f9de5 | |||
840079be32 | |||
50ae962f09 | |||
61aa1f9896 | |||
d88e0e4dd5 | |||
18c36eb4de |
@ -336,6 +336,15 @@
|
|||||||
"contributions": [
|
"contributions": [
|
||||||
"code"
|
"code"
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"login": "bacongobbler",
|
||||||
|
"name": "Matthew Fisher",
|
||||||
|
"avatar_url": "https://avatars.githubusercontent.com/u/1360539?v=4",
|
||||||
|
"profile": "https://blog.bacongobbler.com",
|
||||||
|
"contributions": [
|
||||||
|
"doc"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"contributorsPerLine": 7,
|
"contributorsPerLine": 7,
|
||||||
|
@ -170,6 +170,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
|
|||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td align="center" valign="top" width="14.28%"><a href="http://t.me/AAT_L"><img src="https://avatars.githubusercontent.com/u/118743608?v=4?s=100" width="100px;" alt="Lesha"/><br /><sub><b>Lesha</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=EternalSide" title="Code">💻</a></td>
|
<td align="center" valign="top" width="14.28%"><a href="http://t.me/AAT_L"><img src="https://avatars.githubusercontent.com/u/118743608?v=4?s=100" width="100px;" alt="Lesha"/><br /><sub><b>Lesha</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=EternalSide" title="Code">💻</a></td>
|
||||||
|
<td align="center" valign="top" width="14.28%"><a href="https://blog.bacongobbler.com"><img src="https://avatars.githubusercontent.com/u/1360539?v=4?s=100" width="100px;" alt="Matthew Fisher"/><br /><sub><b>Matthew Fisher</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=bacongobbler" title="Documentation">📖</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "keycloakify",
|
"name": "keycloakify",
|
||||||
"version": "11.8.15",
|
"version": "11.8.18",
|
||||||
"description": "Framework to create custom Keycloak UIs",
|
"description": "Framework to create custom Keycloak UIs",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -220,13 +220,17 @@ export async function buildJar(params: {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
const mvnBuildCmd = `mvn clean install -Dmaven.repo.local="${pathJoin(keycloakifyBuildCacheDirPath, ".m2")}"`;
|
||||||
|
|
||||||
await new Promise<void>((resolve, reject) =>
|
await new Promise<void>((resolve, reject) =>
|
||||||
child_process.exec(
|
child_process.exec(
|
||||||
`mvn clean install -Dmaven.repo.local="${pathJoin(keycloakifyBuildCacheDirPath, ".m2")}"`,
|
mvnBuildCmd,
|
||||||
{ cwd: keycloakifyBuildCacheDirPath },
|
{ cwd: keycloakifyBuildCacheDirPath },
|
||||||
error => {
|
error => {
|
||||||
if (error !== null) {
|
if (error !== null) {
|
||||||
console.error(
|
console.error(
|
||||||
|
[
|
||||||
`Build jar failed: ${JSON.stringify(
|
`Build jar failed: ${JSON.stringify(
|
||||||
{
|
{
|
||||||
jarFileBasename,
|
jarFileBasename,
|
||||||
@ -235,7 +239,10 @@ export async function buildJar(params: {
|
|||||||
},
|
},
|
||||||
null,
|
null,
|
||||||
2
|
2
|
||||||
)}`
|
)}`,
|
||||||
|
"Try running the following command to debug the issue (you are probably under a restricted network and you need to configure your proxy):",
|
||||||
|
`cd ${keycloakifyBuildCacheDirPath} && ${mvnBuildCmd}`
|
||||||
|
].join("\n")
|
||||||
);
|
);
|
||||||
|
|
||||||
reject(error);
|
reject(error);
|
||||||
@ -245,6 +252,7 @@ export async function buildJar(params: {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
await fs.rename(
|
await fs.rename(
|
||||||
pathJoin(
|
pathJoin(
|
||||||
|
@ -190,7 +190,7 @@ function decodeHtmlEntities(htmlStr){
|
|||||||
<#-- https://github.com/keycloakify/keycloakify/discussions/406#discussioncomment-7514787 -->
|
<#-- https://github.com/keycloakify/keycloakify/discussions/406#discussioncomment-7514787 -->
|
||||||
key == "loginAction" &&
|
key == "loginAction" &&
|
||||||
areSamePath(path, ["url"]) &&
|
areSamePath(path, ["url"]) &&
|
||||||
["saml-post-form.ftl", "error.ftl", "info.ftl", "login-oauth-grant.ftl", "logout-confirm.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(xKeycloakify.pageId) &&
|
["saml-post-form.ftl", "error.ftl", "info.ftl", "login-oauth-grant.ftl", "logout-confirm.ftl", "login-oauth2-device-verify-user-code.ftl", "frontchannel-logout.ftl"]?seq_contains(xKeycloakify.pageId) &&
|
||||||
!(auth?has_content && auth.showTryAnotherWayLink())
|
!(auth?has_content && auth.showTryAnotherWayLink())
|
||||||
) || (
|
) || (
|
||||||
<#-- https://github.com/keycloakify/keycloakify/issues/362 -->
|
<#-- https://github.com/keycloakify/keycloakify/issues/362 -->
|
||||||
|
@ -217,6 +217,25 @@ export function createGetI18n<
|
|||||||
return enabledLanguages;
|
return enabledLanguages;
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
// See: https://github.com/keycloak/keycloak/issues/38029
|
||||||
|
patch_keycloak_issue_38029: {
|
||||||
|
const enabledLanguage_current = enabledLanguages.find(({ languageTag }) => languageTag === currentLanguage.languageTag);
|
||||||
|
|
||||||
|
assert(enabledLanguage_current !== undefined);
|
||||||
|
|
||||||
|
if (!enabledLanguage_current.href.includes("kc_locale=")) {
|
||||||
|
// NOTE: Probably a mock
|
||||||
|
break patch_keycloak_issue_38029;
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOTE: Best effort, we don't wait for it to be done
|
||||||
|
// and we don't handle errors
|
||||||
|
fetch(enabledLanguage_current.href).then(
|
||||||
|
() => {},
|
||||||
|
() => {}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey_themeDefined>({
|
const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey_themeDefined>({
|
||||||
themeName: kcContext.themeName,
|
themeName: kcContext.themeName,
|
||||||
messages_themeDefined:
|
messages_themeDefined:
|
||||||
|
Reference in New Issue
Block a user