Merge branch 'feat-cli-g2' into feat-cli-sudo

Author: Meldiron

.github/workflows/cli-beta-publish.yaml

@@ -0,0 +1,47 @@
+name: CLI beta Publish
+on:
+  pull_request:
+    paths:
+      - 'templates/cli/**.twig'
+      - 'src/SDK/Language/CLI.php'
+
+env:
+  PACKAGE_NAME: "${{ vars.PACKAGE_NAME }}@0.16.0${{ github.event.pull_request.head.sha }}"
+
+jobs:
+  publish:
+    environment: cli-testing
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - name: Setup Composer dependencies
+        run: docker run --rm --volume "$(pwd)":/app composer install --ignore-platform-reqs
+      - name: Generate SDKS
+        run: docker run --rm -v "$(pwd)":/app -w /app php:8.1-cli php example.php
+      - name: Fix permission
+        run: sudo chown -R 1001:1001 examples
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'latest'
+          registry-url: 'https://registry.npmjs.org'
+      - name: Setup
+        working-directory: ./examples/cli/
+        run: npm install
+      - name: Set version
+        working-directory: ./examples/cli/
+        run: |
+          sed -i "s#appwrite-cli#${{ vars.PACKAGE_NAME }}#g" package.json
+          sed -i "s#0.16.0#0.16.0${{ github.event.pull_request.head.sha }}#g" package.json
+      - name: Publish
+        working-directory: examples/cli/
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Instruction
+        run: |
+          echo "Install it by running npm install ${{ env.PACKAGE_NAME }}"
+          echo "Run it using npx ${{ env.PACKAGE_NAME }}"

example.php

@@ -186,7 +186,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '0.15.0',
+            'X-Appwrite-Response-Format' => '1.5.0',
         ])
     ;
 
@@ -393,7 +393,7 @@ function getSSLPage($url) {
     ;
 
     $sdk->generate(__DIR__ . '/examples/apple');
-    
+
     // DotNet
     $sdk  = new SDK(new DotNet(), new Swagger2($spec));
 
@@ -442,7 +442,7 @@ function getSSLPage($url) {
     // Android
 
     $sdk = new SDK(new Android(), new Swagger2($spec));
-    
+
     $sdk
         ->setName('Android')
         ->setNamespace('io appwrite')
@@ -466,7 +466,7 @@ function getSSLPage($url) {
 
     // Kotlin
     $sdk = new SDK(new Kotlin(), new Swagger2($spec));
-    
+
     $sdk
         ->setName('Kotlin')
         ->setNamespace('io appwrite')

templates/cli/index.js.twig

@@ -11,7 +11,7 @@ const { version } = require("./package.json");
 const { commandDescriptions, cliConfig } = require("./lib/parser");
 const { client } = require("./lib/commands/generic");
 {% if sdk.test != "true" %}
-const { login, logout } = require("./lib/commands/generic");
+const { login, logout, whoami } = require("./lib/commands/generic");
 const { pull } = require("./lib/commands/pull");
 const { push } = require("./lib/commands/push");
 {% endif %}
@@ -53,6 +53,7 @@ program
   })
   .showSuggestionAfterError()
 {% if sdk.test != "true" %}
+  .addCommand(whoami)
   .addCommand(login)
   .addCommand(pull)
   .addCommand(push)

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

@@ -3,11 +3,51 @@ const { Command } = require("commander");
 const Client = require("../client");
 const { sdkForConsole } = require("../sdks");
 const { globalConfig, localConfig } = require("../config");
-const { actionRunner, success, parseBool, commandDescriptions, log, parse } = require("../parser");
+const { actionRunner, success, parseBool, commandDescriptions, error, parse, drawTable } = require("../parser");
 {% if sdk.test != "true" %}
 const { questionsLogin, questionsListFactors, questionsMfaChallenge } = require("../questions");
 const { accountUpdateMfaChallenge, accountCreateMfaChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
 
+const whoami = new Command("whoami")
+    .description(commandDescriptions['whoami'])
+    .option("-j, --json", "Output in JSON format")
+    .action(actionRunner(async ({ json }) => {
+        if (globalConfig.getEndpoint() === '' || globalConfig.getCookie() === '') {
+            error("No user is signed in. To sign in, run: appwrite login ");
+            return;
+        }
+
+        let client = await sdkForConsole(false);
+
+        let account;
+
+        try {
+            account = await accountGet({
+                sdk: client,
+                parseOutput: false
+            });
+        } catch (error) {
+            error("No user is signed in. To sign in, run: appwrite login");
+            return;
+        }
+
+        const data = [
+            {
+                'ID': account.$id,
+                'Name': account.name,
+                'Email': account.email,
+                'MFA enabled': account.mfa ? 'Yes' : 'No'
+            }
+        ];
+        if (json) {
+            console.log(data);
+
+            return;
+        }
+
+        drawTable(data)
+    }));
+
 const login = new Command("login")
     .description(commandDescriptions['login'])
     .configureHelp({
@@ -34,7 +74,7 @@ const login = new Command("login")
                 sdk: client,
                 parseOutput: false
             });
-        } catch(error) {
+        } catch (error) {
             if (error.response === 'user_more_factors_required') {
                 const { factor } = await inquirer.prompt(questionsListFactors);
 
@@ -158,9 +198,10 @@ const client = new Command("client")
     }));
 
 module.exports = {
-{% if sdk.test != "true" %}
+    {% if sdk.test != "true" %}
+    whoami,
     login,
     logout,
-{% endif %}
+    {% endif %}
     client
 };

templates/cli/lib/parser.js.twig

@@ -208,6 +208,7 @@ const commandDescriptions = {
     "client": `The client command allows you to configure your CLI`,
     "login": `The login command allows you to authenticate and manage a user account.`,
     "logout": `The logout command allows you to logout of your {{ spec.title|caseUcfirst }} account.`,
+    "whoami": `The whoami command gives information about the currently logged in user.`,
     "console" : `The console command allows gives you access to the APIs used by the Appwrite console.`,
     "assistant": `The assistant command allows you to interact with the Appwrite Assistant AI`,
     "messaging": `The messaging command allows you to send messages.`,
@@ -224,6 +225,7 @@ const commandDescriptions = {
 }
 
 module.exports = {
+    drawTable,
     parse,
     actionRunner,
     parseInteger,