app/assets/js/authmanager.js

@@ -13,7 +13,7 @@ const ConfigManager          = require('./configmanager')
 const { LoggerUtil }         = require('helios-core')
 const { RestResponseStatus } = require('helios-core/common')
 const { MojangRestAPI, mojangErrorDisplayable, MojangErrorCode } = require('helios-core/mojang')
-const { MicrosoftAuth, microsoftErrorDisplayable, MicrosoftErrorCode } = require('helios-core/microsoft')
+const { MicrosoftAuth }      = require('helios-core/microsoft')
 const { AZURE_CLIENT_ID }    = require('./ipcconstants')
 
 const log = LoggerUtil.getLogger('AuthManager')
@@ -71,48 +71,48 @@ const AUTH_MODE = { FULL: 0, MS_REFRESH: 1, MC_REFRESH: 2 }
  * @returns An object with all auth data. AccessToken object will be null when mode is MC_REFRESH.
  */
 async function fullMicrosoftAuthFlow(entryCode, authMode) {
-    try {
 
-        let accessTokenRaw
+    let accessTokenRaw
-        let accessToken
+    let accessToken
-        if(authMode !== AUTH_MODE.MC_REFRESH) {
+    if(authMode !== AUTH_MODE.MC_REFRESH) {
-            const accessTokenResponse = await MicrosoftAuth.getAccessToken(entryCode, authMode === AUTH_MODE.MS_REFRESH, AZURE_CLIENT_ID)
+        const accessTokenResponse = await MicrosoftAuth.getAccessToken(entryCode, authMode === AUTH_MODE.MS_REFRESH, AZURE_CLIENT_ID)
-            if(accessTokenResponse.responseStatus === RestResponseStatus.ERROR) {
+        if(accessTokenResponse.responseStatus === RestResponseStatus.ERROR) {
-                return Promise.reject(microsoftErrorDisplayable(accessTokenResponse.microsoftErrorCode))
+            // TODO Fail.
-            }
+            return // TODO
-            accessToken = accessTokenResponse.data
-            accessTokenRaw = accessToken.access_token
-        } else {
-            accessTokenRaw = entryCode
         }
-        
+        accessToken = accessTokenResponse.data
-        const xblResponse = await MicrosoftAuth.getXBLToken(accessTokenRaw)
+        accessTokenRaw = accessToken.access_token
-        if(xblResponse.responseStatus === RestResponseStatus.ERROR) {
+    } else {
-            return Promise.reject(microsoftErrorDisplayable(xblResponse.microsoftErrorCode))
+        accessTokenRaw = entryCode
-        }
+    }
-        const xstsResonse = await MicrosoftAuth.getXSTSToken(xblResponse.data)
+    
-        if(xstsResonse.responseStatus === RestResponseStatus.ERROR) {
+    const xblResponse = await MicrosoftAuth.getXBLToken(accessTokenRaw)
-            return Promise.reject(microsoftErrorDisplayable(xstsResonse.microsoftErrorCode))
+    if(xblResponse.responseStatus === RestResponseStatus.ERROR) {
-        }
+        // TODO Fail.
-        const mcTokenResponse = await MicrosoftAuth.getMCAccessToken(xstsResonse.data)
+        return // TODO
-        if(mcTokenResponse.responseStatus === RestResponseStatus.ERROR) {
+    }
-            return Promise.reject(microsoftErrorDisplayable(mcTokenResponse.microsoftErrorCode))
+    const xstsResonse = await MicrosoftAuth.getXSTSToken(xblResponse.data)
-        }
+    if(xstsResonse.responseStatus === RestResponseStatus.ERROR) {
-        const mcProfileResponse = await MicrosoftAuth.getMCProfile(mcTokenResponse.data.access_token)
+        // TODO Fail.
-        if(mcProfileResponse.responseStatus === RestResponseStatus.ERROR) {
+        return // TODO
-            return Promise.reject(microsoftErrorDisplayable(mcProfileResponse.microsoftErrorCode))
+    }
-        }
+    const mcTokenResponse = await MicrosoftAuth.getMCAccessToken(xstsResonse.data)
-        return {
+    if(mcTokenResponse.responseStatus === RestResponseStatus.ERROR) {
-            accessToken,
+        // TODO Fail.
-            accessTokenRaw,
+        return // TODO
-            xbl: xblResponse.data,
+    }
-            xsts: xstsResonse.data,
+    const mcProfileResponse = await MicrosoftAuth.getMCProfile(mcTokenResponse.data.access_token)
-            mcToken: mcTokenResponse.data,
+    if(mcProfileResponse.responseStatus === RestResponseStatus.ERROR) {
-            mcProfile: mcProfileResponse.data
+        // TODO Fail.
-        }
+        return // TODO
-    } catch(err) {
+    }
-        log.error(err)
+    return {
-        return Promise.reject(microsoftErrorDisplayable(MicrosoftErrorCode.UNKNOWN))
+        accessToken,
+        accessTokenRaw,
+        xbl: xblResponse.data,
+        xsts: xstsResonse.data,
+        mcToken: mcTokenResponse.data,
+        mcProfile: mcProfileResponse.data
     }
 }
 

app/assets/js/scripts/landing.js

@@ -10,7 +10,7 @@ const { MojangRestAPI, getServerStatus }     = require('helios-core/mojang')
 // Internal Requirements
 const DiscordWrapper          = require('./assets/js/discordwrapper')
 const ProcessBuilder          = require('./assets/js/processbuilder')
-const { RestResponseStatus, isDisplayableError } = require('helios-core/common')
+const { RestResponseStatus } = require('helios-core/common')
 
 // Launch Elements
 const launch_content          = document.getElementById('launch_content')

app/assets/js/scripts/login.js

@@ -214,26 +214,13 @@ loginButton.addEventListener('click', () => {
         }, 1000)
     }).catch((displayableError) => {
         loginLoading(false)
-
+        setOverlayContent(displayableError.title, displayableError.desc, Lang.queryJS('login.tryAgain'))
-        let actualDisplayableError
-        if(isDisplayableError(displayableError)) {
-            msftLoginLogger.error('Error while logging in.', displayableError)
-            actualDisplayableError = displayableError
-        } else {
-            // Uh oh.
-            msftLoginLogger.error('Unhandled error during login.', displayableError)
-            actualDisplayableError = {
-                title: 'Unknown Error During Login',
-                desc: 'An unknown error has occurred. Please see the console for details.'
-            }
-        }
-
-        setOverlayContent(actualDisplayableError.title, actualDisplayableError.desc, Lang.queryJS('login.tryAgain'))
         setOverlayHandler(() => {
             formDisabled(false)
             toggleOverlay(false)
         })
         toggleOverlay(true)
+        loggerLogin.log('Error while logging in.', displayableError)
     })
 
 })

