diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 0f1d2ef..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index e6461ba..8c32760 100644 --- a/.gitignore +++ b/.gitignore @@ -47,5 +47,6 @@ package-lock.json #IDE .idea +.DS_Store diff --git a/docker-compose.yml b/docker-compose.yml index 4f80635..f020b82 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ mariadb: keycloak: container_name: keycloak - image: quay.io/ukhomeofficedigital/keycloak:v11.0.2-5 + image: quay.io/ukhomeofficedigital/keycloak:v15.0.2 ports: - "8080:8080" links: @@ -27,6 +27,7 @@ keycloak: - ./hmpo-lev/:/opt/jboss/keycloak/themes/hmpo-lev/ - ./govuk-social-providers/:/opt/jboss/keycloak/themes/govuk-social-providers/ - ./govuk-drt/:/opt/jboss/keycloak/themes/govuk-drt/ + - ./govuk-rscas/:/opt/jboss/keycloak/themes/govuk-rscas/ environment: DB_VENDOR: "mariadb" MARIADB_PORT: "3306" diff --git a/govuk-rscas/login/login-config-totp.ftl b/govuk-rscas/login/login-config-totp.ftl new file mode 100644 index 0000000..faa85ed --- /dev/null +++ b/govuk-rscas/login/login-config-totp.ftl @@ -0,0 +1,35 @@ +<#import "template.ftl" as layout> +<@layout.registrationLayout displayInfo=true; section> + <#if section = "title"> + ${msg("loginTotpTitle")} + <#elseif section = "header"> + ${msg("loginTotpTitle")} + <#elseif section = "form"> +
    +
  1. +

    ${msg("loginTotpStep1")}

    +
  2. +
  3. +

    ${msg("loginTotpStep2")}

    + Figure: Barcode
    + ${totp.totpSecretEncoded} +
  4. +
  5. +

    ${msg("loginTotpStep3")}

    +
  6. +
+
+
+
+ +
+
+ +
+ +
+ + +
+ + diff --git a/govuk-rscas/login/login-otp.ftl b/govuk-rscas/login/login-otp.ftl new file mode 100644 index 0000000..ee4f0ad --- /dev/null +++ b/govuk-rscas/login/login-otp.ftl @@ -0,0 +1,71 @@ +<#import "template.ftl" as layout> + <@layout.registrationLayout; section> + <#if section="header"> + ${msg("doLogIn")} + <#elseif section="form"> +
+ <#if otpLogin.userOtpCredentials?size gt 1> +
+
+ <#list otpLogin.userOtpCredentials as otpCredential> +
+ +
+ +

+ ${otpCredential.userLabel} +

+
+
+ +
+
+ + +
+
+ +
+

The one-time code is available in the Google Authenticator application, which you downloaded to your mobile phone when you set up this account

+ +
+ +
+
+ +
+
+
+
+
+ +
+ +
+
+
+ + + + \ No newline at end of file diff --git a/govuk-rscas/login/messages/messages_en.properties b/govuk-rscas/login/messages/messages_en.properties new file mode 100644 index 0000000..2feb9b0 --- /dev/null +++ b/govuk-rscas/login/messages/messages_en.properties @@ -0,0 +1,3 @@ + +loginTotpStep1=Install the Google Authenticator application on your mobile phone +loginTotpOneTime=Code from Google Authenticator \ No newline at end of file diff --git a/govuk-rscas/login/theme.properties b/govuk-rscas/login/theme.properties new file mode 100644 index 0000000..eef7015 --- /dev/null +++ b/govuk-rscas/login/theme.properties @@ -0,0 +1 @@ +parent=govuk \ No newline at end of file diff --git a/package.json b/package.json index 4fbf526..9f83378 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "build:sass:govuk_elements-ie8": "npm-sass sass/govuk_elements-ie8.scss > govuk/login/resources/css/govuk_elements-ie8.css", "build:sass:govuk-internal": "npm-sass sass/govuk-internal/govuk-internal.scss > govuk-internal/login/resources/css/govuk-internal.css", "build:sass:govuk-cop": "npm-sass sass/govuk-cop/govuk-cop.scss > govuk-cop/login/resources/css/govuk-cop.css", - "dist": "mkdir -p dist && npm-run-all dist:govuk dist:govuk-social-providers dist:govuk-internal dist:govuk-cop dist:hmpo-lev dist:govuk-drt dist:govuk-internal-dq dist:govuk-internal-cba", + "dist": "mkdir -p dist && npm-run-all dist:govuk dist:govuk-social-providers dist:govuk-internal dist:govuk-cop dist:hmpo-lev dist:govuk-drt dist:govuk-internal-dq dist:govuk-internal-cba dist:govuk-rscas", "dist:govuk": "tar -czf dist/govuk.tar.gz govuk/", "dist:govuk-social-providers": "tar -czf dist/govuk-social-providers.tar.gz govuk-social-providers/", "dist:govuk-internal": "tar -czf dist/govuk-internal.tar.gz govuk-internal/", @@ -29,6 +29,7 @@ "dist:hmpo-lev": "tar -czf dist/hmpo-lev.tar.gz hmpo-lev/", "dist:govuk-drt": "tar -czf dist/govuk-drt.tar.gz govuk-drt/", "dist:govuk-internal-dq": "tar -czf dist/govuk-internal-dq.tar.gz govuk-internal-dq/", + "dist:govuk-rscas": "tar -czf dist/govuk-rscas.tar.gz govuk-rscas/", "dist:govuk-internal-cba": "tar -czf dist/govuk-internal-cba.tar.gz govuk-internal-cba/", "clean": "rm -rf govuk/login/resources/ govuk-internal/login/resources govuk-cop/login/resources/css dist/" }