be more careful about nulling out username #3338

getUsername is used in other places and was preventing conversion!
IQSS · Jan 20, 2017 · 306bc9f · 306bc9f
1 parent 98d9724
commit 306bc9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...in/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java b/...in/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java
@@ -280,11 +280,12 @@ public void setNewUser(OAuth2UserRecord newUser) {
         setSelectedEmail(newUser.getDisplayInfo().getEmailAddress());
     }
 
+    // It's a design decision to not suggest a username.
+    public String getNeverSuggestUsername() {
+        return null;
+    }
+
     public String getUsername() {
-        boolean neverSuggestUsername = true;
-        if (neverSuggestUsername) {
-            return null;
-        }
         return username;
     }
 

diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml
@@ -41,7 +41,7 @@
                                     </span>
                                 </label>
                                 <div class="col-sm-4">
-                                    <p:inputText id="username" styleClass="form-control" value="#{OAuth2FirstLoginPage.username}" validator="#{OAuth2FirstLoginPage.validateUserName}"/>
+                                    <p:inputText id="username" styleClass="form-control" value="#{OAuth2FirstLoginPage.neverSuggestUsername}" validator="#{OAuth2FirstLoginPage.validateUserName}"/>
                                     <p:message for="username" display="text"/>
                                 </div>
                                 <div class="col-sm-offset-3 col-sm-9" jsf:rendered="#{OAuth2FirstLoginPage.convertFromBuiltinIsPossible}">