Merge pull request #238 from kuzzleio/39-login-expiresIn

Login: move "expiresIn" option from request.body to request root attribute

Author: stafyniaksacha

src/Kuzzle.js

@@ -492,8 +492,10 @@ Kuzzle.prototype.getJwtToken = function() {
 Kuzzle.prototype.login = function (strategy) {
   var
     self = this,
-    request = {},
-    credentials,
+    request = {
+      body: {},
+      strategy: strategy
+    },
     cb = null;
 
   if (!strategy || typeof strategy !== 'string') {
@@ -503,7 +505,7 @@ Kuzzle.prototype.login = function (strategy) {
   // Handle arguments (credentials, expiresIn, cb)
   if (arguments[1]) {
     if (typeof arguments[1] === 'object') {
-      credentials = arguments[1];
+      request.body = arguments[1];
     } else if (typeof arguments[1] === 'number' || typeof arguments[1] === 'string') {
       request.expiresIn = arguments[1];
     } else if (typeof arguments[1] === 'function') {
@@ -521,13 +523,7 @@ Kuzzle.prototype.login = function (strategy) {
     cb = arguments[3];
   }
 
-  if (typeof credentials === 'object') {
-    Object.keys(credentials).forEach(function (key) {
-      request[key] = credentials[key];
-    });
-  }
-
-  this.query({controller: 'auth', action: 'login'}, {body: request, strategy: strategy}, {queuable: false}, function(error, response) {
+  this.query({controller: 'auth', action: 'login'}, request, {queuable: false}, function(error, response) {
     if (!error) {
       if (response.result.jwt) {
         self.setJwtToken(response.result.jwt);

test/kuzzle/login.test.js

@@ -29,27 +29,47 @@ describe('Kuzzle Login', function () {
     it('should handle login with only the strategy', function (done) {
       kuzzle.login('local', function() {
         should(queryStub).be.calledOnce();
+        should(queryStub.firstCall).be.calledWith(
+          {controller: 'auth', action: 'login'},
+          {body: {}, strategy: 'local'},
+          {queuable: false}
+        );
         done();
       });
     });
 
     it('should handle login with credentials', function (done) {
       kuzzle.login('local', loginCredentials, function() {
         should(queryStub).be.calledOnce();
+        should(queryStub.firstCall).be.calledWith(
+          {controller: 'auth', action: 'login'},
+          {body: {username: 'foo', password: 'bar'}, strategy: 'local'},
+          {queuable: false}
+        );
         done();
       });
     });
 
     it('should handle login without credentials and with expiresIn', function (done) {
       kuzzle.login('local', '1h', function() {
         should(queryStub).be.calledOnce();
+        should(queryStub.firstCall).be.calledWith(
+          {controller: 'auth', action: 'login'},
+          {body: {}, strategy: 'local', expiresIn: '1h'},
+          {queuable: false}
+        );
         done();
       });
     });
 
     it('should have the token in login callback', function (done) {
       kuzzle.login('local', loginCredentials, '1h', function() {
         should(kuzzle.jwtToken).be.exactly('test-toto');
+        should(queryStub.firstCall).be.calledWith(
+          {controller: 'auth', action: 'login'},
+          {body: {username: 'foo', password: 'bar'}, strategy: 'local', expiresIn: '1h'},
+          {queuable: false}
+        );
         done();
       });
     });
@@ -65,29 +85,39 @@ describe('Kuzzle Login', function () {
     it('should handle login with only the strategy', function () {
       kuzzle.login('local');
       should(queryStub).be.calledOnce();
+      should(queryStub.firstCall).be.calledWith(
+        {controller: 'auth', action: 'login'},
+        {body: {}, strategy: 'local'},
+        {queuable: false}
+      );
     });
 
     it('should handle login with credentials', function () {
       kuzzle.login('local', loginCredentials);
       should(queryStub).be.calledOnce();
+      should(queryStub.firstCall).be.calledWith(
+        {controller: 'auth', action: 'login'},
+        {body: {username: 'foo', password: 'bar'}, strategy: 'local'},
+        {queuable: false}
+      );
     });
 
     it('should handle login without credentials and with expiresIn', function () {
       kuzzle.login('local', '1h');
       should(queryStub).be.calledOnce();
+      should(queryStub.firstCall).be.calledWith(
+        {controller: 'auth', action: 'login'},
+        {body: {}, strategy: 'local', expiresIn: '1h'},
+        {queuable: false}
+      );
     });
 
     it('should handle optional arguments correctly', function () {
-      kuzzle.login('local', loginCredentials);
       kuzzle.login('local', loginCredentials, '1h');
+      should(queryStub).be.calledOnce();
       should(queryStub.firstCall).be.calledWith(
         {controller: 'auth', action: 'login'},
-        {strategy: 'local', body: {username: 'foo', password: 'bar'}},
-        {queuable: false}
-      );
-      should(queryStub.secondCall).be.calledWith(
-        {controller: 'auth', action: 'login'},
-        {strategy: 'local', body: {username: 'foo', password: 'bar', expiresIn: '1h'}},
+        {body: {username: 'foo', password: 'bar'}, strategy: 'local', expiresIn: '1h'},
         {queuable: false}
       );
     });