From 7128c078fe85f8aeb87e496d122d66144729ca6e Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Mon, 27 Nov 2023 09:04:08 +0100
Subject: [PATCH 1/2] refactor: make browserCheck an util

- There is no need to be a mixin, it has nothing Vue-related or reactive
- Move to utils
- Refactor computed and Vue component methods to exported constants and functions

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/App.vue                                  |   6 +-
 src/FilesSidebarTabApp.vue                   |   6 +-
 src/PublicShareAuthRequestPasswordButton.vue |   9 +-
 src/PublicShareSidebar.vue                   |   6 +-
 src/components/TopBar/CallButton.vue         |  15 ++-
 src/mixins/browserCheck.js                   | 132 -------------------
 src/utils/browserCheck.js                    |  93 +++++++++++++
 7 files changed, 113 insertions(+), 154 deletions(-)
 delete mode 100644 src/mixins/browserCheck.js
 create mode 100644 src/utils/browserCheck.js

diff --git a/src/App.vue b/src/App.vue
index c2ab6558c34..c3536a83f39 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -57,7 +57,6 @@ import SettingsDialog from './components/SettingsDialog/SettingsDialog.vue'
 import { useActiveSession } from './composables/useActiveSession.js'
 import { useIsInCall } from './composables/useIsInCall.js'
 import { CONVERSATION, PARTICIPANT } from './constants.js'
-import browserCheck from './mixins/browserCheck.js'
 import participant from './mixins/participant.js'
 import sessionIssueHandler from './mixins/sessionIssueHandler.js'
 import talkHashCheck from './mixins/talkHashCheck.js'
@@ -65,6 +64,7 @@ import Router from './router/router.js'
 import BrowserStorage from './services/BrowserStorage.js'
 import { EventBus } from './services/EventBus.js'
 import { leaveConversationSync } from './services/participantsService.js'
