Convert the Authentication mechanism from User to UserAccount.
This commit is contained in:
parent
ee577adff7
commit
72314d3598
24 changed files with 517 additions and 379 deletions
|
@ -10,12 +10,14 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
|
|||
<#if currentUser?has_content>
|
||||
<table summary="Information about the current user" style="border: 1">
|
||||
<caption>Current user</caption>
|
||||
<tr><th>URI:</th><td>${currentUser.URI}</td></tr>
|
||||
<tr><th>URI:</th><td>${currentUser.uri}</td></tr>
|
||||
<tr><th>First name:</th><td>${currentUser.firstName}</td></tr>
|
||||
<tr><th>Last name:</th><td>${currentUser.lastName}</td></tr>
|
||||
<tr><th>Username:</th><td>${currentUser.username}</td></tr>
|
||||
<tr><th>Email:</th><td>${currentUser.emailAddress}</td></tr>
|
||||
<tr><th>Login count:</th><td>${currentUser.loginCount}</td></tr>
|
||||
<tr><th>Role:</th><td>${currentUser.roleURI}</td></tr>
|
||||
<#list currentUser.permissionSetUris as role>
|
||||
<tr><th>Role:</th><td>${role}</td></tr>
|
||||
</#list>
|
||||
</table>
|
||||
<#else>
|
||||
<h3>Not logged in</h3>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<section id="internalLogin" role="region">
|
||||
<h2>Internal Login</h2>
|
||||
|
||||
<#if errorNoUser??>
|
||||
<#if errorNoEmail??>
|
||||
<#assign errorMessage = "No email supplied." />
|
||||
</#if>
|
||||
|
||||
|
@ -52,11 +52,11 @@
|
|||
<label for="confirmPassword">Confirm Password</label>
|
||||
<input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />
|
||||
|
||||
<input id="username" name="username" type="hidden" value="${username!}" />
|
||||
<input id="email" name="email" type="hidden" value="${email!}" />
|
||||
<input id="password" name="password" type="hidden" value="${password!}" />
|
||||
<#else>
|
||||
<label for="username">Email</label>
|
||||
<input id="username" name="username" class="text-field focus" type="text" value="${username!}" required autofocus />
|
||||
<label for="email">Email</label>
|
||||
<input id="email" name="email" class="text-field focus" type="text" value="${email!}" required autofocus />
|
||||
|
||||
<label for="password">Password</label>
|
||||
<input id="password" name="password" class="text-field" type="password" required />
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue