From 4111f3667c86616aec437559cd939bb3159a48c3 Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Tue, 28 Jun 2022 09:35:22 -0500
Subject: [PATCH] feat: update Appwrite to support 0.15.x

---
 package-lock.json               | 14 +++++++-------
 package.json                    |  2 +-
 src/app/helpers/api.ts          |  9 ++++++---
 src/app/store/account/index.ts  |  4 ++--
 src/app/utils/config.ts         |  3 ++-
 src/environments/environment.ts |  3 ++-
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3ac63c9..fb021cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@tailwindcss/forms": "^0.3.2",
         "@tailwindcss/typography": "^0.4.0",
         "angular-svg-icon": "^13.0.0",
-        "appwrite": "^8.0.0",
+        "appwrite": "^9.0.0",
         "rxjs": "^7.4.0",
         "tslib": "^2.0.0",
         "zone.js": "~0.11.4"
@@ -3246,9 +3246,9 @@
       }
     },
     "node_modules/appwrite": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/appwrite/-/appwrite-8.0.0.tgz",
-      "integrity": "sha512-/0GMOUtg5+P9t4XTz3z1/FTXoAyEJ23CQ3zkXZybQJzdqy2TRG1iaktHsOmu4zkxEKBTjIsgSkTrKEgdYC/HHw==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/appwrite/-/appwrite-9.0.0.tgz",
+      "integrity": "sha512-3ufpT/H2+tWfqTe+2YhHvdpFNXxthYfR7xg8w+XLGsXhqOgoiH3ZNkdUhy3DXmS5gyymCsmW75N3Ff7RGRNJmA==",
       "dependencies": {
         "cross-fetch": "3.1.5",
         "isomorphic-form-data": "2.0.0"
@@ -17175,9 +17175,9 @@
       "dev": true
     },
     "appwrite": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/appwrite/-/appwrite-8.0.0.tgz",
-      "integrity": "sha512-/0GMOUtg5+P9t4XTz3z1/FTXoAyEJ23CQ3zkXZybQJzdqy2TRG1iaktHsOmu4zkxEKBTjIsgSkTrKEgdYC/HHw==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/appwrite/-/appwrite-9.0.0.tgz",
+      "integrity": "sha512-3ufpT/H2+tWfqTe+2YhHvdpFNXxthYfR7xg8w+XLGsXhqOgoiH3ZNkdUhy3DXmS5gyymCsmW75N3Ff7RGRNJmA==",
       "requires": {
         "cross-fetch": "3.1.5",
         "isomorphic-form-data": "2.0.0"
diff --git a/package.json b/package.json
index f3d077e..c6da7d4 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "@tailwindcss/forms": "^0.3.2",
     "@tailwindcss/typography": "^0.4.0",
     "angular-svg-icon": "^13.0.0",
-    "appwrite": "^8.0.0",
+    "appwrite": "^9.0.0",
     "rxjs": "^7.4.0",
     "tslib": "^2.0.0",
     "zone.js": "~0.11.4"
diff --git a/src/app/helpers/api.ts b/src/app/helpers/api.ts
index 2cb75a5..ecbef5f 100644
--- a/src/app/helpers/api.ts
+++ b/src/app/helpers/api.ts
@@ -1,8 +1,8 @@
-import { Appwrite } from 'appwrite';
+import { Account, Client as Appwrite, Databases } from 'appwrite';
 import { Server } from '../utils/config';
 
 export class Api {
-  private static sdk: Appwrite | null;
+  private static sdk: { account: Account, database: Databases } | null;
 
   static provider() {
     if (this.sdk) return this.sdk;
@@ -11,7 +11,10 @@ export class Api {
       .setEndpoint(Server.endpoint)
       .setProject(Server.project)
       .setLocale('en-US');
-    this.sdk = client;
+
+    const database = new Databases(client, Server.databaseID);
+    const account = new Account(client);
+    this.sdk = { account, database };
     return this.sdk;
   }
 }
diff --git a/src/app/store/account/index.ts b/src/app/store/account/index.ts
index 52bb189..050896c 100644
--- a/src/app/store/account/index.ts
+++ b/src/app/store/account/index.ts
@@ -69,7 +69,7 @@ export class AccountState {
   ) {
     let { email, password } = action.payload;
     try {
-      await Api.provider().account.createSession(email, password);
+      await Api.provider().account.createEmailSession(email, password);
       let account = await Api.provider().account.get();
       patchState({
         account: account,
@@ -100,7 +100,7 @@ export class AccountState {
         password,
         name
       );
-      let session = await Api.provider().account.createSession(email, password);
+      let session = await Api.provider().account.createEmailSession(email, password);
       patchState({
         account,
         session,
diff --git a/src/app/utils/config.ts b/src/app/utils/config.ts
index 884f7e2..5c2e8b2 100644
--- a/src/app/utils/config.ts
+++ b/src/app/utils/config.ts
@@ -3,5 +3,6 @@ import { environment } from '../../environments/environment';
 export const Server = {
     endpoint : environment.APP_ENDPOINT,
     project: environment.APP_PROJECT,
-    collectionID : environment.APP_COLLECTION_ID
+    collectionID : environment.APP_COLLECTION_ID,
+    databaseID : environment.APP_DATABASE_ID
 }
\ No newline at end of file
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 3620f7c..419001a 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -6,7 +6,8 @@ export const environment = {
   production: false,
   APP_ENDPOINT: "https://demo.appwrite.io/v1",
   APP_PROJECT: "6062f9c2c09ce",
-  APP_COLLECTION_ID:"606621a04837c"
+  APP_COLLECTION_ID:"606621a04837c",
+  APP_DATABASE_ID: "default"
 };
 
 /*