Merge branch 'rate_limiter' of github.com:Cap-go/capgo into rate_limiter

Cap-go · Dec 12, 2024 · e3747c6 · e3747c6
2 parents e6b3c22 + 644dd6d
commit e3747c6
Show file tree

Hide file tree

Showing 46 changed files with 620 additions and 225 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -23,22 +23,24 @@ jobs:
       - name: Set environment variable
         run: |
           if [[ ${{ github.ref }} == *-alpha* ]]; then
-            echo "ENV=alpha" >> $GITHUB_ENV
+            echo "SUPA_ENV=ALPHA" >> $GITHUB_ENV
           else
-            echo "ENV=prod" >> $GITHUB_ENV
+            echo "SUPA_ENV=PROD" >> $GITHUB_ENV
           fi
       - name: Set Supabase credentials
         run: |
-          echo "SUPABASE_DB_PASSWORD=${{ secrets[format('SUPABASE_DB_PASS_{0}', env.ENV)] }}" >> $GITHUB_ENV
-          echo "SUPABASE_PROJECT_ID=${{ secrets[format('SUPABASE_PROJECT_ID_{0}', env.ENV)] }}" >> $GITHUB_ENV
+          echo "SUPABASE_DB_PASSWORD=${{ secrets[format('SUPABASE_DB_PASS_{0}', env.SUPA_ENV)] }}" >> $GITHUB_ENV
+          echo "SUPABASE_PROJECT_ID=${{ secrets[format('SUPABASE_PROJECT_ID_{0}', env.SUPA_ENV)] }}" >> $GITHUB_ENV
       - name: Install dependencies
         run: bun install
       - name: Lint
         run: bun lint && bun lint-backend
       - name: Install Supabase CLI
         uses: supabase/setup-cli@v1
         with:
-          version: latest
+          version: 2.0.8
+      - name: Show Supabase CLI version
+        run: supabase --version
       - name: Prepare Supabase
         run: supabase link --project-ref ${{ env.SUPABASE_PROJECT_ID }}
         env:
@@ -73,7 +75,7 @@ jobs:
         run: |
           if [[ ${{ github.ref }} == *-alpha* ]]; then
             echo "ENV=alpha" >> $GITHUB_ENV
-            echo "PROJECT_NAME=capgo-webapp-preprod" >> $GITHUB_ENV
+            echo "PROJECT_NAME=capgo-webapp-alpha" >> $GITHUB_ENV
             echo "CHANNEL=alpha" >> $GITHUB_ENV
           else
             echo "ENV=prod" >> $GITHUB_ENV

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -30,7 +30,9 @@ jobs:
       - name: Install Supabase CLI
         uses: supabase/setup-cli@v1
         with:
