[nifi] branch main updated: NIFI-10343 Add error code to exception message

[pvillard]

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 1b4d66a726 NIFI-10343 Add error code to exception message
1b4d66a726 is described below

commit 1b4d66a726eb32839cf35c57234ff0e28f21157c
Author: Malthe Borch <mbo...@gmail.com>
AuthorDate: Wed Aug 10 14:12:35 2022 +0000

    NIFI-10343 Add error code to exception message
    
    The error object may not have a description, but should have a code.
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #6288.
---
 .../apache/nifi/web/security/oidc/StandardOidcIdentityProvider.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/StandardOidcIdentityProvider.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/StandardOidcIdentityProvider.java
index 09fa79ecf4..a2b4ba2be5 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/StandardOidcIdentityProvider.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/StandardOidcIdentityProvider.java
@@ -24,6 +24,7 @@ import com.nimbusds.jose.util.ResourceRetriever;
 import com.nimbusds.jwt.JWT;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.oauth2.sdk.AuthorizationGrant;
+import com.nimbusds.oauth2.sdk.ErrorObject;
 import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.Request;
 import com.nimbusds.oauth2.sdk.Scope;
@@ -425,8 +426,9 @@ public class StandardOidcIdentityProvider implements 
OidcIdentityProvider {
         } else {
             // If the response was not successful
             final TokenErrorResponse errorResponse = (TokenErrorResponse) 
response;
+            final ErrorObject errorObject = errorResponse.getErrorObject();
             throw new RuntimeException("An error occurred while invoking the 
Token endpoint: " +
-                    errorResponse.getErrorObject().getDescription());
+                    errorObject.getDescription() + " (" + 
errorObject.getCode() + ")");
         }
     }