chore: merge next (supabase#757)

Author: dshukertjr

.github/workflows/functions_client_ci.yml

@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        sdk: [2.17.0, stable, beta, dev]
+        sdk: [stable, beta, dev]
 
     defaults:
       run:

.github/workflows/gotrue_ci.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        sdk: [2.17.0, stable, beta, dev]
+        sdk: [stable, beta, dev]
 
     defaults:
       run:
@@ -62,4 +62,4 @@ jobs:
           time: '5s'
 
       - name: Run tests
-        run: dart test
+        run: dart test --concurrency=1

.github/workflows/postgrest_ci.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        sdk: [2.17.0, stable, beta, dev]
+        sdk: [stable, beta, dev]
 
     defaults:
       run:
@@ -64,4 +64,4 @@ jobs:
           time: '5s'
 
       - name: Run tests
-        run: dart test
+        run: dart test --concurrency=1

.github/workflows/realtime_client_ci.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        sdk: [2.17.0, stable, beta, dev]
+        sdk: [stable, beta, dev]
 
     defaults:
       run:

.github/workflows/storage_client_ci.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        sdk: [2.17.0, stable, beta, dev]
+        sdk: [stable, beta, dev]
 
     defaults:
       run:

.github/workflows/supabase_ci.yml

@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        sdk: [2.17.0, stable, beta, dev]
+        sdk: [stable, beta, dev]
 
     defaults:
       run:
@@ -61,4 +61,4 @@ jobs:
         run: dart analyze --fatal-warnings --fatal-infos .
 
       - name: Run tests
-        run: dart test
+        run: dart test --concurrency=1

.github/workflows/supabase_flutter_ci.yml

@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        flutter-version: ['3.0.0', '3.x']
+        flutter-version: ['3.10.x', '3.x']
 
     defaults:
       run:
@@ -60,11 +60,11 @@ jobs:
           melos bootstrap
 
       - name: flutterfmt
-        if: ${{ matrix.sdk == '3.x'}} 
+        if: ${{ matrix.sdk == '3.x'}}
         run: dart format lib test -l 80 --set-exit-if-changed
 
       - name: analyzer
         run: flutter analyze --fatal-warnings --fatal-infos .
 
       - name: Run tests
-        run: flutter test
+        run: flutter test --concurrency=1

.github/workflows/yet_another_json_isolate_ci.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        sdk: [2.17.0, stable, beta, dev]
+        sdk: [stable, beta, dev]
 
     defaults:
       run:

CHANGELOG.md

@@ -47,8 +47,6 @@ void main() async {
 final supabase = Supabase.instance.client;
 ```
 
-> `authCallbackUrlHostname` is optional. It will be used to filter Supabase authentication redirect deeplink. You need to provide this param if you use deeplink for other features on the app.
-
 > `debug` is optional. It's enabled by default if you're running the app in debug mode (`flutter run --debug`).
 
 ## Usage example
@@ -173,12 +171,12 @@ class MyWidget extends StatefulWidget {
 
 class _MyWidgetState extends State<MyWidget> {
   // Persisting the future as local variable to prevent refetching upon rebuilds.
-  final List<Map<String, dynamic>> _stream = supabase.from('countries').stream(primaryKey: ['id']);
+  final stream = supabase.from('countries').stream(primaryKey: ['id']);
 
   @override
   Widget build(BuildContext context) {
     return StreamBuilder<List<Map<String, dynamic>>>(
-      stream: _stream,
+      stream: stream,
       builder: (context, snapshot) {
         // return your widget with the data from snapshot
       },
@@ -213,11 +211,13 @@ Broadcast lets you send and receive low latency messages between connected clien
 final myChannel = supabase.channel('my_channel');
 
 // Subscribe to `cursor-pos` broadcast event
-myChannel.on(RealtimeListenTypes.broadcast,
-    ChannelFilter(event: 'cursor-pos'), (payload, [ref]) {
-  // Do something fun or interesting when there is an change on the database
-}).subscribe();
-
+ myChannel.on(
+  RealtimeListenTypes.broadcast,
+  ChannelFilter(event: 'cursor-pos'),
+  (payload, [ref]) {
+    // Do something fun or interesting when there is an change on the database
+  },
+ ).subscribe();
 // Send a broadcast message to other connected clients
 await myChannel.send(
   type: RealtimeListenTypes.broadcast,
@@ -245,13 +245,13 @@ myChannel.on(
 }).on(RealtimeListenTypes.presence, ChannelFilter(event: 'leave'),
     (payload, [ref]) {
   // Users have left
-}).subscribe(((status, [_]) async {
-  if (status == 'SUBSCRIBED') {
+}).subscribe((status, error) async {
+  if (status == RealtimeSubscribeStatus.subscribed) {
     // Send the current user's state upon subscribing
     final status = await myChannel
         .track({'online_at': DateTime.now().toIso8601String()});
   }
-}));
+});
 ```
 
 ### [Storage](https://supabase.com/docs/guides/storage)
@@ -283,7 +283,7 @@ class MyWidget extends StatelessWidget {
 ```dart
 import 'package:supabase_flutter/supabase_flutter.dart';
 
-final client = Supabase.instance.client;
+final supabase = Supabase.instance.client;
 
 class MyWidget extends StatefulWidget {
   const MyWidget({Key? key}) : super(key: key);
@@ -294,12 +294,12 @@ class MyWidget extends StatefulWidget {
 
 class _MyWidgetState extends State<MyWidget> {
   // Persisting the future as local variable to prevent refetching upon rebuilds.
-  final _future = client.functions.invoke('get_countries');
+  final future = supabase.functions.invoke('get_countries');
 
   @override
   Widget build(BuildContext context) {
     return FutureBuilder(
-      future: _future,
+      future: future,
       builder: (context, snapshot) {
         // return your widget with the data from snapshot
       },
@@ -338,45 +338,46 @@ supabase.auth.signInWithOAuth(
 
 ### Custom LocalStorage
 
-As default, `supabase_flutter` uses [`hive`](https://pub.dev/packages/hive) to persist the user session. Encryption is disabled by default, since an unique encryption key is necessary, and we can not define it. To set an `encryptionKey`, do the following:
+As default, `supabase_flutter` uses [`Shared preferences`](https://pub.dev/packages/shared_preferences) to persist the user session.
+
+However, you can use any other methods by creating a `LocalStorage` implementation. For example, we can use [`flutter_secure_storage`](https://pub.dev/packages/flutter_secure_storage) plugin to store the user session in a secure storage.
 
 ```dart
-Future<void> main() async {
-  // set it before initializing
-  HiveLocalStorage.encryptionKey = 'my_secure_key';
-  await Supabase.initialize(...);
-}
-```
+// Define the custom LocalStorage implementation
+class MockLocalStorage extends LocalStorage {
 
-**Note** the key must be the same. There is no check if the encryption key is correct. If it isn't, there may be unexpected behavior. [Learn more](https://docs.hivedb.dev/#/advanced/encrypted_box) about encryption in hive.
+  final storage = FlutterSecureStorage();
 
-However you can use any other methods by creating a `LocalStorage` implementation. For example, we can use [`flutter_secure_storage`](https://pub.dev/packages/flutter_secure_storage) plugin to store the user session in a secure storage.
+  @override
+  Future<void> initialize() async {}
 
-```dart
-// Define the custom LocalStorage implementation
-class SecureLocalStorage extends LocalStorage {
-  SecureLocalStorage() : super(
-    initialize: () async {},
-    hasAccessToken: () {
-      const storage = FlutterSecureStorage();
-      return storage.containsKey(key: supabasePersistSessionKey);
-    }, accessToken: () {
-      const storage = FlutterSecureStorage();
-      return storage.read(key: supabasePersistSessionKey);
-    }, removePersistedSession: () {
-      const storage = FlutterSecureStorage();
-      return storage.delete(key: supabasePersistSessionKey);
-    }, persistSession: (String value) {
-      const storage = FlutterSecureStorage();
-      return storage.write(key: supabasePersistSessionKey, value: value);
-    },
-  );
+  @override
+  Future<String?> accessToken() async {
+    return storage.containsKey(key: supabasePersistSessionKey);
+  }
+
+  @override
+  Future<bool> hasAccessToken() async {
+    return storage.read(key: supabasePersistSessionKey);
+  }
+
+  @override
+  Future<void> persistSession(String persistSessionString) async {
+    return storage.write(key: supabasePersistSessionKey, value: persistSessionString);
+  }
+
+  @override
+  Future<void> removePersistedSession() async {
+    return storage.delete(key: supabasePersistSessionKey);
+  }
 }
 
 // use it when initializing
 Supabase.initialize(
   ...
-  localStorage: SecureLocalStorage(),
+  authOptions: FlutterAuthClientOptions(
+    localStorage: const EmptyLocalStorage(),
+  ),
 );
 ```
 
@@ -385,7 +386,9 @@ You can also use `EmptyLocalStorage` to disable session persistence:
 ```dart
 Supabase.initialize(
   // ...
-  localStorage: const EmptyLocalStorage(),
+  authOptions: FlutterAuthClientOptions(
+    localStorage: const EmptyLocalStorage(),
+  ),
 );
 ```