Update

Author: devksingh4

src/gsuite.ts

@@ -6,7 +6,6 @@ export interface GoogleContact {
   email: string;
   givenName: string;
   familyName: string;
-  displayName: string;
 }
 
 export interface ExistingContact {
@@ -302,6 +301,8 @@ const contactToAtomXml = (contact: GoogleContact): string => {
     );
   }
 
+  const fullName = `${escapeXml(contact.givenName)} ${escapeXml(contact.familyName)}`;
+
   return `<?xml version="1.0" encoding="UTF-8"?>
 <atom:entry xmlns:atom="http://www.w3.org/2005/Atom"
             xmlns:gd="http://schemas.google.com/g/2005">
@@ -310,7 +311,7 @@ const contactToAtomXml = (contact: GoogleContact): string => {
   <gd:name>
     <gd:givenName>${escapeXml(contact.givenName)}</gd:givenName>
     <gd:familyName>${escapeXml(contact.familyName)}</gd:familyName>
-    <gd:fullName>${escapeXml(contact.displayName)}</gd:fullName>
+    <gd:fullName>${fullName}</gd:fullName>
   </gd:name>
 ${emails.join("\n")}
 </atom:entry>`;
@@ -325,8 +326,6 @@ const parseGDataEntry = (entry: any): ExistingContact | null => {
 
   const primaryEmail =
     emails.find((e: any) => e.primary === "true")?.address || emails[0].address;
-  const otherEmail =
-    emails.find((e: any) => e.rel?.includes("other"))?.address || "";
   const name = entry.gd$name || {};
 
   // Extract ID from entry ID (format: https://www.google.com/m8/feeds/contacts/{domain}/base/{id})
@@ -340,7 +339,6 @@ const parseGDataEntry = (entry: any): ExistingContact | null => {
       email: primaryEmail || "",
       givenName: name.gd$givenName?.$t || "",
       familyName: name.gd$familyName?.$t || "",
-      displayName: name.gd$fullName?.$t || primaryEmail || "",
     },
   };
 };

src/sync.ts

@@ -42,7 +42,6 @@ const contactsDiffer = (
   return (
     entra.givenName !== google.givenName ||
     entra.familyName !== google.familyName ||
-    entra.displayName !== google.displayName ||
     entra.email !== google.email
   );
 };
@@ -74,22 +73,34 @@ const syncContacts = async (
   // Build lookup map for Entra users
   const entraMap = new Map<string, GoogleContact>();
   let skippedNoName = 0;
+  let skippedSameDomain = 0;
 
   for (const user of entraUsers) {
+    // Skip users with no name information
     if (!user.familyName || !user.displayName) {
-      logger.info(
+      logger.debug(
         { email: user.email, upn: user.upn },
         "Skipping user with no first and/or last name information",
       );
       skippedNoName++;
       continue;
     }
 
+    // Skip users on the same domain (not external)
+    const userDomain = extractDomain(user.email || user.upn);
+    if (userDomain === domain) {
+      logger.debug(
+        { email: user.email, upn: user.upn, domain: userDomain },
+        "Skipping user on same domain (not external)",
+      );
+      skippedSameDomain++;
+      continue;
+    }
+
     const contact: GoogleContact = {
       email: user.email,
       givenName: user.givenName,
       familyName: user.familyName,
-      displayName: user.displayName,
     };
     entraMap.set(getPrimaryEmail(user), contact);
   }
@@ -101,6 +112,13 @@ const syncContacts = async (
     );
   }
 
+  if (skippedSameDomain > 0) {
+    logger.info(
+      { skipped: skippedSameDomain, domain },
+      "Skipped users on same domain (not external)",
+    );
+  }
+
   // Determine what operations to perform
   const toCreate: GoogleContact[] = [];
   const toUpdate: Array<{ id: string; etag: string; contact: GoogleContact }> =