Mirrors/trezor-suite
2
0
Fork 0
mirror of https://github.com/trezor/trezor-suite.git synced 2026-03-21 22:57:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(env-utils): separate getFirmwareReleaseJwsPublicKey

Browse Source
This commit is contained in:
karliatto
2025-08-28 14:43:30 +02:00
parent ceefdd19af
commit 352f5c2c7e
4 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/env-utils/src/envUtils.native.ts
View File

@@ -4,7 +4,7 @@ import Constants from 'expo-constants';
import { getLocales } from 'expo-localization';
import { firmwareConfigPublicKey, publicKey } from './jws';
import { EnvUtils, JWSPublicKeyUse } from './types';
import { EnvUtils } from './types';
const isWeb = () => false;
@@ -79,15 +79,10 @@ const getOsNameWeb = () => '';
const getOsFamily = (): 'Linux' => 'Linux';
export const getJWSPublicKey = (use: JWSPublicKeyUse, useCodeSignKey = false) => {
if (['message-system', 'token-definitions'].includes(use)) {
return isCodesignBuild() ? publicKey.codesign : publicKey.dev;
}
export const getJWSPublicKey = () => (isCodesignBuild() ? publicKey.codesign : publicKey.dev);
return isCodesignBuild() || useCodeSignKey
? firmwareConfigPublicKey.codesign
: firmwareConfigPublicKey.dev;
};
export const getFirmwareReleaseJwsPublicKey = (useCodeSignKey = false) =>
useCodeSignKey ? firmwareConfigPublicKey.codesign : firmwareConfigPublicKey.dev;
export const envUtils: EnvUtils = {
isWeb,
@@ -123,4 +118,5 @@ export const envUtils: EnvUtils = {
getOsNameWeb,
getOsFamily,
getJWSPublicKey,
getFirmwareReleaseJwsPublicKey,
};

14
packages/env-utils/src/envUtils.ts
View File

@@ -1,7 +1,7 @@
import { UAParser } from 'ua-parser-js';
import { firmwareConfigPublicKey, publicKey } from './jws';
import { EnvUtils, Environment, JWSPublicKeyUse } from './types';
import { EnvUtils, Environment } from './types';
export const isWeb = () => process.env.SUITE_TYPE === 'web';
@@ -143,15 +143,10 @@ const getOsFamily = () => {
const getDeviceType = () => getUserAgentParser().getDevice().type;
export const getJWSPublicKey = (use: JWSPublicKeyUse, useCodeSignKey = false) => {
if (['message-system', 'token-definitions'].includes(use)) {
return isCodesignBuild() ? publicKey.codesign : publicKey.dev;
}
export const getJWSPublicKey = () => (isCodesignBuild() ? publicKey.codesign : publicKey.dev);
return isCodesignBuild() || useCodeSignKey
? firmwareConfigPublicKey.codesign
: firmwareConfigPublicKey.dev;
};
export const getFirmwareReleaseJwsPublicKey = (useCodeSignKey: boolean) =>
useCodeSignKey ? firmwareConfigPublicKey.codesign : firmwareConfigPublicKey.dev;
export const envUtils: EnvUtils = {
isWeb,
@@ -187,4 +182,5 @@ export const envUtils: EnvUtils = {
getOsNameWeb,
getOsFamily,
getJWSPublicKey,
getFirmwareReleaseJwsPublicKey,
};

1
packages/env-utils/src/index.ts
View File

@@ -36,4 +36,5 @@ export const {
getOsNameWeb,
getOsFamily,
getJWSPublicKey,
getFirmwareReleaseJwsPublicKey,
} = envUtils;

5
packages/env-utils/src/types.ts
View File

@@ -1,7 +1,5 @@
export type Environment = 'desktop' | 'web' | 'mobile';
export type JWSPublicKeyUse = 'message-system' | 'firmware-release' | 'token-definitions';
export interface EnvUtils {
isWeb: () => boolean;
isDesktop: () => boolean;
@@ -35,5 +33,6 @@ export interface EnvUtils {
getOsName: () => '' | 'android' | 'linux' | 'windows' | 'macos' | 'chromeos' | 'ios';
getOsNameWeb: () => string | undefined;
getOsFamily: () => 'Windows' | 'MacOS' | 'Linux';
getJWSPublicKey: (use: JWSPublicKeyUse, useCodeSignKey?: boolean) => string;
getJWSPublicKey: () => string;
getFirmwareReleaseJwsPublicKey: (useCodeSignKey: boolean) => string;
}