|
From: <tre...@us...> - 2007-11-08 00:25:34
|
Revision: 563
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=563&view=rev
Author: trevorolio
Date: 2007-11-07 16:25:38 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
Added account level field to auth docs.
Modified Paths:
--------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIGuestAuthenticator.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AuthDocument.java
maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIGuestAuthenticator.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIGuestAuthenticator.java 2007-11-07 21:06:54 UTC (rev 562)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIGuestAuthenticator.java 2007-11-08 00:25:38 UTC (rev 563)
@@ -12,7 +12,7 @@
public WebAPIGuestAuthenticator(WebAPIDescriptor serviceDescriptor, String authCookie) {
super(serviceDescriptor, authCookie);
- authDoc = new AuthDocument(authCookie, true);
+ authDoc = new AuthDocument(authCookie, true, AccountDocument.ACCOUNT_LEVEL_BASIC);
accountDoc = new AccountDocument(authCookie);
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AuthDocument.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AuthDocument.java 2007-11-07 21:06:54 UTC (rev 562)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AuthDocument.java 2007-11-08 00:25:38 UTC (rev 563)
@@ -23,14 +23,16 @@
public static final String AUTHENTICATED = "authenticated";
+ public static final String ACCOUNT_LEVEL = "accountlevel";
+
XMLElement data = null;
public AuthDocument() {
- this.data = create(null, false);
+ this.data = create(null, false, AccountDocument.ACCOUNT_LEVEL_BASIC);
}
- public AuthDocument(String username, boolean authenticated) {
- this.data = create(username, authenticated);
+ public AuthDocument(String username, boolean authenticated, String accountLevel) {
+ this.data = create(username, authenticated, accountLevel);
}
public AuthDocument(XMLElement data) {
@@ -46,12 +48,13 @@
this.data = data;
}
- private XMLElement create(String username, boolean authenticated) {
+ private XMLElement create(String username, boolean authenticated, String accountLevel) {
XMLElement element = new XMLElement(NAME);
if(username != null) {
element.setAttribute(USERNAME, username);
}
element.setAttribute(AUTHENTICATED, authenticated);
+ element.setAttribute(ACCOUNT_LEVEL, accountLevel);
return element;
}
@@ -71,4 +74,8 @@
return data.getStringAttribute(USERNAME);
}
+ public String getAccountLevel(){
+ return data.getStringAttribute(ACCOUNT_LEVEL);
+ }
+
}
\ No newline at end of file
Modified: maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java
===================================================================
--- maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java 2007-11-07 21:06:54 UTC (rev 562)
+++ maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java 2007-11-08 00:25:38 UTC (rev 563)
@@ -108,7 +108,7 @@
}
public void testAuthDocument() {
- AuthDocument doc1 = new AuthDocument(username1, true);
+ AuthDocument doc1 = new AuthDocument(username1, true, AccountDocument.ACCOUNT_LEVEL_BASIC);
assertEquals(username1, doc1.getUsername());
assertTrue(doc1.isAuthenticated());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|