r7424 - in dumbhippo/trunk/server/src/com/dumbhippo: server server/impl web/servlets

[commits mugshot org]

Author: walters
Date: 2008-04-16 14:37:53 -0500 (Wed, 16 Apr 2008)
New Revision: 7424

Modified:
   dumbhippo/trunk/server/src/com/dumbhippo/server/HttpMethods.java
   dumbhippo/trunk/server/src/com/dumbhippo/server/IdentitySpider.java
   dumbhippo/trunk/server/src/com/dumbhippo/server/InvitationSystem.java
   dumbhippo/trunk/server/src/com/dumbhippo/server/impl/HttpMethodsBean.java
   dumbhippo/trunk/server/src/com/dumbhippo/server/impl/IdentitySpiderBean.java
   dumbhippo/trunk/server/src/com/dumbhippo/server/impl/InvitationSystemBean.java
   dumbhippo/trunk/server/src/com/dumbhippo/server/impl/PostingBoardBean.java
   dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/VerifyServlet.java
Log:
Bug 1387: Use setPublicPage in identityspider too.


Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/HttpMethods.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/HttpMethods.java	2008-04-16 18:53:39 UTC (rev 7423)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/HttpMethods.java	2008-04-16 19:37:53 UTC (rev 7424)
@@ -148,7 +148,7 @@
 	@HttpContentTypes(HttpResponseData.NONE)
 	@HttpParams( { "disabled" })
 	@HttpOptions( allowDisabledAccount = true )
-	public void doSetAccountDisabled(UserViewpoint viewpoint, boolean disabled) throws IOException, HumanVisibleException;
+	public void doSetAccountDisabled(UserViewpoint viewpoint, boolean disabled) throws IOException, HumanVisibleException, RetryException;
 
 	@HttpContentTypes(HttpResponseData.NONE)
 	@HttpParams( { "password" })

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/IdentitySpider.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/IdentitySpider.java	2008-04-16 18:53:39 UTC (rev 7423)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/IdentitySpider.java	2008-04-16 19:37:53 UTC (rev 7424)
@@ -396,7 +396,7 @@
 	
 	public boolean getAccountDisabled(User user);
 	
-	public void setAccountDisabled(User user, Site site, boolean disabled);
+	public void setAccountDisabled(User user, Site site, boolean disabled) throws RetryException;
 	
 	public boolean getAccountAdminDisabled(User user);
 	

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/InvitationSystem.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/InvitationSystem.java	2008-04-16 18:53:39 UTC (rev 7423)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/InvitationSystem.java	2008-04-16 19:37:53 UTC (rev 7424)
@@ -171,8 +171,9 @@
 	 * @param disable true if the user wants to disable the account
 	 * 
 	 * @return initial client authorized to access the account
+	 * @throws RetryException 
 	 */
-	public Client viewInvitation(Site site, InvitationToken invite, String firstClientName, boolean disable);
+	public Client viewInvitation(Site site, InvitationToken invite, String firstClientName, boolean disable) throws RetryException;
 	
 	/**
 	 * Return the names (from the system viewpoint) of the inviting

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/impl/HttpMethodsBean.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/impl/HttpMethodsBean.java	2008-04-16 18:53:39 UTC (rev 7423)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/impl/HttpMethodsBean.java	2008-04-16 19:37:53 UTC (rev 7424)
@@ -695,7 +695,7 @@
 	}
 	
 	public void doSetAccountDisabled(UserViewpoint viewpoint, boolean disabled)
-			throws IOException, HumanVisibleException {
+			throws IOException, HumanVisibleException, RetryException {
 		identitySpider.setAccountDisabled(viewpoint.getViewer(), viewpoint.getSite(), disabled);
 	}
 

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/impl/IdentitySpiderBean.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/impl/IdentitySpiderBean.java	2008-04-16 18:53:39 UTC (rev 7423)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/impl/IdentitySpiderBean.java	2008-04-16 19:37:53 UTC (rev 7424)
@@ -1184,11 +1184,11 @@
 		return user.getAccount().isDisabled();
 	}
 
-	public void setAccountDisabled(User user, Site site, boolean disabled) {
+	public void setAccountDisabled(User user, Site site, boolean disabled) throws RetryException {
 		Account account = getAttachedAccount(user);
 		if (site == Site.MUGSHOT && account.getAccountType() == AccountType.GNOME) {
 			if (account.isPublicPage() == disabled) {
-			    account.setPublicPage(!disabled);
+				setPublicPage(new UserViewpoint(user, site), !disabled);
 			    logger.debug("Public page flag toggled to {} on account {}", !disabled,
 					         account);
 			}

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/impl/InvitationSystemBean.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/impl/InvitationSystemBean.java	2008-04-16 18:53:39 UTC (rev 7423)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/impl/InvitationSystemBean.java	2008-04-16 19:37:53 UTC (rev 7424)
@@ -647,7 +647,7 @@
 		//}
 	}
 	
-	public Client viewInvitation(Site site, InvitationToken invite, String firstClientName, boolean disable) {
+	public Client viewInvitation(Site site, InvitationToken invite, String firstClientName, boolean disable) throws RetryException {
 		if (invite.isViewed()) {
 			throw new IllegalArgumentException("InvitationToken " + invite + " has already been viewed");
 		}

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/impl/PostingBoardBean.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/impl/PostingBoardBean.java	2008-04-16 18:53:39 UTC (rev 7423)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/impl/PostingBoardBean.java	2008-04-16 19:37:53 UTC (rev 7424)
@@ -419,7 +419,7 @@
 	
 	public void doShareLinkTutorialPost(Viewpoint viewpoint, User recipient) throws RetryException {
 		doTutorialPost(viewpoint, recipient, Character.LOVES_ACTIVITY, 
-				configuration.getBaseUrl(viewpoint) + "/account",
+				configuration.getBaseUrl(viewpoint) + "/features",
 				"Welcome to Mugshot!",
 				"Learn how you can create shares like this to send to your friends, and see what other features Mugshot offers.");
 	}

Modified: dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/VerifyServlet.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/VerifyServlet.java	2008-04-16 18:53:39 UTC (rev 7423)
+++ dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/VerifyServlet.java	2008-04-16 19:37:53 UTC (rev 7424)
@@ -42,7 +42,7 @@
 	static final long serialVersionUID = 1;
 
 	private String doInvitationToken(HttpServletRequest request, HttpServletResponse response, InvitationToken invite) 
-	    throws HumanVisibleException, HttpException, ServletException, IOException {
+	    throws HumanVisibleException, HttpException, ServletException, IOException, RetryException {
 		
 		logger.debug("Processing invitation token {}", invite);