Bug fix

Author: eldadfux

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.2
+
+- Fixed an error that happend when the OAuth session creation request was sent before any other API call
+- 
 ## 0.2.1
 
 - Fixed callback scheme

README.md

@@ -2,9 +2,9 @@
 
 [![pub package](https://img.shields.io/pub/v/appwrite.svg)](https://pub.dartlang.org/packages/appwrite)
 ![License](https://img.shields.io/github/license/appwrite/sdk-for-flutter.svg?v=1)
-![Version](https://img.shields.io/badge/api%20version-0.6.0-blue.svg?v=1)
+![Version](https://img.shields.io/badge/api%20version-0.6.1-blue.svg?v=1)
 
-**This SDK is compatible with Appwrite server version 0.6.0. For older versions, please check previous releases.**
+**This SDK is compatible with Appwrite server version 0.6.1. For older versions, please check previous releases.**
 
 Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way.
                         Use the Flutter SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools.
@@ -20,7 +20,7 @@ Add this to your package's `pubspec.yaml` file:
 
 ```yml
 dependencies:
-  appwrite: ^0.2.1
+  appwrite: ^0.2.2
 ```
 
 You can install packages from the command line:

lib/client.dart

@@ -15,7 +15,7 @@ class Client {
     Map<String, String> headers;
     Map<String, String> config;
     bool selfSigned;
-    bool init = false;
+    bool initialized = false;
     Dio http;
     PersistCookieJar cookieJar;
 
@@ -30,7 +30,7 @@ class Client {
 
         this.headers = {
             'content-type': 'application/json',
-            'x-sdk-version': 'appwrite:dart:0.2.1',
+            'x-sdk-version': 'appwrite:dart:0.2.2',
         };
 
         this.config = {};
@@ -76,6 +76,22 @@ class Client {
         return this;
     }
 
+    Future init() async {
+        if(!initialized) {
+          final Directory cookieDir = await _getCookiePath();
+
+          cookieJar = new PersistCookieJar(dir:cookieDir.path);
+
+          this.http.options.baseUrl = this.endPoint;
+          this.http.options.validateStatus = (status) => status < 400;
+          this.http.interceptors.add(CookieManager(cookieJar));
+
+          PackageInfo packageInfo = await PackageInfo.fromPlatform();
+
+          addHeader('Origin', 'appwrite-' + type + '://' + packageInfo.packageName);
+        }
+    }
+
     Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}}) async {
         if(selfSigned) {
             // Allow self signed requests
@@ -85,21 +101,7 @@ class Client {
             };
         }
 
-        if(!init) {
-            final Directory cookieDir = await _getCookiePath();
-
-            cookieJar = new PersistCookieJar(dir:cookieDir.path);
-
-            this.http.options.baseUrl = this.endPoint;
-            this.http.options.validateStatus = (status) => status < 400;
-            this.http.interceptors.add(CookieManager(cookieJar));
-
-            PackageInfo packageInfo = await PackageInfo.fromPlatform();
-
-            addHeader('Origin', 'appwrite-' + type + '://' + packageInfo.packageName);
-
-            init = true;
-        }
+        await this.init();
 
         // Origin is hardcoded for testing
         Options options = Options(

lib/services/account.dart

@@ -325,9 +325,10 @@ class Account extends Service {
         return FlutterWebAuth.authenticate(
           url: url.toString(),
           callbackUrlScheme: "appwrite-callback-" + client.config['project']
-          ).then((value) {
+          ).then((value) async {
               Uri url = Uri.parse(value);
                 List<Cookie> cookies = [new Cookie(url.queryParameters['key'], url.queryParameters['secret'])];
+                await client.init();
                 client.cookieJar.saveFromResponse(Uri.parse(client.endPoint), cookies);
           });
     }

pubspec.yaml

@@ -1,5 +1,5 @@
 name: appwrite
-version: 0.2.1
+version: 0.2.2
 description: Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API
 homepage: https://appwrite.io
 repository: https://github.com/appwrite/sdk-for-flutter