Merge pull request strongloop#113 from strongloop/newRelease_683

Use Auto-generated email

Author: loay

README.md

@@ -2,7 +2,7 @@
 
 **NOTE: This module supersedes [loopback-passport](https://www.npmjs.org/package/loopback-passport). Please update your package.json accordingly.**
 
-The module provides integration between [LoopBack](http://loopback.io) and 
+The module provides integration between [LoopBack](http://loopback.io) and
 [Passport](http://passportjs.org) to support third-party login and account 
 linking for LoopBack applications.
 
@@ -12,35 +12,17 @@ linking for LoopBack applications.
 
 ## All local accounts requires verification
 
-In order to let third party accounts to login with an email of `[email protected]` example `123456@loopback.twitter.com` 
+### All third party accounts will login with an email of `[email protected]` example `123456@loopback.facebook.com`
 
-In `./lib/models/user-identity.js`, replace:
-
-```
-var email = profile.emails && profile.emails[0] && profile.emails[0].value;
-if (!email && !options.emailOptional) {
-  // Fake an e-mail
-  email = (profile.username || profile.id) + '@loopback.' +
-      (profile.provider || provider) + '.com';
-}
-```
-
-with
-
-```
-var email = (profile.username || profile.id) + '@loopback.' +
-    (profile.provider || provider) + '.com'; 
-```
-
-which will allow the user to link the social media accounts that they want as well as the users could sign up with the same email account that is used for facebook/twitter/google/local if they wish to keep them separate. 
+which will allow the user to link the social media accounts that they want as well as the users could sign up with the same email account that is used for facebook/twitter/google/local if they wish to keep them separate.
 
 If more info is required from the Facebook profile such as email, it could still be obtained. In `node_modules\passport-facebook\lib\strategy.js`, replace:
 
 ```
 this._profileURL = options.profileURL || 'https://graph.facebook.com/me';
 ```
 
-with 
+with
 
 ```
 this._profileURL = options.profileURL ||

lib/models/user-identity.js

@@ -44,12 +44,8 @@
 
   function profileToUser(provider, profile, options) {
   // Let's create a user for that
-    var email = profile.emails && profile.emails[0] && profile.emails[0].value;
-    if (!email && !options.emailOptional) {
-      // Fake an e-mail
-      email = (profile.username || profile.id) + '@loopback.' +
+    var  email = (profile.username || profile.id) + '@loopback.' +
               (profile.provider || provider) + '.com';
-    }
     var username = provider + '.' + (profile.username || profile.id);
     var password = utils.generateKey('password');
     var userObj = {

package.json

@@ -9,7 +9,7 @@
     "security"
   ],
   "homepage": "https://github.com/strongloop/loopback-component-passport",
-  "version": "1.6.0",
+  "version": "2.0.0",
   "engines": {
     "node": ">=0.10.0"
   },

test/model.user-identity.test.js

@@ -14,7 +14,7 @@ describe('UserIdentity', function () {
     var ds = loopback.createDataSource({
       connector: 'memory'
     });
-    
+
     UserIdentity.attachTo(ds);
     User.attachTo(ds);
     UserIdentity.belongsTo(User);
@@ -30,7 +30,7 @@ describe('UserIdentity', function () {
       function (err, user, identity, token) {
         assert(!err, 'No error should be reported');
         assert.equal(user.username, 'facebook.xyz');
-        assert.equal(user.email, 'foo@bar.com');
+        assert.equal(user.email, '[email protected].com');
 
         assert.equal(identity.externalId, 'f123');
         assert.equal(identity.provider, 'facebook');
@@ -44,7 +44,7 @@ describe('UserIdentity', function () {
         identity.user(function (err, user) {
           assert(!err, 'No error should be reported');
           assert.equal(user.username, 'facebook.xyz');
-          assert.equal(user.email, 'foo@bar.com');
+          assert.equal(user.email, '[email protected].com');
           done();
         });
       });
@@ -104,8 +104,8 @@ describe('UserIdentity', function () {
         ], id: 'f789', username: 'ttt'
         }, {accessToken: 'at3', refreshToken: 'rt3'}, function (err, user, identity, token) {
           assert(!err, 'No error should be reported');
-          assert.equal(user.username, 'facebook.789');
-          assert.equal(user.email, '789@facebook.com');
+          assert.equal(user.username, 'facebook.ttt');
+          assert.equal(user.email, 'ttt@loopback.facebook.com');
 
           assert.equal(identity.externalId, 'f789');
           assert.equal(identity.provider, 'facebook');
@@ -118,8 +118,8 @@ describe('UserIdentity', function () {
           // Follow the belongsTo relation
           identity.user(function (err, user) {
             assert(!err, 'No error should be reported');
-            assert.equal(user.username, 'facebook.789');
-            assert.equal(user.email, '789@facebook.com');
+            assert.equal(user.username, 'facebook.ttt');
+            assert.equal(user.email, 'ttt@loopback.facebook.com');
             done();
           });
         });