(FatalBadgers#1) Resolve user promise to prevent race conditions

scottrice10 · Feb 6, 2015 · a81d8f2 · a81d8f2
1 parent af4228c
commit a81d8f2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/client/app/search/search.controller.js b/client/app/search/search.controller.js
@@ -5,26 +5,31 @@ angular.module('tikrApp')
     $scope.users = [];
     $scope.searchStarted = false;
     $scope.selected = 'javascript';
+    var user = Auth.getCurrentUser();
 
     // returns a promise
     $scope.fetchUsers = function(language, pageNumber) {
       $scope.selected = language;
-      User.search({
-        skill: language,
-        username: $scope.TEST_USER || Auth.getCurrentUser().github.login,
-        pageNumber: pageNumber
-      }, function(data) {
-        $scope.searchStarted = true;
-        $scope.data = data[0];
-        $scope.users = $scope.data.items;
-      });
+
+      user.$promise
+        .then(function(user){
+          User.search({
+            skill: language,
+            username: $scope.TEST_USER || user.github.login,
+            pageNumber: pageNumber
+          }, function(data) {
+            $scope.searchStarted = true;
+            $scope.data = data[0];
+            $scope.users = $scope.data.items;
+          });
+        });
     };
 
     $scope.entry = {};
-    $scope.languages = [];
     $scope.refreshTypeahead = function(input) {
-      $scope.languages = [];
+
       $http.get('/api/languages').success(function(data) {
+        $scope.languages = [];
         data.forEach(function(language) {
           $scope.languages.push(language.Name);
         });

diff --git a/client/components/auth/auth.service.js b/client/components/auth/auth.service.js
@@ -145,4 +145,4 @@ angular.module('tikrApp')
         return $cookieStore.get('token');
       }
     };
-  });
+  });
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,4 +145,4 @@ angular.module('tikrApp') @@
             return $cookieStore.get('token');
           }
         };
-      });
+      });