new configuration version

This commit is contained in:
haburger 2025-01-23 06:19:50 +00:00
parent bc5a108481
commit e822cec46f
23 changed files with 78 additions and 70 deletions

View File

@ -45,7 +45,7 @@ spec:
podDisruptionBudget:
maxUnavailable: "50%"
git:
tag: "r-ca9c333b8eea500c04c843bc438a729cab8a92ee"
tag: "r-e1c8fb676d3cb1b89262d9f0a54f74c6fe4b3a00"
dir: "DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth"
credentials: "git-credentials"
keystores:

View File

@ -960,7 +960,7 @@
<!-- source: pattern://d1298ac82e8bab66583d5571 -->
<property name="condition:timeout" value="#{ (inargs.containsKey('authRequestId') and inargs.getProperty('authRequestId') != sess.get('ch.nevis.auth.saml.request.id')) ? 'TIMEOUT' : '' }==TIMEOUT"/>
</AuthState>
<AuthState name="Auth_Realm_Main_IDP_Recovery_ongoing" class="ch.nevis.esauth.auth.states.scripting.ScriptState" final="true" resumeState="false">
<AuthState name="Auth_Realm_Main_IDP_Recovery_ongoing" class="ch.nevis.esauth.auth.states.scripting.ScriptState" final="true" resumeState="true">
<!-- source: pattern://1d38203c48e017b5b3812385 -->
<ResultCond name="ok" next="Auth_Realm_Main_IDP_Recovery_redirectAgovMe"/>
<!-- source: pattern://1d38203c48e017b5b3812385 -->
@ -2166,7 +2166,7 @@
<!-- source: pattern://9a1d3c6052019748d3510261 -->
<property name="recreateIfExists" value="true"/>
</AuthState>
<AuthState name="Auth_Realm_Recovery_Recovery_ongoing" class="ch.nevis.esauth.auth.states.scripting.ScriptState" final="true" resumeState="false">
<AuthState name="Auth_Realm_Recovery_Recovery_ongoing" class="ch.nevis.esauth.auth.states.scripting.ScriptState" final="true" resumeState="true">
<!-- source: pattern://1d38203c48e017b5b3812385 -->
<ResultCond name="ok" next="Auth_Realm_Recovery_Recovery_redirectAgovMe"/>
<!-- source: pattern://1d38203c48e017b5b3812385 -->

View File

@ -44,7 +44,7 @@ spec:
podDisruptionBudget:
maxUnavailable: "50%"
git:
tag: "r-ba449badcbd7e27508a5cbf6db1b00df4429733f"
tag: "r-e1c8fb676d3cb1b89262d9f0a54f74c6fe4b3a00"
dir: "DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/logrend"
credentials: "git-credentials"
podSecurity:

View File

