Merge pull request #3 from TeamKun/fix_validate_account

ログアウトされる問題を修正
2021-03-01 17:01:13 +09:00 · 2021-03-01 17:01:13 +09:00 · 10f0b6018f
commit 10f0b6018f
parent 1a5eec7a41 0708b8fa7b
3 changed files with 1174 additions and 1510 deletions
--- a/app/assets/js/authmanager.js
+++ b/app/assets/js/authmanager.js
@ -1,32 +1,32 @@
 /**
 * AuthManager
- * 
+ *
 * This module aims to abstract login procedures. Results from Mojang's REST api
 * are retrieved through our Mojang module. These results are processed and stored,
 * if applicable, in the config using the ConfigManager. All login procedures should
 * be made through this module.
- * 
+ *
 * @module authmanager
 */
 // Requirements
 const ConfigManager = require('./configmanager')
-const LoggerUtil    = require('./loggerutil')
-const Mojang        = require('./mojang')
-const Microsoft     = require('./microsoft')
-const logger        = LoggerUtil('%c[AuthManager]', 'color: #a02d2a; font-weight: bold')
+const LoggerUtil = require('./loggerutil')
+const Mojang = require('./mojang')
+const Microsoft = require('./microsoft')
+const logger = LoggerUtil('%c[AuthManager]', 'color: #a02d2a; font-weight: bold')
 const loggerSuccess = LoggerUtil('%c[AuthManager]', 'color: #209b07; font-weight: bold')

 async function validateSelectedMojang() {
    const current = ConfigManager.getSelectedAccount()
    const isValid = await Mojang.validate(current.accessToken, ConfigManager.getClientToken())
-    if(!isValid){
+    if (!isValid) {
        try {
            const session = await Mojang.refresh(current.accessToken, ConfigManager.getClientToken())
            ConfigManager.updateAuthAccount(current.uuid, session.accessToken)
            ConfigManager.save()
-        } catch(err) {
+        } catch (err) {
            logger.debug('Error while validating selected profile:', err)
-            if(err && err.error === 'ForbiddenOperationException'){
+            if (err && err.error === 'ForbiddenOperationException') {
                // What do we do?
            }
            logger.log('Account access token is invalid.')
@ -47,19 +47,19 @@ async function validateSelectedMicrosoft() {
        const MCExpiresAt = Date.parse(current.expiresAt)
        const MCExpired = now > MCExpiresAt

-        if(MCExpired) {
+        if (MCExpired) {
            const MSExpiresAt = Date.parse(current.microsoft.expires_at)
            const MSExpired = now > MSExpiresAt

            if (MSExpired) {
                const newAccessToken = await Microsoft.refreshAccessToken(current.microsoft.refresh_token)
                const newMCAccessToken = await Microsoft.authMinecraft(newAccessToken.access_token)
-                ConfigManager.updateAuthAccount(current.uuid, newMCAccessToken.access_token, newAccessToken.expires_at)
+                ConfigManager.updateAuthAccountWithMicrosoft(current.uuid, newMCAccessToken.access_token, newAccessToken.expires_at)
                ConfigManager.save()
                return true
            }
            const newMCAccessToken = await Microsoft.authMinecraft(current.microsoft.access_token)
-            ConfigManager.updateAuthAccount(current.uuid, newMCAccessToken.access_token, current.microsoft.access_token, current.microsoft.expires_at, newMCAccessToken.expires_at)
+            ConfigManager.updateAuthAccountWithMicrosoft(current.uuid, newMCAccessToken.access_token, current.microsoft.access_token, current.microsoft.expires_at, newMCAccessToken.expires_at)
            ConfigManager.save()

            return true
@ -78,17 +78,17 @@ async function validateSelectedMicrosoft() {
 * Add an account. This will authenticate the given credentials with Mojang's
 * authserver. The resultant data will be stored as an auth account in the
 * configuration database.
- * 
+ *
 * @param {string} username The account username (email if migrated).
 * @param {string} password The account password.
 * @returns {Promise.<Object>} Promise which resolves the resolved authenticated account object.
 */
-exports.addAccount = async function(username, password){
+exports.addAccount = async function (username, password) {
    try {
        const session = await Mojang.authenticate(username, password, ConfigManager.getClientToken())
-        if(session.selectedProfile != null){
+        if (session.selectedProfile != null) {
            const ret = ConfigManager.addAuthAccount(session.selectedProfile.id, session.accessToken, username, session.selectedProfile.name)
-            if(ConfigManager.getClientToken() == null){
+            if (ConfigManager.getClientToken() == null) {
                ConfigManager.setClientToken(session.clientToken)
            }
            ConfigManager.save()
@ -96,8 +96,8 @@ exports.addAccount = async function(username, password){
        } else {
            throw new Error('NotPaidAccount')
        }
-        
-    } catch (err){
+
+    } catch (err) {
        return Promise.reject(err)
    }
 }
@ -105,14 +105,14 @@ exports.addAccount = async function(username, password){
 /**
 * Remove an account. This will invalidate the access token associated
 * with the account and then remove it from the database.
- * 
+ *
 * @param {string} uuid The UUID of the account to be removed.
 * @returns {Promise.<void>} Promise which resolves to void when the action is complete.
 */
-exports.removeAccount = async function(uuid){
+exports.removeAccount = async function (uuid) {
    try {
        const authAcc = ConfigManager.getAuthAccount(uuid)
-        if(authAcc.type === 'microsoft'){
+        if (authAcc.type === 'microsoft') {
            ConfigManager.removeAuthAccount(uuid)
            ConfigManager.save()
            return Promise.resolve()
@ -121,7 +121,7 @@ exports.removeAccount = async function(uuid){
        ConfigManager.removeAuthAccount(uuid)
        ConfigManager.save()
        return Promise.resolve()
-    } catch (err){
+    } catch (err) {
        return Promise.reject(err)
    }
 }
@ -130,28 +130,23 @@ exports.removeAccount = async function(uuid){
 * Validate the selected account with Mojang's authserver. If the account is not valid,
 * we will attempt to refresh the access token and update that value. If that fails, a
 * new login will be required.
- * 
+ *
 * **Function is WIP**
- * 
+ *
 * @returns {Promise.<boolean>} Promise which resolves to true if the access token is valid,
 * 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)
+exports.validateSelected = async function () {
+    try {
+        const account = ConfigManager.getSelectedAccount()
+        if (account.type === 'microsoft') {
+            return await validateSelectedMicrosoft()
+        } else {
+            return await validateSelectedMojang()
        }
-    } else return true
+    } catch (error) {
+        return Promise.reject(error)
+    }
 }

 exports.addMSAccount = async authCode => {
@ -159,7 +154,7 @@ exports.addMSAccount = async authCode => {
        const accessToken = await Microsoft.getAccessToken(authCode)
        const MCAccessToken = await Microsoft.authMinecraft(accessToken.access_token)
        const minecraftBuyed = await Microsoft.checkMCStore(MCAccessToken.access_token)
-        if(!minecraftBuyed)
+        if (!minecraftBuyed)
            return Promise.reject({
                message: 'You didn\'t buy Minecraft! Please use another Microsoft account or buy Minecraft.'
            })
@ -168,7 +163,7 @@ exports.addMSAccount = async authCode => {
        ConfigManager.save()

        return ret
-    } catch(error) {
+    } catch (error) {
        return Promise.reject(error)
    }
 }
--- a/app/assets/js/configmanager.js
+++ b/app/assets/js/configmanager.js
@ -341,7 +341,7 @@ exports.updateAuthAccount = function(uuid, accessToken){
 * 
 * @returns {Object} The authenticated account object created by this action.
 */
-exports.updateAuthAccount = function(uuid, accessToken, msAccessToken, msRefreshToken, msExpires, mcExpires){
+exports.updateAuthAccountWithMicrosoft = function(uuid, accessToken, msAccessToken, msRefreshToken, msExpires, mcExpires){
    config.authenticationDatabase[uuid].accessToken = accessToken
    config.authenticationDatabase[uuid].expiresAt = mcExpires
    config.authenticationDatabase[uuid].microsoft.access_token = msAccessToken
--- a/package-lock.json
+++ b/package-lock.json