Merge remote-tracking branch 'origin/main'

Author: danny-gallagher

src/main/java/com/mastercard/developer/encryption/JweConfigBuilder.java

@@ -94,10 +94,10 @@ public JweConfigBuilder withEncryptionKeyFingerprint(String encryptionKeyFingerp
         this.encryptionKeyFingerprint = encryptionKeyFingerprint;
         return this;
     }
-    
+
     private void checkParameterValues() {
-        if (decryptionKey == null && encryptionCertificate == null) {
-            throw new IllegalArgumentException("You must include at least an encryption certificate or a decryption key");
+        if (decryptionKey == null && encryptionCertificate == null && encryptionKey == null) {
+            throw new IllegalArgumentException("You must include at least an encryption key/certificate or a decryption key");
         }
     }
 }

src/test/java/com/mastercard/developer/encryption/JweConfigBuilderTest.java

@@ -31,6 +31,20 @@ public void testBuild_Nominal() throws Exception {
         Assert.assertEquals(Collections.singletonMap("$", "$"), config.getEncryptionPaths());
     }
 
+    @Test
+    public void testBuild_EncryptionKeyNoDecryptionKey() throws Exception {
+        JweConfig config = JweConfigBuilder.aJweEncryptionConfig()
+                .withEncryptionKey(TestUtils.getTestEncryptionCertificate().getPublicKey())
+                .withEncryptionPath("$", "$")
+                .withEncryptedValueFieldName("encryptedPayload")
+                .build();
+        Assert.assertNotNull(config);
+        Assert.assertEquals(EncryptionConfig.Scheme.JWE, config.getScheme());
+        Assert.assertEquals(TestUtils.getTestEncryptionCertificate().getPublicKey(), config.getEncryptionKey());
+        Assert.assertEquals("encryptedPayload", config.getEncryptedValueFieldName());
+        Assert.assertEquals(Collections.singletonMap("$", "$"), config.getEncryptionPaths());
+    }
+
     @Test
     public void testBuild_EncryptionKeyFromCertificate() throws Exception {
         EncryptionConfig config = JweConfigBuilder.aJweEncryptionConfig()
@@ -102,7 +116,7 @@ public void testBuild_ShouldFallbackToDefaults() throws Exception {
     @Test
     public void testBuild_ShouldThrowIllegalArgumentException_WhenMissingDecryptionKey() throws Exception {
         expectedException.expect(IllegalArgumentException.class);
-        expectedException.expectMessage("You must include at least an encryption certificate or a decryption key");
+        expectedException.expectMessage("You must include at least an encryption key/certificate or a decryption key");
         JweConfigBuilder.aJweEncryptionConfig()
                 .build();
     }