@ -1,6 +1,6 @@
class ProvidePhoneNumber {
modal;
laterModal;
declineModal;
providePhoneNumberLaterButton;
phoneNumberInput;
agovInputPhoneNumberInput;
@ -9,24 +9,20 @@ class ProvidePhoneNumber {
constructor() {
this.modal = document.querySelector('#modal');
this.laterModal = document.querySelector('#laterModal');
this.declineModal = document.querySelector('#declineModal');
this.providePhoneNumberLaterButton = document.querySelector('#providePhoneNumberLaterButton');
this.phoneNumberInput = document.querySelector('#phoneNumberInput');
this.agovInputPhoneNumberInput = document.querySelector('#agovInputPhoneNumberInput');
this.agovInputRepeatPhoneNumberInput = document.querySelector('#agovInputRepeatPhoneNumberInput');
this.repeatPhoneNumberInput = document.querySelector('#repeatPhoneNumberInput');
document.querySelector('#laterCheckbox').checked = true;
this.initializePhoneInput(this.phoneNumberInput);
this.addPhoneInputEventHandlers(this.phoneNumberInput);
this.addPhoneInputEventHandlers(this.repeatPhoneNumberInput);
this.providePhoneNumberLaterButton.addEventListener('click', () => {
this.setVisible(this.laterModal);
});
document.querySelector('#laterModalBack').addEventListener('click', () => {
document.querySelector('#declineModalBack').addEventListener('click', () => {
this.resetValidation(this.agovInputPhoneNumberInput);
this.setInvisible(this.laterModal);
this.setInvisible(this.declineModal);
});
document.querySelector('#repeatPhoneNumberModalBack').addEventListener('click', () => {
this.initializePhoneInput(this.phoneNumberInput);
@ -39,6 +35,7 @@ class ProvidePhoneNumber {
}
});
document.querySelector('#providePhoneNumberContinueButton').addEventListener('click', () => {
const dialCode = `+${window.phoneNumberUtils.getDialCode()}`;
if (this.validateInput(this.agovInputPhoneNumberInput)) {
this.repeatPhoneNumberInput.value = '';
this.initializePhoneInput(this.repeatPhoneNumberInput);
@ -46,6 +43,10 @@ class ProvidePhoneNumber {
this.showErrorBanner(false);
this.setVisible(this.modal);
}
else if (this.phoneNumberInput.value.trim() === '' ||
this.phoneNumberInput.value.trim() === dialCode) {
this.setVisible(this.declineModal);
}
});
}
@ -118,7 +119,7 @@ class ProvidePhoneNumber {
evaluatePhoneNumbersAndSubmit() {
if (this.arePhoneNumbersEqual()) {
document.querySelector('#mobile').value = this.repeatPhoneNumberInput.value.trim().replaceAll(' ', '');
document.querySelector('#submit').click();
document.querySelector('#submitPhoneNumber').click();
}
else {
this.setInvisible(this.modal);

View File

@ -47,14 +47,20 @@
</div>
<div class="w-full sm:static mt-auto">
<div class="flex flex-col-reverse sm:flex-row gap-4">
<agov-button
id="providePhoneNumberLaterButton"
class="w-full"
data-style="secondary"
data-label="$text.get("loainfo.later")"
data-type="button"
data-fullwidth="true">
</agov-button>
<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
class="w-full"
accept-charset="UTF-8">
<agov-button
data-name="submit"
data-value="submit"
data-style="secondary"
data-label="$text.get("loainfo.later")"
data-type="submit"
data-fullwidth="true">
</agov-button>
<input class="hidden" name="skip" value="later">
<input class="hidden" name="authRequestId" type="hidden" value="$gui.getGuiElem('authRequestId').value"/>
</form>
<agov-button
id="providePhoneNumberContinueButton"
class="w-full"
@ -122,7 +128,7 @@
<agov-button
class="basis-full"
data-name="submit"
data-id="submit"
data-id="submitPhoneNumber"
data-value="submit"
data-type="submit"
data-label="$text.get("general.continue")"
@ -155,7 +161,7 @@
</div>
</div>
<div id="laterModal" class="fixed top-0 bottom-0 left-0 right-0 pb-20 z-50 hidden">
<div id="declineModal" class="fixed top-0 bottom-0 left-0 right-0 pb-20 z-50 hidden">
<div class="fixed top-0 bottom-0 left-0 right-0 backdrop-blur-[10px]" id="modal_light"></div>
<div class="fixed top-0 bottom-0 left-0 right-0 bg-[#E2E2E2E5]/80 dark:bg-[#111111]/90" id="modal_dark"></div>
<div id="drawer"
@ -181,7 +187,7 @@
<div class="w-full sm:static mt-auto sm:justify-items-end">
<div class="flex justify-end flex-col-reverse sm:flex-row gap-4">
<agov-button
id="laterModalBack"
id="declineModalBack"
data-style="secondary"
data-label="$text.get("general.back")"
data-type="button"
@ -189,17 +195,15 @@
</agov-button>
<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
accept-charset="UTF-8"
class="flex flex-col flex-auto block ">
class="flex flex-col flex-auto block">
<agov-button
id="ask_mobile_continue"
data-name="submit"
data-value="submit"
data-id="submit"
data-label="$text.get("general.continue")"
data-type="submit"
data-fullwidth="true">
</agov-button>
<input id="laterCheckbox" class="hidden" type="checkbox" name="skip" value="true">
<input class="hidden" name="skip" value="persistent">
<input class="hidden" name="authRequestId" type="hidden" value="$gui.getGuiElem('authRequestId').value"/>
</form>
</div>
@ -211,5 +215,4 @@
<script src="${login.appDataPath}/static/js-code/ask_mobile.js">
</script>
#parse("${templatePath}/footer.vm")

View File

@ -3,7 +3,7 @@
$text.get("footer.text")
<a target="_blank" class='text-hyperlink dark:text-dark-hyperlink underline' href='$text.get("footer.link")'>$text.get("footer.link.label")</a>
</div>
<p>1.8.x.2527-20250114T143813Z</p>
<p>1.8.x.2565-20250122T172157Z</p>
</footer>
<script src="${login.appDataPath}/static/bundle.js"></script>
</body>

View File

@ -1,6 +1,6 @@
class ProvidePhoneNumber {
modal;
laterModal;
declineModal;
providePhoneNumberLaterButton;
phoneNumberInput;
agovInputPhoneNumberInput;
@ -9,24 +9,20 @@ class ProvidePhoneNumber {
constructor() {
this.modal = document.querySelector('#modal');
this.laterModal = document.querySelector('#laterModal');
this.declineModal = document.querySelector('#declineModal');
this.providePhoneNumberLaterButton = document.querySelector('#providePhoneNumberLaterButton');
this.phoneNumberInput = document.querySelector('#phoneNumberInput');
this.agovInputPhoneNumberInput = document.querySelector('#agovInputPhoneNumberInput');
this.agovInputRepeatPhoneNumberInput = document.querySelector('#agovInputRepeatPhoneNumberInput');
this.repeatPhoneNumberInput = document.querySelector('#repeatPhoneNumberInput');
document.querySelector('#laterCheckbox').checked = true;
this.initializePhoneInput(this.phoneNumberInput);
this.addPhoneInputEventHandlers(this.phoneNumberInput);
this.addPhoneInputEventHandlers(this.repeatPhoneNumberInput);
this.providePhoneNumberLaterButton.addEventListener('click', () => {
this.setVisible(this.laterModal);
});
document.querySelector('#laterModalBack').addEventListener('click', () => {
document.querySelector('#declineModalBack').addEventListener('click', () => {
this.resetValidation(this.agovInputPhoneNumberInput);
this.setInvisible(this.laterModal);
this.setInvisible(this.declineModal);
});
document.querySelector('#repeatPhoneNumberModalBack').addEventListener('click', () => {
this.initializePhoneInput(this.phoneNumberInput);
@ -39,6 +35,7 @@ class ProvidePhoneNumber {
}
});
document.querySelector('#providePhoneNumberContinueButton').addEventListener('click', () => {
const dialCode = `+${window.phoneNumberUtils.getDialCode()}`;
if (this.validateInput(this.agovInputPhoneNumberInput)) {
this.repeatPhoneNumberInput.value = '';
this.initializePhoneInput(this.repeatPhoneNumberInput);
@ -46,6 +43,10 @@ class ProvidePhoneNumber {
this.showErrorBanner(false);
this.setVisible(this.modal);
}
else if (this.phoneNumberInput.value.trim() === '' ||
this.phoneNumberInput.value.trim() === dialCode) {
this.setVisible(this.declineModal);
}
});
}
@ -118,7 +119,7 @@ class ProvidePhoneNumber {
evaluatePhoneNumbersAndSubmit() {
if (this.arePhoneNumbersEqual()) {
document.querySelector('#mobile').value = this.repeatPhoneNumberInput.value.trim().replaceAll(' ', '');
document.querySelector('#submit').click();
document.querySelector('#submitPhoneNumber').click();
}
else {
this.setInvisible(this.modal);

View File

@ -47,14 +47,20 @@
</div>
<div class="w-full sm:static mt-auto">
<div class="flex flex-col-reverse sm:flex-row gap-4">
<agov-button
id="providePhoneNumberLaterButton"
class="w-full"
data-style="secondary"
data-label="$text.get("loainfo.later")"
data-type="button"
data-fullwidth="true">
</agov-button>
<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
class="w-full"
accept-charset="UTF-8">
<agov-button
data-name="submit"
data-value="submit"
data-style="secondary"
data-label="$text.get("loainfo.later")"
data-type="submit"
data-fullwidth="true">
</agov-button>
<input class="hidden" name="skip" value="later">
<input class="hidden" name="authRequestId" type="hidden" value="$gui.getGuiElem('authRequestId').value"/>
</form>
<agov-button
id="providePhoneNumberContinueButton"
class="w-full"
@ -122,7 +128,7 @@
<agov-button
class="basis-full"
data-name="submit"
data-id="submit"
data-id="submitPhoneNumber"
data-value="submit"
data-type="submit"
data-label="$text.get("general.continue")"
@ -155,7 +161,7 @@
</div>
</div>
<div id="laterModal" class="fixed top-0 bottom-0 left-0 right-0 pb-20 z-50 hidden">
<div id="declineModal" class="fixed top-0 bottom-0 left-0 right-0 pb-20 z-50 hidden">
<div class="fixed top-0 bottom-0 left-0 right-0 backdrop-blur-[10px]" id="modal_light"></div>
<div class="fixed top-0 bottom-0 left-0 right-0 bg-[#E2E2E2E5]/80 dark:bg-[#111111]/90" id="modal_dark"></div>
<div id="drawer"
@ -181,7 +187,7 @@
<div class="w-full sm:static mt-auto sm:justify-items-end">
<div class="flex justify-end flex-col-reverse sm:flex-row gap-4">
<agov-button
id="laterModalBack"
id="declineModalBack"
data-style="secondary"
data-label="$text.get("general.back")"
data-type="button"
@ -189,17 +195,15 @@
</agov-button>
<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
accept-charset="UTF-8"
class="flex flex-col flex-auto block ">
class="flex flex-col flex-auto block">
<agov-button
id="ask_mobile_continue"
data-name="submit"
data-value="submit"
data-id="submit"
data-label="$text.get("general.continue")"
data-type="submit"
data-fullwidth="true">
</agov-button>
<input id="laterCheckbox" class="hidden" type="checkbox" name="skip" value="true">
<input class="hidden" name="skip" value="persistent">
<input class="hidden" name="authRequestId" type="hidden" value="$gui.getGuiElem('authRequestId').value"/>
</form>
</div>
@ -211,5 +215,4 @@
<script src="${login.appDataPath}/static/js-code/ask_mobile.js">
</script>
#parse("${templatePath}/footer.vm")

View File

@ -3,7 +3,7 @@
$text.get("footer.text")
<a target="_blank" class='text-hyperlink dark:text-dark-hyperlink underline' href='$text.get("footer.link")'>$text.get("footer.link.label")</a>
</div>
<p>1.8.x.2527-20250114T143813Z</p>
<p>1.8.x.2565-20250122T172157Z</p>
</footer>
<script src="${login.appDataPath}/static/bundle.js"></script>
</body>

View File

@ -46,7 +46,7 @@ spec:
podDisruptionBudget:
maxUnavailable: "50%"
git:
tag: "r-ba449badcbd7e27508a5cbf6db1b00df4429733f"
tag: "r-e1c8fb676d3cb1b89262d9f0a54f74c6fe4b3a00"
dir: "DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp"
credentials: "git-credentials"
keystores:

View File

@ -63,7 +63,7 @@
</div>
</div>
<footer class="hidden sm:flex mt-auto font-body text-body-s text-disabled-grey dark:text-silver w-full p-2 justify-end">
<p>1.8.x.2527-20250114T143813Z</p>
<p>1.8.x.2565-20250122T172157Z</p>
</footer>
<script src="/resources/static/bundle.js"></script>
</body>

View File

@ -60,7 +60,7 @@
</div>
</div>
<footer class="hidden sm:flex mt-auto font-body text-body-s text-disabled-grey dark:text-silver w-full p-2 justify-end">
<p>1.8.x.2527-20250114T143813Z</p>
<p>1.8.x.2565-20250122T172157Z</p>
</footer>
<script src="/resources/static/bundle.js"></script>
</body>

View File

@ -61,7 +61,7 @@
</div>
</div>
<footer class="hidden sm:flex mt-auto font-body text-body-s text-disabled-grey dark:text-silver w-full p-2 justify-end">
<p>1.8.x.2527-20250114T143813Z</p>
<p>1.8.x.2565-20250122T172157Z</p>
</footer>
<script src="/resources/static/bundle.js"></script>
</body>

View File

@ -62,7 +62,7 @@
</div>
</div>
<footer class="hidden sm:flex mt-auto font-body text-body-s text-disabled-grey dark:text-silver w-full p-2 justify-end">
<p>1.8.x.2527-20250114T143813Z</p>
<p>1.8.x.2565-20250122T172157Z</p>
</footer>
<script src="/resources/static/bundle.js"></script>
</body>

View File

@ -59,7 +59,7 @@
</div>
</div>
<footer class="hidden sm:flex mt-auto font-body text-body-s text-disabled-grey dark:text-silver w-full p-2 justify-end">
<p>1.8.x.2527-20250114T143813Z</p>
<p>1.8.x.2565-20250122T172157Z</p>
</footer>
<script src="/resources/static/bundle.js"></script>
</body>

View File

@ -66,7 +66,7 @@
</div>
</div>
<footer class="hidden sm:flex mt-auto font-body text-body-s text-disabled-grey dark:text-silver w-full p-2 justify-end">
<p>1.8.x.2527-20250114T143813Z</p>
<p>1.8.x.2565-20250122T172157Z</p>
</footer>
<script src="/resources/static/bundle.js"></script>
</body>

View File

@ -63,7 +63,7 @@
</div>
</div>
<footer class="hidden sm:flex mt-auto font-body text-body-s text-disabled-grey dark:text-silver w-full p-2 justify-end">
<p>1.8.x.2527-20250114T143813Z</p>
<p>1.8.x.2565-20250122T172157Z</p>
</footer>
<script src="/resources/static/bundle.js"></script>
</body>