From 492f777d0be5ff91e3e07b8f136f498baacb2546 Mon Sep 17 00:00:00 2001 From: Austin Chen Date: Sat, 26 Feb 2022 22:19:16 -0800 Subject: [PATCH] Revert "Manifold for Teams: Support different Firestore dbs (#53)" This reverts commit ebed7c15c0c3471a8f15ce59a1d7078b8c1a9aab. --- common/access.ts | 14 --- firebase.json | 3 +- firestore.indexes.json | 234 ----------------------------------- functions/.gitignore | 3 - functions/src/create-user.ts | 4 - web/hooks/use-admin.ts | 12 +- web/lib/firebase/init.ts | 53 +++----- 7 files changed, 29 insertions(+), 294 deletions(-) delete mode 100644 common/access.ts delete mode 100644 firestore.indexes.json diff --git a/common/access.ts b/common/access.ts deleted file mode 100644 index acd894b1..00000000 --- a/common/access.ts +++ /dev/null @@ -1,14 +0,0 @@ -export function isWhitelisted(email?: string) { - return true - // e.g. return email.endsWith('@theoremone.co') || isAdmin(email) -} - -export function isAdmin(email: string) { - const ADMINS = [ - 'akrolsmir@gmail.com', // Austin - 'jahooma@gmail.com', // James - 'taowell@gmail.com', // Stephen - 'manticmarkets@gmail.com', // Manifold - ] - return ADMINS.includes(email) -} diff --git a/firebase.json b/firebase.json index 8da7d8f3..988e04a4 100644 --- a/firebase.json +++ b/firebase.json @@ -5,7 +5,6 @@ "source": "functions" }, "firestore": { - "rules": "firestore.rules", - "indexes": "firestore.indexes.json" + "rules": "firestore.rules" } } diff --git a/firestore.indexes.json b/firestore.indexes.json deleted file mode 100644 index 0576f860..00000000 --- a/firestore.indexes.json +++ /dev/null @@ -1,234 +0,0 @@ -{ - "indexes": [ - { - "collectionGroup": "contracts", - "queryScope": "COLLECTION", - "fields": [ - { - "fieldPath": "creatorId", - "order": "ASCENDING" - }, - { - "fieldPath": "createdTime", - "order": "DESCENDING" - } - ] - }, - { - "collectionGroup": "contracts", - "queryScope": "COLLECTION", - "fields": [ - { - "fieldPath": "isResolved", - "order": "ASCENDING" - }, - { - "fieldPath": "closeTime", - "order": "ASCENDING" - } - ] - }, - { - "collectionGroup": "contracts", - "queryScope": "COLLECTION", - "fields": [ - { - "fieldPath": "isResolved", - "order": "ASCENDING" - }, - { - "fieldPath": "visibility", - "order": "ASCENDING" - }, - { - "fieldPath": "closeTime", - "order": "ASCENDING" - } - ] - }, - { - "collectionGroup": "contracts", - "queryScope": "COLLECTION", - "fields": [ - { - "fieldPath": "isResolved", - "order": "ASCENDING" - }, - { - "fieldPath": "visibility", - "order": "ASCENDING" - }, - { - "fieldPath": "volume24Hours", - "order": "DESCENDING" - } - ] - }, - { - "collectionGroup": "contracts", - "queryScope": "COLLECTION", - "fields": [ - { - "fieldPath": "isResolved", - "order": "ASCENDING" - }, - { - "fieldPath": "volume24Hours", - "order": "DESCENDING" - } - ] - }, - { - "collectionGroup": "contracts", - "queryScope": "COLLECTION", - "fields": [ - { - "fieldPath": "slug", - "order": "ASCENDING" - }, - { - "fieldPath": "createdTime", - "order": "DESCENDING" - } - ] - } - ], - "fieldOverrides": [ - { - "collectionGroup": "answers", - "fieldPath": "username", - "indexes": [ - { - "order": "ASCENDING", - "queryScope": "COLLECTION" - }, - { - "order": "DESCENDING", - "queryScope": "COLLECTION" - }, - { - "arrayConfig": "CONTAINS", - "queryScope": "COLLECTION" - }, - { - "order": "ASCENDING", - "queryScope": "COLLECTION_GROUP" - } - ] - }, - { - "collectionGroup": "bets", - "fieldPath": "createdTime", - "indexes": [ - { - "order": "ASCENDING", - "queryScope": "COLLECTION" - }, - { - "order": "DESCENDING", - "queryScope": "COLLECTION" - }, - { - "arrayConfig": "CONTAINS", - "queryScope": "COLLECTION" - }, - { - "order": "ASCENDING", - "queryScope": "COLLECTION_GROUP" - }, - { - "order": "DESCENDING", - "queryScope": "COLLECTION_GROUP" - } - ] - }, - { - "collectionGroup": "bets", - "fieldPath": "userId", - "indexes": [ - { - "order": "ASCENDING", - "queryScope": "COLLECTION" - }, - { - "order": "DESCENDING", - "queryScope": "COLLECTION" - }, - { - "arrayConfig": "CONTAINS", - "queryScope": "COLLECTION" - }, - { - "order": "ASCENDING", - "queryScope": "COLLECTION_GROUP" - } - ] - }, - { - "collectionGroup": "comments", - "fieldPath": "createdTime", - "indexes": [ - { - "order": "ASCENDING", - "queryScope": "COLLECTION" - }, - { - "order": "DESCENDING", - "queryScope": "COLLECTION" - }, - { - "arrayConfig": "CONTAINS", - "queryScope": "COLLECTION" - }, - { - "order": "DESCENDING", - "queryScope": "COLLECTION_GROUP" - } - ] - }, - { - "collectionGroup": "comments", - "fieldPath": "userUsername", - "indexes": [ - { - "order": "ASCENDING", - "queryScope": "COLLECTION" - }, - { - "order": "DESCENDING", - "queryScope": "COLLECTION" - }, - { - "arrayConfig": "CONTAINS", - "queryScope": "COLLECTION" - }, - { - "order": "ASCENDING", - "queryScope": "COLLECTION_GROUP" - } - ] - }, - { - "collectionGroup": "followers", - "fieldPath": "userId", - "indexes": [ - { - "order": "ASCENDING", - "queryScope": "COLLECTION" - }, - { - "order": "DESCENDING", - "queryScope": "COLLECTION" - }, - { - "arrayConfig": "CONTAINS", - "queryScope": "COLLECTION" - }, - { - "order": "ASCENDING", - "queryScope": "COLLECTION_GROUP" - } - ] - } - ] -} diff --git a/functions/.gitignore b/functions/.gitignore index 8b54e3dc..e0ba0181 100644 --- a/functions/.gitignore +++ b/functions/.gitignore @@ -1,6 +1,3 @@ -# Secrets -.env* - # Compiled JavaScript files lib/**/*.js lib/**/*.js.map diff --git a/functions/src/create-user.ts b/functions/src/create-user.ts index f583abe4..13c880f3 100644 --- a/functions/src/create-user.ts +++ b/functions/src/create-user.ts @@ -14,7 +14,6 @@ import { cleanUsername, } from '../../common/util/clean-username' import { sendWelcomeEmail } from './emails' -import { isWhitelisted } from '../../common/access' export const createUser = functions .runWith({ minInstances: 1 }) @@ -33,9 +32,6 @@ export const createUser = functions const fbUser = await admin.auth().getUser(userId) const email = fbUser.email - if (!isWhitelisted(email)) { - return { status: 'error', message: `${email} is not whitelisted` } - } const emailName = email?.replace(/@.*$/, '') const rawName = fbUser.displayName || emailName || 'User' + randomString(4) diff --git a/web/hooks/use-admin.ts b/web/hooks/use-admin.ts index bbeaf59c..733f73f6 100644 --- a/web/hooks/use-admin.ts +++ b/web/hooks/use-admin.ts @@ -1,8 +1,12 @@ -import { isAdmin } from '../../common/access' -import { usePrivateUser, useUser } from './use-user' +import { useUser } from './use-user' export const useAdmin = () => { const user = useUser() - const privateUser = usePrivateUser(user?.id) - return isAdmin(privateUser?.email || '') + const adminIds = [ + 'igi2zGXsfxYPgB0DJTXVJVmwCOr2', // Austin + '5LZ4LgYuySdL1huCWe7bti02ghx2', // James + 'tlmGNz9kjXc2EteizMORes4qvWl2', // Stephen + 'IPTOzEqrpkWmEzh6hwvAyY9PqFb2', // Manifold + ] + return adminIds.includes(user?.id || '') } diff --git a/web/lib/firebase/init.ts b/web/lib/firebase/init.ts index da043ad7..64e808de 100644 --- a/web/lib/firebase/init.ts +++ b/web/lib/firebase/init.ts @@ -1,41 +1,28 @@ import { getFirestore } from '@firebase/firestore' import { initializeApp, getApps, getApp } from 'firebase/app' -// Used to decide which Stripe instance to point to export const isProd = process.env.NEXT_PUBLIC_FIREBASE_ENV !== 'DEV' -const FIREBASE_CONFIGS = { - DEV: { - apiKey: 'AIzaSyDp3J57vLeAZCzxLD-vcPaGIkAmBoGOSYw', - authDomain: 'mantic-markets.firebaseapp.com', - projectId: 'mantic-markets', - storageBucket: 'mantic-markets.appspot.com', - messagingSenderId: '128925704902', - appId: '1:128925704902:web:f61f86944d8ffa2a642dc7', - measurementId: 'G-SSFK1Q138D', - }, - PROD: { - apiKey: 'AIzaSyBoq3rzUa8Ekyo3ZaTnlycQYPRCA26VpOw', - authDomain: 'dev-mantic-markets.firebaseapp.com', - projectId: 'dev-mantic-markets', - storageBucket: 'dev-mantic-markets.appspot.com', - messagingSenderId: '134303100058', - appId: '1:134303100058:web:27f9ea8b83347251f80323', - measurementId: 'G-YJC9E37P37', - }, - THEOREMONE: { - apiKey: 'AIzaSyBSXL6Ys7InNHnCKSy-_E_luhh4Fkj4Z6M', - authDomain: 'theoremone-manifold.firebaseapp.com', - projectId: 'theoremone-manifold', - storageBucket: 'theoremone-manifold.appspot.com', - messagingSenderId: '698012149198', - appId: '1:698012149198:web:b342af75662831aa84b79f', - measurementId: 'G-Y3EZ1WNT6E', - }, -} -const ENV = process.env.NEXT_PUBLIC_FIREBASE_ENV ?? 'PROD' -// @ts-ignore -const firebaseConfig = FIREBASE_CONFIGS[ENV] +const firebaseConfig = isProd + ? { + apiKey: 'AIzaSyDp3J57vLeAZCzxLD-vcPaGIkAmBoGOSYw', + authDomain: 'mantic-markets.firebaseapp.com', + projectId: 'mantic-markets', + storageBucket: 'mantic-markets.appspot.com', + messagingSenderId: '128925704902', + appId: '1:128925704902:web:f61f86944d8ffa2a642dc7', + measurementId: 'G-SSFK1Q138D', + } + : { + apiKey: 'AIzaSyBoq3rzUa8Ekyo3ZaTnlycQYPRCA26VpOw', + authDomain: 'dev-mantic-markets.firebaseapp.com', + projectId: 'dev-mantic-markets', + storageBucket: 'dev-mantic-markets.appspot.com', + messagingSenderId: '134303100058', + appId: '1:134303100058:web:27f9ea8b83347251f80323', + measurementId: 'G-YJC9E37P37', + } + // Initialize Firebase export const app = getApps().length ? getApp() : initializeApp(firebaseConfig)