Make sure we get an Apple email address

Author: dmlenton

routes/api/account.js

@@ -359,10 +359,10 @@ module.exports = function (app) {
       // Additional verification not used
       // const authorizationCode = req.body.authorizationCode;
       // const nonce = req.body.nonce;
-      const email = req.body.email;
+      // let email = req.body.email;
       const givenName = req.body.givenName;
       const familyName = req.body.familyName;
-      const { sub: userAppleId } = await appleSignin.verifyIdToken(token, {
+      const { sub: userAppleId, email } = 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
         // nonce: 'NONCE', // nonce
@@ -378,6 +378,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) {