remove deprecated methods. all tests passing.

Author: endel

dist/amd/dl.js

@@ -3,7 +3,7 @@
  * https://github.com/doubleleft/dl-api-javascript
  *
  * @copyright 2014 Doubleleft
- * @build 6/26/2014
+ * @build 7/1/2014
  */
 (function(define) { 'use strict';
 define(function (require) {
@@ -583,15 +583,6 @@ DL.Auth.prototype.register = function(provider, data) {
   return promise;
 };
 
-/**
- * @method authenticate
- * @see register
- */
-DL.Auth.prototype.authenticate = function() {
-  console.log("auth.authenticate method is deprecated. Please use auth.register.");
-  return this.register.apply(this, arguments);
-};
-
 /**
  * Verify if user is already registered, and log-in if succeed.
  * @method login
@@ -612,22 +603,13 @@ DL.Auth.prototype.authenticate = function() {
 DL.Auth.prototype.login = function(provider, data) {
   var promise, that = this;
   if (typeof(data)==="undefined") { data = {}; }
-  promise = this.client.post('auth/' + provider + '/verify', data);
+  promise = this.client.post('auth/' + provider + '/login', data);
   promise.then(function(data) {
     that._registerToken(data);
   });
   return promise;
 };
 
-/**
- * @method verify
- * @see login
- */
-DL.Auth.prototype.verify = function() {
-  console.log("auth.verify method is deprecated. Please use auth.login.");
-  return this.login.apply(this, arguments);
-};
-
 /**
  * Send a 'forgot password' confirmation email to target user email address.
  * @method forgotPassword
@@ -1683,6 +1665,7 @@ DL.Channel.SSE.prototype.subscribe = function(event, callback) {
 /**
  */
 DL.Channel.SSE.prototype._trigger = function(event, data) {
+  console.log("Trigger: ", event, data);
   // always try to dispatch default message handler
   if (event.indexOf('state:')===-1 && this.callbacks._default) {
     this.callbacks._default.apply(this, [event, data]);

dist/dl.js

@@ -3,7 +3,7 @@
  * https://github.com/doubleleft/dl-api-javascript
  *
  * @copyright 2014 Doubleleft
- * @build 6/26/2014
+ * @build 7/1/2014
  */
 (function(window) {
   //
@@ -10128,15 +10128,6 @@ DL.Auth.prototype.register = function(provider, data) {
   return promise;
 };
 
-/**
- * @method authenticate
- * @see register
- */
-DL.Auth.prototype.authenticate = function() {
-  console.log("auth.authenticate method is deprecated. Please use auth.register.");
-  return this.register.apply(this, arguments);
-};
-
 /**
  * Verify if user is already registered, and log-in if succeed.
  * @method login
@@ -10157,22 +10148,13 @@ DL.Auth.prototype.authenticate = function() {
 DL.Auth.prototype.login = function(provider, data) {
   var promise, that = this;
   if (typeof(data)==="undefined") { data = {}; }
-  promise = this.client.post('auth/' + provider + '/verify', data);
+  promise = this.client.post('auth/' + provider + '/login', data);
   promise.then(function(data) {
     that._registerToken(data);
   });
   return promise;
 };
 
-/**
- * @method verify
- * @see login
- */
-DL.Auth.prototype.verify = function() {
-  console.log("auth.verify method is deprecated. Please use auth.login.");
-  return this.login.apply(this, arguments);
-};
-
 /**
  * Send a 'forgot password' confirmation email to target user email address.
  * @method forgotPassword
@@ -11228,6 +11210,7 @@ DL.Channel.SSE.prototype.subscribe = function(event, callback) {
 /**
  */
 DL.Channel.SSE.prototype._trigger = function(event, data) {
+  console.log("Trigger: ", event, data);
   // always try to dispatch default message handler
   if (event.indexOf('state:')===-1 && this.callbacks._default) {
     this.callbacks._default.apply(this, [event, data]);

dist/dl.min.js

@@ -93,15 +93,6 @@ DL.Auth.prototype.register = function(provider, data) {
   return promise;
 };
 
-/**
- * @method authenticate
- * @see register
- */
-DL.Auth.prototype.authenticate = function() {
-  console.log("auth.authenticate method is deprecated. Please use auth.register.");
-  return this.register.apply(this, arguments);
-};
-
 /**
  * Verify if user is already registered, and log-in if succeed.
  * @method login
@@ -122,22 +113,13 @@ DL.Auth.prototype.authenticate = function() {
 DL.Auth.prototype.login = function(provider, data) {
   var promise, that = this;
   if (typeof(data)==="undefined") { data = {}; }
-  promise = this.client.post('auth/' + provider + '/verify', data);
+  promise = this.client.post('auth/' + provider + '/login', data);
   promise.then(function(data) {
     that._registerToken(data);
   });
   return promise;
 };
 
-/**
- * @method verify
- * @see login
- */
-DL.Auth.prototype.verify = function() {
-  console.log("auth.verify method is deprecated. Please use auth.login.");
-  return this.login.apply(this, arguments);
-};
-
 /**
  * Send a 'forgot password' confirmation email to target user email address.
  * @method forgotPassword

src/auth.js

@@ -91,6 +91,7 @@ DL.Channel.SSE.prototype.subscribe = function(event, callback) {
 /**
  */
 DL.Channel.SSE.prototype._trigger = function(event, data) {
+  console.log("Trigger: ", event, data);
   // always try to dispatch default message handler
   if (event.indexOf('state:')===-1 && this.callbacks._default) {
     this.callbacks._default.apply(this, [event, data]);

src/channel/sse.js

@@ -1,11 +1,20 @@
 window.client = new DL.Client({
-  url: "http://dl-api.ddll.co/",
+  url: "http://dl-api.dev/index.php/",
   appId: '1',
-  key: "q1uU7tFtXnLad6FIGGn2cB+gxcx64/uPoDhqe2Zn5AE="
+  key: "4c5f2f5ed5cebe26955829ab948128fc"
 });
 
+window.ascii_rand = function(length) {
+  var str = "";
+  for (var i=0; i < length; i++) {
+    var charCode = 97 + Math.floor((Math.random() * 25));
+    str += String.fromCharCode(charCode);
+  }
+  return str; //  + ((new Date()).getTime().toString().substr(8))
+}
+
 test("API", function() {
-  ok( client.url == "http://dl-api.ddll.co/", "url OK");
+  ok( client.url == "http://dl-api.dev/index.php/", "url OK");
   ok( client.appId == "1", "'appId' OK");
-  ok( client.key == "test", "'secret' OK");
+  ok( client.key == "4c5f2f5ed5cebe26955829ab948128fc", "'secret' OK");
 });

tests/api.js

@@ -1,17 +1,24 @@
-asyncTest("Authentication: Email", function() {
+asyncTest("Auth: register by email", function() {
   expect(3);
 
-  client.auth.authenticate('email', {
-    email: "[email protected]",
+  var email = ascii_rand(8) + "@" + ascii_rand(5) + ".com";
+
+  client.auth.register('email', {
+    email: email,
     name: "Endel Dreyer",
     password: "teste"
+
   }).then(function(response) {
-    ok(client.auth.currentUser.email == "[email protected]", "currentUser.email");
+    ok(client.auth.currentUser.email == email, "currentUser.email");
     ok(client.auth.currentUser.name == "Endel Dreyer", "currentUser.name");
+    // ok(client.auth.currentUser.password == "teste", "currentUser.password");
 
     client.auth.logout();
     ok(client.auth.currentUser == null, "logout");
+
+  }).done(function() {
     start();
+
   });
 
 });

tests/auth/email.js

@@ -0,0 +1,63 @@
+asyncTest("Authentication: Email login (success)", function() {
+  expect(4);
+
+  // register dummy user first
+  var email = ascii_rand(8) + "@" + ascii_rand(5) + ".com";
+  client.auth.register('email', {
+    email: email,
+    name: "Endel Dreyer",
+    password: "teste"
+  }).done(function() {
+
+    client.auth.logout();
+    ok(client.auth.currentUser == null, "should have clean session before login");
+
+    // test for successful login
+    client.auth.login('email', {
+      email: email,
+      name: "Endel Dreyer",
+      password: "teste"
+    }).then(function(response) {
+      ok(client.auth.currentUser.email == email, "currentUser.email");
+      ok(client.auth.currentUser.name == "Endel Dreyer", "currentUser.name");
+
+      client.auth.logout();
+      ok(client.auth.currentUser == null, "logout");
+
+    }).done(function() {
+      start();
+    });
+
+  });
+});
+
+asyncTest("Authentication: Email login (error)", function() {
+  expect(1);
+
+  // register dummy user first
+  var email = ascii_rand(8) + "@" + ascii_rand(5) + ".com";
+  client.auth.register('email', {
+    email: email,
+    name: "Endel Dreyer",
+    password: "teste"
+  }).done(function() {
+
+    var promise = client.auth.login('email', {
+      email: "[email protected]",
+      name: "Endel Dreyer",
+      password: "i'm using the wrong password here"
+    }).then(function(response) {
+      ok(false, "shouldn't login with invalid password");
+      start();
+
+    }, function(response) {
+      ok(typeof(response.error)=="string", "Password invalid");
+
+    }).done(function() {
+      start();
+    });
+
+
+  });
+
+});

tests/auth/email_login.js

@@ -1,16 +1,18 @@
 asyncTest("Authentication: Facebook", function() {
-  expect(3);
+  expect(4);
 
   FB.login(function(response) {
-    client.auth.authenticate('facebook', response.authResponse).then(function(userdata) {
+    data = response.authResponse;
+    data.additional_field = "It's possible to add new fields when registering with facebook.";
+    client.auth.register('facebook', data).then(function(userdata) {
       FB.api('/me', function(me) { // match registered data with actual user info
         ok(client.auth.currentUser.email == me.email, "currentUser.email");
         ok(client.auth.currentUser.name == me.name, "currentUser.name");
+        ok(client.auth.currentUser.additional_field == data.additional_field, "additional_field should be saved");
         client.auth.logout();
         ok(client.auth.currentUser == null, "logout");
         start();
       });
     });
   }, {scope: 'email'});
 });
-