Skip to content

IS-9422: updates templates to support same-device and cross-device flows #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmhsfelix merged 4 commits into from
Apr 22, 2026
Merged

IS-9422: updates templates to support same-device and cross-device flows #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1db54ce
IS-9422: updates templates to support same-device and cross-device flows
pmhsfelix Apr 15, 2026
2efab13
IS-9422: removes extra debug message
pmhsfelix Apr 21, 2026
c6176de
IS-9422: fixes incorrect URL on extend button
pmhsfelix Apr 21, 2026
a91d7fe
IS-9422: removes unused message keys
pmhsfelix Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/identity-server/messages/core/en/authenticator/bankid/launch.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ launch.view.or=OR
launch.view.scan=Scan the code in BankID security app
launch.view.button.this-device=Start your BankID app on this device
launch.view.button.manualstart=Start your BankID app
launch.view.button.show-qr-code=Show QR code
launch.view.button.open-on-this-device=Open BankID on this device
launch.view.button.cancel=Cancel
launch.view.button.continue=Continue
launch.validation.error.autostarttoken.required=Missing input. Retry the request
Expand Down
2 changes: 2 additions & 0 deletions src/identity-server/messages/core/pt-pt/authenticator/bankid/launch.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ launch.view.or=OU
launch.view.scan=Digitalize o código no aplicativo de segurança BankID
launch.view.button.this-device=Iniciar o aplicativo de segurança BankID neste dispositivo
launch.view.button.manualstart=Iniciar o aplicativo de segurança BankID
launch.view.button.show-qr-code=Mostrar código QR
launch.view.button.open-on-this-device=Abrir BankID neste dispositivo
launch.view.button.cancel=Cancelar
launch.validation.error.autostarttoken.required=Entrada ausente. Tente novamente a solicitação
launch.view.poll.continue=Se você não for redirecionado automaticamente, clique aqui para continuar autenticando
Expand Down
2 changes: 2 additions & 0 deletions src/identity-server/messages/core/pt/authenticator/bankid/launch.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ launch.view.or=OU
launch.view.scan=Digitalize o código no aplicativo de segurança BankID
launch.view.button.this-device=Iniciar o aplicativo de segurança BankID neste dispositivo
launch.view.button.manualstart=Iniciar o aplicativo de segurança BankID
launch.view.button.show-qr-code=Mostrar código QR
launch.view.button.open-on-this-device=Abrir BankID neste dispositivo
launch.view.button.cancel=Cancelar
launch.validation.error.autostarttoken.required=Entrada ausente. Tente novamente a solicitação
launch.view.poll.continue=Se você não for redirecionado automaticamente, clique aqui para continuar autenticando
Expand Down
2 changes: 2 additions & 0 deletions src/identity-server/messages/core/sv/authenticator/bankid/launch.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ launch.view.qr.screen-reader.step4.2=Använda kortkommandon
launch.view.qr.screen-reader.step4.2.1=Windows: Ctrl+Pil upp
launch.view.qr.screen-reader.step4.2.2=Mac: Ctrl+Cmd+F
launch.view.qr.screen-reader.outro=Hålla telefonen i stående läge på ett 40cm avstånd från skärmen när du skannar QR-koden.
launch.view.button.show-qr-code=Visa QR-kod
launch.view.button.open-on-this-device=Öppna BankID på den här enheten
Copy link
Copy Markdown

@phylexm phylexm Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't get why we also need messages without the "button" qualifier in the path:
launch.view.show-qr-code launch.view.open-on-this-device does not look to be used.

Copy link
Copy Markdown
Author

@pmhsfelix pmhsfelix Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They were being used by HAAPI, however I removed them and changed the HAAPI representation so that it uses the exact same messages as the VM templates.

launch.view.button.cancel=Avbryt
launch.view.button.continue=Fortsätt
launch.validation.error.autostarttoken.required=Saknar input. Försök igen
Expand Down
37 changes: 22 additions & 15 deletions src/identity-server/templates/core/authenticator/bankid/launch/index.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
#else
#set($qr_time_left = $_maxWaitTime / 60)
#end
#if($_flowMode == 'cross-device' || $_flowMode == 'same-device')
#set($extendUrl="${_authUrl}?flowMode=$_flowMode")
#else
#set($extendUrl=$_authUrl)
#end
#set($qr_time_elapsed = 0)
<iframe id="autoStart" height="0" width="0" frameborder="0"></iframe>
<h1 class="center">#message("${_templatePrefix}.page.title")</h1>
Expand All @@ -52,7 +57,7 @@
<span id="qr-time-label-seconds" #if($_maxWaitTime >= 60) class="hide"#end>#message("${_templatePrefix}.view.qr.seconds-left")</span>
</p>
<div class="mt2">
<a class="button button-tiny button-primary-outline" id="qr-time-extend" href="$_authUrl">
<a class="button button-tiny button-primary-outline" id="qr-time-extend" href="$extendUrl">
#message("${_templatePrefix}.view.button.qr-time-extend")
</a>
</div>
Expand Down Expand Up @@ -92,30 +97,32 @@
<p class="left-align">#message("${_templatePrefix}.view.qr.screen-reader.outro")</p>
</details>
</div>
#end
#if($_autostartTokenDataUri && $_autostartToken)
<p class="login-symbol">#message("${_templatePrefix}.view.or")</p>
#end
#if($_autostartToken)
<form class="manuallink pb0">
<a class="button button-fullwidth button-primary center" id="manualStart">
#message("${_templatePrefix}.view.button.this-device")</a>
</form>
<form name="cancel" action="cancel" class="manuallink" method="get">
<button type="submit" class="button button-fullwidth button-primary-outline">#message($_messages,
"${_templatePrefix}.view.button.cancel")</button>
#end
#if($_flowMode == 'cross-device')
<form class="manuallink pb0">
<a class="button button-fullwidth button-primary center" href="$_switchModeUrl">
#message("${_templatePrefix}.view.button.open-on-this-device")</a>
</form>
#else
<div class="area center">
<p class="h4 mb4 semibold" id="poll_message">#message("${_templatePrefix}.view.title")</p>
#parse("fragments/spinner")
</div>
<form class="manuallink pb0 display-none">
<p class="h4 center">#message("${_templatePrefix}.view.manualstart")</p>
<a class="button button-fullwidth button-primary center" id="manualStart">
#message("${_templatePrefix}.view.button.manualstart")</a>
#end
#if($_flowMode == 'same-device')
<form class="manuallink pb0">
<a class="button button-fullwidth button-primary center" href="$_switchModeUrl">
#message("${_templatePrefix}.view.button.show-qr-code")</a>
</form>
<form name="cancel" action="cancel" class="manuallink display-none" method="get">
#end
Copy link
Copy Markdown

@phylexm phylexm Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously, with the auto-start mode, the cancel button was hidden and then displayed after 5 seconds. Now it will be displayed from the beginning for both modes. Did you remove this behaviour voluntarily?

Copy link
Copy Markdown
Author

@pmhsfelix pmhsfelix Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before my changes, my understanding is that the cancel button was always there when we have a QR code, which always happened for BankID v6.

<form name="cancel" action="cancel" class="manuallink" method="get">
<button type="submit" class="button button-fullwidth button-primary-outline">#message($_messages,
"${_templatePrefix}.view.button.cancel")</button>
</form>
#end
<form action="$_action" method="post" id="pollingDone" class="display-none">
<input type="hidden" name="_pollingDone" value="true"/>
</form>
Expand Down