[java-idp-plugin-webauthn] branch main updated: Improve messages: Add missing admin properties
Phil Smart
philip.smart at jisc.ac.uk
Wed Aug 14 09:03:07 UTC 2024
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-webauthn.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-webauthn.git;a=commit;h=52f0896ebacc24087d794b17e7fd88f9604b622e
The following commit(s) were added to refs/heads/main by this push:
new 52f0896 Improve messages: Add missing admin properties
52f0896 is described below
commit 52f0896ebacc24087d794b17e7fd88f9604b622e
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Aug 14 10:03:04 2024 +0100
Improve messages: Add missing admin properties
---
.../idp/plugin/authn/webauthn/messages.properties | 26 +++++++++++++++-------
.../webauthn/views/webauthn-authn-username.vm | 2 +-
.../plugin/authn/webauthn/views/webauthn-authn.vm | 6 ++---
.../authn/webauthn/views/webauthn-management.vm | 2 +-
.../authn/webauthn/views/webauthn-register.vm | 6 ++---
5 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/messages.properties b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/messages.properties
index d8df1a2..48ff132 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/messages.properties
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/messages.properties
@@ -8,20 +8,18 @@
# in their own message files.
-idp.webauthn.authn.authenticate.inprogress = Authenticating...
-idp.webauthn.authn.authenticate.retry = Login failed, retry
-idp.webauthn.authn.authenticate.submit = Submit authentication
+idp.webauthn.authn.inprogress = Authenticating...
+idp.webauthn.authn.retry = Login failed, retry
+idp.webauthn.authn.submit = Submit authentication
idp.webauthn.authn.authenticate = Login with passkey or security key
-
idp.webauthn.authn.unsupported = Your browser is not WebAuthn compatible
-
-idp.webauthn.passwordless.explain = If you've enrolled a passkey or device/token for passwordless login, please enter your username below and press the corresponding button.
+idp.webauthn.authn.passwordless.explain = If you've enrolled a passkey or device/token for passwordless login, please enter your username below and press the corresponding button.
idp.webauthn.enrollment.url = /idp/profile/admin/webauthn-registration
idp.webauthn.enrollment = Register new credential
idp.webauthn.register.registered.keys = Registered keys for
-idp.webauthn.register.credential.nickanme = Credential nickname
+idp.webauthn.register.credential.nickname = Credential nickname
idp.webauthn.register.credential.remove.confirm = Are you sure
idp.webauthn.register.table.header.keyName = Key Name
idp.webauthn.register.table.header.authenticatorDescription = Authenticator
@@ -37,15 +35,27 @@ idp.webauthn.register.finish = Finish
idp.webauthn.register.submit = Submit registration
idp.webauthn.register.username.explain = Please enter your username below.
idp.webauthn.register.username.proceed = Next
+idp.webauthn.register.unsupported = Your browser is not WebAuthn compatible
idp.webauthn.admin.search.title = Search for user
+idp.webauthn.admin.header = Registered keys for
+idp.webauthn.admin.table.header.userName = User
+idp.webauthn.admin.table.header.keyName = Key Name
+idp.webauthn.admin.table.header.authenticatorDescription = Authenticator
+idp.webauthn.admin.table.header.transports = Transports
+idp.webauthn.admin.table.header.passkey = Passkey?
+idp.webauthn.admin.table.header.registrationTime = Registration Time
+idp.webauthn.admin.table.header.action = Action
+idp.webauthn.admin.noKeys = There are no registered keys
+idp.webauthn.admin.unsupported = Your browser is not WebAuthn compatible
idp.webauthn.ended = Your session has ended
# When debug information has been enabled
idp.webauthn.debug.title = Debugging
idp.webauthn.debug.request = Request options
-idp.webauthn.register.debug.registration = Registration options
+idp.webauthn.debug.register.title Debugging
+idp.webauthn.debug.register.request = Registration options
# Messages to report back to the user during registration
InvalidRegistration = Key registration unsuccessful
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn-username.vm b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn-username.vm
index 2c8e047..339e77c 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn-username.vm
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn-username.vm
@@ -68,7 +68,7 @@ $response.addHeader("Content-Security-Policy", "default-src 'none'; style-src 's
<p>$encoder.encodeForHTML($desc)</p>
#end
- <blockquote>#springMessageText("idp.webauthn.passwordless.explain", "If you've enrolled a passkey or device/token for passwordless login,
+ <blockquote>#springMessageText("idp.webauthn.authn.passwordless.explain", "If you've enrolled a passkey or device/token for passwordless login,
please enter your username below.")</blockquote>
<form name="username-entry" action="$flowExecutionUrl" method="post">
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn.vm b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn.vm
index 1ab9f10..ec15eb3 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn.vm
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn.vm
@@ -66,7 +66,7 @@ $response.addHeader("Content-Security-Policy", "default-src 'none'; style-src 's
async function authenticate() {
// Some UI changes
try {
- document.getElementById('authenticate').textContent='#springMessageText("idp.webauthn.authn.authenticate.inprogress",
+ document.getElementById('authenticate').textContent='#springMessageText("idp.webauthn.authn.inprogress",
"Authenticating...")'
} catch (e) {
// No issue if this does not work
@@ -79,7 +79,7 @@ $response.addHeader("Content-Security-Policy", "default-src 'none'; style-src 's
document.getElementById("authenticationSubmit").click();
}).catch(function (err) {
console.error(err);
- document.getElementById('authenticate').textContent='#springMessageText("idp.webauthn.authn.authenticate.retry",
+ document.getElementById('authenticate').textContent='#springMessageText("idp.webauthn.authn.retry",
"Login failed, retry")'
});
}
@@ -121,7 +121,7 @@ $response.addHeader("Content-Security-Policy", "default-src 'none'; style-src 's
#parse("csrf/csrf.vm")
<input type="hidden" id="publicKeyCredential" name="publicKeyCredential" />
<button class="hidden" id="authenticationSubmit" type="submit"
- name="_eventId_proceed">#springMessageText("idp.webauthn.authn.authenticate.submit", "Submit
+ name="_eventId_proceed">#springMessageText("idp.webauthn.authn.submit", "Submit
authentication")</button>
</form>
<div class="centre">
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-management.vm b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-management.vm
index 0eb0752..a276380 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-management.vm
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-management.vm
@@ -54,7 +54,7 @@ $response.addHeader("Content-Security-Policy", "default-src 'none'; style-src 's
<p id="error_message"></p>
</div>
<div>
- <h1>Registered keys for '$encoder.encodeForHTML($webAuthnManContext.searchUsername)'</h1>
+ <h1>#springMessageText("idp.webauthn.admin.header","Registered keys for") '$encoder.encodeForHTML($webAuthnManContext.searchUsername)'</h1>
#if ($webAuthnManContext.foundCredentials)
<table>
<tr>
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-register.vm b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-register.vm
index f176903..4f7cc5b 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-register.vm
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-register.vm
@@ -49,7 +49,7 @@ $response.addHeader("Content-Security-Policy", "default-src 'none'; style-src 's
var pkCredOptionsParsed = parseCreationOptionsFromJSON(pkCredOptions);
await create(pkCredOptionsParsed)
.then(function (publicKeyCredentialAttestation){
- var nickname = prompt('#springMessageText("idp.webauthn.register.credential.nickanme", "Credential Nickname")');
+ var nickname = prompt('#springMessageText("idp.webauthn.register.credential.nickname", "Credential Nickname")');
document.getElementById("credentialNickname").value = nickname;
document.getElementById("publicKeyCredential").value = JSON.stringify(publicKeyCredentialAttestation);
document.getElementById("registrationSubmit").click();
@@ -182,9 +182,9 @@ $response.addHeader("Content-Security-Policy", "default-src 'none'; style-src 's
</div>
#if($debug == "true")
<hr/>
- <button type="button" class="collapsible-debug">#springMessageText("idp.webauthn.register.debug.title", "Debugging")</button>
+ <button type="button" class="collapsible-debug">#springMessageText("idp.webauthn.debug.register.title", "Debugging")</button>
<div class="debug" id="debug-div">
- <label for="publicKeyCredentialCreation">#springMessageText("idp.webauthn.register.debug.registration", "Registration Options")</label>
+ <label for="publicKeyCredentialCreation">#springMessageText("idp.webauthn.debug.register.request", "Registration Options")</label>
<textarea id="publicKeyCredentialCreation" name="publicKeyCredentialCreation" rows="20" cols="50">
$webAuthnEncoder.serializePublicKeyCredentialOptionsAsJSON($webauthnRegContext.publicKeyCredentialCreationOptions)</textarea>
</div>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list