Merge 5288136 into a1706d1

singpath · Sep 27, 2016 · b4190c2 · b4190c2
2 parents a1706d1 + 5288136
commit b4190c2
Show file tree

Hide file tree

Showing 10 changed files with 226 additions and 428 deletions.
diff --git a/database/security-rules.json b/database/security-rules.json
@@ -831,7 +831,7 @@
               },
               "lastUpdateRequest": {
                 ".validate": "newData.val() === now",
-                ".write": "auth !== null && root.child('classMentors/admins').child(auth.uid).val() === true"
+                ".write": true
               }
             }
           },

diff --git a/database/test/profile.specs.js b/database/test/profile.specs.js
@@ -77,16 +77,10 @@ describe('profile', function() {
         expect(auth.bob).can.patch(patch).to.path('/');
       });
 
-      it('should allow admin to request some user service update', function() {
+      it('should allow any users to request other users update', function() {
         const patch = requestPatch('bob');
 
-        expect(auth.admin).can.patch(patch).to.path('/');
-      });
-
-      it('should disallow users to request other users update', function() {
-        const patch = requestPatch('bob');
-
-        expect(auth.alice).cannot.patch(patch).to.path('/');
+        expect(auth.alice).can.patch(patch).to.path('/');
       });
     });
 

diff --git a/src/classmentors/components/profiles/profiles-view-edit.html b/src/classmentors/components/profiles/profiles-view-edit.html
@@ -36,7 +36,7 @@ <h3 ng-if="ctrl.profile.user.school &amp;&amp; ctrl.profile.user.school.type !=
 
         <div flex="66" flex-sm="100">
 
-            <clm-service-card service-id="freeCodeCamp" public-id="ctrl.profile.$id"
+            <clm-service-card service-id="freeCodeCamp" public-id="ctrl.profile.$id" disable-refresh="ctrl.refreshTimeout"
                 profile-template="https://www.freecodecamp.com/{{name}}"
             >
                 <clm-description>
@@ -45,7 +45,7 @@ <h3 ng-if="ctrl.profile.user.school &amp;&amp; ctrl.profile.user.school.type !=
                 </clm-description>
             </clm-service-card>
 
-            <clm-service-card service-id="pivotalExpert" public-id="ctrl.profile.$id"
+            <clm-service-card service-id="pivotalExpert" public-id="ctrl.profile.$id" disable-refresh="ctrl.refreshTimeout"
                 profile-template="https://pivotal-expert.firebaseapp.com/#/profile/{{name}}"
             >
                 <clm-description>
@@ -54,15 +54,15 @@ <h3 ng-if="ctrl.profile.user.school &amp;&amp; ctrl.profile.user.school.type !=
                 </clm-description>
             </clm-service-card>
 
-            <clm-service-card service-id="codeCombat" public-id="ctrl.profile.$id"
+            <clm-service-card service-id="codeCombat" public-id="ctrl.profile.$id" disable-refresh="ctrl.refreshTimeout"
                 profile-template="https://codecombat.com/user/{{name}}"
             >
                 <clm-description>
                     <a href="http://codecombat.com/" target="_blank">Code Combat</a>,
                     learn to Code JavaScript by Playing a Game.
                 </clm-description>
             </clm-service-card>
-           
+
         </div>
     </div>
 

diff --git a/src/classmentors/components/profiles/profiles-view-show.html b/src/classmentors/components/profiles/profiles-view-show.html
@@ -14,7 +14,7 @@ <h3 ng-if="ctrl.profile.user.school" layout="row" layout-align="center center">
 
     <div flex="66">
 
-        <clm-service-card service-id="freeCodeCamp" public-id="ctrl.profile.$id"
+        <clm-service-card service-id="freeCodeCamp" public-id="ctrl.profile.$id" disable-refresh="ctrl.refreshTimeout"
                 profile-template="https://www.freecodecamp.com/{{name}}"
         >
             <clm-description>
@@ -23,7 +23,7 @@ <h3 ng-if="ctrl.profile.user.school" layout="row" layout-align="center center">
             </clm-description>
         </clm-service-card>
 
-        <clm-service-card service-id="pivotalExpert" public-id="ctrl.profile.$id"
+        <clm-service-card service-id="pivotalExpert" public-id="ctrl.profile.$id" disable-refresh="ctrl.refreshTimeout"
           profile-template="https://pivotal-expert.firebaseapp.com/#/profile/{{name}}"
         >
             <clm-description>
