@bobfrankston/gcards 0.1.34 → 0.1.36

package/.claude/settings.local.json

@@ -23,7 +23,18 @@
       "WebFetch(domain:lh3.googleusercontent.com)",
       "Bash(curl:*)",
       "Bash(bun build:*)",
-      "Bash(xargs -I {} sh -c 'echo \"\"=== {} ===\"\" && head -20 {}')"
+      "Bash(xargs -I {} sh -c 'echo \"\"=== {} ===\"\" && head -20 {}')",
+      "Bash(del \"y:\\\\dev\\\\utils\\\\cardx\\\\gcards\\\\data\\\\bobfrankston\\\\token.json\" \"y:\\\\dev\\\\utils\\\\cardx\\\\gcards\\\\data\\\\bobfrankston\\\\token-write.json\")",
+      "Bash(echo:*)",
+      "Bash(npm whoami:*)",
+      "Bash(npm run build:*)",
+      "Bash(npm publish:*)",
+      "Bash(npm version:*)",
+      "Bash(npm link)",
+      "Bash(npm link:*)",
+      "Bash(cmd /c \"dir /AL\")",
+      "Bash(node gcards.ts:*)",
+      "Bash(npm run release:*)"
     ],
     "deny": [],
     "ask": []

package/README.md

@@ -261,12 +261,31 @@ After export, run `gcards push -u <target>` to upload.
 
 ## Setup
 
