Merge branch 'master' of https://github.com/appwrite/sdk-generator into feat-kmp-sdk

Author: camka14

src/SDK/Language/CLI.php

@@ -270,6 +270,11 @@ public function getFiles(): array
                 'scope'         => 'default',
                 'destination'   => 'lib/commands/generic.js',
                 'template'      => 'cli/lib/commands/generic.js.twig',
+            ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/commands/organizations.js',
+                'template'      => 'cli/lib/commands/organizations.js.twig',
             ]
         ];
     }

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

@@ -0,0 +1,48 @@
+const { sdkForProject } = require('../sdks')
+const { parse } = require('../parser')
+const { showConsoleLink } = require('../utils.js');
+
+/**
+ * @typedef {Object} OrganizationsListRequestParams
+ * @property {string[]} queries Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of 100 queries are allowed, each 4096 characters long. You may filter on the following attributes: name, total, billingPlan
+ * @property {string} search Search term to filter your list results. Max length: 256 chars.
+ * @property {boolean} parseOutput
+ * @property {libClient | undefined} sdk
+ */
+
+/**
+ * @param {OrganizationsListRequestParams} params
+ */
+const organizationsList = async ({queries, search, parseOutput = true, sdk = undefined, console}) => {
+    let client = !sdk ? await sdkForProject() :
+    sdk;
+    let apiPath = '/organizations';
+    let payload = {};
+    if (typeof queries !== 'undefined') {
+        payload['queries'] = queries;
+    }
+    if (typeof search !== 'undefined') {
+        payload['search'] = search;
+    }
+
+    let response = undefined;
+
+    response = await client.call('get', apiPath, {
+        'content-type': 'application/json',
+    }, payload);
+
+    if (parseOutput) {
+        if(console) {
+            showConsoleLink('organizations', 'list');
+         } else {
+            parse(response)
+        }
+    }
+
+    return response;
+
+}
+
+module.exports = {
+    organizationsList
+}

templates/cli/lib/questions.js.twig

@@ -2,6 +2,7 @@ const chalk = require("chalk");
 const Client = require("./client");
 const { localConfig, globalConfig } = require('./config');
 const { projectsList } = require('./commands/projects');
+const { organizationsList } = require('./commands/organizations');
 const { teamsList } = require('./commands/teams');
 const { functionsListRuntimes, functionsListSpecifications, functionsList } = require('./commands/functions');
 const { accountListMfaFactors } = require("./commands/account");
@@ -152,7 +153,10 @@ const questionsInitProject = [
         message: "Choose your organization",
         choices: async () => {
             let client = await sdkForConsole(true);
-            const { teams } = await paginate(teamsList, { parseOutput: false, sdk: client }, 100, 'teams');
+            const hostname = new URL(client.endpoint).hostname;
+            const { teams } = hostname.endsWith('appwrite.io')
+                ? await paginate(organizationsList, { parseOutput: false, sdk: client }, 100, 'teams') 
+                : await paginate(teamsList, { parseOutput: false, sdk: client }, 100, 'teams');
 
             let choices = teams.map((team, idx) => {
                 return {

templates/cli/lib/utils.js.twig

@@ -89,6 +89,9 @@ function showConsoleLink(serviceName, action, ...ids) {
         case "teams":
             url.pathname += getTeamsPath(action, ids);
             break;
+        case "organizations":
+            url.pathname += getOrganizationsPath(action, ids);
+            break;
         case "users":
             url.pathname += getUsersPath(action, ids);
             break;
@@ -241,6 +244,16 @@ function getTeamsPath(action, ids) {
     return path;
 }
 
+function getOrganizationsPath(action, ids) {
+    let path = `/organization-${ids[0]}`;
+
+    if (action === 'list') {
+        path = '/account/organizations';
+    }
+
+    return path;
+}
+
 function getUsersPath(action, ids) {
     let path = '/auth';
 

templates/dart/lib/src/client_mixin.dart.twig

@@ -62,6 +62,9 @@ class ClientMixin {
       (request as http.Request).body = jsonEncode(params);
     }
 
+    headers['User-Agent'] = Uri.encodeFull(headers['User-Agent'] ?? '');
+    headers['X-Forwarded-User-Agent'] = Uri.encodeFull(headers['X-Forwarded-User-Agent'] ?? '');
+
     request.headers.addAll(headers);
     return request;
   }

templates/flutter/lib/src/client_mixin.dart.twig

@@ -62,6 +62,9 @@ class ClientMixin {
       (request as http.Request).body = jsonEncode(params);
     }
 
+    headers['User-Agent'] = Uri.encodeFull(headers['User-Agent'] ?? '');
+    headers['X-Forwarded-User-Agent'] = Uri.encodeFull(headers['X-Forwarded-User-Agent'] ?? '');
+
     request.headers.addAll(headers);
     return request;
   }