bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-30 16:23:53 +00:00
Code Issues Releases Wiki Activity

feat(redirect): [PM-26578] Https Redirection for Cloud Users - Minor touchups

Browse Source
This commit is contained in:
Patrick Pimentel
2025-12-11 12:53:50 -05:00
parent 22d13cba8e
commit dd4b456010
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/web/src/connectors/utils/callbackUri.ts
View File

@@ -1,13 +1,21 @@
declare const __PM_6962_NATIVE_MOBILE_APPS_CLIENT_UPDATES__: boolean;
const SELF_HOSTED = (process.env.SELF_HOSTED || "false").toLowerCase() === "true";
function appLinkHost(): string {
const h = window.location.hostname || "";
if (h.endsWith("bitwarden.eu")) {return "bitwarden.eu";}
if (h.endsWith("bitwarden.pw")) {return "bitwarden.pw";}
if (h.endsWith("bitwarden.eu")) {
return "bitwarden.eu";
}
if (h.endsWith("bitwarden.pw")) {
return "bitwarden.pw";
}
return "bitwarden.com";
}
export function buildMobileCallbackUri(kind: "sso" | "duo" | "webauthn"): string {
const path = `${kind}-callback`;
return SELF_HOSTED ? `bitwarden://${path}` : `https://${appLinkHost()}/${path}`;
if (!SELF_HOSTED && __PM_6962_NATIVE_MOBILE_APPS_CLIENT_UPDATES__) {
return `https://${appLinkHost()}/${path}`;
}
return `bitwarden://${path}`;
}

9
apps/web/webpack.base.js
View File

@@ -224,6 +224,15 @@ module.exports.buildConfig = function buildConfig(params) {
DEV_FLAGS: NODE_ENV === "development" ? envConfig["devFlags"] : {},
ADDITIONAL_REGIONS: envConfig["additionalRegions"] ?? [],
}),
// compile‑time constant for so that at compile time logic branches can be pruned that aren't
// possible.
new webpack.DefinePlugin({
__PM_6962_NATIVE_MOBILE_APPS_CLIENT_UPDATES__: JSON.stringify(
(process.env.PM_6962_NATIVE_MOBILE_APPS_CLIENT_UPDATES
? process.env.PM_6962_NATIVE_MOBILE_APPS_CLIENT_UPDATES.toLowerCase() === "true"
: ENV !== "selfhosted") === true,
),
}),
new AngularWebpackPlugin({
tsconfig: params.tsConfig,
entryModule: params.app.entryModule,