Changeset 3455

Timestamp:

09/02/10 15:15:31 (17 months ago)

Author:

rwagner

Message:

 

Location:

molgenis_auth

Files:

• WebContent/WEB-INF/lib/jopenid-1.07.jar (added)
• auth_ui.xml (modified) (1 diff)
• handwritten/java/commands/MyCommand.java (modified) (2 diffs)
• handwritten/java/plugin/auth/OpenIdLogin.java (added)
• handwritten/java/plugin/auth/UserLogin.ftl (modified) (3 diffs)
• handwritten/java/plugin/auth/UserLogin.java (modified) (7 diffs)

molgenis_auth/auth_ui.xml

@@ -3 +3 @@
 <molgenis name="example">
         <plugin name="molgenis_header" type="plugins.header.MolgenisHeader" />
-        <plugin name="molgenis_auth" type="plugin.auth.UserLogin" />
         <menu name="Main" position="left">
-                <form name="UserGroups" entity="MolgenisUserGroup" />
-                <form name="Users" entity="MolgenisUser" />
-                <form name="Entities" entity="MolgenisEntity" />
+                <plugin name="Authorization" type="plugin.auth.UserLogin" label="Authorization"/>
+                <menu name="Management">
+                        <form name="UserGroups" entity="MolgenisUserGroup" label="UserGroups" />
+                        <form name="Users" entity="MolgenisUser" label="Users" />
+                        <form name="Entities" entity="MolgenisEntity" label="Entities" />
+                </menu>
         </menu>
 </molgenis>

molgenis_auth/handwritten/java/commands/MyCommand.java

@@ -16 +16 @@
 import org.molgenis.util.Tuple;
 
