stashed

web_native/lib/api/api_provider.dart

@@ -1,9 +1,10 @@
 import 'dart:async';
+import "package:imagini/api/auth_client/base_auth_client.dart";
 import 'package:flutter/material.dart' show BoxFit, Center, SizedBox;
 
-import 'package:imagini/api/cookie_client/cookie_client.dart'
-    if (dart.library.html) 'package:imagini/api/cookie_client/browser_cookie_client.dart'
-    if (dart.library.io) 'package:imagini/api/cookie_client/io_cookie_client.dart';
+import 'package:imagini/api/auth_client/auth_client.dart'
+    if (dart.library.html) 'package:imagini/api/auth_client/browser_auth_client.dart'
+    if (dart.library.io) 'package:imagini/api/auth_client/io_auth_client.dart';
 
 import 'package:imagini/core/storage_client/base_storage_client.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
@@ -15,6 +16,7 @@ class APIProvider{
   static const String _GRAPHQL_ENDPOINT = "/query";
 
   BaseStorageClient _storage;
+  BaseAuthClient _authClient;
   GraphQLClient _client;
   HttpLink httpLink;
 
@@ -23,16 +25,22 @@ class APIProvider{
   }
 
   Future<void> init() async {
+    // Initialize Server
     String _server = await _storage.get("server");
-
-    // Initialize
-    if (_server == null)
+    if (_server == null) {
         _server = "http://localhost";
+        await _storage.set("server", _server);
+    }
 
+    // Initialize Auth Client
+    _authClient = getAuthClient(_storage);
+
+    // Initialize HTTP Link
     httpLink = HttpLink(_server + _GRAPHQL_ENDPOINT,
-      httpClient: getCookieClient(_storage),
+      httpClient: _authClient,
     );
 
+    // Initialize GraphQL Client
     _client = GraphQLClient(
       cache: GraphQLCache(),
       link: httpLink,
@@ -64,11 +72,8 @@ class APIProvider{
     return response;
   }
 
-  Future<CachedNetworkImage> getImage(String fileName, int width, int height) async {
-    String server = await _storage.get("server");
-    String accessToken = await _storage.get("accessToken");
-    String refreshToken = await _storage.get("refreshToken");
-
+  CachedNetworkImage getImage(String fileName, int width, int height) {
+    String server = _authClient.getServer();
     String fullURL = "$server/media/$fileName?width=$width";
     print(fullURL);
     return CachedNetworkImage(
@@ -81,14 +86,36 @@ class APIProvider{
         ),
       ),
       imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
-      httpHeaders: {
-        "X-Imagini-AccessToken": accessToken,
-        "X-Imagini-RefreshToken": refreshToken,
-      },
+      httpHeaders: _authClient.getHeaders(),
       fit: BoxFit.contain,
     );
   }
 
+  // Future<CachedNetworkImage> getImage(String fileName, int width, int height) async {
+  //   String server = await _storage.get("server");
+  //   String accessToken = await _storage.get("accessToken");
+  //   String refreshToken = await _storage.get("refreshToken");
+
+  //   String fullURL = "$server/media/$fileName?width=$width";
+  //   print(fullURL);
+  //   return CachedNetworkImage(
+  //     imageUrl: fullURL,
+  //     placeholder: (context, url) => Center(
+  //       child: SizedBox(
+  //         width: width.toDouble() / 3.5,
+  //         height: height.toDouble() / 3.5,
+  //         child: new PlatformCircularProgressIndicator(),
+  //       ),
+  //     ),
+  //     imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
+  //     httpHeaders: {
+  //       "X-Imagini-AccessToken": accessToken,
+  //       "X-Imagini-RefreshToken": refreshToken,
+  //     },
+  //     fit: BoxFit.contain,
+  //   );
+  // }
+
   Future<QueryResult> me() async {
     QueryResult response = await _client.query(
       QueryOptions(

web_native/lib/api/auth_client/auth_client.dart

@@ -0,0 +1,4 @@
+import "package:imagini/api/auth_client/base_auth_client.dart";
+
+BaseAuthClient getAuthClient(storage) => throw UnsupportedError(
+    'Cannot create a client without dart:html or dart:io.');

web_native/lib/api/auth_client/base_auth_client.dart

@@ -0,0 +1,6 @@
+import 'package:http/http.dart';
+
+abstract class BaseAuthClient implements BaseClient {
+  String getServer();
+  Map<String, String> getHeaders();
+}

web_native/lib/api/auth_client/browser_auth_client.dart

@@ -0,0 +1,56 @@
+import "package:http/http.dart";
+import 'package:http/browser_client.dart';
+import "package:imagini/api/auth_client/base_auth_client.dart";
+import "package:imagini/core/storage_client/base_storage_client.dart";
+
+BaseClient getAuthClient(storage) => BrowserAuthClient(storage);
+
+class BrowserAuthClient extends BrowserClient implements BaseAuthClient {
+  BaseStorageClient _storage;
+  String _cachedServer;
+  String _cachedAccessToken;
+  String _cachedRefreshToken;
+
+  BrowserAuthClient(BaseStorageClient storage) {
+    _storage = storage;
+  }
+
+  @override
+  String getServer() {
+    return _cachedServer;
+  }
+
+  @override
+  Map<String, String> getHeaders() {
+    return {
+      'X-Imagini-AccessToken': _cachedAccessToken,
+      'X-Imagini-RefreshToken': _cachedRefreshToken,
+    };
+  }
+
+  @override
+  Future<StreamedResponse> send(BaseRequest request) async {
+    String _accessToken = await _storage.get("accessToken");
+    String _refreshToken = await _storage.get("refreshToken");
+
+    _cachedAccessToken = _accessToken;
+    _cachedRefreshToken = _refreshToken;
+
+    request.headers.addAll({
+      'X-Imagini-AccessToken': _accessToken,
+      'X-Imagini-RefreshToken': _refreshToken,
+    });
+
+    return super.send(request).then((response) async {
+      if (response.headers.containsKey("x-imagini-accesstoken")) {
+        _cachedAccessToken = response.headers["x-imagini-accesstoken"];
+        await _storage.set("accessToken", response.headers["x-imagini-accesstoken"]);
+      }
+      if (response.headers.containsKey("x-imagini-refreshtoken")) {
+        _cachedRefreshToken = response.headers["x-imagini-refreshtoken"];
+        await _storage.set("refreshToken", response.headers["x-imagini-refreshtoken"]);
+      }
+      return response;
+    });
+  }
+}

web_native/lib/api/auth_client/io_auth_client.dart

@@ -0,0 +1,56 @@
+import "package:http/http.dart";
+import 'package:http/io_client.dart';
+import "package:imagini/api/auth_client/base_auth_client.dart";
+import "package:imagini/core/storage_client/base_storage_client.dart";
+
+BaseClient getAuthClient(storage) => IOAuthClient(storage);
+
+class IOAuthClient extends IOClient implements BaseAuthClient {
+  BaseStorageClient _storage;
+  String _cachedServer;
+  String _cachedAccessToken;
+  String _cachedRefreshToken;
+
+  IOAuthClient(BaseStorageClient storage) {
+    _storage = storage;
+  }
+
+  @override
+  String getServer() {
+    return _cachedServer;
+  }
+
+  @override
+  Map<String, String> getHeaders() {
+    return {
+      'X-Imagini-AccessToken': _cachedAccessToken,
+      'X-Imagini-RefreshToken': _cachedRefreshToken,
+    };
+  }
+
+  @override
+  Future<IOStreamedResponse> send(BaseRequest request) async {
+    String _accessToken = await _storage.get("accessToken");
+    String _refreshToken = await _storage.get("refreshToken");
+
+    _cachedAccessToken = _accessToken;
+    _cachedRefreshToken = _refreshToken;
+
+    request.headers.addAll({
+      'X-Imagini-AccessToken': _accessToken,
+      'X-Imagini-RefreshToken': _refreshToken,
+    });
+
+    return super.send(request).then((response) async {
+      if (response.headers.containsKey("x-imagini-accesstoken")) {
+        _cachedAccessToken = response.headers["x-imagini-accesstoken"];
+        await _storage.set("accessToken", response.headers["x-imagini-accesstoken"]);
+      }
+      if (response.headers.containsKey("x-imagini-refreshtoken")) {
+        _cachedRefreshToken = response.headers["x-imagini-refreshtoken"];
+        await _storage.set("refreshToken", response.headers["x-imagini-refreshtoken"]);
+      }
+      return response;
+    });
+  }
+}

web_native/lib/api/imagini_api_repository.dart

@@ -39,7 +39,7 @@ class ImaginiAPIRepository {
     }));
   }
 
-  Future<CachedNetworkImage> getImage(String fileName, int width, int height) {
+  CachedNetworkImage getImage(String fileName, int width, int height) {
     return _apiProvider.getImage(fileName, width, height);
   }
 }