update cors

Author: f3ath

CHANGELOG.md

@@ -10,10 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - URL Design matching now respects the base URL
-- Allo null to be returned by error interceptors
+- Allow null to be returned by error interceptors
 
 ### Fixed
-- StandardUriDesign working incosistently depending on the trailing slash in the path
+- StandardUriDesign working inconsistently, depending on the trailing slash in the path
 
 ## [8.1.0] - 2024-08-29
 ### Added

lib/client.dart

@@ -21,7 +21,7 @@
 /// representing the most common use cases of resource fetching and manipulation.
 /// It can conveniently construct and parse JSON:API documents and URIs.
 /// The [RoutingClient] should be your default choice.
-library client;
+library;
 
 export 'package:json_api/src/client/client.dart';
 export 'package:json_api/src/client/request.dart';

lib/document.dart

@@ -1,5 +1,5 @@
 /// JSON:API Document model.
-library document;
+library;
 
 export 'package:json_api/src/document/error_object.dart';
 export 'package:json_api/src/document/inbound_document.dart';

lib/http.dart

@@ -1,5 +1,5 @@
 /// Common HTTP utilities for JSON:API clients and servers.
 /// WARNING: This library is in beta stage. The API is subject to change.
-library http;
+library;
 
 export 'package:json_api/src/http/status_code.dart';

lib/query.dart

@@ -1,5 +1,5 @@
 /// A set of builders/parsers for special query parameters used in JSON:API.
-library query;
+library;
 
 export 'package:json_api/src/query/fields.dart';
 export 'package:json_api/src/query/include.dart';

lib/routing.dart

@@ -1,6 +1,6 @@
 /// Routing describes the design of URLs on the server.
 /// See https://jsonapi.org/recommendations/#urls
-library routing;
+library;
 
 export 'package:json_api/src/routing/standard_uri_design.dart';
 export 'package:json_api/src/routing/target.dart';

lib/server.dart

@@ -1,6 +1,6 @@
 /// JSON:API server on top of dart:io.
 /// WARNING: This library is in beta stage. The API is subject to change.
-library server;
+library;
 
 export 'package:json_api/src/server/controller.dart';
 export 'package:json_api/src/server/cors_middleware.dart';

lib/src/server/cors_middleware.dart

@@ -1,23 +1,22 @@
 import 'package:http_interop/http_interop.dart';
+import 'package:http_interop_middleware/http_interop_middleware.dart';
 
-Handler corsMiddleware(Handler handler) =>
-    (Request request) async => switch (request.method) {
+final corsMiddleware = middleware(
+    onRequest: (rq) async => switch (rq.method) {
           'options' => Response(
               204,
               Body(),
               Headers.from({
                 'Access-Control-Allow-Methods':
-                    request.headers['Access-Control-Request-Method'] ??
+                    rq.headers['Access-Control-Request-Method'] ??
                         const ['POST', 'GET', 'DELETE', 'PATCH', 'OPTIONS'],
                 'Access-Control-Allow-Headers':
-                    request.headers['Access-Control-Request-Headers'] ??
-                        const ['*'],
+                    rq.headers['Access-Control-Request-Headers'] ?? const ['*'],
               })),
-          _ => await handler(request)
-        }
-          ..headers.addAll({
-            'Access-Control-Allow-Origin': [
-              request.headers['origin']?.last ?? '*'
-            ],
-            'Access-Control-Expose-Headers': const ['Location'],
-          });
+          _ => null
+        },
+    onResponse: (rs, rq) async => rs
+      ..headers.addAll({
+        'Access-Control-Allow-Origin': [rq.headers['origin']?.last ?? '*'],
+        'Access-Control-Expose-Headers': const ['Location'],
+      }));

pubspec.yaml

@@ -1,5 +1,5 @@
 name: json_api
-version: 9.0.0-alpha.5
+version: 9.0.0-alpha.6
 homepage: https://github.com/f3ath/json-api-dart
 description: A framework-agnostic implementations of JSON:API Client and Server. Supports JSON:API v1.0 (https://jsonapi.org)
 environment: