Feat multiple accounts and instances #851

byawitz · 2024-05-21T18:49:23Z

What does this PR do?

Enabling multiple users and Appwrite instances, while keeping comparability with previous prefs.json scheme.
Appwrite cloud is now the default endpoint url, this can be changed by adding the --self-hosted flag.
Easy migrate login credentials with appwrite login migrate
Display all logins using appwrite login list
Change context using appwrite login change --account-id

Test Plan

multiple-accounts.mp4

templates/cli/lib/commands/generic.js.twig

…accounts-and-instances

byawitz · 2024-05-22T17:36:31Z

Changing multiple account selection to the login command and making it interactive

multiple-accounts-interactive.mp4

byawitz · 2024-05-22T18:23:20Z

Interactive multiple account logout

multiple-accounts-logout-interactive.mp4

Meldiron · 2024-05-24T13:25:32Z

appwrite login
If its first time: Normal
If already has account:
New or existring

appwrite logout
- If one, sign out
- If many, select (indicate current)

templates/cli/lib/commands/generic.js.twig

templates/cli/lib/questions.js.twig

Feat general improvements

Feat function init improvments

Feat arg project init

…ts-and-instances

christyjacob4 · 2024-06-11T19:39:26Z

templates/cli/lib/sdks.js.twig

@@ -99,4 +99,5 @@ const sdkForProject = async () => {
 module.exports = {
  sdkForConsole,
  sdkForProject,
+  questionGetEndpoint,


Lets move all questions to questions.js file only.

Lines 5-28 has declared the array questionGetEndpoint

christyjacob4 · 2024-06-11T19:40:40Z

templates/cli/lib/questions.js.twig

+        when: (answers) => answers.method === 'select'
+    },
+];
+const questionGetEndpoint = [


it seems we already have questionGetEndpoint here. We have to remove it from sdks.js

christyjacob4 · 2024-06-11T19:42:07Z

templates/cli/lib/commands/generic.js.twig

+            }
+        }
+
+        const leftLogins = globalConfig.getLogins();


shouldn't this method be called getSessions() ?

…nces' into feat-multiple-accounts-and-instances # Conflicts: # templates/cli/lib/commands/push.js.twig # templates/cli/lib/config.js.twig

christyjacob4 · 2024-06-11T19:42:43Z

templates/cli/lib/commands/generic.js.twig


-    client.setCookie(globalConfig.getCookie());
+    globalConfig.addLogin(id, {});
+    globalConfig.setCurrentLogin(id);


Suggested change

globalConfig.setCurrentLogin(id);

globalConfig.setCurrentSession(id);

christyjacob4 · 2024-06-11T19:43:03Z

templates/cli/lib/commands/generic.js.twig

@@ -53,6 +79,8 @@ const loginCommand = async () => {
                parseOutput: false
            });
        } else {
+            globalConfig.removeLogin(id);
+            globalConfig.setCurrentLogin(oldCurrent);


Suggested change

globalConfig.setCurrentLogin(oldCurrent);

globalConfig.setCurrentSession(oldCurrent);

christyjacob4 · 2024-06-11T19:43:47Z

templates/cli/lib/commands/generic.js.twig

+            return;
+        }
+        if (logins.length === 1) {
+            await singleLogout(current);


Also singleLogout is not a very good name. Lets just call it deleteSession or logout

christyjacob4 · 2024-06-11T19:44:22Z

templates/cli/lib/config.js.twig

+    getCurrentLogin() {
+        if (!this.has(Global.PREFERENCE_CURRENT)) {
+            return "";
+        }
+        return this.get(Global.PREFERENCE_CURRENT);
+    }
+
+    setCurrentLogin(endpoint) {
+        this.set(Global.PREFERENCE_CURRENT, endpoint);
+    }
+
+    getLoginIds() {
+        return Object.keys(this.data).filter((key) => !Global.IGNORE_ATTRIBUTES.includes(key));
+    }
+
+    getLogins() {
+        const logins = Object.keys(this.data).filter((key) => !Global.IGNORE_ATTRIBUTES.includes(key))
+
+        return logins.map((login) => {
+
+            return {
+                id: login,
+                endpoint: this.data[login][Global.PREFERENCE_ENDPOINT],
+                email: this.data[login][Global.PREFERENCE_EMAIL]
+            }
+        })
+    }
+
+    addLogin(login, data) {
+        this.set(login, data);
+    }
+
+    removeLogin(login, data) {
+        this.delete(login);
+    }


Lets refactor all these method names to use Session / Session

And deleteSession / logout

christyjacob4 · 2024-06-11T20:13:18Z

templates/cli/lib/config.js.twig

+        this.set(Global.PREFERENCE_CURRENT, endpoint);
+    }
+
+    getLoginIds() {


shouldn't this be getSessionIds() ?

christyjacob4 · 2024-06-11T20:14:03Z

templates/cli/lib/commands/generic.js.twig

+            }
+        }
+
+        const leftLogins = globalConfig.getSessions();


Suggested change

const leftLogins = globalConfig.getSessions();

const sessions = globalConfig.getSessions();

christyjacob4 · 2024-06-11T20:14:19Z

templates/cli/lib/commands/generic.js.twig

