From 5ef8002c1a129f0c31d59a590ffefbe61b67fff4 Mon Sep 17 00:00:00 2001 From: Andrii Kostenko Date: Thu, 15 May 2025 12:02:17 +0000 Subject: [PATCH 1/2] hardcode staging key --- frontend/src/main.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/main.ts b/frontend/src/main.ts index ee3c8f7ae..7abf8563e 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -49,6 +49,7 @@ const colorConfig: IColorConfig = { type Palettes = { primaryPalette: string, accentedPalette: string, warnPalette: string, whitePalette: string, accentedDarkPalette: string, warnDarkPalette: string }; type Colors = { myColorName: string }; +const stripeKey = location.host === process.env.STAGING_HOST ? 'pk_test_51JM8FBFtHdda1TsBTjVNBFMIAA8cXLNWTmZCF22FCS5swdJIFqMk82ZEeZpvTys7oxlDekdcYIGaQ5MEFz6lWa2s000r6RziCg' : 'pk_live_51JM8FBFtHdda1TsBR7nieMFVFigZAUXbPhQTNvaSyLynIW1lbfzO6rfqqIUn0JAGJRq9mrwKwrVCsDDFOs84M7pE006xDqNgHk' if (environment.production) { @@ -79,7 +80,7 @@ bootstrapApplication(AppComponent, { // ...saasExtraModules, NgxThemeModule.forRoot(colorConfig, { frameworks: ['material'], // optional, default : ['tailwind', 'material'] - }), NgxStripeModule.forRoot('pk_live_51JM8FBFtHdda1TsBR7nieMFVFigZAUXbPhQTNvaSyLynIW1lbfzO6rfqqIUn0JAGJRq9mrwKwrVCsDDFOs84M7pE006xDqNgHk'), ConfigModule.buildForConfigUrl('/config.json')), + }), NgxStripeModule.forRoot(stripeKey), ConfigModule.buildForConfigUrl('/config.json')), PasswordStrengthMeterComponent, ConnectionsService, UsersService, From b6d8a6938bf860f5d68b48ebc72fb6609342caa9 Mon Sep 17 00:00:00 2001 From: Andrii Kostenko Date: Thu, 15 May 2025 15:28:27 +0000 Subject: [PATCH 2/2] correctly provide staging host --- frontend/src/environments/environment.prod.ts | 3 ++- frontend/src/environments/environment.saas-prod.ts | 3 ++- frontend/src/environments/environment.saas.ts | 3 ++- frontend/src/environments/environment.ts | 5 +++-- frontend/src/main.ts | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts index 4c47fccc0..75da7e983 100644 --- a/frontend/src/environments/environment.prod.ts +++ b/frontend/src/environments/environment.prod.ts @@ -1,5 +1,6 @@ export const environment = { production: true, apiRoot: "/api", - saasURL: "" + saasURL: "", + stagingHost: "rocketadmin-dev.tail9f8b2.ts.net" // Tailscale host }; diff --git a/frontend/src/environments/environment.saas-prod.ts b/frontend/src/environments/environment.saas-prod.ts index dc3872683..d93fdce67 100644 --- a/frontend/src/environments/environment.saas-prod.ts +++ b/frontend/src/environments/environment.saas-prod.ts @@ -3,5 +3,6 @@ export const environment = { saas: true, apiRoot: "/api", saasURL: "", - saasHostnames: ['app.rocketadmin.com', 'localhost', 'rocketadmin-dev.tail9f8b2.ts.net'] + saasHostnames: ['app.rocketadmin.com', 'localhost', 'rocketadmin-dev.tail9f8b2.ts.net'], + stagingHost: "rocketadmin-dev.tail9f8b2.ts.net" // Tailscale host }; diff --git a/frontend/src/environments/environment.saas.ts b/frontend/src/environments/environment.saas.ts index 431f08bb5..3b1e1ca49 100644 --- a/frontend/src/environments/environment.saas.ts +++ b/frontend/src/environments/environment.saas.ts @@ -3,5 +3,6 @@ export const environment = { production: false, apiRoot: "/api", saasURL: "", - saasHostnames: ['app.rocketadmin.com', 'localhost', 'rocketadmin-dev.tail9f8b2.ts.net'] + saasHostnames: ['app.rocketadmin.com', 'localhost', 'rocketadmin-dev.tail9f8b2.ts.net'], + stagingHost: "rocketadmin-dev.tail9f8b2.ts.net" // Tailscale host }; diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index 760913e09..8bdf556e6 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -4,7 +4,8 @@ export const environment = { production: false, - apiRoot: "/api" + apiRoot: "/api", + stagingHost: "rocketadmin-dev.tail9f8b2.ts.net" // Tailscale host } as Record; /* @@ -14,4 +15,4 @@ export const environment = { * This import should be commented out in production mode because it will have a negative impact * on performance if an error is thrown. */ -// import 'zone.js/plugins/zone-error'; // Included with Angular CLI. +// import 'zone.js/plugins/zone-error'; // Included with Angular CLI. \ No newline at end of file diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 7abf8563e..67b51ccb0 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -49,7 +49,7 @@ const colorConfig: IColorConfig = { type Palettes = { primaryPalette: string, accentedPalette: string, warnPalette: string, whitePalette: string, accentedDarkPalette: string, warnDarkPalette: string }; type Colors = { myColorName: string }; -const stripeKey = location.host === process.env.STAGING_HOST ? 'pk_test_51JM8FBFtHdda1TsBTjVNBFMIAA8cXLNWTmZCF22FCS5swdJIFqMk82ZEeZpvTys7oxlDekdcYIGaQ5MEFz6lWa2s000r6RziCg' : 'pk_live_51JM8FBFtHdda1TsBR7nieMFVFigZAUXbPhQTNvaSyLynIW1lbfzO6rfqqIUn0JAGJRq9mrwKwrVCsDDFOs84M7pE006xDqNgHk' +const stripeKey = location.host === environment.stagingHost ? 'pk_test_51JM8FBFtHdda1TsBTjVNBFMIAA8cXLNWTmZCF22FCS5swdJIFqMk82ZEeZpvTys7oxlDekdcYIGaQ5MEFz6lWa2s000r6RziCg' : 'pk_live_51JM8FBFtHdda1TsBR7nieMFVFigZAUXbPhQTNvaSyLynIW1lbfzO6rfqqIUn0JAGJRq9mrwKwrVCsDDFOs84M7pE006xDqNgHk' if (environment.production) {