Merge pull request #325 from Gravity-Software-srl/main

fix typing of algToKeyUriAlg + totp interface + cleanup build dir

.gitignore

@@ -53,6 +53,8 @@ jspm_packages
 
 # VS Code devcontainers
 .devcontainer
+/.yarn
+/.yarnrc.yml
 
 /stories/assets/fonts/
 /build_storybook/

package.json

@@ -29,11 +29,11 @@
         "build-storybook": "yarn build && yarn copy-keycloak-resources-to-storybook-static && build-storybook"
     },
     "bin": {
-        "keycloakify": "dist/bin/keycloakify/index.js",
         "copy-keycloak-resources-to-public": "dist/bin/copy-keycloak-resources-to-public.js",
-        "initialize-email-theme": "dist/bin/initialize-email-theme.js",
         "download-builtin-keycloak-theme": "dist/bin/download-builtin-keycloak-theme.js",
-        "eject-keycloak-page": "dist/bin/eject-keycloak-page.js"
+        "eject-keycloak-page": "dist/bin/eject-keycloak-page.js",
+        "initialize-email-theme": "dist/bin/initialize-email-theme.js",
+        "keycloakify": "dist/bin/keycloakify/index.js"
     },
     "lint-staged": {
         "*.{ts,tsx,json,md}": [

src/login/kcContext/KcContext.ts

@@ -333,7 +333,6 @@ export declare namespace KcContext {
             totpSecretEncoded: string;
             qrUrl: string;
             policy: {
-                supportedApplications: string[];
                 algorithm: "HmacSHA1" | "HmacSHA256" | "HmacSHA512";
                 digits: number;
                 lookAheadWindow: number;
@@ -347,6 +346,7 @@ export declare namespace KcContext {
                       initialCounter: number;
                   }
             );
+            supportedApplications: string[];
             totpSecretQrCode: string;
             manualUrl: string;
             totpSecret: string;

src/login/kcContext/kcContextMocks.ts

@@ -453,8 +453,8 @@ export const kcContextMocks: KcContext[] = [
             manualUrl: "#",
             totpSecret: "G4nsI8lQagRMUchH8jEG",
             otpCredentials: [],
+            supportedApplications: ["FreeOTP", "Google Authenticator"],
             policy: {
-                supportedApplications: ["FreeOTP", "Google Authenticator"],
                 algorithm: "HmacSHA1",
                 digits: 6,
                 lookAheadWindow: 1,

src/login/pages/LoginConfigTotp.tsx

@@ -3,6 +3,7 @@ import type { PageProps } from "keycloakify/login/pages/PageProps";
 import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
+import { MessageKey } from "keycloakify/login/i18n/i18n";
 
 export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pageId: "login-config-totp.ftl" }>, I18n>) {
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
@@ -16,7 +17,7 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
 
     const { msg, msgStr } = i18n;
 
-    const algToKeyUriAlg: Record<KcContext.LoginConfigTotp["totp"]["policy"]["algorithm"], string> = {
+    const algToKeyUriAlg: Record<(typeof kcContext)["totp"]["policy"]["algorithm"], string> = {
         "HmacSHA1": "SHA1",
         "HmacSHA256": "SHA256",
         "HmacSHA512": "SHA512"
@@ -30,8 +31,8 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
                         <p>{msg("loginTotpStep1")}</p>
 
                         <ul id="kc-totp-supported-apps">
-                            {totp.policy.supportedApplications.map(app => (
-                                <li>{app}</li>
+                            {totp.supportedApplications.map(app => (
+                                <li>{msgStr(app as MessageKey, app)}</li>
                             ))}
                         </ul>
                     </li>
@@ -169,7 +170,7 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
                                 name="cancel-aia"
                                 value="true"
                             >
-                                ${msg("doCancel")}
+                                {msg("doCancel")}
                             </button>
                         </>
                     ) : (