Merge pull request #1632 from ozskywalker/feature/user-agent-control

Feature: Override User-Agent for all services

app/store/Services.js

@@ -47,6 +47,7 @@ Ext.define('Rambox.store.Services', {
 					,displayTabUnreadCounter: service.get('displayTabUnreadCounter')
 					,enabled: service.get('enabled')
 					,record: service
+					,useragent: ipc.sendSync('getConfig').user_agent
 					,tabConfig: {
 						service: service
 					}

app/ux/WebView.js

@@ -176,7 +176,7 @@ Ext.define('Rambox.ux.WebView',{
 					,autosize: 'on'
 					,webpreferences: '' //,nativeWindowOpen=yes
 					//,disablewebsecurity: 'on' // Disabled because some services (Like Google Drive) dont work with this enabled
-					,useragent: Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent')
+					,useragent: ipc.sendSync('getConfig').user_agent ? ipc.sendSync('getConfig').user_agent : Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent')
 					,preload: './resources/js/rambox-service-api.js'
 				}
 			}];
@@ -302,7 +302,7 @@ Ext.define('Rambox.ux.WebView',{
 									,src: e.url
 									,style: 'width:100%;height:100%;'
 									,partition: me.getWebView().partition
-									,useragent: Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent')
+									,useragent: ipc.sendSync('getConfig').user_agent ? ipc.sendSync('getConfig').user_agent : Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent')
 								}
 							}
 						}).show();
@@ -330,7 +330,7 @@ Ext.define('Rambox.ux.WebView',{
 									,src: e.url
 									,style: 'width:100%;height:100%;'
 									,partition: me.getWebView().partition
-									,useragent: Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent')
+									,useragent: ipc.sendSync('getConfig').user_agent ? ipc.sendSync('getConfig').user_agent : Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent')
 								}
 							}
 						}).show();
@@ -360,7 +360,7 @@ Ext.define('Rambox.ux.WebView',{
 									,src: e.url
 									,style: 'width:100%;height:100%;'
 									,partition: me.getWebView().partition
-									,useragent: Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent')
+									,useragent: ipc.sendSync('getConfig').user_agent ? ipc.sendSync('getConfig').user_agent : Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent')
 									,preload: './resources/js/rambox-modal-api.js'
 								}
 							}

app/view/main/MainController.js

@@ -111,6 +111,7 @@ Ext.define('Rambox.view.main.MainController', {
 				,displayTabUnreadCounter: rec.get('displayTabUnreadCounter')
 				,enabled: rec.get('enabled')
 				,record: rec
+				,useragent: ipc.sendSync('getConfig').user_agent
 				,hidden: hideTab
 				,tabConfig: {
 					 service: rec

app/view/preferences/Preferences.js

@@ -256,6 +256,15 @@ Ext.define('Rambox.view.preferences.Preferences',{
 						,boxLabel: locale['preferences[8]']
 						,value: config.enable_hidpi_support
 						,hidden: process.platform !== 'win32'
+					},
+					{
+						 xtype: 'textfield'
+						,fieldLabel: 'Override User-Agent for all services (needs to relaunch)'
+						,labelAlign: 'top'
+						,name: 'user_agent'
+						,value: config.user_agent
+						,width: 360
+						,emptyText: 'Leave blank for default user agent'
 					}
 					,{
 						 xtype: 'fieldset'

app/view/preferences/PreferencesController.js

@@ -45,6 +45,13 @@ Ext.define('Rambox.view.preferences.PreferencesController', {
 			return;
 		}
 
+		// User Agent
+		if ( values.user_agent !== ipc.sendSync('getConfig').user_agent ) {
+			Ext.Msg.confirm('Action required', 'To change the user agent of Rambox, you need to reload the app. Do you want to do it now?', function(btnId) {
+				if ( btnId === 'yes' ) ipc.send('relaunchApp');
+			});
+		}
+
 		// Locale
 		if ( values.locale !== ipc.sendSync('getConfig').locale ) {
 			localStorage.setItem('locale', values.locale);

electron/main.js

@@ -39,6 +39,7 @@ const config = new Config({
 		,proxyPassword: ''
 		,locale: 'en'
 		,enable_hidpi_support: false
+		,user_agent: ''
 		,default_service: 'ramboxTab'
 		,sendStatistics: false
 
@@ -96,6 +97,9 @@ function createWindow () {
 		}
 	});
 
+	// Check if user has defined a custom User-Agent
+	if ( config.get('user_agent').length > 0 ) mainWindow.webContents.setUserAgent( config.get('user_agent') );
+
 	if ( !config.get('start_minimized') && config.get('maximized') ) mainWindow.maximize();
 	if ( config.get('window_display_behavior') !== 'show_trayIcon' && config.get('start_minimized') ) {
 		// Wait for the mainWindow.loadURL(..) and the optional mainWindow.webContents.openDevTools()
@@ -135,6 +139,7 @@ function createWindow () {
 			case 'new-window':
 				e.preventDefault();
 				const win = new BrowserWindow(options);
+				if ( config.get('user_agent').length > 0 ) win.webContents.setUserAgent( config.get('user_agent') );
 				win.once('ready-to-show', () => win.show());
 				win.loadURL(url);
 				e.newGuest = win;
@@ -346,6 +351,8 @@ ipcMain.on('image:download', function(event, url, partition) {
 		}
 	});
 
+	if ( config.get('user_agent').length > 0 ) tmpWindow.webContents.setUserAgent( config.get('user_agent') );
+
 	tmpWindow.webContents.session.once('will-download', (event, downloadItem) => {
 		imageCache[url] = file = {
 			 path: tmp.tmpNameSync() + '.' + mime.extension(downloadItem.getMimeType())
@@ -379,6 +386,8 @@ ipcMain.on('image:popup', function(event, url, partition) {
 		}
 	});
 
+	if ( config.get('user_agent').length > 0 ) tmpWindow.webContents.setUserAgent( config.get('user_agent') );
+
 	tmpWindow.maximize();
 
 	tmpWindow.loadURL(url);