Enable Background Authentication Calls and handing of undefined on lo…

…ck resumption (#1555)

* adding the enableBackgroundCallsAuthentication removing writeUrlBlockLog, doing some check on the connectionManager and tray to ensure we don't get undefined values

app/browser/tools/reactHandler.js

@@ -21,4 +21,6 @@ class ReactHandler {
 }
 //document.getElementById('app')._reactRootContainer.current.updateQueue.baseState.element.props.coreServices
 
-module.exports = new ReactHandler();
+module.exports = new ReactHandler();
+
+// document.getElementById('app')._reactRootContainer.current.updateQueue.baseState.element.props.coreServices.authenticationService._coreAuthService._authProvider.acquireToken("https://graph.microsoft.com", { correlation: document.getElementById('app')._reactRootContainer.current.updateQueue.baseState.element.props.coreServices.correlation} )

app/config/index.js

@@ -213,6 +213,11 @@ function extractYargConfig(configObject, appVersion) {
 				default: false,
 				describe: 'Use windows platform information in chromium. This is helpful if MFA app does not support Linux.'
 			},
+			enableBackgroundCallsAuthentication: {
+				default: true,
+				describe: 'Enable background calls for authentication to open in a child browser window (temporary solution for debugging)',
+				type: 'boolean'
+			},
 			followSystemTheme: {
 				default: false,
 				describe: 'Follow system theme',
@@ -242,7 +247,7 @@ function extractYargConfig(configObject, appVersion) {
 				default: {
 					"transports": {
 						"console": {
-							"level": "info"
+							"level": "debug"
 						},
 						"file": {
 							"level": false

app/connectionManager/index.js

@@ -28,15 +28,21 @@ class ConnectionManager {
 	}
 
 	async refresh() {
-		const currentUrl = this.window.webContents.getURL();
+		if (!this.window) {
+			console.warn('Window is not available. Cannot refresh.');
+			return;
+		}
+		const currentUrl = this.window?.webContents?.getURL() || '';
 		const hasUrl = currentUrl?.startsWith('https://');
-		this.window.setTitle('Waiting for network...');
+		this.window?.setTitle('Waiting for network...');
 		console.debug('Waiting for network...');
 		const connected = await this.isOnline();
 		if (connected) {
 			if (hasUrl) {
+				console.debug('Reloading current page...');
 				this.window.reload();
 			} else {
+				console.debug('Loading initial URL...');
 				this.window.loadURL(this.currentUrl, { userAgent: this.config.chromeUserAgent });
 			}
 		} else {

app/mainAppWindow/index.js

@@ -1,5 +1,4 @@
-const { shell, app, nativeTheme, dialog, webFrameMain, Notification } = require('electron');
-const path = require('path');
+const { shell, BrowserWindow, app, nativeTheme, dialog, webFrameMain } = require('electron');
 const login = require('../login');
 const customCSS = require('../customCSS');
 const Menus = require('../menus');
@@ -8,13 +7,11 @@ const { execFile } = require('child_process');
 const TrayIconChooser = require('../browser/tools/trayIconChooser');
 require('../appConfiguration');
 const connMgr = require('../connectionManager');
-const fs = require('fs');
 const BrowserWindowManager = require('../mainAppWindow/browserWindowManager');
 
 let iconChooser;
 let intune;
 let isControlPressed = false;
-let lastNotifyTime = null;
 let aboutBlankRequestCount = 0;
 let config;
 let window = null;
@@ -237,10 +234,17 @@ function onBeforeRequestHandler(details, callback) {
 		// Proceed normally
 		callback({});
 	} else {
-		// Open the request externally
 		console.debug('DEBUG - webRequest to  ' + details.url + ' intercepted!');
-		//shell.openExternal(details.url);
-		writeUrlBlockLog(details.url);
+		if (this.config.enableBackgroundCallsAuthentication) {
+			console.debug('Opening the request in a hidden child window for authentication');
+			const child = new BrowserWindow({ parent: window, show: false });
+			child.loadURL(details.url);
+			child.once('ready-to-show', () => {
+				console.debug('Destroying the hidden child window');
+				child.destroy();
+			})	
+		}
+
 		// decrement the counter
 		aboutBlankRequestCount -= 1;
 		callback({ cancel: true });
@@ -281,28 +285,6 @@ function onNewWindow(details) {
 	return secureOpenLink(details);
 }
 
-async function writeUrlBlockLog(url) {
-	const curBlockTime = new Date();
-	const logfile = path.join(appConfig.configPath, 'teams-for-linux-blocked.log');
-	const lstream = fs.createWriteStream(logfile, { flags: 'a' }).on('error', onLogStreamError);
-	lstream.write(`[${new Date().toLocaleString()}]: Blocked '${url}'\n`, onLogStreamError);
-	lstream.end();
-	const notifDuration = lastNotifyTime == null ? 60 : (curBlockTime.getTime() - lastNotifyTime.getTime()) / 1000;
-	if (notifDuration >= 60) {
-		new Notification({
-			title: 'Teams for Linux',
-			body: 'One or more web requests have been blocked. Please check the log for more details.'
-		}).show();
-		lastNotifyTime = curBlockTime;
-	}
-}
-
-function onLogStreamError(e) {
-	if (e) {
-		console.error(`onLogStreamError ${e.message}`);
-	}
-}
-
 function onPageTitleUpdated(_event, title) {
 	window.webContents.send('page-title', title);
 }

app/menus/tray.js

@@ -6,10 +6,7 @@ class ApplicationTray {
 		this.iconPath = iconPath;
 		this.appMenu = appMenu;
 		this.config = config;
-		this.addTray();
-	}
 
-	addTray() {
 		this.tray = new Tray(this.iconPath);
 		this.tray.setToolTip(this.config.appTitle);
 		this.tray.on('click', () => this.showAndFocusWindow());
@@ -28,14 +25,18 @@ class ApplicationTray {
 	}
 
 	updateTrayImage(iconUrl, flash) {
-		const image = nativeImage.createFromDataURL(iconUrl);
+		if (this.tray && !this.tray.isDestroyed()) {
+			const image = nativeImage.createFromDataURL(iconUrl);
 
-		this.tray.setImage(image);
-		this.window.flashFrame(flash);
+			this.tray.setImage(image);
+			this.window.flashFrame(flash);
+		}
 	}
 
 	close() {
-		this.tray.destroy();
+		if (!this.tray.isDestroyed()) {
+			this.tray.destroy()
+		}
 	}
 }
 exports = module.exports = ApplicationTray;

com.github.IsmaelMartinez.teams_for_linux.appdata.xml

@@ -14,6 +14,16 @@
 	<url type="bugtracker">https://github.com/IsmaelMartinez/teams-for-linux/issues</url>
 	<launchable type="desktop-id">com.github.IsmaelMartinez.teams_for_linux.desktop</launchable>
 	<releases>
+		<release version="1.12.7" date="2025-02-15">
+			<description>
+				<ul>
+					<li>Adding enableBackgroundCallsAuthentication config option to validate if this keeps the user authenticated for longer</li>
+					<li>Removing the writeUrlBlockLog function that use to log those requests into a file for debugging</li>
+					<li>Handling of UnhandledPromiseRejectionWarning: TypeError: Cannot read properties of undefined (reading 'webContents') at PowerMonitor.refresh (.../app/connectionManager/index.js:31:34)</li>
+					<li>Checking the tray status before trying to update the badge count</li>
+				</ul>
+			</description>
+		</release>
 		<release version="1.12.6" date="2025-01-17">
 			<description>
 				<ul>

package.json

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