Adding support for OBP-OIDC WIP

Author: simonredfern

src/main/java/com/openbankproject/hydra/auth/controller/IndexController.java

@@ -10,6 +10,7 @@
 import com.openbankproject.hydra.auth.util.PKCEUtil;
 import com.openbankproject.model.*;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -370,6 +371,15 @@ public String requestConsents(@RequestParam("bank") String bankId,
             SessionData.remoteUserInfo(session);
 
             return redirectUrl;
+        } catch (HttpStatusCodeException httpException) {
+            logger.error("Error: ", httpException);
+            String errorDetail = httpException.getStatusCode() + " " + httpException.getStatusText();
+            String responseBody = httpException.getResponseBodyAsString();
+            if (StringUtils.isNotBlank(responseBody)) {
+                errorDetail += " - " + responseBody;
+            }
+            model.addAttribute("errorMsg", errorDetail);
+            return "error";
         } catch (Exception unhandledException) {
             logger.error("Error: ", unhandledException);
             if(showUnhandledErrors) model.addAttribute("errorMsg", unhandledException);
@@ -619,6 +629,15 @@ public String requestConsentsBerlinGroup(@RequestParam("bank") String bankId,
             SessionData.remoteUserInfo(session);
 
             return redirectUrl;
+        } catch (HttpStatusCodeException httpException) {
+            logger.error("Error: ", httpException);
+            String errorDetail = httpException.getStatusCode() + " " + httpException.getStatusText();
+            String responseBody = httpException.getResponseBodyAsString();
+            if (StringUtils.isNotBlank(responseBody)) {
+                errorDetail += " - " + responseBody;
+            }
+            model.addAttribute("errorMsg", errorDetail);
+            return "error";
         } catch (Exception unhandledException) {
             logger.error("Error: ", unhandledException);
             if(showUnhandledErrors) model.addAttribute("errorMsg", unhandledException);
@@ -738,6 +757,15 @@ public String requestConsentsOpenBankProject(@RequestParam("bank") String bankId
             SessionData.remoteUserInfo(session);
 
             return redirectUrl;
+        } catch (HttpStatusCodeException httpException) {
+            logger.error("Error: ", httpException);
+            String errorDetail = httpException.getStatusCode() + " " + httpException.getStatusText();
+            String responseBody = httpException.getResponseBodyAsString();
+            if (StringUtils.isNotBlank(responseBody)) {
+                errorDetail += " - " + responseBody;
+            }
+            model.addAttribute("errorMsg", errorDetail);
+            return "error";
         } catch (Exception unhandledException) {
             logger.error("Error: ", unhandledException);
             if(showUnhandledErrors) model.addAttribute("errorMsg", unhandledException);
@@ -878,6 +906,15 @@ public String requestConsentsVrpOpenBankProject(@RequestParam("bank") String ban
             SessionData.remoteUserInfo(session);
 
             return redirectUrl;
+        } catch (HttpStatusCodeException httpException) {
+            logger.error("Error: ", httpException);
+            String errorDetail = httpException.getStatusCode() + " " + httpException.getStatusText();
+            String responseBody = httpException.getResponseBodyAsString();
+            if (StringUtils.isNotBlank(responseBody)) {
+                errorDetail += " - " + responseBody;
+            }
+            model.addAttribute("errorMsg", errorDetail);
+            return "error";
         } catch (Exception unhandledException) {
             logger.error("Error: ", unhandledException);
             if(showUnhandledErrors) model.addAttribute("errorMsg", unhandledException);
@@ -943,6 +980,15 @@ public String administrateConsents(@RequestParam("bank") String bankId, HttpSess
             SessionData.remoteUserInfo(session);
 
             return redirectUrl;
+        } catch (HttpStatusCodeException httpException) {
+            logger.error("Error: ", httpException);
+            String errorDetail = httpException.getStatusCode() + " " + httpException.getStatusText();
+            String responseBody = httpException.getResponseBodyAsString();
+            if (StringUtils.isNotBlank(responseBody)) {
+                errorDetail += " - " + responseBody;
+            }
+            model.addAttribute("errorMsg", errorDetail);
+            return "error";
         } catch (Exception unhandledException) {
             logger.error("Error: ", unhandledException);
             if(showUnhandledErrors) model.addAttribute("errorMsg", unhandledException);

src/main/resources/application.properties

@@ -7,16 +7,18 @@ server.port=52765
 #logging.level.com.openbankproject=DEBUG
 
 ## OIDC provider: obp-oidc (default) or hydra
-#oauth2.provider=hydra
+oauth2.provider=obp-oidc
 
 ## OBP-OIDC local defaults
 oauth2.public_url=http://localhost:9000/obp-oidc
 obp.base_url=http://localhost:8080
 endpoint.path.prefix=${obp.base_url}/open-banking/v3.1
 
 oauth2.redirect_uri=http://localhost:52765/main.html
-oauth2.client_id=your_client_id_here
-oauth2.client_secret=your_client_secret_here
+
+#  hola                              | wugxfdiewmkstnzkjlcudeiegddczg41exzirtik | imras3cgsjwplcjdcnmj0abkx1nxqlnbyawvwx3e
+oauth2.client_id=wugxfdiewmkstnzkjlcudeiegddczg41exzirtik
+oauth2.client_secret=imras3cgsjwplcjdcnmj0abkx1nxqlnbyawvwx3e
 oauth2.client_scope=openid,profile,email
 
 ## To use Hydra instead, uncomment and adjust:
@@ -51,8 +53,8 @@ display_standards=UKOpenBanking,BerlinGroup,OBP-API,OBP-API-VRP
 #button.hover.background_color=#b92c28
 
 ### Show internal server errors to the end user
-#show_unhandled_errors=false
+show_unhandled_errors=true
 
 ### Show Bank Logo
 #logo.bank.enabled=false
-#logo.bank.url=https://static.openbankproject.com/bank/img/bank-logo.png 
+#logo.bank.url=https://static.openbankproject.com/bank/img/bank-logo.png