Merged in fix-apple-signin-issues (pull request auth0#21)

Allow apple account gap filling if earlier error

Author: David Lenton

routes/api/account.js

@@ -376,11 +376,16 @@ module.exports = function (app) {
       const appId = req.site.server.client_id;
       const account = new User(appId);
       const username = 'apple_' + userId;
+      const name = [];
+      if (givenName) name.push(givenName);
+      if (familyName) name.push(familyName);
       account.loadByUuid(username, (err, user) => {
         if (err) return next(err);
         account.apple = userId;
-        // Save the email address here if we missed it before
+        // Save the email address and other details here if we missed it before
         if (!account.email) account.email = email;
+        if (!account.name) account.name = name.join(' ');
+        if (!account.username) account.username = email;
         if (user !== null) {
           account.save(true, (err) => {
             if (err) {
@@ -389,9 +394,6 @@ module.exports = function (app) {
             return handleTokens(user, deviceId, req, res, next);
           });
         } else {
-          const name = [];
-          if (givenName) name.push(givenName);
-          if (familyName) name.push(familyName);
           account.username = email;
           account.email = email;
           account.name = name.join(' ');