backend changes

Author: ACoullard

components/db/members.ts

@@ -1,7 +1,9 @@
+import { collection, getDocs } from "firebase/firestore"
 import { Timestamp } from "firebase/firestore"
 import { useMemo } from "react"
 import { useAsync } from "react-async-hook"
 import { currentGeneralCourt } from "functions/src/shared"
+import { firestore } from "../firebase"
 import { loadDoc } from "./common"
 export type CommitteeReference = {
   CommitteeCode: string
@@ -55,6 +57,11 @@ export function useMemberSearch() {
   return { index, loading }
 }
 
+export function useClaimedMemberCodes() {
+  const { result: claimedCodes, loading } = useAsync(getClaimedMemberCodes, [])
+  return { claimedCodes, loading }
+}
+
 async function getMember(
   court: number,
   memberCode?: string
@@ -69,3 +76,8 @@ async function getMemberSearchIndex(): Promise<MemberSearchIndex | undefined> {
     `/generalCourts/${currentGeneralCourt}/indexes/memberSearch`
   ) as any
 }
+
+async function getClaimedMemberCodes(): Promise<Set<string>> {
+  const snap = await getDocs(collection(firestore, "claimedMemberCodes"))
+  return new Set(snap.docs.map(d => d.id))
+}

components/db/profile/types.ts

@@ -46,4 +46,6 @@ export type Profile = {
   phoneVerified?: boolean
   memberId?: string
   website?: string
+  memberCode?: string
+  legislatorBiography?: string
 }

firestore.rules

@@ -38,6 +38,10 @@ service cloud.firestore {
         // Only the completePhoneVerification cloud function (Admin SDK) sets phoneVerified
         return !request.resource.data.diff(resource.data).affectedKeys().hasAny(['phoneVerified'])
       }
+      function doesNotChangeMemberCode() {
+        // memberCode is set at signup and is immutable - only Admin SDK can write it
+        return !request.resource.data.diff(resource.data).affectedKeys().hasAny(['memberCode'])
+      }
       // either the change doesn't include the public field, 
       // or the user is a base user (i.e. not an org)
       function validPublicChange() {
@@ -56,7 +60,7 @@ service cloud.firestore {
 
       // Allow users to make updates except to delete their profile or set the role field.
       // Only admins can delete a user profile or set the user role field. 
-      allow update: if validUser() && doesNotChangeRole() && validPublicChange() && doesNotChangeNextDigestAt() && doesNotChangePhoneVerified()
+      allow update: if validUser() && doesNotChangeRole() && doesNotChangeMemberCode() && validPublicChange() && doesNotChangeNextDigestAt() && doesNotChangePhoneVerified()
     }
     // Allow querying publications individually or with a collection group.
     match /{path=**}/publishedTestimony/{id} {
@@ -99,6 +103,10 @@ service cloud.firestore {
         allow read, write: if request.auth.token.get("role", "user") == "admin"
       }
     }
+    match /claimedMemberCodes/{memberCode} {
+      allow read: if true;
+      allow write: if false;
+    }
     match /ballotQuestions/{id} {
       allow read: if true;
       allow write: if false;

functions/src/auth/setRole.ts

@@ -75,10 +75,9 @@ const updateTestimony = async (
 const isPublic = (profile: Profile | undefined, role: Role) => {
   switch (role) {
     case "pendingUpgrade":
+    case "pendingLegislator":
     case "admin":
-      return false
     case "legislator":
-    case "pendingUpgrade":
       return false
     case "organization":
       return true

functions/src/auth/types.ts

@@ -6,6 +6,7 @@ export const Role = Union(
   L("admin"),
   L("legislator"),
   L("pendingUpgrade"),
+  L("pendingLegislator"),
   L("organization")
 )
 export type Role = Static<typeof Role>
@@ -15,6 +16,7 @@ export const ZRole = z.enum([
   "admin",
   "legislator",
   "pendingUpgrade",
+  "pendingLegislator",
   "organization"
 ])
 

functions/src/profile/finishSignup.ts

@@ -5,7 +5,7 @@ import { checkRequestZod, checkAuth } from "../common"
 import { setRole } from "../auth"
 
 const CreateProfileRequest = z.object({
-  requestedRole: z.enum(["user", "organization", "pendingUpgrade"])
+  requestedRole: z.enum(["user", "organization", "pendingUpgrade", "pendingLegislator"])
 })
 
 export const finishSignup = functions.https.onCall(async (data, context) => {
@@ -18,6 +18,7 @@ export const finishSignup = functions.https.onCall(async (data, context) => {
     orgCategories,
     notificationFrequency,
     email,
+    memberCode,
     public: isPublic
   } = data
 
@@ -31,6 +32,15 @@ export const finishSignup = functions.https.onCall(async (data, context) => {
       uid,
       newProfile: { fullName, email, orgCategories }
     })
+  } else if (requestedRole === "pendingLegislator") {
+    await setRole({
+      role: "pendingLegislator",
+      auth,
+      db,
+      uid,
+      newProfile: { fullName, email, memberCode }
+    })
+    await db.doc(`/claimedMemberCodes/${memberCode}`).set({ uid })
   } else {
     await setRole({
       role: "user",

functions/src/profile/types.ts

@@ -34,7 +34,9 @@ export const Profile = Record({
   billsFollowing: Optional(Array(String)),
   contactInfo: Optional(Dictionary(String)),
   location: Optional(String),
-  phoneVerified: Optional(Boolean)
+  phoneVerified: Optional(Boolean),
+  memberCode: Optional(String),
+  legislatorBiography: Optional(String)
 })
 
 export type Profile = Static<typeof Profile>

pages/api/users/[uid].ts

@@ -33,7 +33,9 @@ const ROLES = [
   "user", // Regular old
   "admin", // Can do anything, set in the db manually for now
   "pendingUpgrade", // Sign up as org, admin has to manually upgrade
-  "organization" // An upgraded organization approved by an admin
+  "organization", // An upgraded organization approved by an admin
+  "pendingLegislator", // Sign up as legislator, admin has to manually approve
+  "legislator" // An approved legislator account
 ] as const
 
 const BodySchema = z.object({
@@ -68,6 +70,15 @@ async function patch(req: NextApiRequest, res: NextApiResponse) {
   try {
     const user = await auth.getUser(uid)
 
+    // When rejecting a pending legislator request, release their claimed member code
+    if (role === "user") {
+      const profileSnap = await db.doc(`/profiles/${uid}`).get()
+      const memberCode = profileSnap.data()?.memberCode
+      if (memberCode) {
+        await db.doc(`/claimedMemberCodes/${memberCode}`).delete()
+      }
+    }
+
     await setRole({
       uid: user.uid,
       role,