appwrite-utils-cli 1.7.1 → 1.7.2

package/dist/config/ConfigManager.js

@@ -149,9 +149,26 @@ export class ConfigManager {
         logger.debug(`Config discovered at: ${configPath}`, { prefix: "ConfigManager" });
         // 3. Load config from file
         let config = await this.loaderService.loadFromPath(configPath);
-        // 4. Load session authentication
-        const session = options.sessionOverride ||
-            (await this.sessionService.findSession(config.appwriteEndpoint, config.appwriteProject));
+        // 4. Load session authentication (only if appropriate based on config)
+        // Determine if we should load session:
+        // - Load if authMethod is explicitly "session"
+        // - Load if authMethod is "auto" or undefined AND no API key exists
+        // - Skip if authMethod is "apikey" or if API key is present with "auto" mode
+        const hasApiKey = !!(config.appwriteKey && config.appwriteKey.trim().length > 0);
+        const authMethod = config.authMethod || "auto";
+        const shouldLoadSession = options.sessionOverride !== undefined ||
+            authMethod === "session" ||
+            (authMethod === "auto" && !hasApiKey);
+        logger.debug("Session loading decision", {
+            prefix: "ConfigManager",
+            hasApiKey,
+            authMethod,
+            shouldLoadSession,
+        });
+        const session = shouldLoadSession
+            ? options.sessionOverride ||
+                (await this.sessionService.findSession(config.appwriteEndpoint, config.appwriteProject))
+            : null;
         // 5. Merge session into config
         if (session) {
             logger.debug("Merging session authentication into config", { prefix: "ConfigManager" });

package/dist/config/services/ConfigMergeService.js

@@ -57,7 +57,11 @@ export class ConfigMergeService {
         const merged = cloneDeep(config);
         // Add session authentication (map 'cookie' to 'sessionCookie')
         merged.sessionCookie = session.cookie;
-        merged.authMethod = "session";
+        // Only set authMethod to "session" if not explicitly set to "apikey"
+        // This allows API key authentication to take priority when both are available
+        if (merged.authMethod !== "apikey") {
+            merged.authMethod = "session";
+        }
         // Add session metadata if available
         if (session.email || session.expiresAt) {
             merged.sessionMetadata = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "appwrite-utils-cli",
   "description": "Appwrite Utility Functions to help with database management, data conversion, data import, migrations, and much more. Meant to be used as a CLI tool, I do not recommend installing this in frontend environments.",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/config/ConfigManager.ts

@@ -249,10 +249,30 @@ export class ConfigManager {
     // 3. Load config from file
     let config = await this.loaderService.loadFromPath(configPath);
 
-    // 4. Load session authentication
-    const session =
-      options.sessionOverride ||
-      (await this.sessionService.findSession(config.appwriteEndpoint, config.appwriteProject));
+    // 4. Load session authentication (only if appropriate based on config)
+    // Determine if we should load session:
+    // - Load if authMethod is explicitly "session"
+    // - Load if authMethod is "auto" or undefined AND no API key exists
+    // - Skip if authMethod is "apikey" or if API key is present with "auto" mode
+    const hasApiKey = !!(config.appwriteKey && config.appwriteKey.trim().length > 0);
+    const authMethod = config.authMethod || "auto";
+
+    const shouldLoadSession =
+      options.sessionOverride !== undefined ||
+      authMethod === "session" ||
+      (authMethod === "auto" && !hasApiKey);
+
+    logger.debug("Session loading decision", {
+      prefix: "ConfigManager",
+      hasApiKey,
+      authMethod,
+      shouldLoadSession,
+    });
+
+    const session = shouldLoadSession
+      ? options.sessionOverride ||
+        (await this.sessionService.findSession(config.appwriteEndpoint, config.appwriteProject))
+      : null;
 
     // 5. Merge session into config
     if (session) {

package/src/config/services/ConfigMergeService.ts

@@ -80,7 +80,12 @@ export class ConfigMergeService {
 
     // Add session authentication (map 'cookie' to 'sessionCookie')
     merged.sessionCookie = session.cookie;
-    merged.authMethod = "session";
+
+    // Only set authMethod to "session" if not explicitly set to "apikey"
+    // This allows API key authentication to take priority when both are available
+    if (merged.authMethod !== "apikey") {
+      merged.authMethod = "session";
+    }
 
     // Add session metadata if available
     if (session.email || session.expiresAt) {