Merge branch 'dev' into f2f-dashboard-ronakkaria-3

Author: sushilshinde

app/profile/profile.controller.js

@@ -38,7 +38,11 @@ import moment from 'moment'
     activate()
 
     // adding stats promise on scope so child states can use this.
-    vm.statsPromise = ProfileService.getUserStats(vm.userHandle)
+    vm.statsPromise = UserService.getV2UserProfile(vm.userHandle)
+      .then(function(resp) {
+        vm.profile.badges = resp
+        return ProfileService.getUserStats(vm.userHandle)
+      })
       .then(function(stats) {
         if (stats) {
           vm.stats = stats
@@ -112,10 +116,6 @@ import moment from 'moment'
       } else {
         profile.startMonth = null
       }
-      UserService.getV2UserProfile(vm.userHandle).then(function(resp) {
-        vm.profile.badges = resp
-      })
-
     }
 
     function showBadges() {

app/services/user.service.js

@@ -119,8 +119,17 @@ import { decodeToken } from 'tc-accounts'
      * Temporary end point for getting member's badges/achievements. This endpoint
      * should be removed once we have it in v3.
      */
-    function getV2UserProfile(handle) {
+    function getV2UserProfile(handle, retryIter) {
+      retryIter = retryIter || 0
       return ApiService.restangularV2.one('users', handle).get()
+        .catch(function(err) {
+          // Retry api call once if it fails with 400 or no response
+          // This is suspected to be a backend bug as error message for 400 usually says 'User not activated'
+          if ((err.status === 400 || err.status === -1) && retryIter < 2) {
+            return getV2UserProfile(handle, retryIter + 1)
+          }
+          throw err
+        })
     }
 
     function getPreference(prefName) {

package-lock.json

@@ -3,7 +3,7 @@
   "description": "Topcoder pages including login, registration, settings, dashboard, profile.",
   "scripts": {
     "build": "webpack --bail --progress --build --tc",
-    "start": "webpack-dev-server --history-api-fallback --host 0.0.0.0 --dev --tc --inline --progress --port 3000",
+    "start": "webpack-dev-server --history-api-fallback --host local.topcoder-dev.com --dev --tc --inline --progress --port 3000",
     "start-prod": "webpack-dev-server --history-api-fallback --host local.topcoder.com --prod --tc --inline --progress --port 80",
     "lint": "eslint .",
     "test": "karma start --tc --test"