From 938c0ac92baaeabb4593c3ba4ba9b4521b4fa5cd Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jmcconnell@apache.org>
Date: Tue, 12 Sep 2006 19:44:24 +0000
Subject: [PATCH] reworked login and register so flow is improved and its
 functional!

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@442680 13f79535-47bb-0310-9956-ffa450edef68
---
 .../web/action/admin/NewUserAction.java       |  7 +-
 archiva-webapp/src/main/resources/xwork.xml   |  7 +-
 .../webapp/WEB-INF/jsp/decorators/default.jsp |  3 +-
 .../src/main/webapp/WEB-INF/jsp/login.jsp     | 79 +++++++++++++++++++
 .../jsp/{loginRegister.jsp => register.jsp}   | 45 +----------
 .../src/main/webapp/WEB-INF/jsp/user.jsp      | 30 ++++---
 6 files changed, 114 insertions(+), 57 deletions(-)
 create mode 100644 archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
 rename archiva-webapp/src/main/webapp/WEB-INF/jsp/{loginRegister.jsp => register.jsp} (68%)

diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java
index c3baf970c..a3d078734 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java
@@ -63,6 +63,11 @@ public class NewUserAction
 
     public String createUser()
     {
+        if ( username == null )
+        {
+            return INPUT;
+        }
+
         // TODO: use commons-validator for these fields.
 
         if ( StringUtils.isEmpty( username ) )
@@ -120,7 +125,7 @@ public class NewUserAction
         
         if ( hasActionErrors() )
         {
-            return ERROR;
+            return INPUT;
         }
 
         return SUCCESS;
diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml
index 4b900e04f..e40206cba 100644
--- a/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-webapp/src/main/resources/xwork.xml
@@ -127,7 +127,8 @@
 
     <!-- plexus security actions -->
     <action name="login" class="plexusSecurityLogin" method="login">
-      <result name="input">/WEB-INF/jsp/loginRegister.jsp</result>
+      <result name="input">/WEB-INF/jsp/login.jsp</result>
+      <result name="error">/WEB-INF/jsp/login.jsp</result>
       <result name="success" type="redirect-action">browse</result>
     </action>
 
@@ -136,7 +137,9 @@
     </action>
 
     <action name="register" class="newUser" method="createUser">
-      <result name="success" type="redirect-action">login</result>
+      <result name="input">/WEB-INF/jsp/register.jsp</result>
+      <result name="success">/WEB-INF/jsp/register.jsp</result> 
+      <result name="error">/WEB-INF/jsp/register.jsp</result>
     </action>
   </package>
 
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
index 0260c3619..b7909d252 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
@@ -60,9 +60,10 @@
 <div id="breadcrumbs">
   <div class="xleft">
     <ww:url id="loginUrl" action="login" namespace="/" includeParams="none"/>
+    <ww:url id="registerUrl" action="register" namespace="/" includeParams="none"/>
 
     <ww:if test="${sessionScope.authStatus != true}">
-      <ww:a href="%{loginUrl}">Login/Register</ww:a>
+      <ww:a href="%{loginUrl}">Login</ww:a> - <ww:a href="%{registerUrl}">Register</ww:a>
 
     </ww:if>
     <ww:else>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
new file mode 100644
index 000000000..8a215cdce
--- /dev/null
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -0,0 +1,79 @@
+<%--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  --%>
+
+<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<html>
+<head>
+  <title>Login Page</title>
+  <ww:head/>
+</head>
+
+<body>
+
+<div id="contentArea">
+  <div id="searchBox">
+    <div style="float: right">
+      <a href="#">Forgotten your Password?</a>
+
+    </div>
+
+    <p>
+      <ww:actionmessage/>
+      <ww:actionerror/>
+    </p>
+
+    <h2>Login</h2>
+    <ww:form action="login">
+      <table class="bodyTable">
+        <tr class="a">
+          <th>
+            Username
+          </th>
+          <td>
+            <ww:textfield name="username" size="30"/>
+          </td>
+        </tr>
+        <tr class="b">
+          <th>
+            Password
+          </th>
+          <td>
+            <ww:password name="password" size="20"/>
+
+          </td>
+        </tr>
+        <tr class="a">
+          <td></td>
+          <td>
+            <ww:submit value="Login"/>
+          </td>
+        </tr>
+      </table>
+
+    </ww:form>
+  </div>
+</div>
+
+
+<div class="clear">
+  <hr/>
+</div>
+
+</body>
+
+</html>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/loginRegister.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
similarity index 68%
rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/loginRegister.jsp
rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
index c81485cd3..d48277cb5 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/loginRegister.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
@@ -19,7 +19,7 @@
 
 <html>
 <head>
-  <title>Login Page</title>
+  <title>Registration Page</title>
   <ww:head/>
 </head>
 
@@ -27,45 +27,12 @@
 
 <div id="contentArea">
   <div id="searchBox">
-    <div style="float: right">
-      <a href="#">Forgotten your Password?</a>
-
-    </div>
-
     <p>
       <ww:actionmessage/>
+      <ww:actionerror/>
     </p>
 
-    <h2>Login</h2>
-    <ww:form action="login">
-      <table class="bodyTable">
-        <tr class="a">
-          <th>
-            Username
-          </th>
-          <td>
-            <ww:textfield name="username" size="30"/>
-          </td>
-        </tr>
-        <tr class="b">
-          <th>
-            Password
-          </th>
-          <td>
-            <ww:password name="password" size="20"/>
-
-          </td>
-        </tr>
-        <tr class="a">
-          <td></td>
-          <td>
-            <ww:submit value="Login"/>
-          </td>
-        </tr>
-      </table>
-
-    </ww:form>
-    <h2>Request an Account</h2>
+    <h2>Register for an Account</h2>
     <ww:form action="register">
       <table class="bodyTable">
         <tr class="b">
@@ -82,7 +49,6 @@
           </th>
           <td>
             <ww:password name="password" size="20"/>
-
           </td>
         </tr>
         <tr class="b">
@@ -109,12 +75,7 @@
           </th>
           <td>
             <ww:textfield name="email" size="50 "/>
-            <br></br>
-                <span style="font-size: x-small">(Only administrators will be able to view this, and it will be used to
-                  send you information about your project)
-                </span>
           </td>
-
         </tr>
         <tr class="a">
           <td></td>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp
index ef0c9df95..69e16e206 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp
@@ -85,19 +85,27 @@
 
         <h2>Grant Roles</h2>
 
-        <p>
-
-           </p>
-         <pss:ifAuthorized permission="grant-roles">
+        <pss:ifAuthorized permission="grant-roles">
+          <table class="bodyTable">
             <ww:iterator id="role" value="availableRoles">
-              <ww:url id="addRoleUrl" action="assignRoleToUser">
-                <ww:param name="principal">${sessionScope.SecuritySessionUser.principal}</ww:param>
-                <ww:param name="roleName">${role.name}</ww:param>
-              </ww:url>
-              <ww:a href="%{addRoleUrl}">${role.name}</ww:a>
-              <br/>
+
+              <tr class="a">
+                <td>
+                  <em>${role.name}</em><br/>
+                </td>
+                <td>
+                  <ww:url id="addRoleUrl" action="assignRoleToUser">
+                    <ww:param name="principal">${sessionScope.SecuritySessionUser.principal}</ww:param>
+                    <ww:param name="roleName">${role.name}</ww:param>
+                  </ww:url>
+                  <ww:a href="%{addRoleUrl}">add</ww:a>
+                </td>
+              </tr>
             </ww:iterator>
-          </pss:ifAuthorized>
+          </table>
+        </pss:ifAuthorized>
+
+
            <%--
           <p>
             This following screen needs have the various roles worked into it.