Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/SDK/Language/Dart.php
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,18 @@ public function getFiles()
'template' => 'dart/pubspec.yaml.twig',
'minify' => false,
],
[
'scope' => 'default',
'destination' => '/lib/client_io.dart',
'template' => 'dart/lib/client_io.dart.twig',
'minify' => false,
],
[
'scope' => 'default',
'destination' => '/lib/client_browser.dart',
'template' => 'dart/lib/client_browser.dart.twig',
'minify' => false,
],
[
'scope' => 'default',
'destination' => '/lib/src/service.dart',
Expand Down
24 changes: 24 additions & 0 deletions src/SDK/Language/Flutter.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,30 @@ public function getFiles()
'template' => 'flutter/lib/package.dart.twig',
'minify' => false,
],
[
'scope' => 'default',
'destination' => '/lib/client_io.dart',
'template' => 'flutter/lib/client_io.dart.twig',
'minify' => false,
],
[
'scope' => 'default',
'destination' => '/lib/client_browser.dart',
'template' => 'flutter/lib/client_browser.dart.twig',
'minify' => false,
],
[
'scope' => 'default',
'destination' => '/lib/realtime_io.dart',
'template' => 'flutter/lib/realtime_io.dart.twig',
'minify' => false,
],
[
'scope' => 'default',
'destination' => '/lib/realtime_browser.dart',
'template' => 'flutter/lib/realtime_browser.dart.twig',
'minify' => false,
],
[
'scope' => 'default',
'destination' => '/pubspec.yaml',
Expand Down
1 change: 1 addition & 0 deletions templates/dart/lib/client_browser.dart.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export 'src/client_browser.dart';
1 change: 1 addition & 0 deletions templates/dart/lib/client_io.dart.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export 'src/client_io.dart';
1 change: 1 addition & 0 deletions templates/flutter/lib/client_browser.dart.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export 'src/client_browser.dart';
1 change: 1 addition & 0 deletions templates/flutter/lib/client_io.dart.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export 'src/client_io.dart';
1 change: 1 addition & 0 deletions templates/flutter/lib/package.dart.twig
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export 'src/client.dart';
export 'src/exception.dart';
export 'src/realtime.dart';
export 'src/realtime_subscription.dart';
export 'src/realtime_message.dart';
export 'package:http/http.dart' show MultipartFile;

{% for service in spec.services %}
Expand Down
1 change: 1 addition & 0 deletions templates/flutter/lib/realtime_browser.dart.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export 'src/realtime_browser.dart';
1 change: 1 addition & 0 deletions templates/flutter/lib/realtime_io.dart.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export 'src/realtime_io.dart';
16 changes: 11 additions & 5 deletions templates/flutter/lib/src/client_io.dart.twig
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,17 @@ class ClientIO extends ClientBase with ClientMixin {

Future webAuth(Uri url) {
return FlutterWebAuth.authenticate(
url: url.toString(),
callbackUrlScheme: "appwrite-callback-" + config['project']!)
.then((value) async {
Cookie cookie = new Cookie(
url.queryParameters['key']!, url.queryParameters['secret']!);
url: url.toString(),
callbackUrlScheme: "appwrite-callback-" + config['project']!,
).then((value) async {
Uri url = Uri.parse(value);
final key = url.queryParameters['key'];
final secret = url.queryParameters['secret'];
if (key == null || secret == null) {
throw {{spec.title | caseUcfirst}}Exception(
"Invalid OAuth2 Response. Key and Secret not available.", 500);
}
Cookie cookie = new Cookie(key, secret);
cookie.domain = Uri.parse(_endPoint).host;
cookie.httpOnly = true;
cookie.path = '/';
Expand Down
2 changes: 1 addition & 1 deletion tests/languages/android/ServiceTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class ServiceTest {
@Throws(IOException::class)
fun test() {
val client = Client(ApplicationProvider.getApplicationContext())
.setEndpointRealtime("wss://realtime.appwrite.org/v1")
.setEndpointRealtime("wss://demo.appwrite.io/v1")
.setProject("console")
.addHeader("Origin", "http://localhost")
.setSelfSigned(true)
Expand Down
2 changes: 1 addition & 1 deletion tests/languages/flutter/tests.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ void main() async {

client.setSelfSigned();
client.setProject('console');
client.setEndPointRealtime("wss://realtime.appwrite.org/v1"); // change this later to appwrite.io
client.setEndPointRealtime("wss://demo.appwrite.io/v1"); // change this later to appwrite.io

Realtime realtime = Realtime(client);
final rtsub = realtime.subscribe(["tests"]);
Expand Down
2 changes: 1 addition & 1 deletion tests/languages/web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
let sdk = new Appwrite();

sdk.setProject('console');
sdk.setEndpointRealtime('wss://realtime.appwrite.org/v1');
sdk.setEndpointRealtime('wss://demo.appwrite.io/v1');

sdk.subscribe('tests', event => {
responseRealtime = event.payload.response;
Expand Down