Show login screen if user is not logged in

Author: Redande

tmc-plugin/src/fi/helsinki/cs/tmc/actions/SaveSettingsAction.java

@@ -6,6 +6,7 @@
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.core.events.TmcEventBus;
+import fi.helsinki.cs.tmc.core.utilities.TmcServerAddressNormalizer;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
 import fi.helsinki.cs.tmc.ui.PreferencesUI;
@@ -46,9 +47,8 @@ public void actionPerformed(ActionEvent e) {
         TmcCoreSettingsImpl settings = (TmcCoreSettingsImpl) TmcSettingsHolder.get();
 
         settings.setUsername(prefUi.getUsername());
-        settings.setPassword(prefUi.getPassword());
-        settings.setSavingPassword(prefUi.getShouldSavePassword());
         settings.setServerBaseUrl(prefUi.getServerBaseUrl());
+        TmcServerAddressNormalizer.normalize();
         settings.setProjectRootDir(prefUi.getProjectDir());
         settings.setCheckingForUpdatesInTheBackground(prefUi.getCheckForUpdatesInTheBackground());
         settings.setCheckingForUnopenedAtStartup(prefUi.getCheckForUnopenedExercisesAtStartup());

tmc-plugin/src/fi/helsinki/cs/tmc/actions/ShowSettingsAction.java

@@ -54,8 +54,6 @@ public void run() {
 
         TmcCoreSettingsImpl settings = (TmcCoreSettingsImpl) TmcSettingsHolder.get();
         prefUI.setUsername(settings.getUsername());
-        prefUI.setPassword(settings.getPassword());
-        prefUI.setShouldSavePassword(settings.isSavingPassword());
         prefUI.setServerBaseUrl(settings.getServerBaseUrl());
         prefUI.setProjectDir(settings.getProjectRootDir());
         prefUI.setCheckForUpdatesInTheBackground(settings.isCheckingForUpdatesInTheBackground());

tmc-plugin/src/fi/helsinki/cs/tmc/actions/TmcModuleInstall.java

@@ -77,8 +77,6 @@ public void run() {
                 if (isFirstRun) {
                     doFirstRun();
                     prefs.putBoolean(PREF_FIRST_RUN, false);
-                } else if (new TmcServerCommunicationTaskFactory().needsOnlyPassword() && CourseDb.getInstance().getCurrentCourse() != null) {
-                    LoginDialog.display(new CheckForNewExercisesOrUpdates(false, false));
                 } else {
                     // Do full refresh.
                     new RefreshCoursesAction().addDefaultListener(false, true).addListener(new BgTaskListener<List<Course>>() {

tmc-plugin/src/fi/helsinki/cs/tmc/coreimpl/TmcCoreSettingsImpl.java

@@ -2,6 +2,7 @@
 
 import fi.helsinki.cs.tmc.core.configuration.TmcSettings;
 import fi.helsinki.cs.tmc.core.domain.Course;
+import fi.helsinki.cs.tmc.core.domain.OauthCredentials;
 import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.core.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
@@ -24,7 +25,7 @@
 
 public class TmcCoreSettingsImpl implements TmcSettings {
 
-   
+
     private static final String PREF_BASE_URL = "baseUrl";
     private static final String PREF_USERNAME = "username";
     private static final String PREF_PASSWORD = "password";
@@ -37,19 +38,25 @@ public class TmcCoreSettingsImpl implements TmcSettings {
     private static final String PREF_RESOLVE_DEPENDENCIES = "resolveDependencies";
     private static final String PREF_SEND_DIAGNOSTICS = "sendDiagnostics";
     private static final String PREF_OAUTH_TOKEN = "oauthToken";
-    
+    private static final String PREF_OAUTH_APPLICATION_ID = "oauthApplicationId";
+    private static final String PREF_OAUTH_SECRET = "oauthSecret";
+    private static final String PREF_ORGANIZATION = "organization";
+
     private static PersistableSettings settings = PersistableSettings.forModule(TmcCoreSettingsImpl.class);
 
     private Tailoring tailoring = SelectedTailoring.get();
     private TmcEventBus eventBus = TmcEventBus.getDefault();
-    
-    private String unsavedPassword = settings.get(PREF_PASSWORD, "");
 
     @Override
     public String getServerAddress() {
         return settings.get(PREF_BASE_URL, tailoring.getDefaultServerUrl());
     }
 
+    @Override
+    public void setServerAddress(String address) {
+        settings.put(PREF_BASE_URL, address);
+    }
+
     @Override
     public boolean userDataExists() {
         return true;
@@ -60,11 +67,6 @@ public Optional<Course> getCurrentCourse() {
         return Optional.of(CourseDb.getInstance().getCurrentCourse());
     }
 
-    @Override
-    public String apiVersion() {
-        return "7";
-    }
-
     @Override
     public String clientName() {
         return "netbeans_plugin";
@@ -119,7 +121,7 @@ public Path getConfigRoot() {
                 throw new RuntimeException(ex);
             }
         }
-       
+
         return FileUtil.toFile(tmcRoot).toPath();
     }
 
@@ -142,42 +144,61 @@ public String hostProgramVersion() {
         }
         return "unknown";
     }
-    
+
+    @Override
+    public OauthCredentials getOauthCredentials() {
+        return new OauthCredentials(settings.get(PREF_OAUTH_APPLICATION_ID, null), settings.get(PREF_OAUTH_SECRET, null));
+    }
+
+    @Override
+    public void setOauthCredentials(OauthCredentials credentials) {
+        settings.put(PREF_OAUTH_APPLICATION_ID, credentials.getOauthApplicationId());
+        settings.put(PREF_OAUTH_SECRET, credentials.getOauthSecret());
+    }
+
+    @Override
+    public void setOrganization(String organization) {
+        settings.put(PREF_ORGANIZATION, organization);
+    }
+
+    @Override
+    public String getOrganization() {
+        return settings.get(PREF_ORGANIZATION, null);
+    }
+
     public static class SavedEvent implements TmcEvent {}
-    
+
     public TmcCoreSettingsImpl() {
         // NOP
     }
-    
+
     /*package*/ TmcCoreSettingsImpl(PersistableSettings settings, Tailoring tailoring, TmcEventBus eventBus) {
         this.settings = settings;
         this.tailoring = tailoring;
         this.eventBus = eventBus;
-        
-        this.unsavedPassword = settings.get(PREF_PASSWORD, "");
     }
-    
+
     public void save() {
         settings.saveAll();
-        eventBus.post(new SavedEvent());        
+        eventBus.post(new SavedEvent());
     }
 
     public String getServerBaseUrl() {
         return settings.get(PREF_BASE_URL, tailoring.getDefaultServerUrl());
     }
-    
+
     public void setServerBaseUrl(String baseUrl) {
         baseUrl = stripTrailingSlashes(baseUrl);
         settings.put(PREF_BASE_URL, baseUrl);
     }
-    
+
     private String stripTrailingSlashes(String s) {
         while (s.endsWith("/")) {
             s = s.substring(0, s.length() - 1);
         }
         return s;
     }
-    
+
     @Override
     public String getUsername() {
         return settings.get(PREF_USERNAME, tailoring.getDefaultUsername());
@@ -186,31 +207,21 @@ public String getUsername() {
     public void setUsername(String username) {
         settings.put(PREF_USERNAME, username);
     }
-    
+
     @Override
     public Optional<String> getPassword() {
-        return Optional.fromNullable(unsavedPassword);
+        return Optional.fromNullable(settings.get(PREF_PASSWORD, null));
     }
-    
-    public void setPassword(String password) {
-        unsavedPassword = password;
-        if (isSavingPassword()) {
-            settings.put(PREF_PASSWORD, password);
-        }
-    }
-    
-    public void setSavingPassword(boolean shouldSave) {
-        if (shouldSave) {
-            settings.put(PREF_PASSWORD, unsavedPassword);
+
+    @Override
+    public void setPassword(Optional<String> password) {
+        if (password.isPresent()) {
+            settings.put(PREF_PASSWORD, password.get());
         } else {
             settings.remove(PREF_PASSWORD);
         }
     }
-    
-    public boolean isSavingPassword() {
-        return settings.get(PREF_PASSWORD, null) != null;
-    }
-    
+
     public String getProjectRootDir() {
         String path = settings.get(PREF_PROJECT_ROOT_DIR, null);
         if (path != null) {
@@ -220,23 +231,23 @@ public String getProjectRootDir() {
             return ProjectMediator.getDefaultProjectRootDir();
         }
     }
-    
+
     public void setProjectRootDir(String value) {
         settings.put(PREF_PROJECT_ROOT_DIR, value);
     }
-    
+
     public boolean isCheckingForUpdatesInTheBackground() {
         return settings.get(PREF_CHECK_FOR_UPDATES_IN_BACKGROUND, "1").equals("1");
     }
-    
+
     public void setCheckingForUpdatesInTheBackground(boolean value) {
         settings.put(PREF_CHECK_FOR_UPDATES_IN_BACKGROUND, value ? "1" : "0");
     }
-    
+
     public boolean isCheckingForUnopenedAtStartup() {
         return settings.get(PREF_CHECK_FOR_UNOPENED_AT_STARTUP, "1").equals("1");
     }
-    
+
     public void setCheckingForUnopenedAtStartup(boolean value) {
         settings.put(PREF_CHECK_FOR_UNOPENED_AT_STARTUP, value ? "1" : "0");
     }
@@ -249,53 +260,48 @@ public boolean isSpywareEnabled() {
     public void setIsSpywareEnabled(boolean value) {
         settings.put(PREF_SPYWARE_ENABLED, value ? "1" : "0");
     }
-    
+
     public boolean isDetailedSpywareEnabled() {
         String defaultValue = tailoring.isDetailedSpywareEnabledByDefault() ? "1" : "0";
         return settings.get(PREF_DETAILED_SPYWARE_ENABLED, defaultValue).equals("1");
     }
-    
+
     public Locale getErrorMsgLocale() {
         Locale dflt = tailoring.getDefaultErrorMsgLocale();
         return parseLocale(settings.get(PREF_ERROR_MSG_LOCALE, ""), dflt);
     }
-    
+
     public void setErrorMsgLocale(Locale locale) {
         settings.put(PREF_ERROR_MSG_LOCALE, locale.toString());
     }
-    
+
     public void setResolveDependencies(boolean value) {
         settings.put(PREF_RESOLVE_DEPENDENCIES, value ? "1" : "0");
     }
-    
+
     public boolean getResolveDependencies() {
         return settings.get(PREF_RESOLVE_DEPENDENCIES, "1").equals("1");
     }
 
     public void setSendDiagnostics(boolean value) {
         settings.put(PREF_SEND_DIAGNOSTICS, value ? "1" : "0");
     }
-    
+
     @Override
     public boolean getSendDiagnostics() {
         return settings.get(PREF_SEND_DIAGNOSTICS, "1").equals("1");
     }
-    
+
     @Override
     public Optional<String> getToken() {
         return Optional.fromNullable(settings.get(PREF_OAUTH_TOKEN, null));
     }
-    
+
     @Override
     public void setToken(String token) {
         settings.put(PREF_OAUTH_TOKEN, token);
     }
-    
-    @Override
-    public String getOauthSecret() {
-        return ;
-    }
-    
+
     private Locale parseLocale(String s, Locale dflt) {
         if (s.isEmpty()) {
             return dflt;
@@ -312,5 +318,4 @@ private Locale parseLocale(String s, Locale dflt) {
                 return dflt;
         }
     }
-    
 }

tmc-plugin/src/fi/helsinki/cs/tmc/ui/LoginDialog.form

@@ -76,7 +76,7 @@
                   <Component id="cancelButton" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="loginButton" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="23" max="32767" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>

tmc-plugin/src/fi/helsinki/cs/tmc/ui/LoginDialog.java

@@ -3,9 +3,12 @@
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 
+import com.google.common.base.Optional;
+
+import org.openide.windows.WindowManager;
+
 import java.awt.event.ActionListener;
 import javax.swing.SwingUtilities;
-import org.openide.windows.WindowManager;
 
 public class LoginDialog extends javax.swing.JDialog {
 
@@ -14,10 +17,10 @@ public static void display(ActionListener onOk) {
         dialog.setLocationRelativeTo(null);
         dialog.setVisible(true);
     }
-
+    
     private TmcCoreSettingsImpl settings;
     private ActionListener onLogin;
-
+    
     /** Creates new form LoginForm */
     public LoginDialog(ActionListener onLogin) {
         super(WindowManager.getDefault().getMainWindow(), true);
@@ -27,8 +30,6 @@ public LoginDialog(ActionListener onLogin) {
 
         this.settings = (TmcCoreSettingsImpl)TmcSettingsHolder.get();
         this.usernameField.setText(settings.getUsername());
-        this.passwordField.setText(settings.getPassword());
-        this.savePasswordCheckbox.setSelected(settings.isSavingPassword());
 
         if (!usernameField.getText().isEmpty()) {
             SwingUtilities.invokeLater(new Runnable() {
@@ -153,8 +154,7 @@ private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
 
     private void loginButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_loginButtonActionPerformed
         settings.setUsername(usernameField.getText());
-        settings.setPassword(new String(passwordField.getPassword()));
-        settings.setSavingPassword(savePasswordCheckbox.isSelected());
+        settings.setPassword(Optional.of(new String(passwordField.getPassword())));
         settings.save();
 
         onLogin.actionPerformed(evt);

tmc-plugin/src/fi/helsinki/cs/tmc/ui/PreferencesPanel.java

@@ -3,6 +3,7 @@
 import fi.helsinki.cs.tmc.actions.RefreshCoursesAction;
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
+import fi.helsinki.cs.tmc.core.utilities.TmcServerAddressNormalizer;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 
 import fi.helsinki.cs.tmc.tailoring.SelectedTailoring;
@@ -296,8 +297,8 @@ public int hashCode() {
     private void updateSettingsForRefresh() {
         TmcCoreSettingsImpl settings = (TmcCoreSettingsImpl)TmcSettingsHolder.get();
         settings.setUsername(getUsername());
-        settings.setPassword(getPassword());
         settings.setServerBaseUrl(getServerBaseUrl());
+        TmcServerAddressNormalizer.normalize();
         settings.setProjectRootDir(getProjectDir());
         settings.save(); // TODO: is this wanted
     }