Added logout functionality

Author: cicchr

assign-client/src/main/java/edu/rpi/aris/assign/client/controller/AssignGui.java

@@ -27,13 +27,19 @@ public class AssignGui {
     @FXML
     private Label lblUsername;
     @FXML
+    private Label lblClass;
+    @FXML
     private Button login;
     @FXML
+    private Button refreshButton;
+    @FXML
     private Tab assignmentTab;
     @FXML
     private Tab studentTab;
     @FXML
     private Tab problemTab;
+    @FXML
+    private MenuItem loginMenu;
 
     private UserInfo userInfo = new UserInfo();
     private Stage stage;
@@ -104,9 +110,29 @@ public void initialize() {
 
         login.visibleProperty().bind(userInfo.loginProperty().not());
         login.managedProperty().bind(userInfo.loginProperty().not());
+        login.disableProperty().bind(userInfo.loadingProperty());
+
+        classes.visibleProperty().bind(userInfo.loginProperty());
+        classes.managedProperty().bind(userInfo.loginProperty());
+
+        lblClass.visibleProperty().bind(userInfo.loginProperty());
+        lblClass.managedProperty().bind(userInfo.loginProperty());
+
+        refreshButton.visibleProperty().bind(userInfo.loginProperty());
+        refreshButton.managedProperty().bind(userInfo.loginProperty());
 
         lblUsername.textProperty().bind(Bindings.createStringBinding(() -> userInfo.isLoggedIn() ? Config.USERNAME.getValue() + " (" + userInfo.getUserType().readableName + ")" : "Not Logged In", Config.USERNAME.getProperty(), userInfo.userTypeProperty(), userInfo.loginProperty()));
 
+        loginMenu.textProperty().bind(Bindings.createStringBinding(() -> userInfo.loginProperty().get() ? "Logout" : "Login", userInfo.loginProperty()));
+        loginMenu.disableProperty().bind(userInfo.loadingProperty());
+    }
+
+    @FXML
+    public void loginOut() {
+        if (userInfo.loginProperty().get()) {
+            userInfo.logout();
+        } else
+            refresh();
     }
 
     @FXML

assign-client/src/main/java/edu/rpi/aris/assign/client/model/UserInfo.java

@@ -76,6 +76,15 @@ public void getUserInfo(boolean refresh) {
         }
     }
 
+    public void logout() {
+        loggedIn.set(false);
+        classes.clear();
+        classMap.clear();
+        userType.set(null);
+        Config.USERNAME.setValue(null);
+        Config.ACCESS_TOKEN.setValue(null);
+    }
+
     public void createClass(String name) {
         Client.getInstance().processMessage(new ClassCreateMsg(name), createHandler);
     }
@@ -97,6 +106,8 @@ public void response(UserGetMsg message) {
             });
             Collections.sort(classes);
             selectedClass.set(classMap.get(Config.SELECTED_COURSE_ID.getValue()));
+            if (selectedClass.get() == null && classes.size() > 0)
+                selectedClass.set(classes.get(0));
             loggedIn.set(true);
             loading.set(false);
         });

assign-client/src/main/resources/edu/rpi/aris/assign/client/view/assignment_window.fxml

@@ -23,7 +23,7 @@
          <menus>
             <Menu mnemonicParsing="false" text="User">
                <items>
-                  <MenuItem mnemonicParsing="false" text="Login" />
+                  <MenuItem fx:id="loginMenu" mnemonicParsing="false" onAction="#loginOut" text="Login" />
                </items>
             </Menu>
             <Menu mnemonicParsing="false" text="Class">
@@ -64,7 +64,7 @@
                           <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
                       </HBox.margin>
                   </Label>
-                  <Button fx:id="login" mnemonicParsing="false" text="Login" />
+                  <Button fx:id="login" mnemonicParsing="false" onAction="#loginOut" text="Login" />
                <BorderPane.margin>
                   <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
                </BorderPane.margin>

libaris/src/main/resources/edu/rpi/aris/VERSION

@@ -1 +1 @@
-0.0.85
+0.0.86

libassign/src/main/resources/edu/rpi/aris/assign/VERSION

@@ -1 +1 @@
-0.0.85
+0.0.86