Skirda/SkirdaElectronLauncher
4
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

test mine login and custom dist urls

Browse Source
This commit is contained in:
cyber-dream 2024-01-08 15:40:02 +03:00
parent 30e635a3b9
commit b5327c71fc
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,9 +34,15 @@ exports.addMojangAccount = async function(username, password) {
const response = await MojangRestAPI.authenticate(username, password, ConfigManager.getClientToken()) const response = await MojangRestAPI.authenticate(username, password, ConfigManager.getClientToken())
console.log(response) console.log(response)
if(response.responseStatus === RestResponseStatus.SUCCESS) { if(response.responseStatus === RestResponseStatus.SUCCESS) {
const session = response.data const session = response.data
console.log(session)
session.selectedProfile = {
id:'12039109283',
acessToken:'asdasdas',
clientToken: 'asdasldkjalskdj',
}
if(session.selectedProfile != null){ if(session.selectedProfile != null){
console.log("here")
const ret = ConfigManager.addMojangAuthAccount(session.selectedProfile.id, session.accessToken, username, session.selectedProfile.name) const ret = ConfigManager.addMojangAuthAccount(session.selectedProfile.id, session.accessToken, username, session.selectedProfile.name)
if(ConfigManager.getClientToken() == null){ if(ConfigManager.getClientToken() == null){
ConfigManager.setClientToken(session.clientToken) ConfigManager.setClientToken(session.clientToken)
@ -77,7 +83,8 @@ const AUTH_MODE = { FULL: 0, MS_REFRESH: 1, MC_REFRESH: 2 }
*/ */
async function fullMicrosoftAuthFlow(entryCode, authMode) { async function fullMicrosoftAuthFlow(entryCode, authMode) {
try { try {
console.error("try auth from ms")
return Promise.reject(microsoftErrorDisplayable(MicrosoftErrorCode.UNKNOWN))
let accessTokenRaw let accessTokenRaw
let accessToken let accessToken
if(authMode !== AUTH_MODE.MC_REFRESH) { if(authMode !== AUTH_MODE.MC_REFRESH) {

4
app/assets/js/distromanager.js
View File

@ -4,7 +4,11 @@ const ConfigManager = require('./configmanager')
// Old WesterosCraft url. // Old WesterosCraft url.
// exports.REMOTE_DISTRO_URL = 'http://mc.westeroscraft.com/WesterosCraftLauncher/distribution.json' // exports.REMOTE_DISTRO_URL = 'http://mc.westeroscraft.com/WesterosCraftLauncher/distribution.json'
// exports.REMOTE_DISTRO_URL = 'https://skirda-minecraft-distribution.brzezinski.ru/distribution.json'
exports.REMOTE_DISTRO_URL = 'https://helios-files.geekcorner.eu.org/distribution.json' exports.REMOTE_DISTRO_URL = 'https://helios-files.geekcorner.eu.org/distribution.json'
// exports.REMOTE_DISTRO_URL = 'http://192.168.88.10:8080/distribution/manifest'
// exports.REMOTE_DISTRO_URL = 'http://gregbrzezinski:8080/distribution/manifest'
// exports.REMOTE_DISTRO_URL = 'http://localhost:8080/distribution/files/files/distribution.json'
const api = new DistributionAPI( const api = new DistributionAPI(
ConfigManager.getLauncherDirectory(), ConfigManager.getLauncherDirectory(),