fixing issue with custom headers

jonasroussel · Nov 5, 2023 · 881fe9a · 881fe9a
1 parent 44e2815
commit 881fe9a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.12.1
+
+- Fixing issue with custom headers (https://github.com/jonasroussel/dart_jsonwebtoken/issues/48)
+
 ## 2.12.0
 
 - **NEW:** tests have been added

diff --git a/lib/src/jwt.dart b/lib/src/jwt.dart
@@ -261,9 +261,6 @@ class JWT {
     bool noIssueAt = false,
   }) {
     try {
-      header ??= {};
-      header!.addAll({'alg': algorithm.name, 'typ': 'JWT'});
-
       if (payload is Map<String, dynamic> || payload is Map<dynamic, dynamic>) {
         try {
           payload = Map<String, dynamic>.from(payload);
@@ -287,7 +284,11 @@ class JWT {
         }
       }
 
-      final b64Header = base64Unpadded(jsonBase64.encode(header));
+      final tokenHeader = Map.from(header ?? {});
+      tokenHeader.putIfAbsent('alg', () => algorithm.name);
+      tokenHeader.putIfAbsent('typ', () => 'JWT');
+
+      final b64Header = base64Unpadded(jsonBase64.encode(tokenHeader));
 
       String b64Payload;
       try {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dart_jsonwebtoken
 description: A dart implementation of the famous javascript library 'jsonwebtoken' (JWT).
-version: 2.12.0
+version: 2.12.1
 repository: https://github.com/jonasroussel/dart_jsonwebtoken
 homepage: https://github.com/jonasroussel/dart_jsonwebtoken#readme