fix(outlook-api): Falls back to username as account email if failed t…

…o retrieve account email address

lib/account.js

@@ -3,7 +3,7 @@
 const logger = require('./logger');
 const Boom = require('@hapi/boom');
 const msgpack = require('msgpack5')();
-const { normalizePath, formatAccountListingResponse, unpackUIDRangeForSearch, mergeObjects, download, resolveCredentials } = require('./tools');
+const { normalizePath, formatAccountListingResponse, unpackUIDRangeForSearch, mergeObjects, download, resolveCredentials, isEmail } = require('./tools');
 const crypto = require('crypto');
 const { MessageChannel } = require('worker_threads');
 const { MessagePortReadable } = require('./message-port-stream');
@@ -343,6 +343,11 @@ class Account {
             result.account = null;
         }
 
+        // falls back to oauth2 username as the email address if email address is not set
+        if (!result.email && result?.oauth2?.auth?.user && isEmail(result?.oauth2?.auth?.user)) {
+            result.email = result.oauth2.auth.user;
+        }
+
         result.counters = counters;
 
         return result;

workers/api.js

@@ -1978,7 +1978,7 @@ const init = async () => {
                         }
                     }
 
-                    if (!userInfo.email && userInfo.username) {
+                    if (!userInfo.email && userInfo.username && isEmail(userInfo.username)) {
                         userInfo.email = userInfo.username;
                     }