Issue/147

dist/stormpath-sdk-angularjs.js

@@ -2,7 +2,7 @@
  * stormpath-sdk-angularjs
  * Copyright Stormpath, Inc. 2016
  * 
- * @version v1.1.1-dev-2016-10-28
+ * @version v1.1.1-dev-2016-10-31
  * @link https://github.com/stormpath/stormpath-sdk-angularjs
  * @license Apache-2.0
  */
@@ -2923,7 +2923,7 @@ angular.module('stormpath')
  * Currently, this provider does not have any configuration methods.
  */
 
-angular.module('stormpath.userService',['stormpath.CONFIG'])
+angular.module('stormpath.userService',['stormpath.CONFIG', 'stormpath.util'])
 .provider('$user', [function $userProvider(){
 
   /**
@@ -2976,8 +2976,8 @@ angular.module('stormpath.userService',['stormpath.CONFIG'])
   };
 
   this.$get = [
-    '$q','$http','STORMPATH_CONFIG','$rootScope','$spFormEncoder','$spErrorTransformer',
-    function userServiceFactory($q,$http,STORMPATH_CONFIG,$rootScope,$spFormEncoder,$spErrorTransformer){
+    '$q','$http','STORMPATH_CONFIG','$rootScope','$spFormEncoder','$spErrorTransformer', '$verifyResponse',
+    function userServiceFactory($q,$http,STORMPATH_CONFIG,$rootScope,$spFormEncoder,$spErrorTransformer, $verifyResponse){
       function UserService(){
         this.cachedUserOp = null;
 
@@ -3145,6 +3145,13 @@ angular.module('stormpath.userService',['stormpath.CONFIG'])
           self.cachedUserOp = op;
 
           $http.get(STORMPATH_CONFIG.getUrl('CURRENT_USER_URI'),{withCredentials:true}).then(function(response){
+            var responseStatus = $verifyResponse(response);
+
+            if (!responseStatus.valid) {
+              self.currentUser = false;
+              return op.reject(responseStatus.error);
+            }
+
             self.cachedUserOp = null;
             self.currentUser = new User(response.data.account || response.data);
             currentUserEvent(self.currentUser);
@@ -3454,38 +3461,119 @@ angular.module('stormpath.userService',['stormpath.CONFIG'])
   ];
 }]);
 
+'use strict';
+
+/**
+* @ngdoc overview
+*
+* @name stormpath.util
+*
+* @description
+* This module provides general utility functions.
+*/
+
+/**
+* @ngdoc object
+*
+* @name stormpath.util.$verifyResponse
+*
+* @description
+* A factory that creates a {@link stormpath.util.$verifyResponse#$verifyResponse $verifyResponse}
+* function.
+*/
+angular.module('stormpath.util', [])
+.factory('$verifyResponse', function() {
+  /**
+  * @ngdoc function
+  *
+  * @name stormpath.util.$verifyResponse#$verifyResponse
+  * @methodOf stormpath.util.$verifyResponse
+  *
+  * @param {Object} response The response returned from a $http.get() request
+  * @returns {Object} Object containing the validation result. It has a boolean field `value`
+  * that is true if the request passes validation, and otherwise false. If validate is false,
+  * it will return an error field, containing an object with the error message in `retVal.error.message`
+  *
+  * @description
+  * Checks whether the response has a valid format. Currently, to be valid, it
+  * has to be a well-formed response and have the 'application/json' content type.
+  */
+  return function verifyResponse(response) {
+    if (!response || typeof response.headers !== 'function') {
+      return {
+        valid: false,
+        error: {
+          message: 'Invalid response object format'
+        }
+      };
+    }
+
+    var contentType = response.headers('Content-Type');
+
+    if (!contentType.startsWith('application/json')) {
+      return {
+        valid: false,
+        error: {
+          message: 'Incorrect current user API endpoint response content type: ' + contentType
+        }
+      };
+    }
+
+    return {
+      valid: true
+    };
+  };
+});
+
 (function () {
   'use strict';
 
-  function ViewModelService($http, STORMPATH_CONFIG) {
+  function ViewModelService($http, $verifyResponse, STORMPATH_CONFIG) {
     this.$http = $http;
+    this.$verifyResponse = $verifyResponse;
     this.STORMPATH_CONFIG = STORMPATH_CONFIG;
   }
 
   ViewModelService.prototype.getLoginModel = function getLoginModel() {
+    var self = this;
+
     return this.$http.get(this.STORMPATH_CONFIG.getUrl('AUTHENTICATION_ENDPOINT'), {
       headers: {
         'Accept': 'application/json'
       }
     }).then(function (response) {
+      var responseStatus = self.$verifyResponse(response);
+
+      if (!responseStatus.valid) {
+        throw responseStatus.error;
+      }
+
       return response.data;
     });
   };
 
   ViewModelService.prototype.getRegisterModel = function getRegisterModel() {
+    var self = this;
+
     return this.$http.get(this.STORMPATH_CONFIG.getUrl('REGISTER_URI'), {
       headers: {
         'Accept': 'application/json'
       }
     }).then(function (response) {
+      var responseStatus = self.$verifyResponse(response);
+
+      if (!responseStatus.valid) {
+        throw responseStatus.error;
+      }
+
       return response.data;
     });
   };
 
-  angular.module('stormpath.viewModelService', [])
+  angular.module('stormpath.viewModelService', ['stormpath.util'])
   .provider('$viewModel', function () {
-    this.$get = ['$http', 'STORMPATH_CONFIG', function viewModelFactory($http, STORMPATH_CONFIG) {
-      return new ViewModelService($http, STORMPATH_CONFIG);
+    this.$get = ['$http', '$verifyResponse', 'STORMPATH_CONFIG', function viewModelFactory($http, $verifyResponse, STORMPATH_CONFIG) {
+      return new ViewModelService($http, $verifyResponse, STORMPATH_CONFIG);
     }];
   });
 }());

dist/stormpath-sdk-angularjs.tpls.js

@@ -2,7 +2,7 @@
  * stormpath-sdk-angularjs
  * Copyright Stormpath, Inc. 2016
  * 
- * @version v1.1.1-dev-2016-10-28
+ * @version v1.1.1-dev-2016-10-31
  * @link https://github.com/stormpath/stormpath-sdk-angularjs
  * @license Apache-2.0
  */

src/stormpath.user.js

@@ -21,7 +21,7 @@
  * Currently, this provider does not have any configuration methods.
  */
 
-angular.module('stormpath.userService',['stormpath.CONFIG'])
+angular.module('stormpath.userService',['stormpath.CONFIG', 'stormpath.util'])
 .provider('$user', [function $userProvider(){
 
   /**
@@ -74,8 +74,8 @@ angular.module('stormpath.userService',['stormpath.CONFIG'])
   };
 
   this.$get = [
-    '$q','$http','STORMPATH_CONFIG','$rootScope','$spFormEncoder','$spErrorTransformer',
-    function userServiceFactory($q,$http,STORMPATH_CONFIG,$rootScope,$spFormEncoder,$spErrorTransformer){
+    '$q','$http','STORMPATH_CONFIG','$rootScope','$spFormEncoder','$spErrorTransformer', '$verifyResponse',
+    function userServiceFactory($q,$http,STORMPATH_CONFIG,$rootScope,$spFormEncoder,$spErrorTransformer, $verifyResponse){
       function UserService(){
         this.cachedUserOp = null;
 
@@ -243,6 +243,13 @@ angular.module('stormpath.userService',['stormpath.CONFIG'])
           self.cachedUserOp = op;
 
           $http.get(STORMPATH_CONFIG.getUrl('CURRENT_USER_URI'),{withCredentials:true}).then(function(response){
+            var responseStatus = $verifyResponse(response);
+
+            if (!responseStatus.valid) {
+              self.currentUser = false;
+              return op.reject(responseStatus.error);
+            }
+
             self.cachedUserOp = null;
             self.currentUser = new User(response.data.account || response.data);
             currentUserEvent(self.currentUser);

src/stormpath.verify-response.js

@@ -0,0 +1,63 @@
+'use strict';
+
+/**
+* @ngdoc overview
+*
+* @name stormpath.util
+*
+* @description
+* This module provides general utility functions.
+*/
+
+/**
+* @ngdoc object
+*
+* @name stormpath.util.$verifyResponse
+*
+* @description
+* A factory that creates a {@link stormpath.util.$verifyResponse#$verifyResponse $verifyResponse}
+* function.
+*/
+angular.module('stormpath.util', [])
+.factory('$verifyResponse', function() {
+  /**
+  * @ngdoc function
+  *
+  * @name stormpath.util.$verifyResponse#$verifyResponse
+  * @methodOf stormpath.util.$verifyResponse
+  *
+  * @param {Object} response The response returned from a $http.get() request
+  * @returns {Object} Object containing the validation result. It has a boolean field `value`
+  * that is true if the request passes validation, and otherwise false. If validate is false,
+  * it will return an error field, containing an object with the error message in `retVal.error.message`
+  *
+  * @description
+  * Checks whether the response has a valid format. Currently, to be valid, it
+  * has to be a well-formed response and have the 'application/json' content type.
+  */
+  return function verifyResponse(response) {
+    if (!response || typeof response.headers !== 'function') {
+      return {
+        valid: false,
+        error: {
+          message: 'Invalid response object format'
+        }
+      };
+    }
+
+    var contentType = response.headers('Content-Type');
+
+    if (!contentType.startsWith('application/json')) {
+      return {
+        valid: false,
+        error: {
+          message: 'Incorrect current user API endpoint response content type: ' + contentType
+        }
+      };
+    }
+
+    return {
+      valid: true
+    };
+  };
+});

src/stormpath.view-model.js

@@ -1,35 +1,52 @@
 (function () {
   'use strict';
 
-  function ViewModelService($http, STORMPATH_CONFIG) {
+  function ViewModelService($http, $verifyResponse, STORMPATH_CONFIG) {
     this.$http = $http;
+    this.$verifyResponse = $verifyResponse;
     this.STORMPATH_CONFIG = STORMPATH_CONFIG;
   }
 
   ViewModelService.prototype.getLoginModel = function getLoginModel() {
+    var self = this;
+
     return this.$http.get(this.STORMPATH_CONFIG.getUrl('AUTHENTICATION_ENDPOINT'), {
       headers: {
         'Accept': 'application/json'
       }
     }).then(function (response) {
+      var responseStatus = self.$verifyResponse(response);
+
+      if (!responseStatus.valid) {
+        throw responseStatus.error;
+      }
+
       return response.data;
     });
   };
 
   ViewModelService.prototype.getRegisterModel = function getRegisterModel() {
+    var self = this;
+
     return this.$http.get(this.STORMPATH_CONFIG.getUrl('REGISTER_URI'), {
       headers: {
         'Accept': 'application/json'
       }
     }).then(function (response) {
+      var responseStatus = self.$verifyResponse(response);
+
+      if (!responseStatus.valid) {
+        throw responseStatus.error;
+      }
+
       return response.data;
     });
   };
 
-  angular.module('stormpath.viewModelService', [])
+  angular.module('stormpath.viewModelService', ['stormpath.util'])
   .provider('$viewModel', function () {
-    this.$get = ['$http', 'STORMPATH_CONFIG', function viewModelFactory($http, STORMPATH_CONFIG) {
-      return new ViewModelService($http, STORMPATH_CONFIG);
+    this.$get = ['$http', '$verifyResponse', 'STORMPATH_CONFIG', function viewModelFactory($http, $verifyResponse, STORMPATH_CONFIG) {
+      return new ViewModelService($http, $verifyResponse, STORMPATH_CONFIG);
     }];
   });
 }());