Merge pull request #1138 from nextcloud/fix/dynamite/security-schemes

nextcloud · Nov 14, 2023 · 4864ced · 4864ced
2 parents 92ace09 + 6fd4329
commit 4864ced
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 7 deletions.
diff --git a/packages/dynamite/dynamite/lib/src/builder/client.dart b/packages/dynamite/dynamite/lib/src/builder/client.dart
@@ -499,7 +499,7 @@ final authentication = $client.authentications.firstWhereOrNull(
   yield* securityRequirements.map((final requirement) {
     final securityScheme = spec.components!.securitySchemes![requirement.keys.single]!;
     final dynamiteAuth = toDartName(
-      'Dynamite-${securityScheme.type}-${securityScheme.scheme}-Authentication',
+      'Dynamite-${securityScheme.fullName.join('-')}-Authentication',
       uppercaseFirstCharacter: true,
     );
     return '$dynamiteAuth()';

diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.dart b/packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.dart
@@ -1,5 +1,6 @@
 import 'package:built_value/built_value.dart';
 import 'package:built_value/serializer.dart';
+import 'package:collection/collection.dart';
 
 part 'security_scheme.g.dart';
 
@@ -16,4 +17,10 @@ abstract class SecurityScheme implements Built<SecurityScheme, SecuritySchemeBui
   String? get description;
 
   String? get scheme;
+
+  String? get $in;
+
+  String? get name;
+
+  Iterable<String> get fullName => [type, scheme, $in, name].whereNotNull();
 }
diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.g.dart b/packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.g.dart
diff --git a/packages/dynamite/dynamite_runtime/lib/src/dynamite_client.dart b/packages/dynamite/dynamite_runtime/lib/src/dynamite_client.dart
@@ -313,8 +313,8 @@ sealed class DynamiteAuthentication {
   /// The base type of the authentication.
   final String type;
 
-  /// The used authentication scheme.
-  final String scheme;
+  /// The used authentication HTTP scheme.
+  final String? scheme;
 
   /// The authentication headers added to a request.
   Map<String, String> get headers;