Merge remote-tracking branch 'origin/master' into fix-flutter-websocket-issues

Author: lohanidamodar

.travis.yml

@@ -29,9 +29,9 @@ env:
   - SDK=DartStable
   - SDK=Deno1171
   - SDK=FlutterStable
+  - SDK=FlutterBeta
   - SDK=Go112
   - SDK=Go118
-#  - SDK=FlutterBeta
   - SDK=KotlinJava8
   - SDK=KotlinJava11
   - SDK=KotlinJava17

src/SDK/Language/Swift.php

@@ -176,8 +176,8 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Extensions/Codable+JSON.swift',
-                'template'      => 'swift/Sources/Extensions/Codable+JSON.swift.twig',
+                'destination'   => '/Sources/JSONCodable/Codable+JSON.swift',
+                'template'      => 'swift/Sources/JSONCodable/Codable+JSON.swift.twig',
             ],
             [
                 'scope'         => 'default',

templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig

@@ -62,6 +62,13 @@ class {{ service.name | caseUcfirst }} : Service {
         {%~ for parameter in method.parameters.query | merge(method.parameters.body) %}
             "{{ parameter.name }}" to {{ parameter.name | caseCamel }},
         {%~ endfor %}
+        {%~ if method.auth | length > 0 %}
+        {%~ for node in method.auth %}
+        {%~ for key,header in node | keys %}
+            "{{ header | caseLower }}" to client.config["{{ header | caseLower }}"],
+        {%~ endfor %}
+        {%~ endfor %}
+        {%~ endif %}
         )
         {%~ if method.type == 'webAuth' %}
         val query = mutableListOf<String>()
@@ -121,11 +128,11 @@ class {{ service.name | caseUcfirst }} : Service {
         )
         {%~ if method.responseModel %}
         val converter: (Any) -> {{ method | returnType(spec, sdk.namespace | caseDot) | raw }} = {
-        {% if method.responseModel == 'any' %}
+        {%~ if method.responseModel == 'any' %}
             it
-        {% else %}
-        {{sdk.namespace | caseDot}}.models.{{ method.responseModel | caseUcfirst }}.from(map = it as Map<String, Any>{% if method.responseModel | hasGenericType(spec) %}, nestedType{% endif %})
-        {% endif %}
+        {%~ else %}
+            {{sdk.namespace | caseDot}}.models.{{ method.responseModel | caseUcfirst }}.from(map = it as Map<String, Any>{% if method.responseModel | hasGenericType(spec) %}, nestedType{% endif %})
+        {%~ endif %}
         }
         {%~ endif %}
         {%~ if 'multipart/form-data' in method.consumes %}

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

@@ -2,7 +2,7 @@ const inquirer = require("inquirer");
 const JSONbig = require("json-bigint")({ storeAsString: false });
 const { Command } = require("commander");
 const { localConfig } = require("../config");
-const { questionsDeployFunctions, questionsGetEntrypoint, questionsDeployCollections, questionsConfirmDeployCollections } = require("../questions");
+const { questionsDeployTeams, questionsDeployFunctions, questionsGetEntrypoint, questionsDeployCollections, questionsConfirmDeployCollections } = require("../questions");
 const { actionRunner, success, log, error, commandDescriptions } = require("../parser");
 const { functionsGet, functionsCreate, functionsUpdate, functionsCreateDeployment, functionsUpdateDeployment, functionsListVariables, functionsDeleteVariable, functionsCreateVariable } = require('./functions');
 const {
@@ -25,6 +25,11 @@ const {
     databasesListIndexes,
     databasesDeleteIndex
 } = require("./databases");
+const {
+    teamsGet,
+    teamsUpdate,
+    teamsCreate
+} = require("./teams");
 
 const POOL_DEBOUNCE = 2000; // in milliseconds
 const POOL_MAX_DEBOUNCES = 30;
@@ -593,6 +598,76 @@ const deployCollection = async ({ all, yes } = {}) => {
     }
 }
 
+const deployTeam = async ({ all, yes } = {}) => {
+    let response = {};
+
+    let teamIds = [];
+    const configTeams = localConfig.getTeams();
+
+    if(all) {
+        if (configTeams.length === 0) {
+            throw new Error("No teams found in the current directory. Run `appwrite init team` to fetch all your teams.");
+        }
+        teamIds.push(...configTeams.map((t) => t.$id));
+    }
+
+    if(teamIds.length === 0) {
+        let answers = await inquirer.prompt(questionsDeployTeams[0])
+        teamIds.push(...answers.teams);
+    }
+
+    let teams = [];
+
+    for(const teamId of teamIds) {
+        const idTeams = configTeams.filter((t) => t.$id === teamId);
+        teams.push(...idTeams);
+    }
+
+    for (let team of teams) {
+        log(`Deploying team ${team.name} ( ${team['$id']} )`)
+
+        try {
+            response = await teamsGet({
+                teamId: team['$id'],
+                parseOutput: false,
+            })
+            log(`Team ${team.name} ( ${team['$id']} ) already exists.`);
+
+            if(!yes) {
+                answers = await inquirer.prompt(questionsDeployTeams[1])
+                if (answers.override !== "YES") {
+                    log(`Received "${answers.override}". Skipping ${team.name} ( ${team['$id']} )`);
+                    continue;
+                }
+            }
+
+            log(`Updating team ...`)
+
+            await teamsUpdate({
+                teamId: team['$id'],
+                name: team.name,
+                parseOutput: false
+            });
+
+            success(`Deployed ${team.name} ( ${team['$id']} )`);
+        } catch (e) {
+            if (e.code == 404) {
+                log(`Team ${team.name} does not exist in the project. Creating ... `);
+
+                response = await teamsCreate({
+                    teamId: team['$id'],
+                    name: team.name,
+                    parseOutput: false
+                })
+
+                success(`Deployed ${team.name} ( ${team['$id']} )`);
+            } else {
+                throw e;
+            }
+        }
+    }
+}
+
 deploy
     .command("function")
     .description("Deploy functions in the current directory.")
@@ -608,6 +683,13 @@ deploy
     .option(`--yes`, `Flag to confirm all warnings`)
     .action(actionRunner(deployCollection));
 
+deploy
+    .command("team")
+    .description("Deploy teams in the current project.")
+    .option(`--all`, `Flag to deploy all teams`)
+    .option(`--yes`, `Flag to confirm all warnings`)
+    .action(actionRunner(deployTeam));
+
 module.exports = {
     deploy
 }

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

@@ -3,7 +3,7 @@ const path = require("path");
 const childProcess = require('child_process');
 const { Command } = require("commander");
 const inquirer = require("inquirer");
-const { teamsCreate } = require("./teams");
+const { teamsCreate, teamsList } = require("./teams");
 const { projectsCreate } = require("./projects");
 const { functionsCreate } = require("./functions");
 const { databasesListCollections, databasesList } = require("./databases");
@@ -186,6 +186,24 @@ const initCollection = async ({ all, databaseId } = {}) => {
   success();
 }
 
+const initTeam = async () => {
+  // TODO: Pagination?
+  let response = await teamsList({
+    queries: [ 'limit(100)' ],
+    parseOutput: false
+  })
+
+  let teams = response.teams;
+  log(`Found ${teams.length} teams`);
+
+  teams.forEach(async team => {
+    log(`Fetching ${team.name} ...`);
+    localConfig.addTeam(team);
+  });
+
+  success();
+}
+
 init
   .command("project")
   .description("Initialise your {{ spec.title|caseUcfirst }} project")
@@ -203,6 +221,11 @@ init
   .option(`--all`, `Flag to initialize all databases`)
   .action(actionRunner(initCollection))
 
+init
+  .command("team")
+  .description("Initialise your Appwrite teams")
+  .action(actionRunner(initTeam))
+
 module.exports = {
   init,
 };

templates/cli/lib/config.js.twig

@@ -166,6 +166,45 @@ class Local extends Config {
         this.set("collections", collections);
     }
 
+    getTeams() {
+        if (!this.has("teams")) {
+            return [];
+        }
+        return this.get("teams");
+    }
+
+    getTeam($id) {
+        if (!this.has("teams")) {
+            return {};
+        }
+
+        let teams = this.get("teams");
+        for (let i = 0; i < teams.length; i++) {
+            if (teams[i]['$id'] == $id) {
+                return teams[i];
+            }
+        }
+
+        return {};
+    }
+    
+    addTeam(props) {
+        if (!this.has("teams")) {
+            this.set("teams", []);
+        }
+
+        let teams = this.get("teams");
+        for (let i = 0; i < teams.length; i++) {
+            if (teams[i]['$id'] == props['$id']) {
+                teams[i] = props;
+                this.set("teams", teams);
+                return;
+            }
+        }
+        teams.push(props);
+        this.set("teams", teams);
+    }
+
     getProject() {
         if (!this.has("projectId") || !this.has("projectName")) {
             return {};

templates/cli/lib/questions.js.twig

@@ -300,12 +300,39 @@ const questionsGetEntrypoint = [
   },
 ]
 
+const questionsDeployTeams = [
+  {
+    type: "checkbox",
+    name: "teams",
+    message: "Which teams would you like to deploy?",
+    choices: () => {
+      let teams = localConfig.getTeams();
+      if (teams.length === 0) {
+        throw new Error("No teams found in the current directory. Run `appwrite init team` to fetch all your teams.");
+      }
+      let choices = teams.map((team, idx) => {
+        return {
+          name: `${team.name} (${team['$id']})`,
+          value: team.$id
+        }
+      })
+      return choices;
+    }
+  },
+  {
+    type: "input",
+    name: "override",
+    message: 'Are you sure you want to override this team? This can lead to loss of data! Type "YES" to confirm.'
+  },
+]
+
 module.exports = {
   questionsInitProject,
   questionsLogin,
   questionsInitFunction,
   questionsInitCollection,
   questionsDeployFunctions,
   questionsDeployCollections,
+  questionsDeployTeams,
   questionsGetEntrypoint
 };

templates/dart/lib/id.dart.twig

@@ -1,6 +1,8 @@
 part of {{ language.params.packageName }};
 
 class ID {
+    ID._();
+    
     static String unique() {
         return 'unique()';
     }

templates/dart/lib/permission.dart.twig

@@ -1,6 +1,8 @@
 part of {{ language.params.packageName }};
 
 class Permission {
+    Permission._();
+
     static String read(String role) {
         return 'read("$role")';
     }

templates/dart/lib/query.dart.twig

@@ -1,6 +1,8 @@
 part of {{ language.params.packageName }};
 
 class Query {
+    Query._();
+    
   static equal(String attribute, dynamic value) =>
       _addQuery(attribute, 'equal', value);