Merge branch 'staging' into production

.github/workflows/back.yml

@@ -103,6 +103,7 @@ jobs:
             /secrets/database_password/value=database-password:latest,
             /secrets/sendgrid_api_key/value=sendgrid-api-key:latest
             /secrets/apple_sign_in_props/value=apple-sign-in-props:latest
+            /secrets/facebook_oauth_client_id/value=facebook-oauth-client-id:latest
 
   deploy-prod:
     name: Migration DB, Build, and Deploy to Production
@@ -154,3 +155,4 @@ jobs:
             /secrets/database_password/value=database-password:latest,
             /secrets/sendgrid_api_key/value=sendgrid-api-key:latest
             /secrets/apple_sign_in_props/value=apple-sign-in-props:latest
+            /secrets/facebook_oauth_client_id/value=facebook-oauth-client-id:latest

.vscode/settings.json

@@ -38,6 +38,7 @@
     "inblow",
     "isin",
     "isna",
+    "jwks",
     "key",
     "keychain",
     "knex",

CHANGELOG.md

@@ -1,3 +1,14 @@
+## [v3.0.9-643](https://github.com/agrc/roadkill-mobile/compare/v3.0.8-640...v3.0.9-643) (2024-04-24)
+
+
+### Bug Fixes
+
+* **back:** fix invalid lock file ([21932b1](https://github.com/agrc/roadkill-mobile/commit/21932b1db1a0a14b0585d234b7cceab981046ff4))
+* **back:** remove logs ([504ffc7](https://github.com/agrc/roadkill-mobile/commit/504ffc722a24d39619250b0f240f7ce294e525db))
+* **website:** update prod serve command ([ffbce2c](https://github.com/agrc/roadkill-mobile/commit/ffbce2c9ea64a9b3b82d49ce96ad60c4b3d26c82))
+
+
+
 ## [v3.0.8-640](https://github.com/agrc/roadkill-mobile/compare/v3.0.7-639...v3.0.8-640) (2024-03-06)
 
 

README.md

@@ -26,9 +26,9 @@ Press "j" in console after starting expo project. See [Expo Debugging & Profilin
 
 | git branch | app version | runtime version | deployed                                                                                                                                                                                                                                                                         | release-channel | expo version |
 |------------|-------------|-----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------|--------------|
-| dev        | 3.0.8       | 2.1.0           | custom dev clients for simulators are in `src/front/dev-clients`, app has an orange icon (dev clients for for physical devices can be installed directly from the expo build website)                                                                                            | default         | 49           |
-| staging    | 3.0.8       | 2.1.0           | [TestFlight](https://appstoreconnect.apple.com/apps/1613421729/testflight) and [Google Play internal testing](https://play.google.com/console/u/1/developers/6377537875100906890/app/4974417822540767109/tracks/internal-testing) separate apps from production with a blue icon | staging         | 49           |
-| production | 3.0.8       | 2.1.0           | App Stores                                                                                                                                                                                                                                                                       | production      | 49           |
+| dev        | 3.0.9       | 3.1.0           | custom dev clients for simulators are in `src/front/dev-clients`, app has an orange icon (dev clients for for physical devices can be installed directly from the expo build website)                                                                                            | default         | 50           |
+| staging    | 3.0.9       | 3.1.0           | [TestFlight](https://appstoreconnect.apple.com/apps/1613421729/testflight) and [Google Play internal testing](https://play.google.com/console/u/1/developers/6377537875100906890/app/4974417822540767109/tracks/internal-testing) separate apps from production with a blue icon | staging         | 50           |
+| production | 3.0.9       | 3.1.0           | App Stores                                                                                                                                                                                                                                                                       | production      | 50           |
 
 These three environments are three separate bundle IDs (see `src/front/app.config.js`) and can all be installed on the same device simultaneously.
 
@@ -57,7 +57,7 @@ These values are managed in GCP Secrets Manager. After running the terraform, ma
 
 ### Cutting a New Release
 
-1. From `/data`: `./start_cloud_sql_proxy.sh prod` (or `dev`)
+1. From `/data`: `./start_cloud_sql_proxy.sh prod` (or `dev`) (This need so to be done for each environment per release!)
 1. From `src/front`: `npm run update-constants` (may need to update the db connection props in `.env`)
 1. Determine if the api version needs to be bumped and update [src/common/config.js](src/common/config.js) and [src/back/package.json](src/back/package.json) accordingly.
 1. Determine if app version (`version` in [app.config.js](src/front/app.config.js)) needs to be bumped. Apple requires it to be bumped after every production release.

changelog_context.json

@@ -1,3 +1,3 @@
 {
-  "version": "v3.0.8-640"
+  "version": "v3.0.9-643"
 }

data/.node-version

@@ -1 +1 @@
-18
+20

data/knexfile.js

@@ -12,7 +12,10 @@ const connection = {
 module.exports = {
   development: {
     client,
-    connection,
+    connection: {
+      ...connection,
+      user: 'postgres'
+    },
   },
   // this needs to match the GitHub environment name
   Staging: {