# HG changeset patch
# User Bjoern Ricks <bjoern.ricks@intevation.de>
# Date 1345805363 0
# Node ID 1387cdeb8d93d7d1f91e9251e9147f0e39bab92b
# Parent  56f17c6c62880fe7ca04d48757eb219bd0df30c8
Add account information to flys-client user classes


flys-client/trunk@5256 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 56f17c6c6288 -r 1387cdeb8d93 flys-client/ChangeLog
--- a/flys-client/ChangeLog	Fri Aug 24 10:44:55 2012 +0000
+++ b/flys-client/ChangeLog	Fri Aug 24 10:49:23 2012 +0000
@@ -1,3 +1,13 @@
+2012-08-24	Björn Ricks <bjoern.ricks@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/server/auth/DefaultUser.java,
+	  src/main/java/de/intevation/flys/client/server/auth/was/Response.java,
+	  src/main/java/de/intevation/flys/client/server/auth/was/User.java,
+	  src/main/java/de/intevation/flys/client/server/auth/User.java:
+	  Add account information to client user classes. Use the WAS/GGInA
+	  assertion NameIdentifier element for the account name. For text
+	  authentication user username also as account name.
+
 2012-08-24	Björn Ricks <bjoern.ricks@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/server/LoginServlet.java:
diff -r 56f17c6c6288 -r 1387cdeb8d93 flys-client/src/main/java/de/intevation/flys/client/server/auth/DefaultUser.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/auth/DefaultUser.java	Fri Aug 24 10:44:55 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/auth/DefaultUser.java	Fri Aug 24 10:49:23 2012 +0000
@@ -6,6 +6,7 @@
 implements   User
 {
     protected String  name;
+    protected String  account;
     protected String  password;
     protected boolean expired;
     protected List<String> roles;
@@ -26,6 +27,7 @@
         this.expired  = expired;
         this.roles    = roles;
         this.features = features;
+        this.account  = name;
     }
 
     @Override
@@ -73,5 +75,14 @@
     public void setAllowedFeatures(List<String> features) {
         this.features = features;
     }
+
+    @Override
+    public String getAccount() {
+        return this.account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
 }
 // vim:set ts=4 sw=4 si et fenc=utf8 tw=80:
diff -r 56f17c6c6288 -r 1387cdeb8d93 flys-client/src/main/java/de/intevation/flys/client/server/auth/User.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/auth/User.java	Fri Aug 24 10:44:55 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/auth/User.java	Fri Aug 24 10:49:23 2012 +0000
@@ -33,5 +33,10 @@
      * Returns true if the user is allowed access the feature
      */
     public boolean canUseFeature(String feature);
+
+    /**
+     * Returns the users account name
+     */
+    public String getAccount();
 }
 // vim:set ts=4 sw=4 si et fenc=utf8 tw=80:
diff -r 56f17c6c6288 -r 1387cdeb8d93 flys-client/src/main/java/de/intevation/flys/client/server/auth/was/Response.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/auth/was/Response.java	Fri Aug 24 10:44:55 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/auth/was/Response.java	Fri Aug 24 10:49:23 2012 +0000
@@ -111,7 +111,7 @@
                 this.assertion.getRoles());
         logger.debug("User " + this.username + " with features " + features +
                      " successfully authenticated.");
-        return new User(this.username, this.password,
+        return new User(this.username, this.password, assertion.getNameID(),
                 this.assertion.getRoles(), assertion, features);
     }
 }
diff -r 56f17c6c6288 -r 1387cdeb8d93 flys-client/src/main/java/de/intevation/flys/client/server/auth/was/User.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/auth/was/User.java	Fri Aug 24 10:44:55 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/auth/was/User.java	Fri Aug 24 10:49:23 2012 +0000
@@ -13,6 +13,7 @@
 
     public User(String name,
         String       password,
+        String       account,
         List<String> roles,
         Assertion    assertion,
         List<String> features
@@ -22,6 +23,7 @@
         this.setRoles(roles);
         this.assertion = assertion;
         this.setAllowedFeatures(features);
+        this.setAccount(account);
     }
 
     @Override