Added separate service to process required login actions - leaving AccountService for only user account management

forms/src/main/java/org/keycloak/forms/UrlBean.java

@@ -108,8 +108,16 @@ public class UrlBean {
         }
     }
 
-    public String getPasswordResetUrl() {
-        return Urls.accountPasswordReset(baseURI, realm.getId()).toString();
+    public String getLoginUpdatePasswordUrl() {
+        return Urls.loginActionUpdatePassword(baseURI, realm.getId()).toString();
+    }
+
+    public String getLoginUpdateTotpUrl() {
+        return Urls.loginActionUpdateTotp(baseURI, realm.getId()).toString();
+    }
+
+    public String getLoginUpdateProfileUrl() {
+        return Urls.loginActionUpdateProfile(baseURI, realm.getId()).toString();
     }
 
     public String getSocialUrl() {
@@ -124,8 +132,12 @@ public class UrlBean {
         return Urls.accountTotpRemove(baseURI, realm.getId()).toString();
     }
 
-    public String getEmailVerificationUrl() {
-        return Urls.accountEmailVerification(baseURI, realm.getId()).toString();
+    public String getLoginPasswordResetUrl() {
+        return Urls.loginPasswordReset(baseURI, realm.getId()).toString();
+    }
+
+    public String getLoginEmailVerificationUrl() {
+        return Urls.loginActionEmailVerification(baseURI, realm.getId()).toString();
     }
 
 }

forms/src/main/resources/META-INF/resources/forms/theme/default/login-config-totp.ftl

@@ -27,7 +27,7 @@
             </li>
             <li class="clearfix">
                 <p><strong>3</strong>Enter the one-time-password provided by Google Authenticator below and click Submit to finish the setup.</p>
-                <form action="${url.totpUrl}" method="post">
+                <form action="${url.loginUpdateTotpUrl}" method="post">
                     <div>
                         <label for="otp" class="two-lines">One-time-password</label><input type="text" id="totp" name="totp" />
                         <input type="hidden" id="totpSecret" name="totpSecret" value="${totp.totpSecret}" />

forms/src/main/resources/META-INF/resources/forms/theme/default/login-reset-password.ftl

@@ -21,7 +21,7 @@
         </#if>
 
         <p class="instruction">${rb.getString('emailInstruction')}</p>
-        <form action="${url.passwordResetUrl}" method="post">
+        <form action="${url.loginPasswordResetUrl}" method="post">
             <div>
                 <label for="username">${rb.getString('username')}</label><input id="username" name="username" type="text" />
             </div>

forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl

@@ -11,7 +11,7 @@
     <#elseif section = "form">
 
     <div id="form">
-        <form action="${url.passwordUrl}" method="post">
+        <form action="${url.loginUpdatePasswordUrl}" method="post">
         	<div>
             	<label for="password-new">${rb.getString('passwordNew')}</label><input type="password" id="password-new" name="password-new" />
         	</div>

forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl

@@ -15,7 +15,7 @@
     <#elseif section = "form">
 
     <div id="form">
-        <form action="${url.accountUrl}" method="post">
+        <form action="${url.loginUpdateProfileUrl}" method="post">
             <div class="feedback error bottom-left">
                 <p><strong>Some required fields are empty or incorrect.</strong><br>Please correct the fields in red.</p>
             </div>

forms/src/main/resources/META-INF/resources/forms/theme/default/login-verify-email.ftl

@@ -20,7 +20,7 @@
             Your account is not enabled. An email with instructions to verify your email address has been sent to you.
         </p>
         <p class="instruction">Haven't received a verification code in your email?
-            <a href="${url.emailVerificationUrl}">Click here</a> to re-send the email.
+            <a href="${url.loginEmailVerificationUrl}">Click here</a> to re-send the email.
         </p>
     </div>
 

forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl

@@ -24,7 +24,7 @@
             </#list>
 
             <div class="aside-btn">
-                <p>Forgot <a href="${url.passwordResetUrl}">Password</a>?</p>
+                <p>Forgot <a href="${url.loginPasswordResetUrl}">Password</a>?</p>
             </div>
 
             <input class="btn-primary" type="submit" value="Log In"/>