-          version: latest
+          version: 2.0.8
+      - name: Show Supabase CLI version
+        run: supabase --version
       - name: Run Supabase Start
         run: supabase start -x imgproxy,studio,realtime,studio,logflare,vector,inbucket
       - run: supabase test db

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,78 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### 11.5.11 (2024-12-12)
+
+### 11.5.11-alpha.1 (2024-12-12)
+
+### 11.5.11-alpha.0 (2024-12-12)
+
+### 11.5.10 (2024-12-11)
+
+### 11.5.9-alpha.10 (2024-12-12)
+
+
+### Bug Fixes
+
+* remove pgmq untill it's fixed by supabase ([9737131](https://github.com/Cap-go/capgo/commit/97371314ab9838841046762003d7ce1495cb1033))
+
+### 11.5.9-alpha.9 (2024-12-12)
+
+### 11.5.9-alpha.8 (2024-12-11)
+
+### 11.5.9-alpha.7 (2024-12-11)
+
+### 11.5.9-alpha.6 (2024-12-11)
+
+### 11.5.9-alpha.5 (2024-12-11)
+
+### 11.5.9-alpha.4 (2024-12-11)
+
+### 11.5.9-alpha.3 (2024-12-11)
+
+### 11.5.9 (2024-12-11)
+
+
+
+### Bug Fixes
+
+* use latest CLI ([777d2b6](https://github.com/Cap-go/capgo/commit/777d2b6c10d36f67795e9d67e7654bbabdd3fbba))
+
+### 11.5.9-alpha.2 (2024-12-11)
+
+### 11.5.9-alpha.1 (2024-12-11)
+
+
+### Bug Fixes
+
+* supabase CLI use v2 ([6f5f44a](https://github.com/Cap-go/capgo/commit/6f5f44a4386cc9bb489834edf80f152f70f56d2a))
+
+### 11.5.9-alpha.0 (2024-12-11)
+* add preprod config ([661ac14](https://github.com/Cap-go/capgo/commit/661ac1462f61d6bc98a90b687e4ee10191f9bc3a))
+
+
+### 11.5.8 (2024-12-09)
+
+### 11.5.7 (2024-12-09)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @revenuecat/purchases-capacitor to v9.0.8 ([#920](https://github.com/Cap-go/capgo/issues/920)) ([c054e5d](https://github.com/Cap-go/capgo/commit/c054e5db9cbd1a3856d1238bd271029a1c1e0087))
+
+### 11.5.6 (2024-12-09)
+
+### 11.5.5 (2024-12-09)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @capgo/capacitor-screen-recorder to v8.1.90 ([#919](https://github.com/Cap-go/capgo/issues/919)) ([beaf67b](https://github.com/Cap-go/capgo/commit/beaf67bdbef96693b63bd1b9f69f6714c7b04730))
+
+### 11.5.4 (2024-12-07)
+
+### 11.5.3 (2024-12-07)
+
 ### 11.5.2 (2024-12-06)
 
 ### 11.5.1 (2024-12-06)
@@ -27562,7 +27634,6 @@ All notable changes to this project will be documented in this file. See [standa
 * zod test ([0fdbc1c](https://github.com/Cap-go/capgo/commit/0fdbc1c43ecca994c85ddeeaf7c2566897b3a980))
 
 ## [10.566.0-alpha.1](https://github.com/Cap-go/capgo/compare/10.0.0...10.566.0-alpha.1) (2024-04-08)
-=======
 ## [10.572.0](https://github.com/Cap-go/capgo/compare/10.0.0...10.572.0) (2024-04-12)
 
 
@@ -31624,7 +31695,6 @@ All notable changes to this project will be documented in this file. See [standa
 * zod test ([0fdbc1c](https://github.com/Cap-go/capgo/commit/0fdbc1c43ecca994c85ddeeaf7c2566897b3a980))
 
 ## [10.567.0](https://github.com/Cap-go/capgo/compare/10.0.0...10.567.0) (2024-04-10)
->>>>>>> main
 
 
 ### Features
@@ -32064,10 +32134,7 @@ All notable changes to this project will be documented in this file. See [standa
 * load balancer use backend is sequence ([aa0894b](https://github.com/Cap-go/capgo/commit/aa0894bdb0449c3e33a3b0f1b9ab9546a2596f46))
 * lockfile ([01b5d19](https://github.com/Cap-go/capgo/commit/01b5d19562ee30bac430673ca2be20fe896eb8d6))
 * log message ([136a09e](https://github.com/Cap-go/capgo/commit/136a09eca8d769c9aac8778df10b7d064f95643e))
-<<<<<<< HEAD
 * logs xcode cloud bun ([165b683](https://github.com/Cap-go/capgo/commit/165b68372aacde44a57e695ec46f1a802887f227))
-=======
->>>>>>> main
 * logsnag ([4439d73](https://github.com/Cap-go/capgo/commit/4439d73232868b94534219d160cf71159a0a2a3d))
 * logsnag deps ([37b7078](https://github.com/Cap-go/capgo/commit/37b707869f8e7dbdfb5087ea8a4b93e00196b768))
 * logsnag issue ([801a3c4](https://github.com/Cap-go/capgo/commit/801a3c46c0ddae2bc47e6be1b0daecec6658c6fd))
@@ -32331,10 +32398,7 @@ All notable changes to this project will be documented in this file. See [standa
 * try isssue with signing xcloud ([aa4d454](https://github.com/Cap-go/capgo/commit/aa4d454b36ed8472ebbd28b5bfe617e018207bbd))
 * try to understand gogle bots issue ([1b9141a](https://github.com/Cap-go/capgo/commit/1b9141a76c4dac442e75c688ef046288bb5d764c))
 * try to use latest fastlane ([6344466](https://github.com/Cap-go/capgo/commit/6344466ebd267909f610eadcbb489c17c2369585))
-<<<<<<< HEAD
-=======
 * try to use new system for stats with CF ([ab40f99](https://github.com/Cap-go/capgo/commit/ab40f99b55e098fd1108fbcfd30b1bd3c0029d65))
->>>>>>> main
 * type date ([3f7e871](https://github.com/Cap-go/capgo/commit/3f7e871ea054e4dbcc3737e6b2d6ff6f80afe63b))
 * type declaration declaration ([69a091b](https://github.com/Cap-go/capgo/commit/69a091b2d5cebe56a02e092d0d3a7391c639a3a7))
 * type for local stats ([315ea9a](https://github.com/Cap-go/capgo/commit/315ea9ab72013955234ced3d0457aa141623eb5b))
@@ -32385,10 +32449,7 @@ All notable changes to this project will be documented in this file. See [standa
 * use base schema instead of many migrations ([829c294](https://github.com/Cap-go/capgo/commit/829c2943f5da1d0fce9eb4c8649531b08884c97c))
 * use better routing ([13962aa](https://github.com/Cap-go/capgo/commit/13962aaea50f5cc6a2941debac58de356570ece1))
 * use db pass ([db93821](https://github.com/Cap-go/capgo/commit/db93821313b1e22a32e7a97e45f32eec2ddc5a4a))
-<<<<<<< HEAD
-=======
 * use executionCtx for waitUntil ([fa09155](https://github.com/Cap-go/capgo/commit/fa09155f9e3c5a41dac62333a607c36d153f59ee))
->>>>>>> main
 * use fix version for postgress ([6349f8c](https://github.com/Cap-go/capgo/commit/6349f8c8d0d61792eba767cbc64b35fca9833060))
 * use fix version in import map ([9f75296](https://github.com/Cap-go/capgo/commit/9f75296fc310b5073df8e72dc737fc90c1660b77))
 * use get_total_storage_size ([a09b9f2](https://github.com/Cap-go/capgo/commit/a09b9f22500b4ed41c06a5e835cf13eb736e0475))
@@ -32442,11 +32503,8 @@ All notable changes to this project will be documented in this file. See [standa
 * zod missing ([81fe3f4](https://github.com/Cap-go/capgo/commit/81fe3f4d7dd58e552b8c361aa726fe82d60686a4))
 * zod test ([0fdbc1c](https://github.com/Cap-go/capgo/commit/0fdbc1c43ecca994c85ddeeaf7c2566897b3a980))
 
-<<<<<<< HEAD
 ## [10.566.0-alpha.0](https://github.com/Cap-go/capgo/compare/10.0.0...10.566.0-alpha.0) (2024-04-08)
-=======
 ## [10.566.0](https://github.com/Cap-go/capgo/compare/10.0.0...10.566.0) (2024-04-10)
->>>>>>> main
 
 
 ### Features
@@ -33199,10 +33257,7 @@ All notable changes to this project will be documented in this file. See [standa
 * use base schema instead of many migrations ([829c294](https://github.com/Cap-go/capgo/commit/829c2943f5da1d0fce9eb4c8649531b08884c97c))
 * use better routing ([13962aa](https://github.com/Cap-go/capgo/commit/13962aaea50f5cc6a2941debac58de356570ece1))
 * use db pass ([db93821](https://github.com/Cap-go/capgo/commit/db93821313b1e22a32e7a97e45f32eec2ddc5a4a))
-<<<<<<< HEAD
-=======
 * use executionCtx for waitUntil ([fa09155](https://github.com/Cap-go/capgo/commit/fa09155f9e3c5a41dac62333a607c36d153f59ee))
->>>>>>> main
 * use fix version for postgress ([6349f8c](https://github.com/Cap-go/capgo/commit/6349f8c8d0d61792eba767cbc64b35fca9833060))
 * use fix version in import map ([9f75296](https://github.com/Cap-go/capgo/commit/9f75296fc310b5073df8e72dc737fc90c1660b77))
 * use get_total_storage_size ([a09b9f2](https://github.com/Cap-go/capgo/commit/a09b9f22500b4ed41c06a5e835cf13eb736e0475))

diff --git a/bun.lockb b/bun.lockb
diff --git a/capacitor.config.ts b/capacitor.config.ts
@@ -1,4 +1,4 @@
-import type { CapacitorConfig } from '@capacitor/cli';
+import type { CapacitorConfig } from '@capacitor/cli'
 
 const config: CapacitorConfig = {
   appId: 'ee.forgr.capacitor_go',
@@ -9,20 +9,19 @@ const config: CapacitorConfig = {
       presentationOptions: [
         'badge',
         'sound',
-        'alert'
-      ]
+        'alert',
+      ],
     },
     SplashScreen: {
       launchAutoHide: false,
-      androidScaleType: 'CENTER_CROP'
+      androidScaleType: 'CENTER_CROP',
     },
     CapacitorUpdater: {
-      publicKey: '-----BEGIN RSA PUBLIC KEY-----\nMIIBCgKCAQEAr14i5kxJzunGDdobtL/GQt6AHtO2cogKW8mCfe0JRi6VLuyxti8v\nM9rexGPTKswuhICMObVwvvfYlyE2Hc6FnWABWkWVujSfqvpRYb7qzfh2cMJzpaHM\nIqKeDVV1nRT9nt+wK3xJ/FZn+YZEaOQF07k9zTy78MqmQbSg95+aOBkfdujQhMYl\n2LyXUgN8xZXRMJUbdqgtkyUS4y7T3ODvgGzzrnhszcDF4AhC5R9mz7NqPrAf0T2A\nGIYnA6f6omsc9VzItvtV4wFp3dZHbzpM+7BcSrL7KtpjPDuNaiAdAvOyrRJZAg8b\nionslGkRyAJj1OMmuAHPfXEBLJFZf+0GxQIDAQAB\n-----END RSA PUBLIC KEY-----\n'
-    }
+    },
   },
   android: {
-    webContentsDebuggingEnabled: true
-  }
-};
+    webContentsDebuggingEnabled: true,
+  },
+}
 
-export default config;
+export default config
diff --git a/configs.json b/configs.json
@@ -25,8 +25,8 @@
   },
   "captcha_key": {
     "prod": "0x4AAAAAAAxItBa5rCQ3Vvhl",
-    "preprod": "",
-    "development": "",
+    "preprod": "0x4AAAAAAAxItBa5rCQ3Vvhl",
+    "development": "0x4AAAAAAAxDbvW2bw7mcEZs",
     "local": ""
   }
 }
diff --git a/locales/de.yml b/locales/de.yml
@@ -243,6 +243,7 @@ discover-module-in-a: Entdecken Sie das Modul in Awesome-capacitor
 discover-your-dashbo: Entdecken Sie Ihr Dashboard!
 documentation: Dokumentation
 dont-have-an-account: Sie haben kein Konto?
+downgrade: Herabstufung
 download: Herunterladen
 email: Email
 enable: Aktivieren
@@ -440,6 +441,7 @@ plan-storage: GB Speicher
 plan-team: Am besten für Großunternehmer geeignet
 plan-updates: Aktualisierung
 plan-upgrade: Abonniert
+plan-upgrade-v2: Upgrade
 plan-whats-included: Was ist inbegriffen
 plans: Pläne
 plans-super-only: Nur Superadministratoren dürfen Pläne und Abrechnungen einsehen

diff --git a/locales/en.yml b/locales/en.yml
@@ -210,6 +210,7 @@ discover-module-in-a: Discover module in Awesome-capacitor
 discover-your-dashbo: Discover your dashboard !
 documentation: documentation
 dont-have-an-account: Don’t have an account?
+downgrade: Downgrade
 download: Download
 email: Email
 enable: Enable
@@ -381,6 +382,7 @@ plan-storage: GB Storage
 plan-team: Best for big business owners
 plan-updates: Updates
 plan-upgrade: Subscribe
+plan-upgrade-v2: Upgrade
 plan-whats-included: What's included
 plans: plans
 plans-super-only: Only super admins are allowed to view plans and billing

diff --git a/locales/es.yml b/locales/es.yml
@@ -230,6 +230,7 @@ discover-module-in-a: Descubra el módulo en Awesome-capacitor
 discover-your-dashbo: ¡Descubre tu tablero!
 documentation: documentación
 dont-have-an-account: ¿No tienes una cuenta?
+downgrade: Baja de categoría
 download: Descargar
 email: Correo electrónico
 enable: Permitir
@@ -421,6 +422,7 @@ plan-storage: GB de almacenamiento
 plan-team: Lo mejor para propietarios de grandes empresas
 plan-updates: Actualizaciones
 plan-upgrade: suscribete
+plan-upgrade-v2: Actualizar
 plan-whats-included: Qué está incluido
 plans: planes
 plans-super-only: Solo los superadministradores pueden ver los planes y la facturación

diff --git a/locales/fr.yml b/locales/fr.yml
@@ -238,6 +238,7 @@ discover-module-in-a: Découvrez le module dans Awesome-capacitor
 discover-your-dashbo: Découvrez votre tableau de bord !
 documentation: documentation
 dont-have-an-account: Vous n'avez pas de compte ?
+downgrade: Rétrogradation
 download: Télécharger
 email: Courriel
 enable: Activer
@@ -421,6 +422,7 @@ plan-storage: Stockage GB
 plan-team: Meilleur pour les grands propriétaires d'entreprise
 plan-updates: Mises à jour
 plan-upgrade: S'abonner
+plan-upgrade-v2: Mise à niveau
 plan-whats-included: Qu'est-ce qui est inclus
 plans: projets
 plans-super-only: >-

diff --git a/locales/id.yml b/locales/id.yml
@@ -216,6 +216,7 @@ discover-module-in-a: Temukan modul di Awesome-capacitor
 discover-your-dashbo: Temukan dasbor Anda!
 documentation: dokumentasi
 dont-have-an-account: Belum punya akun?
+downgrade: Downgrade
 download: Unduh
 email: Surel
 enable: Memungkinkan
@@ -399,6 +400,7 @@ plan-storage: Penyimpanan GB
 plan-team: Terbaik untuk pemilik bisnis besar
 plan-updates: Pembaruan
 plan-upgrade: Berlangganan
+plan-upgrade-v2: Tingkatkan
 plan-whats-included: Apa yang disertakan
 plans: rencana
 plans-super-only: Hanya admin super yang diizinkan melihat paket dan penagihan

diff --git a/locales/it.yml b/locales/it.yml
@@ -228,6 +228,7 @@ discover-module-in-a: Scopri il modulo in Awesome-condensatore
 discover-your-dashbo: Scopri la tua dashboard!
 documentation: documentazione
 dont-have-an-account: Non hai un account?
+downgrade: Declassamento
 download: Scaricamento
 email: E-mail
 enable: Abilitare
@@ -411,6 +412,7 @@ plan-storage: Archiviazione GB
 plan-team: Il meglio per i grandi imprenditori
 plan-updates: Aggiornamenti
 plan-upgrade: Sottoscrizioni
+plan-upgrade-v2: Aggiornamento
 plan-whats-included: Cosa è incluso
 plans: piani
 plans-super-only: Solo i super amministratori possono visualizzare i piani e la fatturazione

diff --git a/locales/ja.yml b/locales/ja.yml
@@ -209,6 +209,7 @@ discover-module-in-a: Awesome-capacitor でモジュールを発見する
 discover-your-dashbo: あなたのダッシュボードを見つけてください！
 documentation: ドキュメンテーション
 dont-have-an-account: アカウントを持っていませんか？
+downgrade: 格下げ
 download: ダウンロード
 email: Eメール
 enable: 有効にする
@@ -382,6 +383,7 @@ plan-storage: GB ストレージ
 plan-team: 大企業の経営者に最適
 plan-updates: アップデート
 plan-upgrade: 購読者
+plan-upgrade-v2: アップグレード
 plan-whats-included: 含まれるもの
 plans: 予定
 plans-super-only: スーパー管理者のみがプランと請求を表示できます

diff --git a/locales/ko.yml b/locales/ko.yml
@@ -209,6 +209,7 @@ discover-module-in-a: Awesome-capacitor에서 모듈 발견
 discover-your-dashbo: 대시보드를 발견하십시오!
 documentation: 선적 서류 비치
 dont-have-an-account: 계정이 없습니까?
+downgrade: 다운그레이드
 download: 다운로드
 email: 이메일
 enable: 할 수 있게 하다
@@ -382,6 +383,7 @@ plan-storage: GB 스토리지
 plan-team: 대기업 소유자에게 가장 적합
 plan-updates: 업데이트
 plan-upgrade: 구독자
+plan-upgrade-v2: 업그레이드
 plan-whats-included: 포함된 것
 plans: 계획
 plans-super-only: 최고 관리자만 요금제 및 결제를 볼 수 있습니다.

diff --git a/locales/pl.yml b/locales/pl.yml
@@ -222,6 +222,7 @@ discover-module-in-a: Odkryj moduł w Awesome-capacitor
 discover-your-dashbo: Odkryj swój pulpit nawigacyjny!
 documentation: dokumentacja
 dont-have-an-account: Nie masz konta?
+downgrade: Obniżenie oceny
 download: Pobierać
 email: E-mail
 enable: Włączać
@@ -405,6 +406,7 @@ plan-storage: GB pamięci
 plan-team: Najlepsze dla właścicieli dużych firm
 plan-updates: Aktualizacje
 plan-upgrade: Subskrybenci
+plan-upgrade-v2: Aktualizacja
 plan-whats-included: Co jest zawarte
 plans: plany
 plans-super-only: Tylko superadministratorzy mogą przeglądać plany i rozliczenia