-### Google API Setup
-
-1. Create Google Cloud project
-2. Enable People API
-3. Create OAuth2 credentials (Desktop app type)
-4. Download `credentials.json` to the gcards directory
+### Google API Credentials (Required)
+
+Each user must create their own Google Cloud credentials. This is a one-time setup:
+
+1. Go to [Google Cloud Console](https://console.cloud.google.com/)
+2. Create a new project (e.g., "gcards")
+3. Enable the **People API**:
+   - Go to APIs & Services > Library
+   - Search for "People API" and enable it
+4. Configure OAuth consent screen:
+   - Go to APIs & Services > OAuth consent screen
+   - Choose "External" user type
+   - Fill in app name and email fields
+   - Add scope: `https://www.googleapis.com/auth/contacts`
+5. Create OAuth credentials:
+   - Go to APIs & Services > Credentials
+   - Click "+ CREATE CREDENTIALS" > "OAuth client ID"
+   - Choose "Web application"
+   - Add redirect URI: `http://localhost:9326/oauth2callback`
+   - Click Create and download the JSON file
+6. Save as `credentials.json` in the gcards install directory:
+   - Find install location: `npm list -g @bobfrankston/gcards`
+   - Or run gcards once to see the expected path in the error message
+
+For detailed instructions, see: [SETUP-GOOGLE-OAUTH.md](https://github.com/BobFrankston/oauthsupport/blob/master/SETUP-GOOGLE-OAUTH.md)
 
 ### AI Error Explanations (Optional)
 

package/gcards.ts

@@ -10,7 +10,7 @@ import path from 'path';
 import crypto from 'crypto';
 import { parse as parseJsonc } from 'jsonc-parser';
 import { parseArgs, showUsage, showHelp } from './glib/parsecli.ts';
-import { authenticateOAuth } from '../../../projects/oauth/oauthsupport/index.ts';
+import { authenticateOAuth } from '@bobfrankston/oauthsupport';
 import type { GooglePerson, GoogleConnectionsResponse } from './glib/types.ts';
 import { GCARDS_GUID_KEY, extractGuids } from './glib/gctypes.ts';
 import type { ContactIndex, IndexEntry, DeletedEntry, DeleteQueue, DeleteQueueEntry, PushStatus, PendingChange, UserPaths } from './glib/gctypes.ts';
@@ -87,7 +87,15 @@ function cleanupEscapeHandler(): void {
 
 async function getAccessToken(user: string, writeAccess = false, forceRefresh = false): Promise<string> {
     if (!fs.existsSync(CREDENTIALS_FILE)) {
-        throw new Error(`Credentials file not found: ${CREDENTIALS_FILE}`);
+        console.error(`\nCredentials file not found: ${CREDENTIALS_FILE}\n`);
+        console.error(`To use gcards, you need to create your own Google Cloud credentials:`);
+        console.error(`  1. Go to https://console.cloud.google.com/`);
+        console.error(`  2. Create a project and enable the People API`);
+        console.error(`  3. Create OAuth 2.0 credentials (Web application type)`);
+        console.error(`  4. Add redirect URI: http://localhost:9326/oauth2callback`);
+        console.error(`  5. Download credentials.json to: ${CREDENTIALS_FILE}\n`);
+        console.error(`See: https://github.com/BobFrankston/oauthsupport/blob/master/SETUP-GOOGLE-OAUTH.md`);
+        process.exit(1);
     }
 
     const paths = getUserPaths(user);
@@ -108,9 +116,10 @@ async function getAccessToken(user: string, writeAccess = false, forceRefresh =
         tokenDirectory: paths.userDir,
         tokenFileName,
         credentialsKey: 'web',
-        includeOfflineAccess: true,
-        prompt: 'select_account',  // Always show account picker for new auth
-        signal: abortController?.signal  // Pass abort signal for immediate cancellation
+        signal: abortController?.signal
+        // includeOfflineAccess defaults to true - auto-requests refresh token
+        // prompt auto-detects when consent is needed for refresh token
+        // maxTokenLifetimeHours defaults to unlimited (uses refresh token indefinitely)
     });
 
     if (!token) {
@@ -419,7 +428,7 @@ async function fetchContactsWithRetry(
     const BASE_DELAY = 5000;  /** 5 seconds base delay */
 
     const params = new URLSearchParams({
-        personFields: 'names,emailAddresses,phoneNumbers,addresses,organizations,biographies,urls,birthdays,photos,memberships,metadata,fileAses',
+        personFields: 'names,emailAddresses,phoneNumbers,addresses,organizations,biographies,urls,birthdays,photos,memberships,metadata,fileAses,userDefined',
         pageSize: '100'  /** Smaller page size to avoid quota issues */
     });
 
@@ -923,7 +932,7 @@ async function confirm(message: string): Promise<boolean> {
 }
 
 async function updateContactOnGoogle(person: GooglePerson, retryCount = 0, tokenRefreshed = false): Promise<void> {
-    const updateMask = 'names,emailAddresses,phoneNumbers,addresses,organizations,biographies,urls,birthdays,fileAses';
+    const updateMask = 'names,emailAddresses,phoneNumbers,addresses,organizations,biographies,urls,birthdays,fileAses,userDefined';
 
     const response = await fetch(`${PEOPLE_API_BASE}/${person.resourceName}:updateContact?updatePersonFields=${updateMask}`, {
         method: 'PATCH',

package/glib/gmerge.ts

@@ -149,15 +149,36 @@ function unionMemberships(target: GoogleMembership[], source: GoogleMembership[]
 }
 
 function unionUserDefined(target: GoogleUserDefined[], source: GoogleUserDefined[]): GoogleUserDefined[] {
-    const seen = new Set<string>();
-    const result: GoogleUserDefined[] = [];
+    const byKey = new Map<string, GoogleUserDefined[]>();
+    
+    // Collect all values for each key
     for (const u of [...target, ...source]) {
-        const key = `${u.key}:${u.value}`;
-        if (!seen.has(key)) {
-            seen.add(key);
-            result.push(u);
+        if (!u.key) continue;
+        const existing = byKey.get(u.key) || [];
+        // Only add if this exact key:value pair isn't already present
+        if (!existing.some(e => e.value === u.value)) {
+            existing.push(u);
+        }
+        byKey.set(u.key, existing);
+    }
+    
+    const result: GoogleUserDefined[] = [];
+    
+    // For each key, handle based on what makes sense
+    for (const [key, values] of byKey.entries()) {
+        if (values.length === 1) {
+            // Single value - just add it
+            result.push(values[0]);
+        } else {
+            // Multiple values for same key
+            // For most keys, prefer target (first occurrence)
+            // But preserve all unique values by keeping them separate
+            for (const val of values) {
+                result.push(val);
+            }
         }
     }
+    
     return result;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/gcards",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "Google Contacts cleanup and management tool",
   "type": "module",
   "main": "gcards.ts",
@@ -33,7 +33,8 @@
     "tsx": "^4.21.0"
   },
   "dependencies": {
-    "@bobfrankston/miscassists": "file:../../../projects/NodeJS/miscassists",
+    "@bobfrankston/miscassists": "^1.0.36",
+    "@bobfrankston/oauthsupport": "^1.0.1",
     "jsonc-parser": "^3.3.1"
   }
 }