Merge branch 'staging' of https://github.com/sparkletown/sparkle into feature/banner-announcement

Author: oleksii-front

.circleci/config.yml

@@ -149,6 +149,24 @@ jobs:
             if [ $CIRCLE_BRANCH = "env/pa" ]; then
               ENV=sparkle-pa
             fi
+            if [ $CIRCLE_BRANCH = "env/demo" ]; then
+              ENV=sparkle-demo-e65b1
+            fi
+            if [ $CIRCLE_BRANCH = "env/unity" ]; then
+              ENV=sparkle-unity
+            fi
+            if [ $CIRCLE_BRANCH = "env/clever" ]; then
+              ENV=sparkle-clever
+            fi
+            if [ $CIRCLE_BRANCH = "env/burn" ]; then
+              ENV=sparkle-burn
+            fi
+            if [ $CIRCLE_BRANCH = "env/burn-staging" ]; then
+              ENV=sparkle-burn-staging
+            fi
+            if [ $CIRCLE_BRANCH = "env/github" ]; then
+              ENV=sparkle-github
+            fi
 
             ./node_modules/.bin/firebase use $ENV --token "$FIREBASE_TOKEN"
 
@@ -287,6 +305,42 @@ jobs:
               TARGET=sparkle-pa
               RELEASE_STAGE=env/pa
             fi
+            if [ $CIRCLE_BRANCH = "env/demo" ]; then
+              PREFIX=DEMO_
+              ENV=sparkle-demo-e65b1
+              TARGET=sparkle-demo-e65b1
+              RELEASE_STAGE=env/demo
+            fi
+            if [ $CIRCLE_BRANCH = "env/unity" ]; then
+              PREFIX=UNITY_
+              ENV=sparkle-unity
+              TARGET=sparkle-unity
+              RELEASE_STAGE=env/unity
+            fi
+            if [ $CIRCLE_BRANCH = "env/clever" ]; then
+              PREFIX=CLEVER_
+              ENV=sparkle-clever
+              TARGET=sparkle-clever
+              RELEASE_STAGE=env/clever
+            fi
+            if [ $CIRCLE_BRANCH = "env/burn" ]; then
+              PREFIX=BURN_
+              ENV=sparkle-burn
+              TARGET=sparkle-burn
+              RELEASE_STAGE=env/burn
+            fi
+            if [ $CIRCLE_BRANCH = "env/burn-staging" ]; then
+              PREFIX=BURN_STAGING_
+              ENV=sparkle-burn-staging
+              TARGET=sparkle-burn-staging
+              RELEASE_STAGE=env/burn-staging
+            fi
+            if [ $CIRCLE_BRANCH = "env/github" ]; then
+              PREFIX=GITHUB_
+              ENV=sparkle-github
+              TARGET=sparkle-github
+              RELEASE_STAGE=env/github
+            fi
 
             ./scripts/init-env.sh $PREFIX
 
@@ -345,6 +399,12 @@ workflows:
                 - env/unesco
                 - env/ohbm
                 - env/pa
+                - env/demo
+                - env/unity
+                - env/clever
+                - env/burn
+                - env/burn-staging
+                - env/github
       - deploy-hosting:
           requires:
             - lint-and-test
@@ -371,6 +431,12 @@ workflows:
                 - env/unesco
                 - env/ohbm
                 - env/pa
+                - env/demo
+                - env/unity
+                - env/clever
+                - env/burn
+                - env/burn-staging
+                - env/github
 #      - smoke-test:
 #          requires:
 #            - deploy-functions

.firebaserc

@@ -20,7 +20,13 @@
     "memrise": "sparkle-memrise",
     "unesco": "sparkle-unesco",
     "ohbm": "sparkle-ohbm",
-    "sparkle-pa": "sparkle-pa"
+    "sparkle-pa": "sparkle-pa",
+    "sparkle-demo-e65b1": "sparkle-demo-e65b1",
+    "sparkle-clever": "sparkle-clever",
+    "sparkle-unity": "sparkle-unity",
+    "sparkle-burn": "sparkle-burn",
+    "sparkle-burn-staging": "sparkle-burn-staging",
+    "sparkle-github": "sparkle-github"
   },
   "targets": {
     "co-reality-map": {
@@ -175,6 +181,48 @@
           "sparkle-pa"
         ]
       }
+    },
+    "sparkle-demo-e65b1": {
+      "hosting": {
+        "sparkle-demo-e65b1": [
+          "sparkle-demo-e65b1"
+        ]
+      }
+    },
+    "sparkle-unity": {
+      "hosting": {
+        "sparkle-unity": [
+          "sparkle-unity"
+        ]
+      }
+    },
+    "sparkle-clever": {
+      "hosting": {
+        "sparkle-clever": [
+          "sparkle-clever"
+        ]
+      }
+    },
+    "sparkle-burn": {
+      "hosting": {
+        "sparkle-burn": [
+          "sparkle-burn"
+        ]
+      }
+    },
+    "sparkle-burn-staging": {
+      "hosting": {
+        "sparkle-burn-staging": [
+          "sparkle-burn-staging"
+        ]
+      }
+    },
+    "sparkle-github": {
+      "hosting": {
+        "sparkle-github": [
+          "sparkle-github"
+        ]
+      }
     }
   }
 }