+        helpWidth: process.stdout.columns || 80
+    })
+    .action(actionRunner(async () => {
+        const logins = globalConfig.getSessions();


Suggested change

const logins = globalConfig.getSessions();

const sessions = globalConfig.getSessions();

feat(cli): Multiple accounts in CLI

d9fa0bb

byawitz requested review from Meldiron and christyjacob4 May 21, 2024 18:49

byawitz self-assigned this May 21, 2024

byawitz changed the base branch from master to feat-cli-whoami-command May 21, 2024 18:49

Meldiron reviewed May 22, 2024

View reviewed changes

templates/cli/lib/commands/generic.js.twig Outdated Show resolved Hide resolved

byawitz added 2 commits May 22, 2024 12:32

Merge branch 'refs/heads/feat-cli-whoami-command' into feat-multiple-…

6eeef88

…accounts-and-instances

feat(cli): Hooking migration before any command

fd78fad

byawitz added 3 commits May 22, 2024 13:37

feat(cli): Interactive multiple account changing

9387d95

feat(cli): Adding json option to list accounts

d250003

feat(cli): Interactive multiple user logout

144e043

byawitz added 7 commits May 22, 2024 14:37

fix(cli): Changing migrate to regular function

9a61aef

fix(cli): Login question

0cf5edd

fix(cli): Extracting migrate

7c07523

fix(cli): Renaming the migrate function name

58df0ee

fix(cli): Excluding migrate from tests

8c77004

fix(cli): Adding migrate to tests

c1e5c41

fix(cli): Adapting the client command and bug when getting key.

ea494b7

Base automatically changed from feat-cli-whoami-command to feat-cli-g2 May 24, 2024 13:02

refactor(cli): Multiple account login refactoring

8c7b894

byawitz requested a review from Meldiron May 24, 2024 15:07

Meldiron reviewed May 27, 2024

View reviewed changes

templates/cli/lib/commands/generic.js.twig Outdated Show resolved Hide resolved

Meldiron reviewed May 27, 2024

View reviewed changes

templates/cli/lib/commands/generic.js.twig Outdated Show resolved Hide resolved

Meldiron reviewed May 27, 2024

View reviewed changes

templates/cli/lib/commands/generic.js.twig Outdated Show resolved Hide resolved

Meldiron reviewed May 27, 2024

View reviewed changes

templates/cli/lib/questions.js.twig Outdated Show resolved Hide resolved

Meldiron reviewed May 27, 2024

View reviewed changes

templates/cli/lib/questions.js.twig Outdated Show resolved Hide resolved

refactor(cli): Review fixing

32452ff

byawitz and others added 10 commits June 11, 2024 09:02

fix: texts

aabddae

refactor: Removing login from init

dea75b4

refactor: Removing self-hosted from login

5fe0bd2

Merge pull request #874 from appwrite/feat-general-improvements

2db03b5

Feat general improvements

feat: Fetching function templates from API

9116fc0

Update templates/cli/lib/commands/init.js.twig

7ed643e

Merge pull request #877 from appwrite/feat-function-init-improvments

57984ba

Feat function init improvments

refactor: Removing --open option

0cf2882

Merge pull request #868 from appwrite/feat-arg-project-init

fcb2ddc

Feat arg project init

Merge branch 'refs/heads/feat-console-flow' into feat-multiple-accoun…

3b04fe8

…ts-and-instances

christyjacob4 reviewed Jun 11, 2024

View reviewed changes

Merge remote-tracking branch 'origin/feat-multiple-accounts-and-insta…

3e054b0

…nces' into feat-multiple-accounts-and-instances # Conflicts: # templates/cli/lib/commands/push.js.twig # templates/cli/lib/config.js.twig

christyjacob4 reviewed Jun 11, 2024

View reviewed changes

refactor: reviews

309d764

byawitz temporarily deployed to cli-testing June 11, 2024 19:53 — with GitHub Actions Inactive

refactor: removing redundant exports and questions.

4641f61

byawitz temporarily deployed to cli-testing June 11, 2024 20:02 — with GitHub Actions Inactive

christyjacob4 reviewed Jun 11, 2024

View reviewed changes

refactor: renaming login to sessions

0860867

byawitz temporarily deployed to cli-testing June 11, 2024 20:19 — with GitHub Actions Inactive

christyjacob4 approved these changes Jun 11, 2024

View reviewed changes

christyjacob4 merged commit 11fe1ff into feat-console-flow Jun 11, 2024
35 checks passed

christyjacob4 deleted the feat-multiple-accounts-and-instances branch June 11, 2024 20:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat multiple accounts and instances #851

Feat multiple accounts and instances #851

byawitz commented May 21, 2024

byawitz commented May 22, 2024

byawitz commented May 22, 2024

Meldiron commented May 24, 2024

christyjacob4 Jun 11, 2024

christyjacob4 Jun 11, 2024

christyjacob4 Jun 11, 2024

christyjacob4 Jun 11, 2024

christyjacob4 Jun 11, 2024

christyjacob4 Jun 11, 2024

christyjacob4 Jun 11, 2024

christyjacob4 Jun 11, 2024

christyjacob4 Jun 11, 2024

christyjacob4 Jun 11, 2024

christyjacob4 Jun 11, 2024

	globalConfig.setCurrentLogin(id);
	globalConfig.setCurrentSession(id);

	globalConfig.setCurrentLogin(oldCurrent);
	globalConfig.setCurrentSession(oldCurrent);

	const leftLogins = globalConfig.getSessions();
	const sessions = globalConfig.getSessions();

	const logins = globalConfig.getSessions();
	const sessions = globalConfig.getSessions();

Feat multiple accounts and instances #851

Feat multiple accounts and instances #851

Conversation

byawitz commented May 21, 2024

What does this PR do?

Test Plan

byawitz commented May 22, 2024

byawitz commented May 22, 2024

Meldiron commented May 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment