Merge pull request #110 from lohanidamodar/feat-flutter-sdk-private-storage-files

eldadfux · web-flow · commit 05e89e478a5a · 2021-03-02T18:55:45.000+02:00
feat-flutter-dart-sdk-private-storage-files
diff --git a/templates/dart/docs/example.md.twig b/templates/dart/docs/example.md.twig
@@ -17,7 +17,7 @@ void main() { // Init SDK
 {% endfor %}  ;
 
 {% endif %}
-  {% if method.type == 'location' %}String{% else %}Future{% endif %} result = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% for parameter in method.parameters.all %}
+  Future result = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% for parameter in method.parameters.all %}
 {% if loop.first %}
 
 {% endif %}
@@ -26,14 +26,10 @@ void main() { // Init SDK
 {% endif %}
 {% endfor %}{% if method.parameters.all|length > 0 %}  {% endif %});
 
-{% if method.type == 'location' %}
-  print(result); // Resource URL string
-{% else %}
   result
     .then((response) {
       print(response);
     }).catchError((error) {
       print(error.response);
   });
-{% endif %}
 }
diff --git a/templates/dart/lib/client.dart.twig b/templates/dart/lib/client.dart.twig
@@ -60,7 +60,7 @@ class Client {
         }
     }
 
-    Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}}) async {
+    Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}, ResponseType responseType}) async {
         if(selfSigned) {
             // Allow self signed requests
             (http.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate = (HttpClient client) {
@@ -75,6 +75,7 @@ class Client {
         Options options = Options(
             headers: {...this.headers, ...headers},
             method: method.name(),
+            responseType: responseType
         );
         try {
 
diff --git a/templates/dart/lib/services/service.dart.twig b/templates/dart/lib/services/service.dart.twig
@@ -22,7 +22,7 @@ class {{ service.name | caseUcfirst }} extends Service {
 {{ method.description|dartComment }}
      ///
 {% endif %}
-    {% if method.type == 'webAuth' %}Future{% elseif method.type == 'location' %}String{% else %}Future<Response>{% endif %} {{ method.name | caseCamel }}({{ _self.method_parameters(method.parameters) }}) {
+    {% if method.type == 'webAuth' %}Future{% else %}Future<Response>{% endif %} {{ method.name | caseCamel }}({{ _self.method_parameters(method.parameters) }}) {
         final String path = '{{ method.path }}'{% for parameter in method.parameters.path %}.replaceAll(RegExp('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}'), {{ parameter.name | caseCamel }}){% endfor %};
 
         final Map<String, dynamic> params = {
@@ -48,15 +48,7 @@ class {{ service.name | caseUcfirst }} extends Service {
           params[key] = params[key].toString();
         }});
         
-        Uri endpoint = Uri.parse(client.endPoint);
-        Uri location = new Uri(scheme: endpoint.scheme,
-          host: endpoint.host,
-          port: endpoint.port,
-          path: endpoint.path + path,
-          queryParameters:params,
-        );
-
-        return location.toString();
+        return client.call(HttpMethod.{{ method.method | caseLower }}, path: path, params: params, responseType: ResponseType.bytes);
 {% else %}
         final Map<String, String> headers = {
 {% for key, header in method.headers %}
diff --git a/templates/flutter/docs/example.md.twig b/templates/flutter/docs/example.md.twig
@@ -15,9 +15,31 @@ void main() { // Init SDK
     .set{{header}}('{{node[header]['x-appwrite']['demo']}}') // {{node[header].description}}
 {% endfor %}
 {% endfor %}  ;
+{% endif %}
+{% if method.type == 'location' %}
+}
+
+//displaying image
+FutureBuilder(
+  future: {{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% for parameter in method.parameters.all %}
+{% if loop.first %}
 
 {% endif %}
-  {% if method.type == 'location' %}String{% else %}Future{% endif %} result = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% for parameter in method.parameters.all %}
+{% if parameter.required %}
+    {{ parameter.name | caseCamel }}: {{ parameter | paramExample }},
+{% endif %}
+{% endfor %}{% if method.parameters.all|length > 0 %}  {% endif %}
+), //works for both public file and private file, for private files you need to be logged in
+  builder: (context, snapshot) {
+    return snapshot.hasData && snapshot.data != null
+      ? Image.memory(
+          snapshot.data.data,
+        )
+      : CircularProgressIndicator();
+  },
+);
+{% else %}
+  Future result = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% for parameter in method.parameters.all %}
 {% if loop.first %}
 
 {% endif %}
@@ -26,14 +48,11 @@ void main() { // Init SDK
 {% endif %}
 {% endfor %}{% if method.parameters.all|length > 0 %}  {% endif %});
 
-{% if method.type == 'location' %}
-  print(result); // Resource URL string
-{% else %}
   result
     .then((response) {
       print(response);
     }).catchError((error) {
       print(error.response);
   });
-{% endif %}
-}
+}
+{% endif %}
diff --git a/templates/flutter/lib/client.dart.twig b/templates/flutter/lib/client.dart.twig
@@ -91,7 +91,7 @@ class Client {
         }
     }
 
-    Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}}) async {
+    Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}, ResponseType responseType}) async {
         if(selfSigned && !kIsWeb) {
             // Allow self signed requests
             (http.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate = (HttpClient client) {
@@ -106,6 +106,7 @@ class Client {
         Options options = Options(
             headers: {...this.headers, ...headers},
             method: method.name(),
+            responseType: responseType
         );
 
         try {
diff --git a/templates/flutter/lib/services/service.dart.twig b/templates/flutter/lib/services/service.dart.twig
@@ -22,7 +22,7 @@ class {{ service.name | caseUcfirst }} extends Service {
 {{ method.description|dartComment }}
      ///
 {% endif %}
-    {% if method.type == 'webAuth' %}Future{% elseif method.type == 'location' %}String{% else %}Future<Response>{% endif %} {{ method.name | caseCamel }}({{ _self.method_parameters(method.parameters) }}) {
+    {% if method.type == 'webAuth' %}Future{% else %}Future<Response>{% endif %} {{ method.name | caseCamel }}({{ _self.method_parameters(method.parameters) }}) {
         final String path = '{{ method.path }}'{% for parameter in method.parameters.path %}.replaceAll(RegExp('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}'), {{ parameter.name | caseCamel }}){% endfor %};
 
         final Map<String, dynamic> params = {
@@ -90,16 +90,8 @@ class {{ service.name | caseUcfirst }} extends Service {
         params.keys.forEach((key) {if (params[key] is int || params[key] is double) {
           params[key] = params[key].toString();
         }});
-        
-        Uri endpoint = Uri.parse(client.endPoint);
-        Uri location = new Uri(scheme: endpoint.scheme,
-          host: endpoint.host,
-          port: endpoint.port,
-          path: endpoint.path + path,
-          queryParameters:params,
-        );
 
-        return location.toString();
+        return client.call(HttpMethod.{{ method.method | caseLower }}, path: path, params: params, responseType: ResponseType.bytes);
 {% else %}
         final Map<String, String> headers = {
 {% for key, header in method.headers %}

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class Client {`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}}) async {`
	`63`	`+ Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}, ResponseType responseType}) async {`
`64`	`64`	`if(selfSigned) {`
`65`	`65`	`// Allow self signed requests`
`66`	`66`	`(http.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate = (HttpClient client) {`
`@@ -75,6 +75,7 @@ class Client {`
`75`	`75`	`Options options = Options(`
`76`	`76`	`headers: {...this.headers, ...headers},`
`77`	`77`	`method: method.name(),`
	`78`	`+ responseType: responseType`
`78`	`79`	`);`
`79`	`80`	`try {`
`80`	`81`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ class Client {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}}) async {`
	`94`	`+ Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}, ResponseType responseType}) async {`
`95`	`95`	`if(selfSigned && !kIsWeb) {`
`96`	`96`	`// Allow self signed requests`
`97`	`97`	`(http.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate = (HttpClient client) {`
`@@ -106,6 +106,7 @@ class Client {`
`106`	`106`	`Options options = Options(`
`107`	`107`	`headers: {...this.headers, ...headers},`
`108`	`108`	`method: method.name(),`
	`109`	`+ responseType: responseType`
`109`	`110`	`);`
`110`	`111`
`111`	`112`	`try {`