diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css
index 56816997..9fbcf949 100644
--- a/app/assets/css/launcher.css
+++ b/app/assets/css/launcher.css
@@ -613,8 +613,7 @@ body, button {
font-weight: bold;
letter-spacing: 2px;
border: none;
- padding: 15px 5px;
- margin: 10px 0px;
+ margin: 15px 0px;
cursor: pointer;
position: relative;
right: -20px;
@@ -689,6 +688,21 @@ body, button {
width: 16px;
height: 16px;
}
+.circle-loader-big {
+ margin:auto;
+ border: 5px solid rgba(255, 255, 255, 0.5);
+ border-left-color: #ffffff;
+ animation-name: loader-spin;
+ animation-duration: 1s;
+ animation-iteration-count: infinite;
+ animation-timing-function: linear;
+ position: relative;
+ display: block;
+ align-self: center;
+ border-radius: 50%;
+ width: 60px;
+ height: 60px;
+}
.load-complete {
animation: none;
border-color: #ffffff;
@@ -859,6 +873,29 @@ body, button {
transform: rotate(45deg);
}
+#loginMSButton {
+ background: none;
+ border: none;
+ margin-top: 5px;
+ margin-bottom: 10px;
+ font-size: 20px;
+}
+#loginMSButton:disabled {
+ color: rgba(255, 255, 255, 0.75);
+ pointer-events: none;
+}
+
+#loginMSButton:hover,
+#loginMSButton:focus {
+ text-shadow: 0px 0px 20px #fff;
+ outline: none;
+}
+
+#loginMSButton:active {
+ color: #c7c7c7;
+ text-shadow: 0px 0px 20px #c7c7c7;
+}
+
/*
#login_filter {
height: calc(100% - 22px);
diff --git a/app/assets/images/microsoft.svg b/app/assets/images/microsoft.svg
new file mode 100644
index 00000000..a45f5fc9
--- /dev/null
+++ b/app/assets/images/microsoft.svg
@@ -0,0 +1 @@
+
diff --git a/app/assets/js/authmanager.js b/app/assets/js/authmanager.js
index 22b2fed9..415029f5 100644
--- a/app/assets/js/authmanager.js
+++ b/app/assets/js/authmanager.js
@@ -12,9 +12,62 @@
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 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) {
+ try {
+ const session = await Mojang.refresh(current.accessToken, ConfigManager.getClientToken())
+ ConfigManager.updateAuthAccount(current.uuid, session.accessToken)
+ ConfigManager.save()
+ } catch (err) {
+ logger.debug('Error while validating selected profile:', err)
+ if (err && err.error === 'ForbiddenOperationException') {
+ // What do we do?
+ }
+ logger.log('Account access token is invalid.')
+ return false
+ }
+ loggerSuccess.log('Account access token validated.')
+ return true
+ } else {
+ loggerSuccess.log('Account access token validated.')
+ return true
+ }
+}
+
+async function validateSelectedMicrosoft() {
+ const current = ConfigManager.getSelectedAccount()
+ const now = new Date().getTime()
+ const MCExpiresAt = Date.parse(current.expiresAt)
+ const MCExpired = now > MCExpiresAt
+
+ if (!MCExpired) {
+ return true
+ }
+
+ 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.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.save()
+
+ return true
+}
+
+// Exports
// Functions
/**
@@ -39,7 +92,7 @@ exports.addAccount = async function(username, password){
} else {
throw new Error('NotPaidAccount')
}
-
+
} catch (err){
return Promise.reject(err)
}
@@ -53,15 +106,16 @@ exports.addAccount = async function(username, password){
* @returns {Promise.} Promise which resolves to void when the action is complete.
*/
exports.removeAccount = async function(uuid){
- try {
- const authAcc = ConfigManager.getAuthAccount(uuid)
- await Mojang.invalidate(authAcc.accessToken, ConfigManager.getClientToken())
+ const authAcc = ConfigManager.getAuthAccount(uuid)
+ if (authAcc.type === 'microsoft') {
ConfigManager.removeAuthAccount(uuid)
ConfigManager.save()
- return Promise.resolve()
- } catch (err){
- return Promise.reject(err)
+ return
}
+ await Mojang.invalidate(authAcc.accessToken, ConfigManager.getClientToken())
+ ConfigManager.removeAuthAccount(uuid)
+ ConfigManager.save()
+ return
}
/**
@@ -77,23 +131,31 @@ exports.removeAccount = async function(uuid){
exports.validateSelected = async function(){
const current = ConfigManager.getSelectedAccount()
const isValid = await Mojang.validate(current.accessToken, ConfigManager.getClientToken())
- if(!isValid){
- try {
- const session = await Mojang.refresh(current.accessToken, ConfigManager.getClientToken())
- ConfigManager.updateAuthAccount(current.uuid, session.accessToken)
- ConfigManager.save()
- } catch(err) {
- logger.debug('Error while validating selected profile:', err)
- if(err && err.error === 'ForbiddenOperationException'){
- // What do we do?
- }
- logger.log('Account access token is invalid.')
- return false
- }
- loggerSuccess.log('Account access token validated.')
- return true
- } else {
- loggerSuccess.log('Account access token validated.')
+
+ if (isValid) {
return true
}
-}
\ No newline at end of file
+
+ if (ConfigManager.getSelectedAccount() === 'microsoft') {
+ const validate = await validateSelectedMicrosoft()
+ return validate
+ } else {
+ const validate = await validateSelectedMojang()
+ return validate
+ }
+}
+
+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)
+ throw {
+ message: 'You didn\'t buy Minecraft! Please use another Microsoft account or buy Minecraft.'
+ }
+ const MCProfile = await Microsoft.getMCProfile(MCAccessToken.access_token)
+ const result = ConfigManager.addMsAuthAccount(MCProfile.id, MCAccessToken.access_token, MCProfile.name, MCAccessToken.expires_at, accessToken.access_token, accessToken.refresh_token)
+ ConfigManager.save()
+
+ return result
+}
diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js
index 2c0bb53c..5bb85bc4 100644
--- a/app/assets/js/configmanager.js
+++ b/app/assets/js/configmanager.js
@@ -103,7 +103,8 @@ const DEFAULT_CONFIG = {
selectedServer: null, // Resolved
selectedAccount: null,
authenticationDatabase: {},
- modConfigurations: []
+ modConfigurations: [],
+ microsoftAuth: {}
}
let config = null
@@ -330,6 +331,27 @@ exports.updateAuthAccount = function(uuid, accessToken){
return config.authenticationDatabase[uuid]
}
+/**
+ * Update the tokens of an authenticated microsoft account.
+ *
+ * @param {string} uuid The uuid of the authenticated account.
+ * @param {string} accessToken The new Access Token.
+ * @param {string} msAccessToken The new Microsoft Access Token
+ * @param {string} msRefreshToken The new Microsoft Refresh Token
+ * @param {date} msExpires The date when the microsoft access token expires
+ * @param {date} mcExpires The date when the mojang access token expires
+ *
+ * @returns {Object} The authenticated account object created by this action.
+ */
+exports.updateAuthAccount = function (uuid, accessToken, msAccessToken, msRefreshToken, msExpires, mcExpires) {
+ config.authenticationDatabase[uuid].accessToken = accessToken
+ config.authenticationDatabase[uuid].expiresAt = mcExpires
+ config.authenticationDatabase[uuid].microsoft.access_token = msAccessToken
+ config.authenticationDatabase[uuid].microsoft.refresh_token = msRefreshToken
+ config.authenticationDatabase[uuid].microsoft.expires_at = msRefreshToken
+ return config.authenticationDatabase[uuid]
+}
+
/**
* Adds an authenticated account to the database to be stored.
*
@@ -346,7 +368,39 @@ exports.addAuthAccount = function(uuid, accessToken, username, displayName){
accessToken,
username: username.trim(),
uuid: uuid.trim(),
- displayName: displayName.trim()
+ displayName: displayName.trim(),
+ type: 'mojang'
+ }
+ return config.authenticationDatabase[uuid]
+}
+
+/**
+ * Adds an authenticated microsoft account to the database to be stored.
+ *
+ * @param {string} uuid The uuid of the authenticated account.
+ * @param {string} accessToken The accessToken of the authenticated account.
+ * @param {string} name The in game name of the authenticated account.
+ * @param {date} mcExpires The date when the mojang access token expires
+ * @param {string} msAccessToken The microsoft access token
+ * @param {string} msRefreshToken The microsoft refresh token
+ * @param {date} msExpires The date when the microsoft access token expires
+ *
+ * @returns {Object} The authenticated account object created by this action.
+ */
+exports.addMsAuthAccount = function (uuid, accessToken, name, mcExpires, msAccessToken, msRefreshToken, msExpires) {
+ config.selectedAccount = uuid
+ config.authenticationDatabase[uuid] = {
+ accessToken,
+ username: name.trim(),
+ uuid: uuid.trim(),
+ displayName: name.trim(),
+ expiresAt: mcExpires,
+ type: 'microsoft',
+ microsoft: {
+ access_token: msAccessToken,
+ refresh_token: msRefreshToken,
+ expires_at: msExpires
+ }
}
return config.authenticationDatabase[uuid]
}
diff --git a/app/assets/js/microsoft.js b/app/assets/js/microsoft.js
new file mode 100644
index 00000000..e6762914
--- /dev/null
+++ b/app/assets/js/microsoft.js
@@ -0,0 +1,162 @@
+const got = require('got').extend({
+ responseType: 'json',
+ resolveBodyOnly: true
+})
+
+// TODO: Add client ID (https://portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationsListBlade)
+const CLIENT_ID = ''
+
+const TOKEN_URI = 'https://login.microsoftonline.com/consumers/oauth2/v2.0/token'
+const AUTH_XBL_URI = 'https://user.auth.xboxlive.com/user/authenticate'
+const AUTH_XSTS_URI = 'https://xsts.auth.xboxlive.com/xsts/authorize'
+const AUTH_MC_URI = 'https://api.minecraftservices.com/authentication/login_with_xbox'
+const PROFILE_URI = 'https://api.minecraftservices.com/minecraft/profile'
+
+async function getXBLToken(accessToken) {
+ const {
+ Token: token,
+ DisplayClaims: displayClaims
+ } = await got.post(AUTH_XBL_URI, {
+ json: {
+ Properties: {
+ AuthMethod: 'RPS',
+ SiteName: 'user.auth.xboxlive.com',
+ RpsTicket: `d=${accessToken}`
+ },
+ RelyingParty: 'http://auth.xboxlive.com',
+ TokenType: 'JWT'
+ }
+ })
+
+ return {
+ token,
+ uhs: displayClaims.xui[0].uhs
+ }
+}
+
+async function getXSTSToken(XBLToken) {
+ const data = await got.post(AUTH_XSTS_URI, {
+ json: {
+ Properties: {
+ SandboxId: 'RETAIL',
+ UserTokens: [XBLToken]
+ },
+ RelyingParty: 'rp://api.minecraftservices.com/',
+ TokenType: 'JWT'
+ }
+ })
+
+ if (data.XErr) {
+ switch (data.XErr) {
+ case 2148916233:
+ throw {
+ message: 'Your Microsoft account is not connected to an Xbox account. Please create one. '
+ }
+ case 2148916238:
+ throw {
+ message: 'Since you are not yet 18 years old, an adult must add you to a family in order for you to use Helios Launcher!'
+ }
+ }
+ throw data
+ }
+
+ return data.Token
+}
+
+async function getMCAccessToken(UHS, XSTSToken) {
+ const data = await got.post(AUTH_MC_URI, {
+ json: {
+ identityToken: `XBL3.0 x=${UHS};${XSTSToken}`
+ }
+ })
+
+ const expiresAt = new Date()
+ expiresAt.setSeconds(expiresAt.getSeconds() + data.expires_in)
+
+ return {
+ expired_at: expiresAt,
+ access_token: data.access_token
+ }
+}
+
+exports.getAccessToken = async authCode => {
+ const {
+ expires_in,
+ access_token,
+ refresh_token
+ } = await got.post(TOKEN_URI, {
+ form: {
+ client_id: CLIENT_ID,
+ code: authCode,
+ scope: 'XboxLive.signin',
+ redirect_uri: 'https://login.microsoftonline.com/common/oauth2/nativeclient',
+ grant_type: 'authorization_code'
+ }
+ })
+
+ const expiresAt = new Date()
+ expiresAt.setSeconds(expiresAt.getSeconds() + expires_in)
+
+ return {
+ expires_at: expiresAt,
+ access_token,
+ refresh_token
+ }
+}
+
+exports.refreshAccessToken = async refreshToken => {
+ const {
+ expires_in,
+ access_token
+ } = await got.post(TOKEN_URI, {
+ form: {
+ client_id: CLIENT_ID,
+ refresh_token: refreshToken,
+ scope: 'XboxLive.signin',
+ redirect_uri: 'https://login.microsoftonline.com/common/oauth2/nativeclient',
+ grant_type: 'refresh_token'
+ },
+ responseType: 'json'
+ })
+
+ const expiresAt = new Date()
+ expiresAt.setSeconds(expiresAt.getSeconds() + expires_in)
+
+ return {
+ expires_at: expiresAt,
+ access_token
+ }
+}
+
+exports.authMinecraft = async accessToken => {
+ const XBLToken = await getXBLToken(accessToken)
+ const XSTSToken = await getXSTSToken(XBLToken.token)
+ const MCToken = await getMCAccessToken(XBLToken.uhs, XSTSToken)
+
+ return MCToken
+}
+
+exports.checkMCStore = async access_token => {
+ try {
+ const {items} = await got('https://api.minecraftservices.com/entitlements/mcstore', {
+ headers: {
+ Authorization: 'Bearer ' + access_token
+ },
+ responseType: 'json'
+ })
+
+ return items && items.length > 0
+ } catch {
+ return false
+ }
+}
+
+exports.getMCProfile = async MCAccessToken => {
+ const data = await got(PROFILE_URI, {
+ headers: {
+ Authorization: `Bearer ${MCAccessToken}`
+ }
+ })
+
+ return data
+}
\ No newline at end of file
diff --git a/app/assets/js/scripts/login.js b/app/assets/js/scripts/login.js
index 34078bd1..3629c9f0 100644
--- a/app/assets/js/scripts/login.js
+++ b/app/assets/js/scripts/login.js
@@ -17,6 +17,7 @@ const checkmarkContainer = document.getElementById('checkmarkContainer')
const loginRememberOption = document.getElementById('loginRememberOption')
const loginButton = document.getElementById('loginButton')
const loginForm = document.getElementById('loginForm')
+const loginMSButton = document.getElementById('loginMSButton')
// Control variables.
let lu = false, lp = false
@@ -297,4 +298,95 @@ loginButton.addEventListener('click', () => {
loggerLogin.log('Error while logging in.', err)
})
-})
\ No newline at end of file
+})
+
+loginMSButton.addEventListener('click', () => {
+ // Show loading stuff.
+ toggleOverlay(true, false, 'msOverlay')
+ loginMSButton.disabled = true
+ ipcRenderer.send('openMSALoginWindow', 'open')
+})
+
+ipcRenderer.on('MSALoginWindowReply', (_, ...arguments_) => {
+ if (arguments_[0] === 'error') {
+ loginMSButton.disabled = false
+ loginLoading(false)
+ switch (arguments_[1]) {
+ case 'AlreadyOpenException': {
+ setOverlayContent('ERROR', 'There is already a login window open!', 'OK')
+ setOverlayHandler(() => {
+ toggleOverlay(false)
+ toggleOverlay(false, false, 'msOverlay')
+ })
+ toggleOverlay(true)
+ return
+ }
+ case 'AuthNotFinished': {
+ setOverlayContent('ERROR', 'You have to finish the login process to use Helios Launcher. The window will close by itself when you have successfully logged in.', 'OK')
+ setOverlayHandler(() => {
+ toggleOverlay(false)
+ toggleOverlay(false, false, 'msOverlay')
+ })
+ toggleOverlay(true)
+ return
+ }
+ }
+
+ }
+ toggleOverlay(false, false, 'msOverlay')
+ const queryMap = arguments_[0]
+ if (queryMap.has('error')) {
+ let error = queryMap.get('error')
+ let errorDesc = queryMap.get('error_description')
+ if (error === 'access_denied') {
+ error = 'ERRPR'
+ errorDesc = 'To use the Helios Launcher, you must agree to the required permissions! Otherwise you can\'t use this launcher with Microsoft accounts.
Despite agreeing to the permissions you don\'t give us the possibility to do anything with your account, because all data will always be sent back to you (the launcher) IMMEDIATELY and WITHOUT WAY.'
+ }
+ setOverlayContent(error, errorDesc, 'OK')
+ setOverlayHandler(() => {
+ loginMSButton.disabled = false
+ toggleOverlay(false)
+ })
+ toggleOverlay(true)
+ return
+ }
+
+ // Disable form.
+ formDisabled(true)
+
+ const authCode = queryMap.get('code')
+ AuthManager.addMSAccount(authCode).then(account => {
+ updateSelectedAccount(account)
+ loginButton.innerHTML = loginButton.innerHTML.replace(Lang.queryJS('login.loggingIn'), Lang.queryJS('login.success'))
+ $('.circle-loader').toggleClass('load-complete')
+ $('.checkmark').toggle()
+ setTimeout(() => {
+ switchView(VIEWS.login, loginViewOnSuccess, 500, 500, () => {
+ // Temporary workaround
+ if (loginViewOnSuccess === VIEWS.settings) {
+ prepareSettings()
+ }
+ loginViewOnSuccess = VIEWS.landing // Reset this for good measure.
+ loginCancelEnabled(false) // Reset this for good measure.
+ loginViewCancelHandler = null // Reset this for good measure.
+ loginUsername.value = ''
+ loginPassword.value = ''
+ $('.circle-loader').toggleClass('load-complete')
+ $('.checkmark').toggle()
+ loginLoading(false)
+ loginButton.innerHTML = loginButton.innerHTML.replace(Lang.queryJS('login.success'), Lang.queryJS('login.login'))
+ formDisabled(false)
+ })
+ }, 1000)
+ }).catch(error => {
+ loginMSButton.disabled = false
+ loginLoading(false)
+ setOverlayContent('ERROR', error.message ? error.message : 'An error occurred while logging in with Microsoft! For more detailed information please check the log. You can open it with CTRL + SHIFT + I.', Lang.queryJS('login.tryAgain'))
+ setOverlayHandler(() => {
+ formDisabled(false)
+ toggleOverlay(false)
+ })
+ toggleOverlay(true)
+ loggerLogin.error(error)
+ })
+})
diff --git a/app/assets/js/scripts/settings.js b/app/assets/js/scripts/settings.js
index 4a1997fe..8fd6f84d 100644
--- a/app/assets/js/scripts/settings.js
+++ b/app/assets/js/scripts/settings.js
@@ -381,15 +381,28 @@ function bindAuthAccountLogOut(){
})
}
+let data = null
+
/**
* Process a log out.
*
* @param {Element} val The log out button element.
* @param {boolean} isLastAccount If this logout is on the last added account.
*/
-function processLogOut(val, isLastAccount){
- const parent = val.closest('.settingsAuthAccount')
- const uuid = parent.getAttribute('uuid')
+function processLogOut(val, isLastAccount, skip = false) {
+ data = {
+ val,
+ isLastAccount
+ }
+ if (!skip) {
+ const parent = val.closest('.settingsAuthAccount')
+ const uuid = parent.getAttribute('uuid')
+ const account = ConfigManager.getAuthAccount(uuid)
+ if (account.type === 'microsoft') {
+ toggleOverlay(true, false, 'msOverlay')
+ ipcRenderer.send('openMSALogoutWindow', 'open')
+ }
+ }
const prevSelAcc = ConfigManager.getSelectedAccount()
AuthManager.removeAccount(uuid).then(() => {
if(!isLastAccount && uuid === prevSelAcc.uuid){
@@ -404,6 +417,11 @@ function processLogOut(val, isLastAccount){
})
}
+ipcRenderer.on('MSALogoutWindowReply', (event, ...args) => {
+ toggleOverlay(false, false, 'msOverlay')
+ processLogOut(data.val, data.isLastAccount, true)
+})
+
/**
* Refreshes the status of the selected account on the auth account
* elements.
diff --git a/app/login.ejs b/app/login.ejs
index 7ecc4a6c..b622afef 100644
--- a/app/login.ejs
+++ b/app/login.ejs
@@ -32,7 +32,7 @@
forgot password?
@@ -52,6 +52,19 @@
+ or
+
Need an Account?
diff --git a/app/overlay.ejs b/app/overlay.ejs
index 0c18aef4..09ea19b2 100644
--- a/app/overlay.ejs
+++ b/app/overlay.ejs
@@ -28,6 +28,7 @@
+
Lorem Ipsum: Finis IlludLorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud..