Fix logging in on changing server address

Logging in now loops until login is successful.
Also made the login messages more clear, and validated login first in the command paste
Also fix not filling out username if login failed

Author: Irene

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

@@ -85,10 +85,13 @@ 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();
+                io.println("You have been logged out.");
+                io.println("Please login again to use the new server.");
                 LoginCommand loginCommand = new LoginCommand();
-                loginCommand.login(context, null, Optional.of(value));
+                while (!loginCommand.login(context, null, Optional.of(value))) {
+                    io.println("Please login again.");
+                }
             }
         });
         ALLOWED_KEYS.put(testResultRightKey, new PropertyFunctions() {
@@ -291,7 +294,7 @@ private void setProperties(String[] arguments) {
             String oldValue = properties.get(parts[0]);
             if (parts[0].equals(serverAddressKey)) {
                 io.println("All courses are now hosted at https://tmc.mooc.fi. We do not advise changing the server address.");
-                if (parts[0].contains("tmc.mooc.fi/mooc")) {
+                if (parts[1].contains("tmc.mooc.fi/mooc")) {
                     io.println("The server https://tmc.mooc.fi/mooc is no longer supported by this client.\n" +
                             "If you'd like to do the migrated courses, you'll have to create an account on the new server.\n" +
                             "Choose the MOOC organization when logging in.\n\n" +

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

@@ -56,8 +56,8 @@ public void run(CliContext context, CommandLine args) {
                     (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.");
+            io.println("You can change your organization with the command organization.");
+            io.println("You can change your current settings with the command config.");
             return;
         }
 
@@ -75,7 +75,7 @@ public void run(CliContext context, CommandLine args) {
         login(this.ctx, args, Optional.absent());
     }
 
-    public void login(CliContext ctx, CommandLine args, Optional<String> serverAddress) {
+    public boolean 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);
@@ -89,21 +89,22 @@ public void login(CliContext ctx, CommandLine args, Optional<String> serverAddre
 
         if (!TmcUtil.tryToLogin(ctx, account, password)) {
             ctx.getSettings().setAccount(ctx, new Account());
-            return;
+            username = null;
+            return false;
         }
 
         OrganizationCommand organizationCommand = new OrganizationCommand();
-        Optional<Organization> organization = organizationCommand.chooseOrganization(ctx, Optional.of(args));
+        Optional<Organization> organization = organizationCommand.chooseOrganization(ctx, Optional.fromNullable(args));
         if (!organization.isPresent()) {
-            return;
+            return false;
         }
         account.setOrganization(organization);
 
-        boolean sendDiagnostics = getBooleanAnswerFromUser(Optional.of(username),
+        boolean sendDiagnostics = getBooleanAnswerFromUser(Optional.fromNullable(username),
                 "Do you want to send crash reports for client development?",
                                     ctx.getSettings().getSendDiagnostics(), io);
         account.setSendDiagnostics(sendDiagnostics);
-        boolean sendAnalytics = getBooleanAnswerFromUser(Optional.of(username),
+        boolean sendAnalytics = getBooleanAnswerFromUser(Optional.fromNullable(username),
                 "Do you want to send analytics data for research?",
                                     ctx.getSettings().isSpywareEnabled(), io);
         account.setSendAnalytics(sendAnalytics);
@@ -112,14 +113,15 @@ public void login(CliContext ctx, CommandLine args, Optional<String> serverAddre
         list.addAccount(account);
         if (!SettingsIo.saveAccountList(list)) {
             io.errorln("Failed to write the accounts file.");
-            return;
+            return false;
         }
 
         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.");
+                "and change other settings with the command config.");
+        return true;
     }
 
     private String getLoginInfo(CommandLine line, String oldValue, String option, String prompt, Io io) {

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

@@ -48,11 +48,11 @@ public void run(CliContext context, CommandLine args) {
         this.io = context.getIo();
         WorkDir workdir = ctx.getWorkDir();
 
-        if (!parseArgs(args)) {
+        if (!ctx.checkIsLoggedIn(false, true)) {
             return;
         }
 
-        if (!ctx.checkIsLoggedIn(false, true)) {
+        if (!parseArgs(args)) {
             return;
         }