Warn users on unsupported browsers before they lack features (#12830)
* Warn users on unsupported browsers before they lack features Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update Learn more link Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Add comments Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
parent
96777f84b5
commit
a12c1874f9
10 changed files with 299 additions and 19 deletions
22
src/@types/electron-to-chromium.d.ts
vendored
Normal file
22
src/@types/electron-to-chromium.d.ts
vendored
Normal file
|
@ -0,0 +1,22 @@
|
|||
/*
|
||||
Copyright 2024 The Matrix.org Foundation C.I.C.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
declare module "electron-to-chromium/versions" {
|
||||
const versionMap: {
|
||||
[electronVersion: string]: string;
|
||||
};
|
||||
export default versionMap;
|
||||
}
|
|
@ -83,6 +83,7 @@ import {
|
|||
tryDecryptToken,
|
||||
} from "./utils/tokens/tokens";
|
||||
import { TokenRefresher } from "./utils/oidc/TokenRefresher";
|
||||
import { checkBrowserSupport } from "./SupportedBrowser";
|
||||
|
||||
const HOMESERVER_URL_KEY = "mx_hs_url";
|
||||
const ID_SERVER_URL_KEY = "mx_is_url";
|
||||
|
@ -1001,6 +1002,7 @@ async function startMatrixClient(
|
|||
IntegrationManagers.sharedInstance().startWatching();
|
||||
ActiveWidgetStore.instance.start();
|
||||
LegacyCallHandler.instance.start();
|
||||
checkBrowserSupport();
|
||||
|
||||
// Start Mjolnir even though we haven't checked the feature flag yet. Starting
|
||||
// the thing just wastes CPU cycles, but should result in no actual functionality
|
||||
|
|
123
src/SupportedBrowser.ts
Normal file
123
src/SupportedBrowser.ts
Normal file
|
@ -0,0 +1,123 @@
|
|||
/*
|
||||
Copyright 2024 The Matrix.org Foundation C.I.C.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import { logger } from "matrix-js-sdk/src/logger";
|
||||
import browserlist from "browserslist";
|
||||
import electronToChromium from "electron-to-chromium/versions";
|
||||
|
||||
import { DeviceType, parseUserAgent } from "./utils/device/parseUserAgent";
|
||||
import ToastStore from "./stores/ToastStore";
|
||||
import GenericToast from "./components/views/toasts/GenericToast";
|
||||
import { _t } from "./languageHandler";
|
||||
import SdkConfig from "./SdkConfig";
|
||||
|
||||
export const LOCAL_STORAGE_KEY = "mx_accepts_unsupported_browser";
|
||||
const TOAST_KEY = "unsupportedbrowser";
|
||||
|
||||
const SUPPORTED_DEVICE_TYPES = [DeviceType.Web, DeviceType.Desktop];
|
||||
const SUPPORTED_BROWSER_QUERY =
|
||||
"last 2 Chrome versions, last 2 Firefox versions, last 2 Safari versions, last 2 Edge versions";
|
||||
const LEARN_MORE_URL = "https://github.com/element-hq/element-web#supported-environments";
|
||||
|
||||
function onLearnMoreClick(): void {
|
||||
onDismissClick();
|
||||
window.open(LEARN_MORE_URL, "_blank", "noopener,noreferrer");
|
||||
}
|
||||
|
||||
function onDismissClick(): void {
|
||||
localStorage.setItem(LOCAL_STORAGE_KEY, String(true));
|
||||
ToastStore.sharedInstance().dismissToast(TOAST_KEY);
|
||||
}
|
||||
|
||||
function getBrowserNameVersion(browser: string): [name: string, version: number] {
|
||||
const [browserName, browserVersion] = browser.split(" ");
|
||||
const browserNameLc = browserName.toLowerCase();
|
||||
if (browserNameLc === "electron") {
|
||||
// The electron-to-chromium map is keyed by the major and minor version of Electron
|
||||
const chromiumVersion = electronToChromium[browserVersion.split(".").slice(0, 2).join(".")];
|
||||
if (chromiumVersion) {
|
||||
return ["chrome", parseInt(chromiumVersion, 10)];
|
||||
}
|
||||
}
|
||||
|
||||
return [browserNameLc, parseInt(browserVersion, 10)];
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to check if the current browser is considered supported by our support policy.
|
||||
* Based on user agent parsing so may be inaccurate if the user has fingerprint prevention turned up to 11.
|
||||
*/
|
||||
export function getBrowserSupport(): boolean {
|
||||
const browsers = browserlist(SUPPORTED_BROWSER_QUERY).sort();
|
||||
const minimumBrowserVersions = new Map<string, number>();
|
||||
for (const browser of browsers) {
|
||||
const [browserName, browserVersion] = getBrowserNameVersion(browser);
|
||||
// We sorted the browsers so will encounter the minimum version first
|
||||
if (minimumBrowserVersions.has(browserName)) continue;
|
||||
minimumBrowserVersions.set(browserName, browserVersion);
|
||||
}
|
||||
|
||||
const details = parseUserAgent(navigator.userAgent);
|
||||
|
||||
let supported = true;
|
||||
if (!SUPPORTED_DEVICE_TYPES.includes(details.deviceType)) {
|
||||
logger.warn("Browser unsupported, unsupported device type", details.deviceType);
|
||||
supported = false;
|
||||
}
|
||||
|
||||
if (details.client) {
|
||||
const [browserName, browserVersion] = getBrowserNameVersion(details.client);
|
||||
const minimumVersion = minimumBrowserVersions.get(browserName);
|
||||
// Check both with the sub-version cut off and without as some browsers have less granular versioning e.g. Safari
|
||||
if (!minimumVersion || browserVersion < minimumVersion) {
|
||||
logger.warn("Browser unsupported, unsupported user agent", details.client);
|
||||
supported = false;
|
||||
}
|
||||
} else {
|
||||
logger.warn("Browser unsupported, unknown client", navigator.userAgent);
|
||||
supported = false;
|
||||
}
|
||||
|
||||
return supported;
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows a user warning toast if the user's browser is not supported.
|
||||
*/
|
||||
export function checkBrowserSupport(): void {
|
||||
const supported = getBrowserSupport();
|
||||
if (supported) return;
|
||||
|
||||
if (localStorage.getItem(LOCAL_STORAGE_KEY)) {
|
||||
logger.warn("Browser unsupported, but user has previously accepted");
|
||||
return;
|
||||
}
|
||||
|
||||
const brand = SdkConfig.get().brand;
|
||||
ToastStore.sharedInstance().addOrReplaceToast({
|
||||
key: TOAST_KEY,
|
||||
title: _t("unsupported_browser|title", { brand }),
|
||||
props: {
|
||||
description: _t("unsupported_browser|description", { brand }),
|
||||
acceptLabel: _t("action|learn_more"),
|
||||
onAccept: onLearnMoreClick,
|
||||
rejectLabel: _t("action|dismiss"),
|
||||
onReject: onDismissClick,
|
||||
},
|
||||
component: GenericToast,
|
||||
priority: 40,
|
||||
});
|
||||
}
|
|
@ -32,6 +32,7 @@ import DialogButtons from "../elements/DialogButtons";
|
|||
import { sendSentryReport } from "../../../sentry";
|
||||
import defaultDispatcher from "../../../dispatcher/dispatcher";
|
||||
import { Action } from "../../../dispatcher/actions";
|
||||
import { getBrowserSupport } from "../../../SupportedBrowser";
|
||||
|
||||
interface IProps {
|
||||
onFinished: (success: boolean) => void;
|
||||
|
@ -206,7 +207,10 @@ export default class BugReportDialog extends React.Component<IProps, IState> {
|
|||
}
|
||||
|
||||
let warning: JSX.Element | undefined;
|
||||
if (window.Modernizr && Object.values(window.Modernizr).some((support) => support === false)) {
|
||||
if (
|
||||
(window.Modernizr && Object.values(window.Modernizr).some((support) => support === false)) ||
|
||||
!getBrowserSupport()
|
||||
) {
|
||||
warning = (
|
||||
<p>
|
||||
<b>{_t("bug_reporting|unsupported_browser")}</b>
|
||||
|
|
|
@ -3694,6 +3694,10 @@
|
|||
"truncated_list_n_more": {
|
||||
"other": "And %(count)s more..."
|
||||
},
|
||||
"unsupported_browser": {
|
||||
"description": "If you continue, some features may stop working and there is a risk that you may lose data in the future. Update your browser to continue using %(brand)s.",
|
||||
"title": "%(brand)s does not support this browser"
|
||||
},
|
||||
"unsupported_server_description": "This server is using an older version of Matrix. Upgrade to Matrix %(version)s to use %(brand)s without errors.",
|
||||
"unsupported_server_title": "Your server is unsupported",
|
||||
"update": {
|
||||
|
|
|
@ -42,15 +42,15 @@ const getDeviceType = (
|
|||
browser: UAParser.IBrowser,
|
||||
operatingSystem: UAParser.IOS,
|
||||
): DeviceType => {
|
||||
if (device.type === "mobile" || operatingSystem.name?.includes("Android") || userAgent.indexOf(IOS_KEYWORD) > -1) {
|
||||
return DeviceType.Mobile;
|
||||
}
|
||||
if (browser.name === "Electron") {
|
||||
return DeviceType.Desktop;
|
||||
}
|
||||
if (!!browser.name) {
|
||||
return DeviceType.Web;
|
||||
}
|
||||
if (device.type === "mobile" || operatingSystem.name?.includes("Android") || userAgent.indexOf(IOS_KEYWORD) > -1) {
|
||||
return DeviceType.Mobile;
|
||||
}
|
||||
return DeviceType.Unknown;
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue