Merge pull request #67 from benbc/insist-username-not-empty

Insist that username is not empty

Author: benbc

cypher-shell/src/main/java/org/neo4j/shell/Main.java

@@ -127,16 +127,36 @@ void connectInteractively(@Nonnull CypherShell shell, @Nonnull ConnectionConfig
             }
             // else need to prompt for username and password
             if (connectionConfig.username().isEmpty()) {
-                connectionConfig.setUsername(promptForText("username: ", null));
+                connectionConfig.setUsername(promptForNonEmptyText("username", null));
             }
             if (connectionConfig.password().isEmpty()) {
-                connectionConfig.setPassword(promptForText("password: ", '*'));
+                connectionConfig.setPassword(promptForText("password", '*'));
             }
             // try again
             shell.connect(connectionConfig);
         }
     }
 
+    /**
+     * @param prompt
+     *         to display to the user
+     * @param mask
+     *         single character to display instead of what the user is typing, use null if text is not secret
+     * @return the text which was entered
+     * @throws Exception
+     *         in case of errors
+     */
+    @Nonnull
+    private String promptForNonEmptyText(@Nonnull String prompt, @Nullable Character mask) throws Exception {
+        String text = promptForText(prompt, mask);
+        if (!text.isEmpty()) {
+            return text;
+        }
+        out.println(prompt + " cannot be empty");
+        out.println();
+        return promptForNonEmptyText(prompt, mask);
+    }
+
     /**
      * @param prompt
      *         to display to the user
@@ -150,7 +170,7 @@ void connectInteractively(@Nonnull CypherShell shell, @Nonnull ConnectionConfig
     private String promptForText(@Nonnull String prompt, @Nullable Character mask) throws Exception {
         String line;
         ConsoleReader consoleReader = new ConsoleReader(in, out);
-        line = consoleReader.readLine(prompt, mask);
+        line = consoleReader.readLine(prompt + ": ", mask);
         consoleReader.close();
 
         if (line == null) {

cypher-shell/src/test/java/org/neo4j/shell/MainTest.java

@@ -170,6 +170,28 @@ public void connectInteractivelyTriesOnlyOnceIfUserPassExists() throws Exception
         }
     }
 
+    @Test
+    public void connectInteractivelyRepromptsIfUserIsNotProvided() throws Exception {
+        doThrow(authException).doNothing().when(shell).connect(connectionConfig);
+
+        String inputString = "\nbob\nsecret\n";
+        InputStream inputStream = new ByteArrayInputStream(inputString.getBytes());
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PrintStream ps = new PrintStream(baos);
+
+        Main main = new Main(inputStream, ps);
+        main.connectInteractively(shell, connectionConfig);
+
+        String out = new String(baos.toByteArray(), StandardCharsets.UTF_8);
+
+        assertEquals(out, "username: \r\nusername cannot be empty" + System.lineSeparator() + System.lineSeparator() +
+                "username: bob\r\npassword: ******\r\n");
+        verify(connectionConfig).setUsername("bob");
+        verify(connectionConfig).setPassword("secret");
+        verify(shell, times(2)).connect(connectionConfig);
+    }
+
     @Test
     public void printsVersionAndExits() throws Exception {
         CliArgs args = new CliArgs();