bugfix: allow users to set their own active flag

blinkenrocket · Dec 31, 2019 · 40a9d0f · 40a9d0f
1 parent 0707e59
commit 40a9d0f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/firestore.rules b/firestore.rules
@@ -16,9 +16,7 @@ service cloud.firestore {
       allow write: if isAdmin();
     }
     match /users/{uid} {
-      allow create: if !signedIn();
-      allow read: if isUser(uid) || isAdmin();  
-      allow update: if isAdmin() || (isUser(uid) && !("admin" in request.resource.data));
+      allow create, read, update: if isAdmin() || (isUser(uid) && !("admin" in request.resource.data));
 
       match /animations/{animationId} {
       	allow read, write: if isUser(uid) || isAdmin();

diff --git a/src/Actions/auth.js b/src/Actions/auth.js
@@ -19,7 +19,7 @@ export const syncLibrary = createAction('UPSERT_ANIMATIONS', async (uid, localLi
   ), Map());
 
   // store all remote animations locally
-  remoteLib.map(animation => { 
+  remoteLib.map(animation => {
     localStorage.setItem(`animation:${animation.id}`, JSON.stringify(animation));
   })
 
@@ -32,8 +32,8 @@ export const syncLibrary = createAction('UPSERT_ANIMATIONS', async (uid, localLi
 export const signedUp = createAction('LOGIN', (uid, localLib) => {
   const lib = localLib.filterNot(a => a.text === INITIAL_ANIMATION_TEXT);
   //TODO add more signup context. last login referrer etc
-  DB.collection('users').doc(uid).set({active: true }, {merge: true});
-  saveAnimationsToRemote(uid, lib);
+  DB.collection('users').doc(uid).set({active: true})
+    .then(() => {saveAnimationsToRemote(uid, lib)})
+    .catch((err) => {console.log("error during signup: ", err)});
   return { uid, admin: false };
 });
-//