Fixed re-auth on reload of launcher

app/assets/css/launcher.css

@@ -857,7 +857,8 @@ body, button {
     font-family: 'Avenir Medium';
     font-size: 12px;
     font-weight: bold;
-    margin-bottom: 3px;
+    margin-bottom: 253px;
+    margin-top: -250px;
     color: rgba(255, 255, 255, 0.75);
 }
 

app/assets/js/authmanager.js

@@ -18,8 +18,8 @@ const loggerSuccess = LoggerUtil('%c[AuthManager]', 'color: #209b07; font-weight
 
 // Validation
 
-async function validateSelectedMojang() {
-    const current = ConfigManager.getSelectedAccount()
+async function validateSelectedMojang(selectedAccount) {
+    const current = selectedAccount
     const isValid = await Mojang.validate(current.accessToken, ConfigManager.getClientToken())
     if(!isValid){
         try {
@@ -42,9 +42,9 @@ async function validateSelectedMojang() {
     }
 }
 
-async function validateSelectedMicrosoft() {
+async function validateSelectedMicrosoft(selectedAccount) {
     try {
-        const current = ConfigManager.getSelectedAccount()
+        const current = selectedAccount
         const now = new Date().getTime()
         const MCExpiresAt = Date.parse(current.expiresAt)
         const MCExpired = now > MCExpiresAt
@@ -131,21 +131,14 @@ exports.removeAccount = async function(uuid){
  * otherwise false.
  */
 exports.validateSelected = async function(){
-    const current = ConfigManager.getSelectedAccount()
-    const isValid = await Mojang.validate(current.accessToken, ConfigManager.getClientToken())
-    if(!isValid){
-      try{
-          if (ConfigManager.getSelectedAccount() === 'microsoft') {
-              const validate = await validateSelectedMicrosoft()
-              return validate
-          } else {
-              const validate = await validateSelectedMojang()
-              return validate
-          }
-        } catch (error) {
-            return Promise.reject(error)
-        }
-    }
+  const selectedAccount = ConfigManager.getSelectedAccount()
+  if (selectedAccount.type === 'microsoft') {
+      const validate = await validateSelectedMicrosoft(selectedAccount)
+      return validate
+  } else {
+      const validate = await validateSelectedMojang(selectedAccount)
+      return validate
+  }
 }
 
 exports.addMSAccount = async authCode => {
@@ -156,7 +149,6 @@ exports.addMSAccount = async authCode => {
         const MCProfile = await Microsoft.getMCProfile(MCAccessToken.access_token)
         const ret = ConfigManager.addAuthAccount(MCProfile.id, MCAccessToken.access_token, MCProfile.name, MCProfile.name, MCAccessToken.expires_at, 'microsoft')
         ConfigManager.save()
-
         return ret
     } catch(error) {
         return Promise.reject(error)

app/assets/js/mojang.js

@@ -1,8 +1,8 @@
 /**
  * Mojang
- * 
+ *
  * This module serves as a minimal wrapper for Mojang's REST api.
- * 
+ *
  * @module mojang
  */
 // Requirements
@@ -60,7 +60,7 @@ const statuses = [
  * Converts a Mojang status color to a hex value. Valid statuses
  * are 'green', 'yellow', 'red', and 'grey'. Grey is a custom status
  * to our project which represents an unknown status.
- * 
+ *
  * @param {string} status A valid status code.
  * @returns {string} The hex color of the status code.
  */
@@ -83,7 +83,7 @@ exports.statusToHex = function(status){
  * The response is condensed into a single object. Each service is
  * a key, where the value is an object containing a status and name
  * property.
- * 
+ *
  * @see http://wiki.vg/Mojang_API#API_Status
  */
 exports.status = function(){
@@ -122,13 +122,13 @@ exports.status = function(){
 
 /**
  * Authenticate a user with their Mojang credentials.
- * 
+ *
  * @param {string} username The user's username, this is often an email.
  * @param {string} password The user's password.
  * @param {string} clientToken The launcher's Client Token.
  * @param {boolean} requestUser Optional. Adds user object to the reponse.
  * @param {Object} agent Optional. Provided by default. Adds user info to the response.
- * 
+ *
  * @see http://wiki.vg/Authentication#Authenticate
  */
 exports.authenticate = function(username, password, clientToken, requestUser = true, agent = minecraftAgent){
@@ -167,10 +167,10 @@ exports.authenticate = function(username, password, clientToken, requestUser = t
 /**
  * Validate an access token. This should always be done before launching.
  * The client token should match the one used to create the access token.
- * 
+ *
  * @param {string} accessToken The access token to validate.
  * @param {string} clientToken The launcher's client token.
- * 
+ *
  * @see http://wiki.vg/Authentication#Validate
  */
 exports.validate = function(accessToken, clientToken){
@@ -202,10 +202,10 @@ exports.validate = function(accessToken, clientToken){
 /**
  * Invalidates an access token. The clientToken must match the
  * token used to create the provided accessToken.
- * 
+ *
  * @param {string} accessToken The access token to invalidate.
  * @param {string} clientToken The launcher's client token.
- * 
+ *
  * @see http://wiki.vg/Authentication#Invalidate
  */
 exports.invalidate = function(accessToken, clientToken){
@@ -237,11 +237,11 @@ exports.invalidate = function(accessToken, clientToken){
  * Refresh a user's authentication. This should be used to keep a user logged
  * in without asking them for their credentials again. A new access token will
  * be generated using a recent invalid access token. See Wiki for more info.
- * 
+ *
  * @param {string} accessToken The old access token.
  * @param {string} clientToken The launcher's client token.
  * @param {boolean} requestUser Optional. Adds user object to the reponse.
- * 
+ *
  * @see http://wiki.vg/Authentication#Refresh
  */
 exports.refresh = function(accessToken, clientToken, requestUser = true){
@@ -268,4 +268,4 @@ exports.refresh = function(accessToken, clientToken, requestUser = true){
                 }
             })
     })
-}
+}

app/assets/js/scripts/login.js

@@ -366,3 +366,4 @@ ipcRenderer.on('MSALoginWindowReply', (event, ...args) => {
         toggleOverlay(true)
         loggerLogin.error(error)
     })
+})

app/landing.ejs

@@ -35,7 +35,7 @@
                             </a>
                         </div>
                         <div class="mediaContainer" id="settingsMediaContainer">
-                            <a href="https://discord.gg/Hd3ufCDCeg" class="mediaURL" id="discordURL">
+                            <a href="https://discord.com/invite/MMy6GwY" class="mediaURL" id="discordURL">
                               <button class="mediaButton" id="discordMediaButton">
                                 <svg id="discordSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500">
                                     <g>

app/login.ejs

@@ -9,7 +9,6 @@
         <form id="loginForm">
             <img id="loginImageSeal" src="assets/images/SealCircle.png"/>
             <span id="loginSubheader">MINECRAFT LOGIN</span>
-            <button id="loginMSButton">OR Microsoft Login</button>
             <div class="loginFieldContainer">
                 <svg id="profileSVG" class="loginSVG" viewBox="40 37 65.36 61.43">
                     <g>
@@ -53,6 +52,7 @@
                     <!--<div class="spinningCircle" id="loginSpinner"></div>-->
                 </div>
             </button>
+            <button id="loginMSButton">OR Microsoft Login</button>
             <div id="loginDisclaimer">
                 <span class="loginSpanDim" id="loginRegisterSpan">
                     <a href="https://www.minecraft.net/en-us/store/minecraft-java-edition">Need an Account?</a>