ONIMAI-SMP/Launcher
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

validateSelectedを修正

Browse Source
This commit is contained in:
ReyADayer 2021-02-18 04:52:34 +09:00
parent 1a5eec7a41
commit 27a1986569
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/assets/js/authmanager.js
View File

@ -1,11 +1,11 @@
/**
* 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
@ -78,7 +78,7 @@ 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.
@ -96,7 +96,7 @@ exports.addAccount = async function(username, password){
} else {
throw new Error('NotPaidAccount')
}
} catch (err){
return Promise.reject(err)
}
@ -105,7 +105,7 @@ 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.
*/
@ -130,28 +130,24 @@ 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)
try {
if (ConfigManager.getSelectedAccount() === 'microsoft') {
const validate = await validateSelectedMicrosoft()
return validate
} else {
const validate = await validateSelectedMojang()
return validate
}
} else return true
} catch (error) {
return Promise.reject(error)
}
}
exports.addMSAccount = async authCode => {