@bobfrankston/rmfmail 1.1.153 → 1.1.155

package/client/android-bootstrap.bundle.js

@@ -10210,8 +10210,25 @@ var OAUTH_CLIENT = {
   redirectUri: "com.googleusercontent.apps.884213380682-hcso64dcqmk4p98vsc7br2e6gvn7iv2u:/oauth2callback"
 };
 var OAUTH_SCOPES = "https://mail.google.com/ https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/drive https://www.googleapis.com/auth/calendar https://www.googleapis.com/auth/tasks";
+function canonEmail(email) {
+  const s = (email || "").trim().toLowerCase();
+  const at = s.indexOf("@");
+  if (at < 0) return s;
+  let local = s.slice(0, at);
+  const domain = s.slice(at + 1);
+  if (domain === "gmail.com" || domain === "googlemail.com") {
+    const plus = local.indexOf("+");
+    if (plus >= 0) local = local.slice(0, plus);
+    local = local.replace(/\./g, "");
+    return `${local}@gmail.com`;
+  }
+  return `${local}@${domain}`;
+}
+function tokenKey(email) {
+  return `oauth-token-${canonEmail(email).replace(/[@.]/g, "_")}`;
+}
 async function getCachedToken(email) {
-  const key = `oauth-token-${email.replace(/[@.]/g, "_")}`;
+  const key = tokenKey(email);
   const raw = localStorage.getItem(key);
   if (!raw) {
     console.log(`[oauth] no cached token for ${email} (localStorage key=${key} missing \u2014 fresh consent will follow)`);
@@ -10229,7 +10246,7 @@ async function getCachedToken(email) {
   }
 }
 async function setCachedToken(email, token) {
-  const key = `oauth-token-${email.replace(/[@.]/g, "_")}`;
+  const key = tokenKey(email);
   localStorage.setItem(key, JSON.stringify(token));
 }
 async function exchangeCodeForTokens(code) {