Fix/default response content type

lib/helpers/handle-accept-request.js

@@ -26,11 +26,14 @@ function handleAcceptRequest(req, res, handlers, fallbackHandler) {
   // Accepted is an ordered list of preferred types, as specified by the request.
   var accepted = req.accepts();
   var produces = config.web.produces;
+  var defaultContentType = produces && produces.length >= 1
+    ? produces[0]
+    : 'text/html';
 
-  // Our default response is HTML, if the client does not specify something more
-  // specific.  As such, map the wildcard type to html.
+  // Our default response is the first entry in the `produces` array, if the
+  // request does not specify otherwise via the `Accepts` header.
   accepted = accepted.map(function (contentType) {
-    return contentType === '*/*' ? 'text/html' : contentType;
+    return contentType === '*/*' ? defaultContentType : contentType;
   });
 
   // Of the accepted types, find the ones that are allowed by the configuration.

test/controllers/test-email-verification.js

@@ -54,7 +54,8 @@ describe('email verification', function () {
           web: {
             register: {
               enabled: true
-            }
+            },
+            produces: ['text/html', 'application/json']
           }
         });
         expressApp.on('stormpath.ready', done);
@@ -113,8 +114,8 @@ describe('email verification', function () {
           var config = expressApp.get('stormpathConfig');
           request(expressApp)
             .post(config.web.verifyEmail.uri)
-            .send({ login: uuid() })
             .set('Accept', 'application/json')
+            .send({ login: uuid() })
             .expect(200, '', done);
         });
       });
@@ -206,7 +207,8 @@ describe('email verification', function () {
       web:{
         verifyEmail:{
           uri: '/' + uuid()
-        }
+        },
+        produces: ['text/html']
       }
     });
 

test/controllers/test-forgot-password.js

@@ -70,7 +70,8 @@ describe('forgotPassword', function () {
       web: {
         forgotPassword: {
           enabled: true
-        }
+        },
+        produces: ['text/html', 'application/json']
       }
     });
 
@@ -101,7 +102,8 @@ describe('forgotPassword', function () {
       web: {
         forgotPassword: {
           enabled: true
-        }
+        },
+        produces: ['text/html', 'application/json']
       }
     });
 
@@ -130,7 +132,8 @@ describe('forgotPassword', function () {
       web: {
         forgotPassword: {
           enabled: true
-        }
+        },
+        produces: ['text/html', 'application/json']
       }
     });
 
@@ -153,7 +156,8 @@ describe('forgotPassword', function () {
       web: {
         forgotPassword: {
           enabled: true
-        }
+        },
+        produces: ['text/html', 'application/json']
       }
     });
 
@@ -177,7 +181,8 @@ describe('forgotPassword', function () {
         web: {
           forgotPassword: {
             enabled: true
-          }
+          },
+          produces: ['text/html', 'application/json']
         }
       });
 
@@ -204,7 +209,8 @@ describe('forgotPassword', function () {
         web: {
           forgotPassword: {
             enabled: true
-          }
+          },
+          produces: ['text/html', 'application/json']
         }
       });
       spaRootFixture.before(done);

test/controllers/test-id-site.js

@@ -149,7 +149,8 @@ describe('id site', function () {
               },
               idSite: {
                 enabled: true
-              }
+              },
+              produces: ['text/html', 'application/json']
             }
           });
 

test/controllers/test-login.js

@@ -33,14 +33,18 @@ describe('login', function () {
 
       stormpathApplication = app;
       defaultExpressApp = helpers.createStormpathExpressApp({
-        application: stormpathApplication
+        application: stormpathApplication,
+        web: {
+          produces: ['text/html', 'application/json']
+        }
       });
       alternateUrlExpressApp = helpers.createStormpathExpressApp({
         application: stormpathApplication,
         web: {
           login: {
             uri: '/newlogin'
-          }
+          },
+          produces: ['text/html', 'application/json']
         }
       });
       app.createAccount(accountData, done);
@@ -240,7 +244,8 @@ describe('login', function () {
         web: {
           login: {
             enabled: true
-          }
+          },
+          produces: ['text/html', 'application/json']
         }
       });
       spaRootFixture.before(done);

test/controllers/test-logout.js

