Merge pull request #361 from tmc-cli/ask-only-password-in-courses-aleksi

Get the username and server from course info in login.

Author: mikkomaa

src/main/java/fi/helsinki/cs/tmc/cli/command/LoginCommand.java

@@ -4,6 +4,7 @@
 import fi.helsinki.cs.tmc.cli.command.core.AbstractCommand;
 import fi.helsinki.cs.tmc.cli.command.core.Command;
 import fi.helsinki.cs.tmc.cli.io.Io;
+import fi.helsinki.cs.tmc.cli.tmcstuff.CourseInfo;
 import fi.helsinki.cs.tmc.cli.tmcstuff.Settings;
 import fi.helsinki.cs.tmc.cli.tmcstuff.SettingsIo;
 import fi.helsinki.cs.tmc.cli.tmcstuff.TmcUtil;
@@ -17,6 +18,10 @@ public class LoginCommand extends AbstractCommand {
     private CliContext ctx;
     private Io io;
 
+    private String serverAddress;
+    private String username;
+    private String password;
+
     @Override
     public void getOptions(Options options) {
         options.addOption("u", "user", true, "TMC username");
@@ -28,37 +33,47 @@ public void getOptions(Options options) {
     public void run(CommandLine args, Io io) {
         this.ctx = getContext();
         this.io = io;
-        String serverAddress = getLoginInfo(args, "s", "server address: ");
-        String username = getLoginInfo(args, "u", "username: ");
-        String password = getLoginInfo(args, "p", "password: ");
 
         if (!ctx.loadBackendWithoutLogin()) {
             return;
         }
 
+        CourseInfo info = ctx.getCourseInfo();
+        if (info != null) {
+            serverAddress = info.getServerAddress();
+            username = info.getUsername();
+        }
+
+        serverAddress = getLoginInfo(args, serverAddress, "s", "server address: ");
+        username = getLoginInfo(args, username, "u", "username: ");
+        password = getLoginInfo(args, null, "p", "password: ");
+
         //TODO don't create new settings object.  
         Settings settings = new Settings(serverAddress, username, password);
-        if (TmcUtil.tryToLogin(ctx, settings) && saveLoginSettings(settings)) {
-            io.println("Login successful.");
+        if (!TmcUtil.tryToLogin(ctx, settings)) {
+            return;
         }
+        if (!SettingsIo.save(settings)) {
+            io.println("Failed to write the accounts file.");
+            return;
+        }
+
+        io.println("Login successful.");
     }
 
-    private String getLoginInfo(CommandLine line, String option, String prompt) {
-        String info = line.getOptionValue(option);
-        if (info == null && option.equals("p")) {
-            info = io.readPassword(prompt);
-        } else if (info == null) {
-            info = io.readLine(prompt);
+    private String getLoginInfo(CommandLine line, String oldValue, String option,
+            String prompt) {
+        String value = oldValue;
+
+        if (line.hasOption(option)) {
+            value = line.getOptionValue(option);
         }
-        return info;
-    }
 
-    private boolean saveLoginSettings(Settings settings) {
-        if (SettingsIo.save(settings)) {
-            return true;
-        } else {
-            io.println("Login failed.");
-            return false;
+        if (value == null && option.equals("p")) {
+            value = io.readPassword(prompt);
+        } else if (value == null) {
+            value = io.readLine(prompt);
         }
+        return value;
     }
 }

src/main/java/fi/helsinki/cs/tmc/cli/tmcstuff/Settings.java

@@ -41,6 +41,24 @@ public void setWorkDir(WorkDir workDir) {
         this.workDir = workDir;
     }
 
+    public static boolean stringEquals(String str1, String str2) {
+        return (str1 == null ? str2 == null : str1.equals(str2));
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof Settings)) {
+            return false;
+        }
+        Settings another = (Settings)obj;
+        return stringEquals(this.serverAddress, another.serverAddress)
+                && stringEquals(this.username, another.username)
+                && stringEquals(this.password, another.password);
+    }
+
     @Override
     public String getServerAddress() {
         return serverAddress;

src/test/java/fi/helsinki/cs/tmc/cli/command/LoginCommandTest.java

@@ -2,23 +2,26 @@
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
+import static org.powermock.api.mockito.PowerMockito.verifyStatic;
 
 import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.cli.CliContext;
 import fi.helsinki.cs.tmc.cli.io.TestIo;
+import fi.helsinki.cs.tmc.cli.tmcstuff.CourseInfo;
 import fi.helsinki.cs.tmc.cli.tmcstuff.Settings;
 import fi.helsinki.cs.tmc.cli.tmcstuff.SettingsIo;
 import fi.helsinki.cs.tmc.cli.tmcstuff.TmcUtil;
 import fi.helsinki.cs.tmc.core.TmcCore;
+import fi.helsinki.cs.tmc.core.configuration.TmcSettings;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -49,7 +52,17 @@ public void setUp() {
     }
 
     @Test
-    public void logsInWithCorrectServerUserAndPassword() throws Exception {
+    public void failIfBackendFails() {
+        app = new Application(ctx);
+        when(ctx.loadBackendWithoutLogin()).thenReturn(false);
+
+        String[] args = {"login", "-s", SERVER, "-u", USERNAME, "-p", PASSWORD};
+        app.run(args);
+        io.assertNotContains("Login successful");
+    }
+
+    @Test
+    public void logsInWithCorrectServerUserAndPassword() {
         when(TmcUtil.tryToLogin(eq(ctx), any(Settings.class))).thenReturn(true);
         when(SettingsIo.save(any(Settings.class))).thenReturn(true);
         String[] args = {"login", "-s", SERVER, "-u", USERNAME, "-p", PASSWORD};
@@ -58,16 +71,16 @@ public void logsInWithCorrectServerUserAndPassword() throws Exception {
     }
 
     @Test
-    public void userGetsErrorMessageIfLoginFails() throws Exception {
+    public void userGetsErrorMessageIfLoginFails() {
         when(TmcUtil.tryToLogin(eq(ctx), any(Settings.class))).thenReturn(true);
         when(SettingsIo.save(any(Settings.class))).thenReturn(false);
         String[] args = {"login", "-s", SERVER, "-u", USERNAME, "-p", "WrongPassword"};
         app.run(args);
-        io.assertContains("Login failed.");
+        io.assertContains("Failed to write the accounts file.");
     }
 
     @Test
-    public void loginAsksUsernameFromUserIfNotGiven() throws Exception {
+    public void loginAsksUsernameFromUserIfNotGiven() {
         when(TmcUtil.tryToLogin(eq(ctx), any(Settings.class))).thenReturn(true);
         String[] args = {"login", "-s", SERVER, "-p", PASSWORD};
         io.addLinePrompt(USERNAME);
@@ -76,7 +89,7 @@ public void loginAsksUsernameFromUserIfNotGiven() throws Exception {
     }
 
     @Test
-    public void loginAsksPasswordFromUserIfNotGiven() throws Exception {
+    public void loginAsksPasswordFromUserIfNotGiven() {
         when(TmcUtil.tryToLogin(eq(ctx), any(Settings.class))).thenReturn(true);
         String[] args = {"login", "-s", SERVER, "-u", USERNAME};
         io.addPasswordPrompt(PASSWORD);
@@ -85,11 +98,38 @@ public void loginAsksPasswordFromUserIfNotGiven() throws Exception {
     }
 
     @Test
-    public void loginAsksServerFromUserIfNotGiven() throws Exception {
+    public void loginAsksServerFromUserIfNotGiven() {
         when(TmcUtil.tryToLogin(eq(ctx), any(Settings.class))).thenReturn(true);
         String[] args = {"login", "-p", PASSWORD, "-u", USERNAME};
         io.addLinePrompt(SERVER);
         app.run(args);
         io.assertAllPromptsUsed();
     }
+
+    @Test
+    public void serverAndNotAskedAfterLogout() {
+        TmcSettings settings = new Settings(SERVER, "username", "pass");
+        CourseInfo info = new CourseInfo(settings, null);
+        when(TmcUtil.tryToLogin(eq(ctx), any(Settings.class))).thenReturn(true);
+        when(ctx.getCourseInfo()).thenReturn(info);
+        String[] args = {"login"};
+        io.addPasswordPrompt(PASSWORD);
+        app.run(args);
+        io.assertAllPromptsUsed();
+    }
+
+    @Test
+    public void courseInfoValuesOverridedByOptions() {
+        Settings settings = new Settings(SERVER, "username", "pass");
+        CourseInfo info = new CourseInfo(settings, null);
+        when(TmcUtil.tryToLogin(eq(ctx), any(Settings.class))).thenReturn(true);
+        when(ctx.getCourseInfo()).thenReturn(info);
+        String[] args = {"login", "-p", PASSWORD, "-u", USERNAME};
+        app.run(args);
+        io.assertAllPromptsUsed();
+
+        Settings expectedSettings = new Settings(SERVER, USERNAME, PASSWORD);
+        verifyStatic();
+        TmcUtil.tryToLogin(eq(ctx), eq(expectedSettings));
+    }
 }

src/test/java/fi/helsinki/cs/tmc/cli/tmcstuff/SettingsTest.java

@@ -26,6 +26,24 @@ public void constructorInitializesFields() {
         assertEquals("testpassword", settings.getPassword());
     }
 
+    @Test
+    public void equalsWorksWithSameValues() {
+        Settings compared = new Settings("testserver", "testuser", "testpassword");
+        assertEquals(true, settings.equals(compared));
+    }
+
+    @Test
+    public void equalsWorksWithNull() {
+        Settings compared = new Settings(null, "testuser", "testpassword");
+        assertEquals(false, settings.equals(compared));
+    }
+
+    @Test
+    public void equalsWorksWithRandomValue() {
+        Settings compared = new Settings("xyz", "testuser", "testpassword");
+        assertEquals(false, settings.equals(compared));
+    }
+
     @Test
     public void correctApiVersion() {
         assertEquals("7", settings.apiVersion());