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

Fix apple signin issues

Author: David Lenton

routes/api/account.js

@@ -13,6 +13,7 @@ const { Audience } = require('../../models/audience');
 const { Program } = require('../../models/program');
 const { OAuth2Client } = require('google-auth-library');
 const appleSignin = require('apple-signin-auth');
+const jwt = require('jsonwebtoken');
 
 const passports = new Passports();
 // const permissions = require('../../models/permissions');
@@ -359,9 +360,9 @@ module.exports = function (app) {
       // Additional verification not used
       // const authorizationCode = req.body.authorizationCode;
       // const nonce = req.body.nonce;
-      const email = req.body.email;
       const givenName = req.body.givenName;
       const familyName = req.body.familyName;
+      const { email } = jwt.decode(token);
       const { sub: userAppleId } = await appleSignin.verifyIdToken(token, {
         // Optional Options for further verification - Full list can be found here https://github.com/auth0/node-jsonwebtoken#jwtverifytoken-secretorpublickey-options-callback
         // audience: 'localhost', // client id - can also be an array
@@ -378,6 +379,8 @@ module.exports = function (app) {
       account.loadByUuid(username, (err, user) => {
         if (err) return next(err);
         account.apple = userId;
+        // Save the email address here if we missed it before
+        if (!account.email) account.email = email;
         if (user !== null) {
           account.save(true, (err) => {
             if (err) {