@@ -32,7 +32,7 @@ <h3 ng-if="ctrl.profile.user.school" layout="row" layout-align="center center">
             </clm-description>
         </clm-service-card>
 
-        <clm-service-card service-id="codeCombat" public-id="ctrl.profile.$id"
+        <clm-service-card service-id="codeCombat" public-id="ctrl.profile.$id" disable-refresh="ctrl.refreshTimeout"
           profile-template="https://codecombat.com/user/{{name}}"
         >
             <clm-description>

diff --git a/src/classmentors/components/profiles/profiles.js b/src/classmentors/components/profiles/profiles.js
@@ -126,36 +126,38 @@ clmShowProfileInitialDataResolver.$inject = ['$q', '$route', 'spfAuth', 'spfAuth
  *
  */
 function ClmProfileCtrl(
-  $log, $q, $timeout, $route, spfAuthData, spfNavBarService, initialData, clmDataStore, spfAlert
+  $log, $q, $timeout, $route, spfAuthData, spfNavBarService, initialData, clmDataStore, spfAlert, clmRefreshTimout
 ) {
   const refreshLabel = 'Refresh Achievements';
   const waitingLabel = 'Waiting...';
   var self = this;
-  var menu = [];
   var refreshButton = {
     title: refreshLabel,
     onClick: () => this.refreshAllService(),
     icon: 'loop',
     disabled: false
   };
+  var menu = [refreshButton];
 
   this.auth = initialData.auth;
   this.currentUser = initialData.currentUser;
   this.currentUserProfile = initialData.currentUserProfile;
   this.profile = initialData.profile;
   this.settings = initialData.settings;
+  this.canRefresh = true;
+  this.refreshTimeout = undefined;
 
   if (
     this.profile &&
     this.profile.$id &&
     this.currentUser &&
     this.currentUser.publicId === this.profile.$id
   ) {
-    menu = [refreshButton, {
+    menu.push({
       title: 'Edit',
       onClick: () => (this.profileNeedsUpdate = true),
       icon: 'create'
-    }];
+    });
   }
 
   spfNavBarService.update('Profile', undefined, menu);
@@ -203,7 +205,10 @@ function ClmProfileCtrl(
   };
 
   this.refreshAllService = () => {
+    this.disableRefresh();
+
     clmDataStore.services.refresh(this.profile).catch(err => {
+      this.canRefresh = true;
       $log.error(err);
       spfAlert.error('Failed to refresh achievements.');
     });
@@ -212,23 +217,34 @@ function ClmProfileCtrl(
   this.disableRefresh = () => {
     refreshButton.title = waitingLabel;
     refreshButton.disabled = true;
+    this.canRefresh = false;
 
-    clmDataStore.services.canRefresh(this.profile).catch(
-      err => $log.error(err)
-    ).then(() => {
-      refreshButton.title = refreshLabel;
-      refreshButton.disabled = false;
-    });
+    this.refreshTimeout = $timeout(clmRefreshTimout);
+    this.refreshTimeout.then(
+      () => this.enableRefresh()
+    );
   };
 
-  const servicesRef = clmDataStore.services.ref(this.profile.$id);
-  const serviceUpdatehandler = servicesRef.on('value', () => this.disableRefresh());
+  this.enableRefresh = () => {
+    refreshButton.title = refreshLabel;
+    refreshButton.disabled = false;
+
+    if (this.refreshTimeout) {
+      $timeout.cancel(this.refreshTimeout);
+      this.refreshTimeout = undefined;
+    }
+  };
 
-  this.$onDestroy = () => servicesRef.off('value', serviceUpdatehandler);
+  this.$onDestroy = () => {
+    if (this.refreshTimeout) {
+      $timeout.cancel(this.refreshTimeout);
+      this.refreshTimeout = undefined;
+    }
+  };
 }
 
 ClmProfileCtrl.$inject = [
   '$log', '$q', '$timeout', '$route',
   'spfAuthData', 'spfNavBarService',
-  'initialData', 'clmDataStore', 'spfAlert'
+  'initialData', 'clmDataStore', 'spfAlert', 'clmRefreshTimout'
 ];