fix: some variables issues

getlago · Jul 12, 2022 · 1e54772 · 1e54772
1 parent 2615c8b
commit 1e54772
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/api b/api
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -43,16 +43,17 @@ services:
       - RAILS_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - LAGO_FRONT_URL=${LAGO_FRONT_URL:-http://localhost}
+      - RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
       - LAGO_RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
       - LAGO_SIDEKIQ_WEB=${LAGO_SIDEKIQ_WEB}
       - ENCRYPTION_PRIMARY_KEY=${LAGO_ENCRYPTION_PRIMARY_KEY:-your-encrpytion-primary-key}
       - ENCRYPTION_DETERMINISTIC_KEY=${LAGO_ENCRYPTION_DETERMINISTIC_KEY:-your-encrpytion-deterministic-key}
       - ENCRYPTION_KEY_DERIVATION_SALT=${LAGO_ENCRYPTION_KEY_DERIVATION_SALT:-your-encrpytion-derivation-salt}
-      - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3}
-      - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID}
-      - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY}
-      - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION}
-      - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET}
+      - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3:-false}
+      - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID:-azerty123456}
+      - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY:-azerty123456}
+      - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION:-us-east-1}
+      - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET:-bucket}
       - LAGO_PDF_URL=${LAGO_PDF_URL:-http://pdf:3000}
       - LAGO_REDIS_CACHE_URL=redis://${LAGO_REDIS_CACHE_HOST:-redis}:${LAGO_REDIS_CACHE_PORT:-6379}
     ports:
@@ -86,14 +87,15 @@ services:
       - RAILS_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - LAGO_RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
+      - RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
       - ENCRYPTION_PRIMARY_KEY=${LAGO_ENCRYPTION_PRIMARY_KEY:-your-encrpytion-primary-key}
       - ENCRYPTION_DETERMINISTIC_KEY=${LAGO_ENCRYPTION_DETERMINISTIC_KEY:-your-encrpytion-deterministic-key}
       - ENCRYPTION_KEY_DERIVATION_SALT=${LAGO_ENCRYPTION_KEY_DERIVATION_SALT:-your-encrpytion-derivation-salt}
-      - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3}
-      - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID}
-      - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY}
-      - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION}
-      - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET}
+      - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3:-false}
+      - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID:-azerty123456}
+      - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY:-azerty123456}
+      - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION:-us-east-1}
+      - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET:-bucket}
       - LAGO_PDF_URL=${LAGO_PDF_URL:-http://pdf:3000}
       - LAGO_REDIS_CACHE_URL=redis://${LAGO_REDIS_CACHE_HOST:-redis}:${LAGO_REDIS_CACHE_PORT:-6379}
 
@@ -112,6 +114,7 @@ services:
       - RAILS_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - LAGO_RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
+      - RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
       - ENCRYPTION_PRIMARY_KEY=${LAGO_ENCRYPTION_PRIMARY_KEY:-your-encrpytion-primary-key}
       - ENCRYPTION_DETERMINISTIC_KEY=${LAGO_ENCRYPTION_DETERMINISTIC_KEY:-your-encrpytion-deterministic-key}
       - ENCRYPTION_KEY_DERIVATION_SALT=${LAGO_ENCRYPTION_KEY_DERIVATION_SALT:-your-encrpytion-derivation-salt}

diff --git a/front b/front
+8 −6		.eslintrc
+1 −0		.gitignore
+713 −713		ditto/base.json
+34 −30		ditto/config.yml
+84 −1		ditto/index.js
+21 −19		package.json
+3 −5		scripts/InspectTranslationKeys.js
+46 −0		scripts/MergeTranslationFiles.js
+0 −1		src/components/addOns/AddOnForm.tsx
+0 −1		src/components/billableMetrics/BillableMetricForm.tsx
+0 −1		src/components/coupons/CouponForm.tsx
+1 −4		src/components/customers/AddAddOnToCustomerDialog.tsx
+1 −4		src/components/customers/AddCouponToCustomerDialog.tsx
+1 −2		src/components/customers/AddCustomerDialog.tsx
+134 −42		src/components/customers/CustomerInvoicesList.tsx
+221 −0		src/components/customers/CustomerUsage.tsx
+48 −0		src/components/designSystem/ShowMoreText.tsx
+39 −21		src/components/designSystem/Tabs/BasicTabs.tsx
+1 −0		src/components/designSystem/index.ts
+29 −11		src/components/form/ButtonSelector/ButtonSelectorField.tsx
+29 −11		src/components/form/ComboBox/ComboBoxField.tsx
+0 −1		src/components/form/ComboBox/ComboBoxInput.tsx
+10 −2		src/components/form/ComboBox/ComboBoxVirtualizedList.tsx
+29 −14		src/components/form/Radio/RadioField.tsx
+33 −26		src/components/form/Switch/Switch.tsx
+28 −12		src/components/form/Switch/SwitchField.tsx
+5 −24		src/components/form/TextInput/TextInput.tsx
+33 −18		src/components/form/TextInput/TextInputField.tsx
+2 −4		src/components/plans/AddChargeDialog.tsx
+0 −2		src/components/plans/GraduatedChargeTable.tsx
+11 −10		src/components/plans/PlanForm.tsx
+12 −11		src/components/settings/EditOrganizationInformationsDialog.tsx
+157 −0		src/components/settings/EditOrganizationInvoiceTemplateDialog.tsx
+5 −9		src/core/apolloClient/reactiveVars/internationalizationVar.ts
+2 −0		src/core/router/index.tsx
+282 −26		src/generated/graphql.tsx
+2 −4		src/hooks/useCreateEditCustomer.ts
+2 −2		src/layouts/Settings.tsx
+69 −3		src/layouts/SideNavLayout.tsx
+59 −52		src/pages/CustomerDetails.tsx
+1 −7		src/pages/auth/Login.tsx
+22 −24		src/pages/settings/OrganizationInformations.tsx
+100 −14		src/pages/settings/VatRate.tsx
+2,289 −1,466		yarn.lock