@@ -35,7 +35,8 @@ describe('logout', function () {
           },
           accessTokenCookie: {
             domain: 'example.com'
-          }
+          },
+          produces: ['text/html', 'application/json']
         },
         postLogoutHandler: postLogoutHandlerSpy
       });

test/controllers/test-register.js

@@ -34,7 +34,8 @@ function DefaultRegistrationFixture(stormpathApplication) {
     web: {
       register: {
         enabled: true
-      }
+      },
+      produces: ['text/html', 'application/json']
     }
   });
   return this;
@@ -128,7 +129,8 @@ function NamesOptionalRegistrationFixture(stormpathApplication) {
             }
           }
         }
-      }
+      },
+      produces: ['text/html', 'application/json']
     }
   });
   return this;
@@ -191,7 +193,8 @@ function NamesDisabledRegistrationFixture(stormpathApplication) {
             }
           }
         }
-      }
+      },
+      produces: ['text/html', 'application/json']
     }
   });
   return this;
@@ -247,7 +250,8 @@ function CustomFieldRegistrationFixture(stormpathApplication) {
           },
           fieldOrder: ['givenName', 'surname', 'color', 'music', 'email', 'password']
         }
-      }
+      },
+      produces: ['text/html', 'application/json']
     }
   });
   return this;
@@ -405,7 +409,8 @@ describe('register', function () {
           register: {
             enabled: true,
             uri: '/customRegistrationUri'
-          }
+          },
+          produces: ['text/html', 'application/json']
         }
       });
       app.on('stormpath.ready', done);
@@ -687,7 +692,8 @@ describe('register', function () {
         web: {
           register: {
             enabled: true
-          }
+          },
+          produces: ['text/html', 'application/json']
         }
       });
       spaRootFixture.before(done);
@@ -956,7 +962,8 @@ describe('register', function () {
               autoLogin: true,
               enabled: true,
               nextUri: '/woot'
-            }
+            },
+            produces: ['text/html', 'application/json']
           }
         });
         app.on('stormpath.ready', done);

test/controllers/test-reset-password.js

@@ -75,7 +75,10 @@ describe('resetPassword', function () {
           passwordResetToken = tokenResource.href.match(/\/([^\/]+)$/)[1];
 
           defaultExpressApp = helpers.createStormpathExpressApp({
-            application: stormpathApplication
+            application: stormpathApplication,
+            web: {
+              produces: ['text/html', 'application/json']
+            }
           });
 
           defaultExpressApp.on('stormpath.ready', done);
@@ -320,7 +323,8 @@ describe('resetPassword', function () {
         web: {
           changePassword: {
             enabled: true
-          }
+          },
+          produces: ['text/html', 'application/json']
         }
       });
       spaRootFixture.before(done);

test/fixtures/spa-root-fixture.js

@@ -21,7 +21,9 @@ function SpaRootFixture(stormpathConfig) {
   this.filename = '/tmp/' + uuid.v4();
 
   if (!stormpathConfig.web) {
-    stormpathConfig.web = {};
+    stormpathConfig.web = {
+      produces: ['text/html', 'application/json']
+    };
   }
 
   stormpathConfig.web.spa = {

test/handlers/test-post-registration-handler.js

@@ -26,7 +26,8 @@ function preparePostRegistrationExpansionTestFixture(stormpathApplication, cb) {
             }
           }
         }
-      }
+      },
+      produces: ['text/html', 'application/json']
     },
     postRegistrationHandler: function (account, req, res) {
       // Simply return the user object, so that we can
@@ -54,6 +55,9 @@ function preparePostRegistrationPassThroughTestFixture(stormpathApplication, cb)
 
   fixture.expressApp = helpers.createStormpathExpressApp({
     application: stormpathApplication,
+    web: {
+      produces: ['text/html', 'application/json']
+    },
     postRegistrationHandler: function (account, req, res, next) {
       fixture.sideEffect = fixture.sideEffectData;
       next();
@@ -78,7 +82,8 @@ function preparePostRegistrationAutoLoginTestFixture(stormpathApplication, cb) {
       register: {
         enabled: true,
         autoLogin: true
-      }
+      },
+      produces: ['text/html', 'application/json']
     },
     postRegistrationHandler: function (account, req, res, next) {
       fixture.sideEffect = fixture.sideEffectData;