+import { checkBrowser } from './utils/browserCheck.js'
 import { signalingKill } from './utils/webrtc/index.js'
 
 export default {
@@ -81,7 +81,6 @@ export default {
 	},
 
 	mixins: [
-		browserCheck,
 		talkHashCheck,
 		sessionIssueHandler,
 		participant,
@@ -474,8 +473,7 @@ export default {
 
 	async mounted() {
 		if (!IS_DESKTOP) {
-			// see browserCheck mixin
-			this.checkBrowser()
+			checkBrowser()
 		}
 		// Check sidebar status in previous sessions
 		if (BrowserStorage.getItem('sidebarOpen') === 'false') {
diff --git a/src/FilesSidebarTabApp.vue b/src/FilesSidebarTabApp.vue
index d92b62d1a86..749c5a095ae 100644
--- a/src/FilesSidebarTabApp.vue
+++ b/src/FilesSidebarTabApp.vue
@@ -52,13 +52,13 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 import LoadingComponent from './components/LoadingComponent.vue'
 
-import browserCheck from './mixins/browserCheck.js'
 import sessionIssueHandler from './mixins/sessionIssueHandler.js'
 import { EventBus } from './services/EventBus.js'
 import { getFileConversation } from './services/filesIntegrationServices.js'
 import {
 	leaveConversationSync,
 } from './services/participantsService.js'
+import { checkBrowser } from './utils/browserCheck.js'
 import CancelableRequest from './utils/cancelableRequest.js'
 import { signalingKill } from './utils/webrtc/index.js'
 
@@ -77,7 +77,6 @@ export default {
 	},
 
 	mixins: [
-		browserCheck,
 		sessionIssueHandler,
 	],
 
@@ -171,8 +170,7 @@ export default {
 
 	methods: {
 		async joinConversation() {
-			// see browserCheck mixin
-			this.checkBrowser()
+			checkBrowser()
 
 			try {
 				await this.getFileConversation()
diff --git a/src/PublicShareAuthRequestPasswordButton.vue b/src/PublicShareAuthRequestPasswordButton.vue
index 4fc1c47e4cb..fedf1ad5cba 100644
--- a/src/PublicShareAuthRequestPasswordButton.vue
+++ b/src/PublicShareAuthRequestPasswordButton.vue
@@ -41,8 +41,8 @@
 <script>
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
-import browserCheck from './mixins/browserCheck.js'
 import { getPublicShareAuthConversationToken } from './services/publicShareAuthService.js'
+import { checkBrowser } from './utils/browserCheck.js'
 
 export default {
 
@@ -52,10 +52,6 @@ export default {
 		NcButton,
 	},
 
-	mixins: [
-		browserCheck,
-	],
-
 	props: {
 		shareToken: {
 			type: String,
@@ -89,8 +85,7 @@ export default {
 
 	methods: {
 		async requestPassword() {
-			// see browserCheck mixin
-			this.checkBrowser()
+			checkBrowser()
 
 			this.hasRequestFailed = false
 			this.isRequestLoading = true
diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
index 4d1678946f8..57d0aefd6b7 100644
--- a/src/PublicShareSidebar.vue
+++ b/src/PublicShareSidebar.vue
@@ -68,7 +68,6 @@ import TopBar from './components/TopBar/TopBar.vue'
 import TransitionWrapper from './components/TransitionWrapper.vue'
 
 import { useIsInCall } from './composables/useIsInCall.js'
-import browserCheck from './mixins/browserCheck.js'
 import participant from './mixins/participant.js'
 import sessionIssueHandler from './mixins/sessionIssueHandler.js'
 import talkHashCheck from './mixins/talkHashCheck.js'
@@ -77,6 +76,7 @@ import { getPublicShareConversationData } from './services/filesIntegrationServi
 import {
 	leaveConversationSync,
 } from './services/participantsService.js'
+import { checkBrowser } from './utils/browserCheck.js'
 import { signalingKill } from './utils/webrtc/index.js'
 
 export default {
@@ -95,7 +95,6 @@ export default {
 	},
 
 	mixins: [
-		browserCheck,
 		sessionIssueHandler,
 		participant,
 		talkHashCheck,
@@ -160,8 +159,7 @@ export default {
 	methods: {
 
 		async joinConversation() {
-			// see browserCheck mixin
-			this.checkBrowser()
+			checkBrowser()
 
 			this.joiningConversation = true
 
diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue
index 026a5c2ae5c..e756269aea2 100644
--- a/src/components/TopBar/CallButton.vue
+++ b/src/components/TopBar/CallButton.vue
@@ -112,12 +112,12 @@ import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
 import { useIsInCall } from '../../composables/useIsInCall.js'
 import { ATTENDEE, CALL, CONVERSATION, PARTICIPANT } from '../../constants.js'
-import browserCheck from '../../mixins/browserCheck.js'
 import isInLobby from '../../mixins/isInLobby.js'
 import participant from '../../mixins/participant.js'
 import { callSIPDialOut } from '../../services/callsService.js'
 import { EventBus } from '../../services/EventBus.js'
 import { useSettingsStore } from '../../stores/settings.js'
+import { blockCalls, unsupportedWarning } from '../../utils/browserCheck.js'
 
 export default {
 	name: 'CallButton',
@@ -140,7 +140,6 @@ export default {
 	},
 
 	mixins: [
-		browserCheck,
 		isInLobby,
 		participant,
 	],
@@ -310,7 +309,17 @@ export default {
 
 		isPhoneRoom() {
 			return this.conversation.objectType === CONVERSATION.OBJECT_TYPE.PHONE
-		}
+		},
+
+		callButtonTooltipText() {
+			if (blockCalls) {
+				return unsupportedWarning
+			} else {
+				// Passing a falsy value into the content of the tooltip
+				// is the only way to disable it conditionally.
+				return false
+			}
+		},
 	},
 
 	mounted() {
diff --git a/src/mixins/browserCheck.js b/src/mixins/browserCheck.js
deleted file mode 100644
index c7370ee90d4..00000000000
--- a/src/mixins/browserCheck.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * @copyright Copyright (c) 2019 Marco Ambrosini <marcoambrosini@icloud.com>
- *
- * @author Marco Ambrosini <marcoambrosini@icloud.com>
- *
- * @license AGPL-3.0-or-later
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-import UAParser from 'ua-parser-js'
-
-import { showError, TOAST_PERMANENT_TIMEOUT } from '@nextcloud/dialogs'
-
-const browserCheck = {
-	methods: {
-		checkBrowser() {
-			console.info('Detected browser ' + this.browser.name + ' ' + this.majorVersion + ' (' + this.browser.version + ')')
-			if (!this.isFullySupported) {
-				showError(
-					this.unsupportedWarning,
-					{
-						timeout: TOAST_PERMANENT_TIMEOUT,
-					})
-			}
-		},
-	},
-	computed: {
-		parser() {
-			return new UAParser()
-		},
-
-		browser() {
-			return this.parser.getBrowser()
-		},
-
-		isFirefox() {
-			return this.browser.name === 'Firefox'
-		},
-		isChrome() {
-			return this.browser.name === 'Chrome' || this.browser.name === 'Chromium'
-		},
-		isOpera() {
-			return this.browser.name === 'Opera'
-		},
-		isSafari() {
-			return this.browser.name === 'Safari' || this.browser.name === 'Mobile Safari'
-		},
-		isEdge() {
-			return this.browser.name === 'Edge'
-		},
-		isBrave() {
-			return this.browser.name === 'Brave'
-		},
-		isIE() {
-			return this.browser.name === 'IE' || this.browser.name === 'IEMobile'
-		},
-		isYandex() {
-			return this.browser.name === 'Yandex'
-		},
-		browserVersion() {
-			if (this.browser.version) {
-				return this.browser.version
-			}
-
-			if (this.browser.name === 'Safari') {
-				// Workaround for https://github.com/faisalman/ua-parser-js/issues/599
-				const match = this.parser.getUA().match(' Version/([0-9.,]+) ')
-				if (match) {
-					return match[1]
-				}
-			}
-
-			return undefined
-		},
-
-		majorVersion() {
-			if (this.browserVersion) {
-				return parseInt(this.browserVersion.split('.')[0], 10)
-			}
-
-			return 0
-		},
-
-		isFullySupported() {
-			return (this.isFirefox && this.majorVersion >= 52)
-			|| (this.isChrome && this.majorVersion >= 49)
-			|| (this.isOpera && this.majorVersion >= 72)
-			|| (this.isSafari && this.majorVersion >= 12)
-			|| this.isEdge
-			|| this.isBrave
-			|| this.isYandex
-		},
-		// Disable the call button and show the tooltip
-		blockCalls() {
-			return (this.isFirefox && this.majorVersion < 52)
-			|| (this.isChrome && this.majorVersion < 49)
-			|| (this.isOpera && this.majorVersion < 72)
-			|| (this.isSafari && this.majorVersion < 12)
-			|| this.isIE
-		},
-		// Used both in the toast and in the call button tooltip
-		unsupportedWarning() {
-			return t('spreed', "The browser you're using is not fully supported by Nextcloud Talk. Please use the latest version of Mozilla Firefox, Microsoft Edge, Google Chrome, Opera or Apple Safari.")
-		},
-		// Used in CallButton.vue
-		callButtonTooltipText() {
-			if (this.blockCalls) {
-				return this.unsupportedWarning
-			} else {
-				// Passing a falsy value into the content of the tooltip
-				// is the only way to disable it conditionally.
-				return false
-			}
-		},
-
-	},
-}
-
-export default browserCheck
diff --git a/src/utils/browserCheck.js b/src/utils/browserCheck.js
new file mode 100644
index 00000000000..64e2d2227c8
--- /dev/null
+++ b/src/utils/browserCheck.js
@@ -0,0 +1,93 @@
+/**
+ * @copyright Copyright (c) 2019 Marco Ambrosini <marcoambrosini@icloud.com>
+ *
+ * @author Marco Ambrosini <marcoambrosini@icloud.com>
+ * @author Grigorii K. Shartsev <me@shgk.me>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import UAParser from 'ua-parser-js'
+
+import { showError, TOAST_PERMANENT_TIMEOUT } from '@nextcloud/dialogs'
+import { translate as t } from '@nextcloud/l10n'
+
+const parser = new UAParser()
+const browser = parser.getBrowser()
+
+const getBrowserVersion = () => {
+	if (browser.version) {
+		return browser.version
+	}
+
+	if (browser.name === 'Safari') {
+		// Workaround for https://github.com/faisalman/ua-parser-js/issues/599
+		const match = parser.getUA().match(' Version/([0-9.,]+) ')
+		if (match) {
+			return match[1]
+		}
+	}
+
+	return undefined
+}
+
+export const isFirefox = browser.name === 'Firefox'
+export const isChrome = browser.name === 'Chrome' || browser.name === 'Chromium'
+export const isOpera = browser.name === 'Opera'
+export const isSafari = browser.name === 'Safari' || browser.name === 'Mobile Safari'
+export const isEdge = browser.name === 'Edge'
+export const isBrave = browser.name === 'Brave'
+export const isIE = browser.name === 'IE' || browser.name === 'IEMobile'
+export const isYandex = browser.name === 'Yandex'
+
+export const browserVersion = getBrowserVersion()
+export const majorVersion = browserVersion ? parseInt(browserVersion.split('.')[0], 10) : 0
+
+/**
+ * Is the browser fully supported by Talk
+ */
+export const isFullySupported = (isFirefox && majorVersion >= 52)
+	|| (isChrome && majorVersion >= 49)
+	|| (isOpera && majorVersion >= 72)
+	|| (isSafari && majorVersion >= 12)
+	|| isEdge
+	|| isBrave
+	|| isYandex
+
+/**
+ * Are calls should be blocked due to browser incompatibility
+ */
+export const blockCalls = (isFirefox && majorVersion < 52)
+	|| (isChrome && majorVersion < 49)
+	|| (isOpera && majorVersion < 72)
+	|| (isSafari && majorVersion < 12)
+	|| isIE
+
+/**
+ * Reusable error message for unsupported browsers
+ */
+export const unsupportedWarning = t('spreed', "The browser you're using is not fully supported by Nextcloud Talk. Please use the latest version of Mozilla Firefox, Microsoft Edge, Google Chrome, Opera or Apple Safari.")
+
+/**
+ * Show an error toast if the browser is not fully supported
+ */
+export function checkBrowser() {
+	console.info('Detected browser ' + browser.name + ' ' + majorVersion + ' (' + browserVersion + ')')
+	if (!isFullySupported) {
+		showError(unsupportedWarning, { timeout: TOAST_PERMANENT_TIMEOUT })
+	}
+}

From 772b0935fb1f7be295ec66d3842e9bc5911ea276 Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Mon, 27 Nov 2023 12:05:59 +0100
Subject: [PATCH 2/2] refactor: remove workaround for Safari in browserCheck

- https://github.com/faisalman/ua-parser-js/issues/599 is fixed in 1.0.32

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/utils/browserCheck.js | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/utils/browserCheck.js b/src/utils/browserCheck.js
index 64e2d2227c8..ce4039caa48 100644
--- a/src/utils/browserCheck.js
+++ b/src/utils/browserCheck.js
@@ -29,21 +29,9 @@ import { translate as t } from '@nextcloud/l10n'
 const parser = new UAParser()
 const browser = parser.getBrowser()
 
-const getBrowserVersion = () => {
-	if (browser.version) {
-		return browser.version
-	}
-
-	if (browser.name === 'Safari') {
-		// Workaround for https://github.com/faisalman/ua-parser-js/issues/599
-		const match = parser.getUA().match(' Version/([0-9.,]+) ')
-		if (match) {
-			return match[1]
-		}
-	}
-
-	return undefined
-}
+/**
+ * Per-browser flags and a major version
+ */
 
 export const isFirefox = browser.name === 'Firefox'
 export const isChrome = browser.name === 'Chrome' || browser.name === 'Chromium'
@@ -54,8 +42,7 @@ export const isBrave = browser.name === 'Brave'
 export const isIE = browser.name === 'IE' || browser.name === 'IEMobile'
 export const isYandex = browser.name === 'Yandex'
 
-export const browserVersion = getBrowserVersion()
-export const majorVersion = browserVersion ? parseInt(browserVersion.split('.')[0], 10) : 0
+export const majorVersion = browser.version ? parseInt(browser.version.split('.')[0], 10) : 0
 
 /**
  * Is the browser fully supported by Talk
@@ -86,7 +73,7 @@ export const unsupportedWarning = t('spreed', "The browser you're using is not f
  * Show an error toast if the browser is not fully supported
  */
 export function checkBrowser() {
-	console.info('Detected browser ' + browser.name + ' ' + majorVersion + ' (' + browserVersion + ')')
+	console.info('Detected browser ' + browser.name + ' ' + majorVersion + ' (' + browser.version + ')')
 	if (!isFullySupported) {
 		showError(unsupportedWarning, { timeout: TOAST_PERMANENT_TIMEOUT })
 	}