allow setting of twitter handle

slidr-app · Jul 17, 2023 · 0c0181f · 0c0181f
1 parent ec88687
commit 0c0181f
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 13 deletions.
diff --git a/firestore.rules b/firestore.rules
@@ -16,13 +16,15 @@ service cloud.firestore {
 
       allow update: if request.auth != null
         && request.auth.uid == resource.data.uid
-        && request.resource.data.diff(resource.data).affectedKeys().hasOnly(['original', 'pages', 'rendered', 'title', 'notes', 'username']); 
+        && request.resource.data.diff(resource.data).affectedKeys().hasOnly(['original', 'pages', 'rendered', 'title', 'notes', 'username', 'twitterHandle']); 
 
       allow delete: if request.auth != null
         && request.auth.uid == resource.data.uid;
     }
     match /users/{userId} {
-    	allow write: if request.auth != null && request.auth.uid == userId;
+    	allow write: if request.auth != null && request.auth.uid == userId
+        && request.resource.data.keys().hasAll(['username', 'twitterHandle'])
+        && request.resource.data.keys().hasOnly(['username', 'twitterHandle']);
       allow read: if request.auth != null && request.auth.uid == userId;
     }
     match /sessions/{sessionId} {

diff --git a/functions/src/presentation.d.ts b/functions/src/presentation.d.ts
@@ -14,6 +14,7 @@ export type PresentationCreate = {
   notes: Note[];
   uid: string;
   username: string;
+  twitterHandle: string;
 };
 
 export type PresentationUpdate =
@@ -22,6 +23,7 @@ export type PresentationUpdate =
     }
   | {
       username: string;
+      twitterHandle: string;
     }
   | {
       title: string;
@@ -34,11 +36,12 @@ export type PresentationUpdate =
       notes: Note[];
     };
 
-export type PresentationData = PresentationCreate &
-  PresentationUpdate & {
-    // Thumb: string;
-    // TODO: use this in function metadata
-    twitterHandle?: string;
-    thumbIndex?: number;
-  };
+export type PresentationData = PresentationCreate & {
+  original: string;
+  rendered: Date;
+
+  // Thumb: string;
+  // TODO: use this in function metadata
+  thumbIndex?: number;
+};
 export type PresentationDoc = Doc & PresentationData;
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "pnpm run emulators:exec --import test-data 'pnpm run dev:start'",
+    "dev": "pnpm run emulators:exec --ui --import test-data 'pnpm run dev:start'",
     "dev:update": "pnpm run emulators:exec --import test-data 'pnpm run dev:start' --export-on-exit",
     "dev:start": "vite --mode emulator",
     "build": "tsc && vite build",

diff --git a/src/components/UserProvider.tsx b/src/components/UserProvider.tsx
@@ -13,6 +13,7 @@ export type User = {
 
 export type UserDoc = {
   username?: string;
+  twitterHandle?: string;
 };
 
 export const UserContext = createContext<{

diff --git a/src/pages/Audience.Test.tsx b/src/pages/Audience.Test.tsx
@@ -33,6 +33,7 @@ beforeAll(async () => {
     pages: ['img1.jpg', 'img2.jpg', 'img3.jpg'],
     notes: [],
     title: 'test presentation',
+    twitterHandle: '@doesnotexist',
   } satisfies PresentationCreate);
 });
 

