Merge pull request #37 from IsmaelMartinez/0.1.12

0.1.12

app/index.js

@@ -13,7 +13,6 @@ app.commandLine.appendSwitch('auth-server-whitelist', config.authServerWhitelist
 app.commandLine.appendSwitch('enable-ntlm-v2', config.ntlmV2enabled);
 
 app.on('ready', () => {
-	let isFirstLoginTry = false;
 	let window = createWindow();
 	new Menus(window, config, iconPath);
 
@@ -32,19 +31,7 @@ app.on('ready', () => {
 		}
 	});
 
-	//login.handleLoginDialogTry(window.webContents);
-	window.webContents.on('login', (event, request, authInfo, callback) => {
-		event.preventDefault();
-		if (isFirstLoginTry) {
-			isFirstLoginTry = false;
-			login.loginService(window, callback);
-		} else {
-			// if fails to authenticate we need to relanch the app as we are closed 
-			isFirstLoginTry = true;
-			app.relaunch();
-			app.exit(0);
-		}
-	});
+	login.handleLoginDialogTry(window);
 
 	window.webContents.setUserAgent(config.chromeUserAgent);
 

app/login/index.js

@@ -1,6 +1,7 @@
-const {ipcMain, BrowserWindow} = require('electron');
+const {app, ipcMain, BrowserWindow} = require('electron');
+let isFirstLoginTry = true;
 
-exports.loginService = function loginService(parentWindow, callback) {
+exports.loginService = function loginService(parentWindow, callback) {	
 	let win = new BrowserWindow({
 		width: 363,
 		height: 124,
@@ -26,4 +27,20 @@ exports.loginService = function loginService(parentWindow, callback) {
 	});
 
 	win.loadURL(`file://${__dirname}/login.html`);
-};
+};
+
+exports.handleLoginDialogTry = function handleLoginDialogTry(window) {
+	window.webContents.on('login', (event, request, authInfo, callback) => {
+		event.preventDefault();
+		if (isFirstLoginTry) {
+			isFirstLoginTry = false;
+			this.loginService(window, callback);
+		} else {
+			// if fails to authenticate we need to relanch the app as we have close the login browser window.
+			isFirstLoginTry = true;
+			app.relaunch();
+			app.exit(0);
+		}
+	});
+}
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "teams-for-linux",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "main": "app/index.js",
   "description": "Unofficial client for Microsoft Teams for Linux",
   "homepage": "https://github.com/IsmaelMartinez/teams-for-linux",