app/assets/js/scripts/loginOptions.js

@@ -1,22 +1,9 @@
-const loginOptionsCancelContainer = document.getElementById('loginOptionCancelContainer')
 const loginOptionMicrosoft = document.getElementById('loginOptionMicrosoft')
 const loginOptionMojang = document.getElementById('loginOptionMojang')
-const loginOptionsCancelButton = document.getElementById('loginOptionCancelButton')
-
-let loginOptionsCancellable = false
 
 let loginOptionsViewOnLoginSuccess
 let loginOptionsViewOnLoginCancel
 let loginOptionsViewOnCancel
-let loginOptionsViewCancelHandler
-
-function loginOptionsCancelEnabled(val){
-    if(val){
-        $(loginOptionsCancelContainer).show()
-    } else {
-        $(loginOptionsCancelContainer).hide()
-    }
-}
 
 loginOptionMicrosoft.onclick = (e) => {
     switchView(getCurrentView(), VIEWS.waiting, 500, 500, () => {
@@ -34,17 +21,4 @@ loginOptionMojang.onclick = (e) => {
         loginViewOnCancel = loginOptionsViewOnLoginCancel
         loginCancelEnabled(true)
     })
-}
-
-loginOptionsCancelButton.onclick = (e) => {
-    switchView(getCurrentView(), loginOptionsViewOnCancel, 500, 500, () => {
-        // Clear login values (Mojang login)
-        // No cleanup needed for Microsoft.
-        loginUsername.value = ''
-        loginPassword.value = ''
-        if(loginOptionsViewCancelHandler != null){
-            loginOptionsViewCancelHandler()
-            loginOptionsViewCancelHandler = null
-        }
-    })
 }

app/assets/js/scripts/overlay.js

@@ -197,9 +197,6 @@ document.getElementById('accountSelectConfirm').addEventListener('click', () =>
             const authAcc = ConfigManager.setSelectedAccount(listings[i].getAttribute('uuid'))
             ConfigManager.save()
             updateSelectedAccount(authAcc)
-            if(getCurrentView() === VIEWS.settings) {
-                prepareSettings()
-            }
             toggleOverlay(false)
             validateSelectedAccount()
             return
@@ -210,9 +207,6 @@ document.getElementById('accountSelectConfirm').addEventListener('click', () =>
         const authAcc = ConfigManager.setSelectedAccount(listings[0].getAttribute('uuid'))
         ConfigManager.save()
         updateSelectedAccount(authAcc)
-        if(getCurrentView() === VIEWS.settings) {
-            prepareSettings()
-        }
         toggleOverlay(false)
         validateSelectedAccount()
     }

app/assets/js/scripts/settings.js

@@ -397,29 +397,6 @@ ipcRenderer.on(MSFT_OPCODE.REPLY_LOGIN, (_, ...arguments_) => {
                     prepareSettings()
                 })
             })
-                .catch((displayableError) => {
-
-                    let actualDisplayableError
-                    if(isDisplayableError(displayableError)) {
-                        msftLoginLogger.error('Error while logging in.', displayableError)
-                        actualDisplayableError = displayableError
-                    } else {
-                        // Uh oh.
-                        msftLoginLogger.error('Unhandled error during login.', displayableError)
-                        actualDisplayableError = {
-                            title: 'Unknown Error During Login',
-                            desc: 'An unknown error has occurred. Please see the console for details.'
-                        }
-                    }
-
-                    switchView(getCurrentView(), viewOnClose, 500, 500, () => {
-                        setOverlayContent(actualDisplayableError.title, actualDisplayableError.desc, Lang.queryJS('login.tryAgain'))
-                        setOverlayHandler(() => {
-                            toggleOverlay(false)
-                        })
-                        toggleOverlay(true)
-                    })
-                })
         }
     }
 })
@@ -468,6 +445,7 @@ function bindAuthAccountLogOut(){
                 setOverlayHandler(() => {
                     processLogOut(val, isLastAccount)
                     toggleOverlay(false)
+                    switchView(getCurrentView(), VIEWS.login)
                 })
                 setDismissHandler(() => {
                     toggleOverlay(false)
@@ -498,6 +476,7 @@ function processLogOut(val, isLastAccount){
         switchView(getCurrentView(), VIEWS.waiting, 500, 500, () => {
             ipcRenderer.send(MSFT_OPCODE.OPEN_LOGOUT, uuid, isLastAccount)
         })
+        // TODO ADD LOGIC FOR LAST ACCOUNT - SAME AS SOLUTION FOR FIRST TIME LOGIN!
     } else {
         AuthManager.removeMojangAccount(uuid).then(() => {
             if(!isLastAccount && uuid === prevSelAcc.uuid){
@@ -506,12 +485,6 @@ function processLogOut(val, isLastAccount){
                 updateSelectedAccount(selAcc)
                 validateSelectedAccount()
             }
-            if(isLastAccount) {
-                loginOptionsCancelEnabled(false)
-                loginOptionsViewOnLoginSuccess = VIEWS.settings
-                loginOptionsViewOnLoginCancel = VIEWS.loginOptions
-                switchView(getCurrentView(), VIEWS.loginOptions)
-            }
         })
         $(parent).fadeOut(250, () => {
             parent.remove()
@@ -557,21 +530,13 @@ ipcRenderer.on(MSFT_OPCODE.REPLY_LOGOUT, (_, ...arguments_) => {
                     updateSelectedAccount(selAcc)
                     validateSelectedAccount()
                 }
-                if(isLastAccount) {
-                    loginOptionsCancelEnabled(false)
-                    loginOptionsViewOnLoginSuccess = VIEWS.settings
-                    loginOptionsViewOnLoginCancel = VIEWS.loginOptions
-                    switchView(getCurrentView(), VIEWS.loginOptions)
-                }
                 if(msAccDomElementCache) {
                     msAccDomElementCache.remove()
                     msAccDomElementCache = null
                 }
             })
             .finally(() => {
-                if(!isLastAccount) {
+                switchView(getCurrentView(), VIEWS.settings, 500, 500)
-                    switchView(getCurrentView(), VIEWS.settings, 500, 500)
-                }
             })
 
     }

app/assets/js/scripts/uibinder.js

@@ -88,11 +88,8 @@ function showMainUI(data){
                 currentView = VIEWS.landing
                 $(VIEWS.landing).fadeIn(1000)
             } else {
-                loginOptionsCancelEnabled(false)
+                currentView = VIEWS.login
-                loginOptionsViewOnLoginSuccess = VIEWS.landing
+                $(VIEWS.login).fadeIn(1000)
-                loginOptionsViewOnLoginCancel = VIEWS.loginOptions
-                currentView = VIEWS.loginOptions
-                $(VIEWS.loginOptions).fadeIn(1000)
             }
         }
 
@@ -334,46 +331,20 @@ async function validateSelectedAccount(){
                 'Select Another Account'
             )
             setOverlayHandler(() => {
-
+                document.getElementById('loginUsername').value = selectedAcc.username
-                const isMicrosoft = selectedAcc.type === 'microsoft'
+                validateEmail(selectedAcc.username)
-
+                loginViewOnSuccess = getCurrentView()
-                if(isMicrosoft) {
+                loginViewOnCancel = getCurrentView()
-                    // Empty for now
+                if(accLen > 0){
-                } else {
+                    loginViewCancelHandler = () => {
-                    // Mojang
+                        ConfigManager.addMojangAuthAccount(selectedAcc.uuid, selectedAcc.accessToken, selectedAcc.username, selectedAcc.displayName)
-                    // For convenience, pre-populate the username of the account.
-                    document.getElementById('loginUsername').value = selectedAcc.username
-                    validateEmail(selectedAcc.username)
-                }
-                
-                loginOptionsViewOnLoginSuccess = getCurrentView()
-                loginOptionsViewOnLoginCancel = VIEWS.loginOptions
-
-                if(accLen > 0) {
-                    loginOptionsViewOnCancel = getCurrentView()
-                    loginOptionsViewCancelHandler = () => {
-                        if(isMicrosoft) {
-                            ConfigManager.addMicrosoftAuthAccount(
-                                selectedAcc.uuid,
-                                selectedAcc.accessToken,
-                                selectedAcc.username,
-                                selectedAcc.expiresAt,
-                                selectedAcc.microsoft.access_token,
-                                selectedAcc.microsoft.refresh_token,
-                                selectedAcc.microsoft.expires_at
-                            )
-                        } else {
-                            ConfigManager.addMojangAuthAccount(selectedAcc.uuid, selectedAcc.accessToken, selectedAcc.username, selectedAcc.displayName)
-                        }
                         ConfigManager.save()
                         validateSelectedAccount()
                     }
-                    loginOptionsCancelEnabled(true)
+                    loginCancelEnabled(true)
-                } else {
-                    loginOptionsCancelEnabled(false)
                 }
                 toggleOverlay(false)
-                switchView(getCurrentView(), VIEWS.loginOptions)
+                switchView(getCurrentView(), VIEWS.login)
             })
             setDismissHandler(() => {
                 if(accLen > 1){

app/assets/js/scripts/welcome.js

@@ -2,7 +2,6 @@
  * Script for welcome.ejs
  */
 document.getElementById('welcomeButton').addEventListener('click', e => {
-    loginOptionsCancelEnabled(false) // False by default, be explicit.
     loginOptionsViewOnLoginSuccess = VIEWS.landing
     loginOptionsViewOnLoginCancel = VIEWS.loginOptions
     switchView(VIEWS.welcome, VIEWS.loginOptions)