diff --git a/src/pages/Home.Test.tsx b/src/pages/Home.Test.tsx
@@ -39,6 +39,7 @@ beforeAll(async () => {
     pages: [],
     notes: [],
     title: 'home1',
+    twitterHandle: '@doesnotexist',
   } satisfies PresentationCreate);
   await updateDoc(doc(firestore, 'presentations', 'home-p1'), {
     notes: [],
@@ -54,6 +55,7 @@ beforeAll(async () => {
     pages: ['img1.jpg', 'img2.jpg', 'img3.jpg'],
     notes: [],
     title: 'home2',
+    twitterHandle: '@doesnotexist',
   } satisfies PresentationCreate);
   await updateDoc(doc(firestore, 'presentations', 'home-p2'), {
     notes: [],
@@ -69,6 +71,7 @@ beforeAll(async () => {
     pages: ['img1.jpg', 'img2.jpg', 'img3.jpg'],
     notes: [],
     title: 'home3',
+    twitterHandle: '@doesnotexist',
   } satisfies PresentationCreate);
   await updateDoc(doc(firestore, 'presentations', 'home-p3'), {
     notes: [],

diff --git a/src/pages/Presentation.Test.tsx b/src/pages/Presentation.Test.tsx
@@ -21,6 +21,7 @@ beforeAll(async () => {
     pages: ['img1.jpg', 'img2.jpg', 'img3.jpg'],
     notes: [],
     title: 'test presentation',
+    twitterHandle: '@doesnotexist',
   } satisfies PresentationCreate);
 });
 

diff --git a/src/pages/Speaker.Test.tsx b/src/pages/Speaker.Test.tsx
@@ -39,6 +39,7 @@ beforeAll(async () => {
     pages: ['img1.jpg', 'img2.jpg', 'img3.jpg'],
     notes: [],
     title: 'test presentation',
+    twitterHandle: '@doesnotexist',
   } satisfies PresentationCreate);
 });
 

diff --git a/src/pages/Upload.tsx b/src/pages/Upload.tsx
@@ -90,6 +90,7 @@ export default function Export() {
           created: new Date(),
           uid: auth.currentUser!.uid,
           username: userData?.username ?? '',
+          twitterHandle: userData?.twitterHandle ?? '',
           pages: [],
           notes: [],
           title: '',

diff --git a/src/pages/UserPreferences.tsx b/src/pages/UserPreferences.tsx
@@ -57,6 +57,7 @@ export default function UserPreferences() {
       userPresentationsSnapshot.docs.map(async (presentation) =>
         updateDoc(doc(firestore, 'presentations', presentation.id), {
           username: userData.username!,
+          twitterHandle: userData.twitterHandle!,
         } satisfies PresentationUpdate),
       ),
     );
@@ -68,12 +69,20 @@ export default function UserPreferences() {
   return (
     <DefaultLayout title="User Preferences">
       <div className="max-w-screen-sm mx-auto grid grid-cols-[auto_1fr] gap-4 w-full">
-        <label className="flex items-center justify-end">Email:</label>
+        <div className="flex items-center justify-end">Email:</div>
         <div className="">{user?.email ?? ''}</div>
-        <label className="flex items-center justify-end">Username:</label>
+        <label
+          id="username-label"
+          className="flex flex-col items-end justify-center"
+        >
+          <div>Username:</div>
+          <div className="text-xs">(optional)</div>
+        </label>
         <input
+          aria-labelledby="username-label"
           className="input flex-grow"
           value={userData.username ?? ''}
+          placeholder="your name"
           onChange={(event) => {
             setSaveState('dirty');
             setUserData((currentUser) => ({
@@ -83,6 +92,27 @@ export default function UserPreferences() {
             void save();
           }}
         />
+        <label
+          id="twitter-label"
+          className="flex flex-col items-end justify-center"
+        >
+          <div>Twitter handle:</div>
+          <div className="text-xs">(optional)</div>
+        </label>
+        <input
+          aria-labelledby="twitter-label"
+          className="input flex-grow"
+          value={userData.twitterHandle ?? ''}
+          placeholder="@yourhandle"
+          onChange={(event) => {
+            setSaveState('dirty');
+            setUserData((currentUser) => ({
+              ...currentUser,
+              twitterHandle: event.target.value,
+            }));
+            void save();
+          }}
+        />
         <SaveIndicator saveState={saveState} />
       </div>
     </DefaultLayout>

diff --git a/test-data/auth_export/accounts.json b/test-data/auth_export/accounts.json
@@ -1 +1 @@
-{"kind":"identitytoolkit#DownloadAccountResponse","users":[{"localId":"8xv74jU1Ac5srObCVP2QphcQ6emp","createdAt":"1689154854814","lastLoginAt":"1689160869623","displayName":"","photoUrl":"","passwordHash":"fakeHash:salt=fakeSaltQvugFwADIS9rqdVcbniJ:password=123456","salt":"fakeSaltQvugFwADIS9rqdVcbniJ","passwordUpdatedAt":1689160862685,"providerUserInfo":[{"providerId":"password","email":"test@doesnotexist.com","federatedId":"test@doesnotexist.com","rawId":"test@doesnotexist.com","displayName":"","photoUrl":""}],"validSince":"1689160862","email":"test@doesnotexist.com","emailVerified":false,"disabled":false,"lastRefreshAt":"2023-07-12T11:21:09.623Z"}]}
+{"kind":"identitytoolkit#DownloadAccountResponse","users":[{"localId":"8xv74jU1Ac5srObCVP2QphcQ6emp","createdAt":"1689154854814","lastLoginAt":"1689590441148","displayName":"","photoUrl":"","passwordHash":"fakeHash:salt=fakeSaltQvugFwADIS9rqdVcbniJ:password=123456","salt":"fakeSaltQvugFwADIS9rqdVcbniJ","passwordUpdatedAt":1689590425137,"providerUserInfo":[{"providerId":"password","email":"test@doesnotexist.com","federatedId":"test@doesnotexist.com","rawId":"test@doesnotexist.com","displayName":"","photoUrl":""}],"validSince":"1689590425","email":"test@doesnotexist.com","emailVerified":false,"disabled":false,"lastRefreshAt":"2023-07-17T10:40:41.148Z"}]}
diff --git a/test-data/firestore_export/all_namespaces/all_kinds/all_namespaces_all_kinds.export_metadata b/test-data/firestore_export/all_namespaces/all_kinds/all_namespaces_all_kinds.export_metadata
diff --git a/test-data/firestore_export/all_namespaces/all_kinds/output-0 b/test-data/firestore_export/all_namespaces/all_kinds/output-0
diff --git a/test-data/firestore_export/firestore_export.overall_export_metadata b/test-data/firestore_export/firestore_export.overall_export_metadata
diff --git a/...lobs/7175f126-9a39-454f-a81d-f930d6417ebb → ...lobs/2c77a84b-6db9-415c-94dd-e92bfca51d80 b/...lobs/7175f126-9a39-454f-a81d-f930d6417ebb → ...lobs/2c77a84b-6db9-415c-94dd-e92bfca51d80
diff --git a/...lobs/6eb9c85e-f29c-4160-8191-751658920aee → ...lobs/5bf16433-33ac-4212-890f-0e1a685130fc b/...lobs/6eb9c85e-f29c-4160-8191-751658920aee → ...lobs/5bf16433-33ac-4212-890f-0e1a685130fc
diff --git a/...lobs/1f9c89da-f5fe-4155-8850-ce0500b40c32 → ...lobs/77bee732-da38-424f-9ac7-347b60fac5be b/...lobs/1f9c89da-f5fe-4155-8850-ce0500b40c32 → ...lobs/77bee732-da38-424f-9ac7-347b60fac5be
diff --git a/...lobs/8b2b591a-bebe-42b3-b0a0-3e2752d39f62 → ...lobs/901ca050-04eb-44e5-9a60-0cede2a54843 b/...lobs/8b2b591a-bebe-42b3-b0a0-3e2752d39f62 → ...lobs/901ca050-04eb-44e5-9a60-0cede2a54843
diff --git a/...7175f126-9a39-454f-a81d-f930d6417ebb.json → ...2c77a84b-6db9-415c-94dd-e92bfca51d80.json b/...7175f126-9a39-454f-a81d-f930d6417ebb.json → ...2c77a84b-6db9-415c-94dd-e92bfca51d80.json
diff --git a/...6eb9c85e-f29c-4160-8191-751658920aee.json → ...5bf16433-33ac-4212-890f-0e1a685130fc.json b/...6eb9c85e-f29c-4160-8191-751658920aee.json → ...5bf16433-33ac-4212-890f-0e1a685130fc.json
diff --git a/...1f9c89da-f5fe-4155-8850-ce0500b40c32.json → ...77bee732-da38-424f-9ac7-347b60fac5be.json b/...1f9c89da-f5fe-4155-8850-ce0500b40c32.json → ...77bee732-da38-424f-9ac7-347b60fac5be.json
diff --git a/...8b2b591a-bebe-42b3-b0a0-3e2752d39f62.json → ...901ca050-04eb-44e5-9a60-0cede2a54843.json b/...8b2b591a-bebe-42b3-b0a0-3e2752d39f62.json → ...901ca050-04eb-44e5-9a60-0cede2a54843.json
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"kind":"identitytoolkit#DownloadAccountResponse","users":[{"localId":"8xv74jU1Ac5srObCVP2QphcQ6emp","createdAt":"1689154854814","lastLoginAt":"1689160869623","displayName":"","photoUrl":"","passwordHash":"fakeHash:salt=fakeSaltQvugFwADIS9rqdVcbniJ:password=123456","salt":"fakeSaltQvugFwADIS9rqdVcbniJ","passwordUpdatedAt":1689160862685,"providerUserInfo":[{"providerId":"password","email":"test@doesnotexist.com","federatedId":"test@doesnotexist.com","rawId":"test@doesnotexist.com","displayName":"","photoUrl":""}],"validSince":"1689160862","email":"test@doesnotexist.com","emailVerified":false,"disabled":false,"lastRefreshAt":"2023-07-12T11:21:09.623Z"}]}
		{"kind":"identitytoolkit#DownloadAccountResponse","users":[{"localId":"8xv74jU1Ac5srObCVP2QphcQ6emp","createdAt":"1689154854814","lastLoginAt":"1689590441148","displayName":"","photoUrl":"","passwordHash":"fakeHash:salt=fakeSaltQvugFwADIS9rqdVcbniJ:password=123456","salt":"fakeSaltQvugFwADIS9rqdVcbniJ","passwordUpdatedAt":1689590425137,"providerUserInfo":[{"providerId":"password","email":"test@doesnotexist.com","federatedId":"test@doesnotexist.com","rawId":"test@doesnotexist.com","displayName":"","photoUrl":""}],"validSince":"1689590425","email":"test@doesnotexist.com","emailVerified":false,"disabled":false,"lastRefreshAt":"2023-07-17T10:40:41.148Z"}]}