awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 20:27:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into ENG-2800

Browse Source
This commit is contained in:
x032205
2025-05-27 20:47:13 -04:00
parent 3190ff2eb1 e739b29b3c
commit f3768c90c7
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/services/license/license-fns.ts
+10 -3
View File
@@ -60,12 +60,19 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
enterpriseAppConnections: false enterpriseAppConnections: false
}); });
export const setupLicenseRequestWithStore = (baseURL: string, refreshUrl: string, licenseKey: string) => { export const setupLicenseRequestWithStore = (
baseURL: string,
refreshUrl: string,
licenseKey: string,
region?: string
) => {
let token: string; let token: string;
const licenseReq = axios.create({ const licenseReq = axios.create({
baseURL, baseURL,
timeout: 35 * 1000 timeout: 35 * 1000,
// signal: AbortSignal.timeout(60 * 1000) headers: {
"x-region": region
}
}); });
const refreshLicense = async () => { const refreshLicense = async () => {
backend/src/ee/services/license/license-service.ts
+4 -2
View File
@@ -77,13 +77,15 @@ export const licenseServiceFactory = ({
const licenseServerCloudApi = setupLicenseRequestWithStore( const licenseServerCloudApi = setupLicenseRequestWithStore(
appCfg.LICENSE_SERVER_URL || "", appCfg.LICENSE_SERVER_URL || "",
LICENSE_SERVER_CLOUD_LOGIN, LICENSE_SERVER_CLOUD_LOGIN,
appCfg.LICENSE_SERVER_KEY || "" appCfg.LICENSE_SERVER_KEY || "",
appCfg.INTERNAL_REGION
); );
const licenseServerOnPremApi = setupLicenseRequestWithStore( const licenseServerOnPremApi = setupLicenseRequestWithStore(
appCfg.LICENSE_SERVER_URL || "", appCfg.LICENSE_SERVER_URL || "",
LICENSE_SERVER_ON_PREM_LOGIN, LICENSE_SERVER_ON_PREM_LOGIN,
appCfg.LICENSE_KEY || "" appCfg.LICENSE_KEY || "",
appCfg.INTERNAL_REGION
); );
const syncLicenseKeyOnPremFeatures = async (shouldThrow: boolean = false) => { const syncLicenseKeyOnPremFeatures = async (shouldThrow: boolean = false) => {
backend/src/lib/config/env.ts
+4 -3
View File
@@ -245,7 +245,6 @@ const envSchema = z
DATADOG_HOSTNAME: zpStr(z.string().optional()), DATADOG_HOSTNAME: zpStr(z.string().optional()),
/* CORS ----------------------------------------------------------------------------- */ /* CORS ----------------------------------------------------------------------------- */
CORS_ALLOWED_ORIGINS: zpStr( CORS_ALLOWED_ORIGINS: zpStr(
z z
.string() .string()
@@ -255,7 +254,6 @@ const envSchema = z
return JSON.parse(val) as string[]; return JSON.parse(val) as string[];
}) })
), ),
CORS_ALLOWED_HEADERS: zpStr( CORS_ALLOWED_HEADERS: zpStr(
z z
.string() .string()
@@ -264,7 +262,10 @@ const envSchema = z
if (!val) return undefined; if (!val) return undefined;
return JSON.parse(val) as string[]; return JSON.parse(val) as string[];
}) })
) ),
/* INTERNAL ----------------------------------------------------------------------------- */
INTERNAL_REGION: zpStr(z.enum(["us", "eu"]).optional())
}) })
// To ensure that basic encryption is always possible. // To ensure that basic encryption is always possible.
.refine( .refine(
docs/cli/usage.mdx
+1 -1
View File
@@ -130,7 +130,7 @@ The CLI is designed for a variety of secret management applications ranging from
export INFISICAL_CUSTOM_HEADERS="Access-Client-Id=your-client-id Access-Client-Secret=your-client-secret" export INFISICAL_CUSTOM_HEADERS="Access-Client-Id=your-client-id Access-Client-Secret=your-client-secret"
# Execute Infisical commands after setting the environment variable # Execute Infisical commands after setting the environment variable
infisical secrets ls infisical secrets
``` ```
This functionality enables secure interaction with Infisical instances that require specific authentication headers. This functionality enables secure interaction with Infisical instances that require specific authentication headers.