fix invite by unexisting email address

SwellRT · Aug 12, 2016 · bd9a14c · bd9a14c
1 parent 07140a3
commit bd9a14c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 21 deletions.
diff --git a/wave/build.gradle b/wave/build.gradle
@@ -30,11 +30,7 @@ apply plugin: 'com.google.protobuf'
 /* Meta Data Info */
 def title = 'SwellRT'
 def vendor = 'SwellRT Community'
-<<<<<<< HEAD
 version = "0.53.0-alpha"
-=======
-version = "0.51.3-alpha"
->>>>>>> Fixes class dependency in ObjectApi
 archivesBaseName = "swellrt"
 def distFolder = "swellrt"
 mainClassName = "org.waveprotocol.box.server.ServerMain"
@@ -326,14 +322,14 @@ task generateGXP {
 
 
 //
-// Warning: excluding sources from GWT modules doesn't seem to work properly. 
+// Warning: excluding sources from GWT modules doesn't seem to work properly.
 // see http://stackoverflow.com/questions/27902152/gwt-2-7-ignores-exclude-tag
 //
 // Workaround:
 //
 // Add "-noincremental"
 // Remove "-strict"
-// 
+//
 
 
 task compileJsWeb {
@@ -352,7 +348,7 @@ task compileJsWeb {
             jvmArgs = [
                     "-Xmx1024M"
             ]
-            args = [            		
+            args = [
                     "-style", "OBFUSCATED",
                     "-XnoclassMetadata",
                     "-XnocheckCasts",
@@ -386,7 +382,7 @@ task compileJsWebDev {
                     "-noincremental",
                     "-logLevel", "TRACE",
                     "-saveSource",
-                    "-draftCompile",                   
+                    "-draftCompile",
                     "org.swellrt.api.SwellRT"
             ]
         }
@@ -404,9 +400,9 @@ compileJava.dependsOn = [generateMessages, generateGXP]
 
 /* Gwt Dev Tasks */
 
-/* 
+/*
 	Use CodeServer instead of DevMode to have the
-	-style property available.  
+	-style property available.
 */
 
 
@@ -428,9 +424,9 @@ task gwtDev {
             		"-style", "PRETTY",
             		"-XmethodNameDisplayMode", "FULL",
                     "-noprecompile",
-                    "-noincremental",                               
+                    "-noincremental",
                     "-bindAddress", "0.0.0.0",
-                    "-logLevel", "DEBUG",                 
+                    "-logLevel", "DEBUG",
                     "org.swellrt.api.SwellRT",
             ]
         }
@@ -440,7 +436,7 @@ task gwtDev {
 gwtDev.dependsOn compileJava
 
 //
-// Warning: excluding sources from GWT modules doesn't seem to work properly. 
+// Warning: excluding sources from GWT modules doesn't seem to work properly.
 // see http://stackoverflow.com/questions/27902152/gwt-2-7-ignores-exclude-tag
 //
 
@@ -460,12 +456,12 @@ task gwtEditorDev {
                         configurations.gwt,
                 ]
             }
-            args = [            		
+            args = [
             		"-style", "PRETTY",
             		"-XmethodNameDisplayMode", "FULL",
                     "-noprecompile",
-                    "-noincremental",                               
-                    "-bindAddress", "0.0.0.0",                                        
+                    "-noincremental",
+                    "-bindAddress", "0.0.0.0",
                     "-logLevel", "TRACE",
                     "org.waveprotocol.wave.client.editor.harness.EditorTest",
             ]

diff --git a/wave/src/main/java/org/swellrt/server/box/servlet/InviteService.java b/wave/src/main/java/org/swellrt/server/box/servlet/InviteService.java
@@ -86,9 +86,9 @@ public void execute(HttpServletRequest req, HttpServletResponse response) throws
 
     String idOrEmail = req.getParameter(ID_OR_EMAIL);
 
-    String emailAddress = "";
+    String emailAddress = idOrEmail;
 
-    String nickOrEmail = "";
+    String nickOrEmail = idOrEmail;
 
     List<AccountData> accounts = null;
 
@@ -108,9 +108,6 @@ public void execute(HttpServletRequest req, HttpServletResponse response) throws
           emailAddress = acc.asHuman().getEmail();
           nickOrEmail = acc.getId().getName();
         }
-      } else {
-        emailAddress = idOrEmail;
-        nickOrEmail = idOrEmail;
       }
     } catch (PersistenceException e) {
       response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);