From 0a82fed4beb0ae48042fc9e20bac82d3c9d03298 Mon Sep 17 00:00:00 2001 From: Sadetdin EYILI Date: Sun, 26 Sep 2021 17:59:54 +0200 Subject: Fix Slack connection with Google SSO (#1991) --- src/models/UserAgent.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/models/UserAgent.js b/src/models/UserAgent.js index 8ec274aa5..33bf9d072 100644 --- a/src/models/UserAgent.js +++ b/src/models/UserAgent.js @@ -47,25 +47,24 @@ export default class UserAgent { return defaultUserAgent(); } - @computed get userAgentWithChromeVersion() { + @computed get serviceUserAgentPref() { if (typeof this.userAgentPref === 'string') { const trimmed = this.userAgentPref.trim(); if (trimmed !== '') { return trimmed; } } - return this.defaultUserAgent; + return null; } @computed get userAgentWithoutChromeVersion() { - const withChrome = this.userAgentWithChromeVersion; + const withChrome = this.defaultUserAgent; return withChrome.replace(/Chrome\/[\d.]+/, 'Chrome'); } @computed get userAgent() { - return this.chromelessUserAgent - ? this.userAgentWithoutChromeVersion - : this.userAgentWithChromeVersion; + return this.serviceUserAgentPref + || (this.chromelessUserAgent ? this.userAgentWithoutChromeVersion : this.defaultUserAgent); } @action setWebviewReference(webview) { -- cgit v1.2.3-54-g00ecf