Refactor: Dart version bump 3.4 (#223)

* chore(release): publish packages - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] * Refactor/dimoshka fix dependencies (#221) * chore(release): publish packages - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] * Fix * FIxes * version: 5.0.2 bump * Upgrade dependenciea and fix pubspec * Restore * Revert version upgrade, #219 * Refactoring * Fix --------- Co-authored-by: Dmytro Prylutskyi <[email protected]> * Refactor: ci and code quality (#222) * chore(release): publish packages - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] * refactor(ci): Reintroduce publishing pipeline and some code changes * postgres setup * No longer supporting nullable map elements * chore(release): publish packages - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] * refactor: Version bump, includes analyzer upgrade * remove some nullables * feat: Allow passing `sslMode` to `PostgreSQLPersistentStore` This change keeps backward compatibility for `bool useSSL`, but `useSSL` forces `SslMode.verifyFull` which is not always suitable. Signed-off-by: Martin Edlman <[email protected]> * add testing for sslMode --------- Signed-off-by: Martin Edlman <[email protected]> Co-authored-by: Dmytro Prylutskyi <[email protected]> Co-authored-by: Dmytro Prylutskyi <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Edlman <[email protected]>
conduit-dart · May 18, 2024 · e70f5fe · e70f5fe
1 parent 3daf802
commit e70f5fe
Show file tree

Hide file tree

Showing 137 changed files with 841 additions and 812 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -68,7 +68,7 @@ jobs:
           dart pub global activate -spath packages/cli
           dart pub global activate melos
           melos bootstrap
-          melos cache-source
+          melos cache-source --no-select
           dart pub get --directory=packages/isolate_exec_test_packages/test_package --offline
           dart pub get --directory=packages/runtime_test_packages/application --offline
           dart pub get --directory=packages/runtime_test_packages/dependency --offline

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -72,7 +72,7 @@ jobs:
         dart pub global activate -spath packages/cli
         dart pub global activate melos
         melos bootstrap
-        melos cache-source
+        melos cache-source --no-select
         dart pub get --directory=packages/isolate_exec_test_packages/test_package --offline
         dart pub get --directory=packages/runtime_test_packages/application --offline
         dart pub get --directory=packages/runtime_test_packages/dependency --offline

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -75,7 +75,7 @@ jobs:
         dart pub global activate -spath packages/cli
         dart pub global activate melos
         dart pub global run melos:melos bootstrap
-        dart pub global run melos:melos cache-source-win
+        dart pub global run melos:melos cache-source-win --no-select
         dart pub get --directory=packages/isolate_exec_test_packages/test_package --offline
         dart pub get --directory=packages/runtime_test_packages/application --offline
         dart pub get --directory=packages/runtime_test_packages/dependency --offline

diff --git a/melos.yaml b/melos.yaml
@@ -13,7 +13,7 @@ command:
     linkToCommits: true
 scripts:
   test-unit:
-    run: melos exec -c1 --fail-fast --ignore "*common*" --ignore "*application*" --ignore "*dependency*" -- "dart test"
+    run: melos exec -c1 --fail-fast --ignore "*common*" --ignore "*application*" --ignore "*dependency*" -- "dart test -r failures-only"
     packageFilters:
       noPrivate: true
   test-with-coverage:

diff --git a/packages/cli/example/main.dart b/packages/cli/example/main.dart
@@ -24,8 +24,8 @@ Future main() async {
 }
 
 class App extends ApplicationChannel {
-  ManagedContext? context;
-  AuthServer? authServer;
+  late ManagedContext context;
+  late final AuthServer authServer;
 
   @override
   Future prepare() async {
@@ -61,7 +61,7 @@ class UserController extends ResourceController {
   UserController(this.context, this.authServer);
 
   final ManagedContext? context;
-  final AuthServer? authServer;
+  final AuthServer authServer;
 
   @Operation.get()
   Future<Response> getUsers() async {
@@ -90,7 +90,7 @@ class UserController extends ResourceController {
     }
 
     final salt = generateRandomSalt();
-    final hashedPassword = authServer!.hashPassword(user.password!, salt);
+    final hashedPassword = authServer.hashPassword(user.password!, salt);
 
     final query = Query<User>(context!)
       ..values = user
@@ -99,7 +99,7 @@ class UserController extends ResourceController {
       ..values.email = user.username;
 
     final u = await query.insert();
-    final token = await authServer!.authenticate(
+    final token = await authServer.authenticate(
       u.username,
       query.values.password,
       request!.authorization!.credentials!.username,

diff --git a/packages/cli/lib/src/command.dart b/packages/cli/lib/src/command.dart
@@ -1,5 +1,3 @@
-// ignore_for_file: avoid_print
-
 import 'dart:async';
 import 'dart:io';
 import 'dart:mirrors';

diff --git a/packages/cli/lib/src/commands/auth_add_client.dart b/packages/cli/lib/src/commands/auth_add_client.dart
@@ -95,7 +95,7 @@ class CLIAuthAddClient extends CLICommand
     context = ManagedContext(dataModel, persistentStore);
 
     final credentials = generateAPICredentialPair(
-      clientID,
+      clientID!,
       secret,
       redirectURI: redirectUri,
       hashLength: hashLength,

diff --git a/packages/cli/lib/src/commands/auth_scope.dart b/packages/cli/lib/src/commands/auth_scope.dart
@@ -49,7 +49,7 @@ class CLIAuthScopeClient extends CLICommand
     );
 
     final query = Query<ManagedAuthClient>(context)
-      ..where((o) => o.id).equalTo(clientID)
+      ..where((o) => o.id).equalTo(clientID!)
       ..values.allowedScope =
           scopingClient.allowedScopes?.map((s) => s.toString()).join(" ");
 

diff --git a/packages/cli/lib/src/commands/db_upgrade.dart b/packages/cli/lib/src/commands/db_upgrade.dart
@@ -117,7 +117,7 @@ class CLIDatabaseUpgrade extends CLICommand
         s.port,
         s.databaseName,
         s.timeZone,
-        useSSL: s.isSSLConnection,
+        sslMode: s.sslMode,
       );
     }
 

diff --git a/packages/cli/lib/src/migration_source.dart b/packages/cli/lib/src/migration_source.dart
@@ -7,13 +7,13 @@ class MigrationSource {
   MigrationSource(this.source, this.uri, int nameStartIndex, int nameEndIndex) {
     originalName = source!.substring(nameStartIndex, nameEndIndex);
     name = "M${md5.convert(source!.codeUnits)}";
-    source = source!.replaceRange(nameStartIndex, nameEndIndex, name!);
+    source = source!.replaceRange(nameStartIndex, nameEndIndex, name);
   }
 
   MigrationSource.fromMap(Map<String, dynamic> map) {
-    originalName = map["originalName"] as String?;
+    originalName = map["originalName"] as String;
     source = map["source"] as String?;
-    name = map["name"] as String?;
+    name = map["name"] as String;
     uri = map["uri"] as String?;
   }
 
@@ -58,9 +58,9 @@ class MigrationSource {
 
   String? source;
 
-  String? originalName;
+  late final String originalName;
 
-  String? name;
+  late final String name;
 
   String? uri;
 

diff --git a/packages/cli/lib/src/mixins/database_connecting.dart b/packages/cli/lib/src/mixins/database_connecting.dart
@@ -14,11 +14,17 @@ mixin CLIDatabaseConnectingCommand implements CLICommand, CLIProject {
 
   @Flag(
     "use-ssl",
-    help: "Whether or not the database connection should use SSL",
+    help: "DEPRECATED: Use ssl-mode instead",
     defaultsTo: false,
   )
   bool get useSSL => decode("use-ssl");
 
+  @Option("ssl-mode",
+      help:
+          "Whether or not the database connection should use SSL (disable/require/verifyFull)",
+      defaultsTo: "disable")
+  String get sslMode => decode("ssl-mode");
+
   @Option(
     "connect",
     abbr: "c",
@@ -102,7 +108,7 @@ mixin CLIDatabaseConnectingCommand implements CLICommand, CLIProject {
         connectedDatabase.host,
         connectedDatabase.port,
         connectedDatabase.databaseName,
-        useSSL: useSSL,
+        sslMode: sslMode,
       );
     }
 

diff --git a/packages/cli/lib/src/scripts/run_upgrade.dart b/packages/cli/lib/src/scripts/run_upgrade.dart
@@ -49,7 +49,7 @@ class RunUpgradeExecutable extends Executable<Map<String, dynamic>> {
         dbInfo.port,
         dbInfo.databaseName,
         timeZone: dbInfo.timeZone,
-        useSSL: dbInfo.useSSL,
+        sslMode: dbInfo.sslMode,
       );
     }
 
@@ -71,7 +71,7 @@ class RunUpgradeExecutable extends Executable<Map<String, dynamic>> {
     }).toList();
 
     try {
-      final updatedSchema = (await store.upgrade(inputSchema, instances))!;
+      final updatedSchema = (await store.upgrade(inputSchema, instances));
       await store.close();
 
       return updatedSchema.asMap();
@@ -129,7 +129,7 @@ class DBInfo {
     this.port,
     this.databaseName,
     this.timeZone, {
-    this.useSSL = false,
+    this.sslMode,
   });
 
   DBInfo.fromMap(Map<String, dynamic> map)
@@ -140,7 +140,7 @@ class DBInfo {
         port = map["port"] as int?,
         databaseName = map["databaseName"] as String?,
         timeZone = map["timeZone"] as String?,
-        useSSL = (map["useSSL"] ?? false) as bool;
+        sslMode = map["sslMode"] as String?;
 
   final String? flavor;
   final String? username;
@@ -149,7 +149,7 @@ class DBInfo {
   final int? port;
   final String? databaseName;
   final String? timeZone;
-  final bool useSSL;
+  final String? sslMode;
 
   Map<String, dynamic>? asMap() {
     return {
@@ -160,7 +160,7 @@ class DBInfo {
       "port": port,
       "databaseName": databaseName,
       "timeZone": timeZone,
-      "useSSL": useSSL
+      "sslMode": sslMode
     };
   }
 }
diff --git a/packages/cli/lib/src/scripts/schema_builder.dart b/packages/cli/lib/src/scripts/schema_builder.dart
@@ -27,10 +27,10 @@ class SchemaBuilderExecutable extends Executable<Map<String, dynamic>> {
     PostgreSQLPersistentStore.logger.level = Level.ALL;
     PostgreSQLPersistentStore.logger.onRecord.listen((r) => log(r.message));
     try {
-      Schema? outputSchema = inputSchema;
+      Schema outputSchema = inputSchema;
       for (final source in sources) {
         final Migration instance = instanceOf(
-          source.name!,
+          source.name,
           positionalArguments: const [],
           namedArguments: const <Symbol, dynamic>{},
           constructorName: Symbol.empty,
@@ -39,7 +39,7 @@ class SchemaBuilderExecutable extends Executable<Map<String, dynamic>> {
         await instance.upgrade();
         outputSchema = instance.currentSchema;
       }
-      return outputSchema!.asMap();
+      return outputSchema.asMap();
     } on SchemaException catch (e) {
       return {
         "error":

diff --git a/packages/cli/pubspec.yaml b/packages/cli/pubspec.yaml
@@ -6,10 +6,10 @@ repository: https://github.com/conduit-dart/conduit
 issue_tracker: https://github.com/conduit-dart/conduit/issues
 
 environment:
-  sdk: ">=3.3.0 <4.0.0"
+  sdk: ">=3.4.0 <4.0.0"
 
 dependencies:
-  analyzer: ^6.4.1
+  analyzer: ^6.5.0
   args: ^2.4.2
   collection: ^1.18.0
   conduit_common: ^5.0.3

diff --git a/packages/cli/templates/db/pubspec.yaml b/packages/cli/templates/db/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/conduit-dart/conduit-codable
 publish_to: none
 
 environment:
-  sdk: ">=3.3.0 <4.0.0"
+  sdk: ">=3.4.0 <4.0.0"
 
 dependencies:
   conduit: ^5.0.1

diff --git a/packages/cli/templates/db_and_auth/lib/channel.dart b/packages/cli/templates/db_and_auth/lib/channel.dart
@@ -12,8 +12,8 @@ import 'package:wildfire/wildfire.dart';
 class WildfireChannel extends ApplicationChannel
     implements AuthRedirectControllerDelegate {
   final HTMLRenderer htmlRenderer = HTMLRenderer();
-  AuthServer? authServer;
-  ManagedContext? context;
+  late final authServer;
+  late ManagedContext context;
 
   /// Initialize services in this method.
   ///
@@ -49,25 +49,25 @@ class WildfireChannel extends ApplicationChannel
 
     router
         .route("/auth/form")
-        .link(() => AuthRedirectController(authServer!, delegate: this));
+        .link(() => AuthRedirectController(authServer, delegate: this));
 
     /* Create an account */
     router
         .route("/register")
-        .link(() => Authorizer.basic(authServer!))!
-        .link(() => RegisterController(context!, authServer!));
+        .link(() => Authorizer.basic(authServer))!
+        .link(() => RegisterController(context!, authServer));
 
     /* Gets profile for user with bearer token */
     router
         .route("/me")
-        .link(() => Authorizer.bearer(authServer!))!
+        .link(() => Authorizer.bearer(authServer))!
         .link(() => IdentityController(context!));
 
     /* Gets all users or one specific user by id */
     router
         .route("/users/[:id]")
-        .link(() => Authorizer.bearer(authServer!))!
-        .link(() => UserController(context!, authServer!));
+        .link(() => Authorizer.bearer(authServer))!
+        .link(() => UserController(context!, authServer));
 
     return router;
   }
@@ -94,7 +94,7 @@ class WildfireChannel extends ApplicationChannel
       AuthRedirectController forController,
       Uri requestUri,
       String? responseType,
-      String? clientID,
+      String clientID,
       String? state,
       String? scope) async {
     final map = {

diff --git a/packages/cli/templates/db_and_auth/lib/controller/register_controller.dart b/packages/cli/templates/db_and_auth/lib/controller/register_controller.dart
@@ -25,7 +25,7 @@ class RegisterController extends ResourceController {
     final token = await authServer.authenticate(
         user.username,
         user.password,
-        request?.authorization?.credentials?.username,
+        request!.authorization!.credentials!.username,
         request?.authorization?.credentials?.password);
 
     final response = AuthController.tokenResponse(token);

diff --git a/packages/cli/templates/db_and_auth/pubspec.yaml b/packages/cli/templates/db_and_auth/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: ">=3.3.0 <4.0.0"
+  sdk: ">=3.4.0 <4.0.0"
 
 dependencies:
   conduit: ^5.0.1

diff --git a/packages/cli/templates/db_and_auth/test/harness/app.dart b/packages/cli/templates/db_and_auth/test/harness/app.dart
@@ -26,7 +26,7 @@ class Harness extends TestHarness<WildfireChannel>
   ManagedContext? get context => channel?.context;
 
   @override
-  AuthServer? get authServer => channel?.authServer;
+  AuthServer get authServer => channel!.authServer;
 
   Agent? publicAgent;
 

diff --git a/packages/cli/templates/default/pubspec.yaml b/packages/cli/templates/default/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: ">=3.3.0 <4.0.0"
+  sdk: ">=3.4.0 <4.0.0"
 
 dependencies:
   conduit: ^5.0.1