appwrite-utils-cli 0.10.71 → 0.10.73

package/README.md

@@ -148,6 +148,7 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.10.73: Fix moving users, passwords should work now (from Appwrite, Argon2)
 - 0.10.71: Fix create template function `__dirname`
 - 0.10.70: Fixed `--transfer-users` phones
 - 0.10.67: Added `--transfer-users` boolean flag to also transfer users between projects

package/dist/functions/methods.js

@@ -1,12 +1,9 @@
 import { AppwriteException, Client, Functions, Query, Runtime, } from "node-appwrite";
-import { fileURLToPath } from "node:url";
-import { join, dirname } from "node:path";
+import { join } from "node:path";
 import fs from "node:fs";
 import {} from "appwrite-utils";
 import chalk from "chalk";
 import { extract as extractTar } from "tar";
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
 export const listFunctions = async (client, queries, search) => {
     const functions = new Functions(client);
     const functionsList = await functions.list(queries, search);

package/dist/main.js

@@ -12,6 +12,10 @@ import { fetchAllCollections } from "./collections/methods.js";
 import chalk from "chalk";
 import { listSpecifications } from "./functions/methods.js";
 const argv = yargs(hideBin(process.argv))
+    .option("config", {
+    type: "string",
+    description: "Appwrite Config file name",
+})
     .option("it", {
     alias: ["interactive", "i"],
     type: "boolean",

package/dist/migrations/transfer.js

@@ -84,7 +84,7 @@ export const transferStorageLocalToLocal = async (storage, fromBucketId, toBucke
 };
 export const transferStorageLocalToRemote = async (localStorage, endpoint, projectId, apiKey, fromBucketId, toBucketId) => {
     console.log(`Transferring files from current storage ${fromBucketId} to ${endpoint} bucket ${toBucketId}`);
-    const client = getAppwriteClient(endpoint, apiKey, projectId);
+    const client = getAppwriteClient(endpoint, projectId, apiKey);
     const remoteStorage = new Storage(client);
     let numberOfFiles = 0;
     let lastFileId;
@@ -407,9 +407,19 @@ export const transferUsersLocalToRemote = async (localUsers, endpoint, projectId
                 const phone = user.phone
                     ? converterFunctions.convertPhoneStringToUSInternational(user.phone)
                     : undefined;
-                await tryAwaitWithRetry(async () => remoteUsers.create(user.$id, user.email, phone, // phone - optional
-                user.password, // password - cannot transfer hashed passwords
-                user.name));
+                if (user.hash) {
+                    await tryAwaitWithRetry(async () => remoteUsers.createArgon2User(user.$id, user.email, user.password, // password - cannot transfer hashed passwords
+                    user.name // phone - optional
+                    ));
+                    if (phone) {
+                        await tryAwaitWithRetry(async () => remoteUsers.updatePhone(user.$id, phone));
+                    }
+                }
+                else {
+                    await tryAwaitWithRetry(async () => remoteUsers.create(user.$id, user.email, phone, // phone - optional
+                    user.password, // password - cannot transfer hashed passwords
+                    user.name));
+                }
                 // Update user preferences and status
                 await tryAwaitWithRetry(async () => remoteUsers.updatePrefs(user.$id, user.prefs));
                 if (!user.emailVerification) {

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": "0.10.71",
+  "version": "0.10.73",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/functions/methods.ts

@@ -5,8 +5,7 @@ import {
   Query,
   Runtime,
 } from "node-appwrite";
-import { fileURLToPath } from "node:url";
-import { join, dirname } from "node:path";
+import { join } from "node:path";
 import fs from "node:fs";
 import {
   type AppwriteFunction,
@@ -16,9 +15,6 @@ import {
 import chalk from "chalk";
 import { extract as extractTar } from "tar";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
 export const listFunctions = async (
   client: Client,
   queries?: string[],

package/src/main.ts

@@ -15,6 +15,7 @@ import chalk from "chalk";
 import { listSpecifications } from "./functions/methods.js";
 
 interface CliOptions {
+  config?: string;
   it?: boolean;
   dbIds?: string;
   collectionIds?: string;
@@ -50,6 +51,10 @@ interface CliOptions {
 type ParsedArgv = ArgumentsCamelCase<CliOptions>;
 
 const argv = yargs(hideBin(process.argv))
+  .option("config", {
+    type: "string",
+    description: "Appwrite Config file name",
+  })
   .option("it", {
     alias: ["interactive", "i"],
     type: "boolean",

package/src/migrations/transfer.ts

@@ -158,7 +158,7 @@ export const transferStorageLocalToRemote = async (
   console.log(
     `Transferring files from current storage ${fromBucketId} to ${endpoint} bucket ${toBucketId}`
   );
-  const client = getAppwriteClient(endpoint, apiKey, projectId);
+  const client = getAppwriteClient(endpoint, projectId, apiKey);
   const remoteStorage = new Storage(client);
   let numberOfFiles = 0;
   let lastFileId: string | undefined;
@@ -815,15 +815,31 @@ export const transferUsersLocalToRemote = async (
           ? converterFunctions.convertPhoneStringToUSInternational(user.phone)
           : undefined;
 
-        await tryAwaitWithRetry(async () =>
-          remoteUsers.create(
-            user.$id,
-            user.email,
-            phone, // phone - optional
-            user.password, // password - cannot transfer hashed passwords
-            user.name
-          )
-        );
+        if (user.hash) {
+          await tryAwaitWithRetry(async () =>
+            remoteUsers.createArgon2User(
+              user.$id,
+              user.email,
+              user.password!, // password - cannot transfer hashed passwords
+              user.name // phone - optional
+            )
+          );
+          if (phone) {
+            await tryAwaitWithRetry(async () =>
+              remoteUsers.updatePhone(user.$id, phone)
+            );
+          }
+        } else {
+          await tryAwaitWithRetry(async () =>
+            remoteUsers.create(
+              user.$id,
+              user.email,
+              phone, // phone - optional
+              user.password, // password - cannot transfer hashed passwords
+              user.name
+            )
+          );
+        }
 
         // Update user preferences and status
         await tryAwaitWithRetry(async () =>