.github/workflows/firebase-hosting-pull-request.yml

@@ -32,6 +32,7 @@ jobs:
       REACT_APP_PROJECT_ID: '${{ secrets.FIREBASE_PROJECT_ID }}'
       REACT_APP_API_KEY: '${{ secrets.FIREBASE_API_KEY }}'
       REACT_APP_APP_ID: '${{ secrets.FIREBASE_APP_ID }}'
+      REACT_APP_AUTH_DOMAIN: '${{ secrets.FIREBASE_AUTH_DOMAIN }}'
       REACT_APP_MEASUREMENT_ID: '${{ secrets.FIREBASE_MEASUREMENT_ID }}'
       REACT_APP_BUCKET_URL: '${{ secrets.FIREBASE_BUCKET_URL }}'
       REACT_APP_STRIPE_PUBLISHABLE_KEY: '${{ secrets.STRIPE_PUBLISHABLE_KEY }}'

README.md

@@ -73,7 +73,7 @@ npm run firebase login
 npm run firebase use staging
 
 # Copy the runtime config locally
-npm run --silent firebase functions:config:get > .runtimeconfig.json
+npm run --silent firebase functions:config:get > ./functions/.runtimeconfig.json
 ```
 
 Now you're ready to launch the backend function emulator! ✨
@@ -86,6 +86,50 @@ npm run firebase:emulate-functions
 # npm run firebase emulators:start --only functions
 ```
 
+### Firebase emulators
+
+Instead of running just the functions' emulator, the full suite of emulators can be used.
+You can find out more at https://firebase.google.com/docs/emulator-suite.
+
+**Note**: If your code accidentally invokes non-emulated (production) resources, there is a chance of data change, usage and billing.
+To prevent this, you might opt in to use a Firebase project name beginning with `demo-` (e.g. `demo-staging`) in which case no production resources will be used.
+
+First though, a **major version of 8** for the Firebase client is required:
+```bash
+npm i firebase@8
+```
+This might entail some code changes as well, to enable the emulation, e.g.
+```javascript
+// Enable the functions emulator when running in development at specific port
+if (process.env.NODE_ENV === "development" && window.location.port === "5000") {
+  firebaseApp.firestore().useEmulator("localhost", 8080);
+}
+```
+or to account for changed and/or deprecated Firebase client API, e.g.
+```javascript
+// deprecated
+// import firebase, { UserInfo } from "firebase/app";
+// use instead
+import firebase from "firebase/app";
+type UserInfo = firebase.UserInfo;
+```
+
+You can start the emulators in a manner that can persist the data locally:
+```bash
+npx --no-install -- firebase "emulators:start" --import=./tmp --export-on-exit
+```
+
+You should be greeted with
+```bash
+All emulators ready! View status and logs at http://localhost:4000
+```
+That's the location you can access and manage the running emulators.
+The data between emulator runs should be persisted at
+```bash
+tmp/firebase-export-metadata.json
+tmp/firestore_export
+```
+
 ### Stripe
 
 **Note**: Stripe is NOT REQUIRED unless you will be testing ticketing integration.

firebase.json

@@ -33,6 +33,14 @@
       "target": "staging",
       "public": "build",
       "rewrites": [
+        {
+          "source": "/auth/connect/i4a",
+          "function": "auth-connectI4AOAuth"
+        },
+        {
+          "source": "/auth/connect/i4a/handler",
+          "function": "auth-connectI4AOAuthHandler"
+        },
         {
           "source": "**",
           "destination": "/index.html"
@@ -220,6 +228,14 @@
       "target": "sparkle-ohbm",
       "public": "build",
       "rewrites": [
+        {
+          "source": "/auth/connect/i4a",
+          "function": "auth-connectI4AOAuth"
+        },
+        {
+          "source": "/auth/connect/i4a/handler",
+          "function": "auth-connectI4AOAuthHandler"
+        },
         {
           "source": "**",
           "destination": "/index.html"
@@ -237,6 +253,72 @@
         }
       ],
       "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
+    },
+    {
+      "target": "sparkle-demo-e65b1",
+      "public": "build",
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ],
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
+    },
+    {
+      "target": "sparkle-unity",
+      "public": "build",
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ],
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
+    },
+    {
+      "target": "sparkle-clever",
+      "public": "build",
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ],
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
+    },
+    {
+      "target": "sparkle-burn",
+      "public": "build",
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ],
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
+    },
+    {
+      "target": "sparkle-burn-staging",
+      "public": "build",
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ],
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
+    },
+    {
+      "target": "sparkle-github",
+      "public": "build",
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ],
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
     }
   ],
   "functions": {

firestore.rules

@@ -10,6 +10,9 @@ function role(name) {
 
 service cloud.firestore {
   match /databases/{database}/documents {
+    match /authConfigs/{authConfigId} {
+      allow read, write: if false;
+    }
     match /config/{configFile} {
       allow read: if true;
       allow write: if request.auth.uid != null;