Add login prompt on server address change

Author: Irene

docs/MANUAL.md

@@ -207,7 +207,7 @@ List of configurable settings:
 * *send-analytics*
   Allow sending analytics data of commands run. Stored in account.
 * *server-address*
-  Address to fetch courses from and submit to. Defaults to `https://tmc.mooc.fi`. Stored with account.
+  Address to fetch courses from and submit to. Defaults to `https://tmc.mooc.fi`. Stored with account. Changing the server address will log the user out and prompt a new login.
 
 COMMAND: ORGANIZATION
 ---------------

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

@@ -20,6 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.swing.text.html.Option;
 import java.nio.file.Path;
 import java.util.Locale;
 import java.util.concurrent.Callable;
@@ -74,7 +75,7 @@ private boolean migrateAccount(CliContext context, Account account) throws Excep
         io.println("TMC cli has been updated. Please provide the following information.");
         if (!context.getSettings().getOrganization().isPresent()) {
             OrganizationCommand organizationCommand = new OrganizationCommand();
-            Optional<Organization> organization = organizationCommand.chooseOrganization(context, null);
+            Optional<Organization> organization = organizationCommand.chooseOrganization(context, Optional.absent());
             if (!organization.isPresent()) {
                 return false;
             }
@@ -83,12 +84,12 @@ private boolean migrateAccount(CliContext context, Account account) throws Excep
         Callable<Void> callable = context.getTmcCore().authenticate(ProgressObserver.NULL_OBSERVER, account.getPassword().get());
         callable.call();
         LoginCommand loginCommand = new LoginCommand();
-        boolean sendDiagnostics = loginCommand.getAnswerFromUser(null, account.getServerAddress(),
+        boolean sendDiagnostics = loginCommand.getBooleanAnswerFromUser(Optional.absent(),
                 "Do you want to send crash reports for client development?",
                 false,
                 io);
         account.setSendDiagnostics(sendDiagnostics);
-        boolean sendAnalytics = loginCommand.getAnswerFromUser(null, account.getServerAddress(),
+        boolean sendAnalytics = loginCommand.getBooleanAnswerFromUser(Optional.absent(),
                 "Do you want to send analytics data for research?",
                 false,
                 io);

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

@@ -5,6 +5,7 @@
 import fi.helsinki.cs.tmc.cli.core.AbstractCommand;
 import fi.helsinki.cs.tmc.cli.core.CliContext;
 import fi.helsinki.cs.tmc.cli.core.Command;
+import fi.helsinki.cs.tmc.cli.core.CommandFactory;
 import fi.helsinki.cs.tmc.cli.io.Io;
 
 import fi.helsinki.cs.tmc.cli.utils.BadValueTypeException;
@@ -84,6 +85,10 @@ public void setter(String value) throws BadValueTypeException {
                 context.getSettings().setServerAddress(addr);
                 normalizeServerAddress();
                 SettingsIo.saveCurrentSettingsToAccountList(context.getSettings());
+                io.println("Please login again to use the new server.");
+                SettingsIo.delete();
+                LoginCommand loginCommand = new LoginCommand();
+                loginCommand.login(context, null, Optional.of(value));
             }
         });
         ALLOWED_KEYS.put(testResultRightKey, new PropertyFunctions() {

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

@@ -12,6 +12,7 @@
 
 import fi.helsinki.cs.tmc.core.domain.Organization;
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 
 import com.google.common.base.Optional;
@@ -49,9 +50,11 @@ public void run(CliContext context, CommandLine args) {
         }
 
         if (this.ctx.checkIsLoggedIn(true, true)) {
-            io.println("You are already logged in as " + this.ctx.getSettings().getUsername().get() +
-                    (this.ctx.getSettings().getOrganization().isPresent() ?
-                    " and your current organization is " + this.ctx.getSettings().getOrganization().get().getName() :
+            Optional<String> username = this.ctx.getSettings().getUsername();
+            Optional<Organization> organization = this.ctx.getSettings().getOrganization();
+            io.println("You are already logged in " + (username.isPresent()? "as " + username.get() : "") +
+                    (organization.isPresent() ?
+                    " and your current organization is " + organization.get().getName() :
                     "."));
             io.println("Change your organization with the command organization.");
             io.println("Inspect and change your current settings with the command config.");
@@ -69,31 +72,40 @@ public void run(CliContext context, CommandLine args) {
             username = info.getUsername();
         }
 
-        username = getLoginInfo(args, username, "u", "username: ");
-        password = getLoginInfo(args, null, "p", "password: ");
+        login(this.ctx, args, Optional.absent());
+    }
+
+    public void login(CliContext ctx, CommandLine args, Optional<String> serverAddress) {
+        Io io = ctx.getIo();
+        username = getLoginInfo(args, username, "u", "username: ", io);
+        password = getLoginInfo(args, null, "p", "password: ", io);
+
 
         Account account = new Account(username);
+        if (serverAddress.isPresent()) {
+            account.setServerAddress(serverAddress.get());
+        }
         ctx.useAccount(account);
 
         if (!TmcUtil.tryToLogin(ctx, account, password)) {
-            this.ctx.getSettings().setAccount(this.ctx, new Account());
+            ctx.getSettings().setAccount(ctx, new Account());
             return;
         }
 
         OrganizationCommand organizationCommand = new OrganizationCommand();
-        Optional<Organization> organization = organizationCommand.chooseOrganization(ctx, args);
+        Optional<Organization> organization = organizationCommand.chooseOrganization(ctx, Optional.of(args));
         if (!organization.isPresent()) {
             return;
         }
         account.setOrganization(organization);
 
-        boolean sendDiagnostics = getAnswerFromUser(username, account.getServerAddress(),
-                            "Do you want to send crash reports for client development?",
-                                    this.ctx.getSettings().getSendDiagnostics(), this.io);
+        boolean sendDiagnostics = getBooleanAnswerFromUser(Optional.of(username),
+                "Do you want to send crash reports for client development?",
+                                    ctx.getSettings().getSendDiagnostics(), io);
         account.setSendDiagnostics(sendDiagnostics);
-        boolean sendAnalytics = getAnswerFromUser(username, account.getServerAddress(),
-                            "Do you want to send analytics data for research?",
-                                    this.ctx.getSettings().isSpywareEnabled(), this.io);
+        boolean sendAnalytics = getBooleanAnswerFromUser(Optional.of(username),
+                "Do you want to send analytics data for research?",
+                                    ctx.getSettings().isSpywareEnabled(), io);
         account.setSendAnalytics(sendAnalytics);
 
         AccountList list = SettingsIo.loadAccountList();
@@ -103,18 +115,18 @@ public void run(CliContext context, CommandLine args) {
             return;
         }
 
-        this.ctx.getAnalyticsFacade().saveAnalytics("login");
+        ctx.getAnalyticsFacade().saveAnalytics("login");
 
         io.println("Login successful.");
         io.println("You can change your organization with the command organization, " +
                 "and inspect and change other settings with the command config.");
     }
 
-    private String getLoginInfo(CommandLine line, String oldValue, String option, String prompt) {
+    private String getLoginInfo(CommandLine line, String oldValue, String option, String prompt, Io io) {
         String value = oldValue;
         boolean isPassword = option.equals("p");
 
-        if (line.hasOption(option)) {
+        if (line != null && line.hasOption(option)) {
             value = line.getOptionValue(option);
         }
 
@@ -130,9 +142,9 @@ private String getLoginInfo(CommandLine line, String oldValue, String option, St
         return value;
     }
 
-    public boolean getAnswerFromUser(String username, String server, String prompt, boolean defaultValue, Io io) {
+    public boolean getBooleanAnswerFromUser(Optional<String> username, String prompt, boolean defaultValue, Io io) {
         AccountList savedAccounts = SettingsIo.loadAccountList();
-        if (username != null && savedAccounts.getAccount(username) != null) {
+        if (username.isPresent() && savedAccounts.getAccount(username.get()) != null) {
             // not the first time logging in
             return defaultValue;
         }

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

@@ -10,6 +10,7 @@
 import fi.helsinki.cs.tmc.cli.utils.OptionalToGoptional;
 import fi.helsinki.cs.tmc.core.domain.Organization;
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 
 import java.util.ArrayList;
@@ -37,7 +38,7 @@ public void run(CliContext ctx, CommandLine args) {
 
         this.ctx.getAnalyticsFacade().saveAnalytics("organization");
 
-        Optional<Organization> organization = chooseOrganization(ctx, args);
+        Optional<Organization> organization = chooseOrganization(ctx, Optional.of(args));
         this.ctx.getSettings().setOrganization(organization);
         SettingsIo.saveCurrentSettingsToAccountList(this.ctx.getSettings());
     }
@@ -80,24 +81,24 @@ private void printFormattedOrganization(Organization o) {
     }
 
 
-    private String getOrganizationFromUser(List<Organization> organizations, CommandLine line, boolean printOptions, boolean oneLine) {
-        if (oneLine && line != null && line.hasOption("o")) {
-            return line.getOptionValue("o");
+    private String getOrganizationFromUser(List<Organization> organizations, Optional<CommandLine> line, boolean printOptions, boolean oneLine) {
+        if (oneLine && line.isPresent() && line.get().hasOption("o")) {
+            return line.get().getOptionValue("o");
         }
         if (printOptions) {
-            printOrganizations(organizations, line != null && !line.hasOption("n") && !EnvironmentUtil.isWindows());
+            printOrganizations(organizations, line.isPresent() && !line.get().hasOption("n") && !EnvironmentUtil.isWindows());
         }
         return io.readLine("Choose an organization by writing its slug: ");
     }
 
 
-    public Optional<Organization> chooseOrganization(CliContext ctx, CommandLine args) {
+    public Optional<Organization> chooseOrganization(CliContext ctx, Optional<CommandLine> args) {
         this.ctx = ctx;
         this.io = ctx.getIo();
         boolean printOptions = true;
         boolean oneLine = false;
-        if (args != null) {
-            oneLine = args.hasOption("o");
+        if (args.isPresent()) {
+            oneLine = args.get().hasOption("o");
         }
         List<Organization> organizations = listOrganizations();
         if (organizations == null || organizations.isEmpty()) {

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

@@ -3,22 +3,21 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
 import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.cli.analytics.AnalyticsFacade;
-import fi.helsinki.cs.tmc.cli.backend.Account;
-import fi.helsinki.cs.tmc.cli.backend.AccountList;
-import fi.helsinki.cs.tmc.cli.backend.Settings;
-import fi.helsinki.cs.tmc.cli.backend.SettingsIo;
+import fi.helsinki.cs.tmc.cli.backend.*;
 import fi.helsinki.cs.tmc.cli.core.CliContext;
 import fi.helsinki.cs.tmc.cli.io.TestIo;
 
 import fi.helsinki.cs.tmc.cli.io.WorkDir;
 import fi.helsinki.cs.tmc.core.TmcCore;
+import fi.helsinki.cs.tmc.core.domain.Organization;
 import fi.helsinki.cs.tmc.langs.util.TaskExecutor;
 import fi.helsinki.cs.tmc.langs.util.TaskExecutorImpl;
 import fi.helsinki.cs.tmc.spyware.EventSendBuffer;
@@ -35,10 +34,11 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.HashMap;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest(SettingsIo.class)
+@PrepareForTest({ SettingsIo.class, TmcUtil.class })
 public class ConfigCommandTest {
 
     private Application app;
@@ -69,7 +69,11 @@ public void setup() throws IOException {
         when(ctx.getSettings()).thenReturn(settings);
         testConfigRoot = Files.createTempDirectory(".test-config");
         mockStatic(SettingsIo.class);
+        mockStatic(TmcUtil.class);
         when(SettingsIo.getPropertiesFile(any(Path.class))).thenReturn(testConfigRoot.resolve(TEST_PROPERTIES_FILENAME));
+        ArrayList<Organization> organizationList = new ArrayList<>();
+        organizationList.add(new Organization("Test", "", "test", "", false));
+        when(TmcUtil.getOrganizationsFromServer(any(CliContext.class))).thenReturn(organizationList);
         when(SettingsIo.getConfigDirectory()).thenReturn(testConfigRoot);
         AccountList t = new AccountList();
         t.addAccount(new Account("username", ""));
@@ -271,13 +275,6 @@ public void sendDiagnosticsIsAllowed() {
         io.assertContains("Set send-diagnostics to");
     }
 
-    @Test
-    public void serverAddressIsAllowed() {
-        io.addConfirmationPrompt(true);
-        app.run(new String[] {"config", "server-address=https://mooc.fi"});
-        io.assertContains("Set server-address to");
-    }
-
     @Test
     public void printsErrorWithTooFewArgumentsa() {
         app.run(new String[] {"config", "inValid"});
@@ -305,8 +302,14 @@ public void sendDiagnosticsIsValidated() {
     }
 
     @Test
-    public void serverAddressConfiguredToSettings() {
+    public void serverAddressConfiguredToSettingsAndPromptsLogin() {
+        when(TmcUtil.tryToLogin(eq(ctx), any(Account.class), any(String.class))).thenReturn(true);
         io.addConfirmationPrompt(true);
+        io.addLinePrompt("test");
+        io.addPasswordPrompt("password");
+        io.addLinePrompt("test");
+        io.addLinePrompt("yes");
+        io.addLinePrompt("yes");
         app.run(new String[] {"config", "server-address=https://mooc.fi"});
         assertEquals("https://mooc.fi", settings.getServerAddress());
     }
@@ -328,32 +331,32 @@ public void configuredToSettingsWithQuiet() {
     public void ifSeveralPairsAndSomeInvalidConfiguresValidOnes() {
         io.addConfirmationPrompt(true);
         io.addConfirmationPrompt(true);
-        app.run(new String[] {"config", "send-diagnostics=asdf", "server-address=https://mooc.fi"});
+        app.run(new String[] {"config", "send-diagnostics=asdf", "send-diagnostics=true"});
         io.assertContains("Please write either true or false");
-        assertEquals("https://mooc.fi", settings.getServerAddress());
+        assertEquals(true, settings.getSendDiagnostics());
     }
 
     @Test
     public void ifSeveralPairsAndSomeInvalidValuesConfiguresValidOnesWithQuiet() {
-        app.run(new String[] {"config", "-q",  "send-diagnostics=asdf", "server-address=https://mooc.fi"});
+        app.run(new String[] {"config", "-q",  "send-analytics=asdf", "send-diagnostics=true"});
         io.assertContains("Please write either true or false");
-        assertEquals("https://mooc.fi", settings.getServerAddress());
+        assertEquals(true, settings.getSendDiagnostics());
     }
 
     @Test
     public void ifSeveralPairsAndSomeInvalidKeysConfiguresValidOnes() {
         io.addConfirmationPrompt(true);
         io.addConfirmationPrompt(true);
-        app.run(new String[] {"config",  "asd=asdf", "server-address=https://mooc.fi"});
+        app.run(new String[] {"config",  "asd=asdf", "send-diagnostics=true"});
         io.assertContains("not an allowed key");
-        assertEquals("https://mooc.fi", settings.getServerAddress());
+        assertEquals(true, settings.getSendDiagnostics());
     }
 
     @Test
     public void ifSeveralPairsAndSomeInvalidKeysConfiguresValidOnesWithQuiet() {
-        app.run(new String[] {"config", "-q",  "asd=asdf", "server-address=https://mooc.fi"});
+        app.run(new String[] {"config", "-q",  "asd=asdf", "send-diagnostics=true"});
         io.assertContains("not an allowed key");
-        assertEquals("https://mooc.fi", settings.getServerAddress());
+        assertEquals(true, settings.getSendDiagnostics());
     }
 
     @Test