-import app.ui.ExperimentsForm;
+//import app.ui.ExperimentsForm;
 
 /**
@@ -33 +33 @@
         {
                 //reuse the inputs from Experiment
-                List<HtmlInput> inputs = new ExperimentsForm().getInputs();
+                List<HtmlInput> inputs = this.getInputs(); //new ExperimentsForm().getInputs();
                 
                 //you could now replace some of these inputs with your own

molgenis_auth/handwritten/java/plugin/auth/UserLogin.ftl

@@ -17 +17 @@
                 <div class="form_header" id="${screen.getName()}">
                 <#-- ${screen.label} tekst boven &nbsp;-->
-                Een krachtig zelflerend adviessysteem voor mensen met diabetes
+                Molgenis authentication tests
                 </div>
                 <#--messages-->
@@ -42 +42 @@
         <big>
         <table bgcolor="#EFF1F2" style="color:#555555">
-        <tr><td>&nbsp;</td></tr>
-        <tr><td width="10">&nbsp;</td><td align="left" width="200">Welkom, <b>${login.userName}</b>.</td><td width="10">&nbsp;</td></tr>
-        <tr><td width="10">&nbsp;</td><td align="right">        ${form.logout} </td><td>&nbsp;</td></tr>
-        <tr><td>&nbsp;</td></tr>
+        <tr><td colspan="2">Welcome, your login data are:</td></tr>
+        <tr><td>Name:</td><td><b>${login.userName}</b></td></tr>
+        <tr><td>Email:</td><td><b>${login.email}</b></td></tr>
         </table>
         </big>
@@ -51 +50 @@
 <#else>
         <table bgcolor="#EFF1F2" border="0" style="color:#555555"> <#-- style="border-right-width:1px; border-color:gray; border-style: solid;">-->
-        <tr><td width="10">&nbsp;</td><td colspan="2">&nbsp;</td><td>&nbsp;</td><tr/>
-        <tr><td>&nbsp;</td><td colspan="2" align="left"><font size="2"><b><font color="darkred">&raquo;</font></b>&nbsp;Login met uw DIADVIES-account:<font></td><td width="10">&nbsp;</td></tr>
-        <tr><td>&nbsp;</td><td colspan="2">&nbsp;</td><td>&nbsp;</td><tr/>
-        <tr><td>&nbsp;</td><td><label>Naam:&nbsp;</label></td><td align="right">${form.name}</td><td>&nbsp;</td></tr> 
-        <tr><td>&nbsp;</td><td><label>Wachtwoord:&nbsp;</label></td><td align="right">${form.password}</td><td>&nbsp;</td></tr>
-        <tr><td>&nbsp;</td><td colspan="2" align="right">${form.login}</td><td>&nbsp;</td></tr>
-        <tr><td>&nbsp;</td><td colspan="2">&nbsp;</td><td>&nbsp;</td><tr/>
-        <tr><td colspan="4" bgcolor="#F8FAFB">&nbsp;</td><tr/>
-        <tr><td>&nbsp;</td><td colspan="2">&nbsp;</td><td>&nbsp;</td><tr/>
-        <tr><td>&nbsp;</td><td colspan="2" align="left" width="200"><font size="2"><b><font color="darkred">&raquo;</font></b>&nbsp;Nieuw bij DIADVIES?</font></td><td>&nbsp;</td></tr>
-        <tr><td>&nbsp;</td><td colspan="2">&nbsp;</td><td>&nbsp;</td><tr/>
-        <tr><td>&nbsp;</td><td colspan="2" align="center"><b>&raquo; <u>MAAK GRATIS ACCOUNT</u> «</b></td><td>&nbsp;</td><tr/>
-        <tr><td>&nbsp;</td><td colspan="2">&nbsp;</td><td>&nbsp;</td><tr/>
-        
+        <tr><td>${form.login} via ${form.openid}</td></tr>
         </table>
 </#if>

molgenis_auth/handwritten/java/plugin/auth/UserLogin.java

@@ -8 +8 @@
 package plugin.auth;
 
+import java.io.IOException;
 import java.util.List;
 
@@ -17 +18 @@
 import org.molgenis.framework.ui.html.ActionInput;
 import org.molgenis.framework.ui.html.Form;
+import org.molgenis.framework.ui.html.HiddenInput;
 import org.molgenis.framework.ui.html.PasswordInput;
+import org.molgenis.framework.ui.html.SelectInput;
 import org.molgenis.framework.ui.html.StringInput;
 import org.molgenis.util.Tuple;
+import org.openid4java.consumer.ConsumerException;
 
 /**
@@ -27 +31 @@
 public class UserLogin extends PluginModel
 {
-        DatabaseLogin login;
+//      DatabaseLogin login;
+        OpenIdLogin login;
 
         public UserLogin(String name, ScreenModel parent)
         {
                 super(name, parent);
-                login = (DatabaseLogin)this.getRootScreen().getLogin();
+//              login = (DatabaseLogin)this.getRootScreen().getLogin();
+                login = (OpenIdLogin) this.getRootScreen().getLogin();
         }
 
@@ -53 +59 @@
                 this.setMessages();
 
-                logger.debug(request);
+                logger.debug(">>> handleRequest: action==" + request.getAction());
                 if ("Login".equals(request.getAction()))
                 {
-                        boolean loggedIn = getLogin().login(db, request.getString("name"), request.getString("password"));
-                        if (!loggedIn) 
-                                this.setMessages(new ScreenMessage("login failed: username or password unknown", false));
-                        else
-                                this.getRootScreen().setLogin(login);
+                        try {
+                                OpenIdLogin login = (OpenIdLogin) getLogin();
+                                login.authenticate(request.getString("openid"));
+//                              login.authRequest(request.getString("name"));
+//                              login.verifyResponse();
+                        } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                logger.debug(e.toString());
+                                e.printStackTrace();
+                        }
+                        
+//                      boolean loggedIn = getLogin().login(db, request.getString("name"), request.getString("password"));
+//                      if (!loggedIn) 
+//                              this.setMessages(new ScreenMessage("login failed: username or password unknown", false));
+//                      else
+//                              this.getRootScreen().setLogin(login);
                 }
                 else if ("Logout".equals(request.getAction()))
@@ -91 +108 @@
                 else
                 {
-                        f.add(new ActionInput("Login"));
-                        f.add(new PasswordInput("password"));
-                        f.add(new StringInput("name"));
+//                      String provider = "Yahoo";
+//                      f.add(new HiddenInput("openid", provider));
+
+                        SelectInput selectInput = new SelectInput("openid", "");
+                        selectInput.setOptions(new String[] { "Google", "Yahoo"});
+                        f.add(selectInput);
+
+                        ActionInput actionInput = new ActionInput("Login");
+                        actionInput.setLabel("Login");
+                        actionInput.setTooltip("OpenId login");
+                        f.add(actionInput);
                 }
 
@@ -107 +132 @@
         
         public void setLogin(Login login) {
-                this.login = (DatabaseLogin)login;
+//              this.login = (DatabaseLogin)login;
+                this.login = (OpenIdLogin) login;
         }       
         
@@ -115 +141 @@
                 if(getLogin().isAuthenticated())
                 {
-                        return "Beginscherm";//"Loginnaam: "+getLogin().getUserName();
+                        return "Logged in as " + getLogin().getUserName();
                 }
                 else
                 {
-                        return ""; //Login
+                        return "Authorization"; //Login
                 }
         }