Only add kid if the value is not null/empty

hjmikkon · hjmikkon · commit 9e269c3652c6 · 2018-11-21T17:32:51.000+02:00
diff --git a/src/main/java/org/oidc/msg/AbstractMessage.java b/src/main/java/org/oidc/msg/AbstractMessage.java
@@ -451,7 +451,7 @@ public String toJwt(Key signingKey, String alg, Key transportKey, String encAlg,
     header = new HashMap<String, Object>();
     header.put("alg", alg);
     header.put("typ", "JWT");
-    if (signingKey != null && signingKey.getKid() != null) {
+    if (signingKey != null && !Strings.isNullOrEmpty(signingKey.getKid())) {
       header.put("kid", signingKey.getKid());
     }
     Algorithm algorithm = null;
@@ -696,4 +696,4 @@ public String toString() {
     return super.toString();
   }
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ public String toJwt(Key signingKey, String alg, Key transportKey, String encAlg,`
`451`	`451`	`header = new HashMap<String, Object>();`
`452`	`452`	`header.put("alg", alg);`
`453`	`453`	`header.put("typ", "JWT");`
`454`		`- if (signingKey != null && signingKey.getKid() != null) {`
	`454`	`+ if (signingKey != null && !Strings.isNullOrEmpty(signingKey.getKid())) {`
`455`	`455`	`header.put("kid", signingKey.getKid());`
`456`	`456`	`}`
`457`	`457`	`Algorithm algorithm = null;`
`@@ -696,4 +696,4 @@ public String toString() {`
`696`	`696`	`return super.toString();`
`697`	`697`	`}`
`698`	`698`
`699`		`-}`
	`699`	`+}`