Merge pull request #2383 from constantine2nd/develop

Terms; Glossary

obp-api/src/main/scala/code/api/util/Glossary.scala

@@ -2729,6 +2729,15 @@ object Glossary extends MdcLoggable  {
 |
 |
  """)
+	glossaryItems += GlossaryItem(
+		title = "Qualified Certificate Profiles (PSD2 context)",
+		description =
+			s"""
+				 |An overview of the Qualified Certificate Profiles.
+				 |
+				 |<img width="700" alt="qualified-certificate-profiles"  src="$getServerUrl/media/images/glossary/Qualified_Certificate_Profiles.png"></img>
+				 |
+				 | """.stripMargin)
 
 	glossaryItems += GlossaryItem(
 		title = "Consumer, Consent, Transport and Payload Security",
@@ -2753,9 +2762,9 @@ object Glossary extends MdcLoggable  {
 |## JWS
 |
 |The Request is signed by the Consumer with a JWS using the client certificate of the Consumer. Example: [OBP-Hola private void requestIntercept](https://github.com/OpenBankProject/OBP-Hydra-OAuth2/blob/40359cf569a814c1aec4ce593303b39ddf9bdded/src/main/java/com/openbankproject/hydra/auth/RestTemplateConfig.java#L106)
-|The Request is validated by the OBP API Server using the JWS provided by the Consumer. See [OBP-API def verifySignedRequest](https://github.com/OpenBankProject/OBP-API/blob/752044a35ca73ea4d3563c6ced57ee80903b6d30/obp-api/src/main/scala/code/api/util/JwsUtil.scala#L121)
+|The Request is verified by the OBP API Server using the JWS provided by the Consumer. See [OBP-API def verifySignedRequest](https://github.com/OpenBankProject/OBP-API/blob/752044a35ca73ea4d3563c6ced57ee80903b6d30/obp-api/src/main/scala/code/api/util/JwsUtil.scala#L121)
 |The Response is signed by the OBP API Server with a JWS. See [OBP-API def signResponse](https://github.com/OpenBankProject/OBP-API/blob/752044a35ca73ea4d3563c6ced57ee80903b6d30/obp-api/src/main/scala/code/api/util/JwsUtil.scala#L233)
-|The Response is validated by the Client using the JWS provided by the OBP API Server. Example: [OBP-Hola private void responseIntercept](https://github.com/OpenBankProject/OBP-Hydra-OAuth2/blob/c2e4589ad7e6e6b156b54e535bdcd93638317ff7/src/main/java/com/openbankproject/hydra/auth/RestTemplateConfig.java#L121)
+|The Response is verified by the Client using the JWS provided by the OBP API Server. Example: [OBP-Hola private void responseIntercept](https://github.com/OpenBankProject/OBP-Hydra-OAuth2/blob/c2e4589ad7e6e6b156b54e535bdcd93638317ff7/src/main/java/com/openbankproject/hydra/auth/RestTemplateConfig.java#L121)
 |
 |
 |## Consent
@@ -3184,6 +3193,11 @@ object Glossary extends MdcLoggable  {
 				s"""A Qualified Website Authentication Certificate is a qualified digital certificate under the trust services defined in the European Union eIDAS Regulation.
 					 |A website authentication certificate makes it possible to establish a Transport Layer Security channel with the subject of the certificate, which secures data transferred through the channel.""".stripMargin)
 
+		glossaryItems += GlossaryItem(
+			title = "Dynamic linking (PSD2 context)",
+			description =
+				s"""""".stripMargin)
+
 		glossaryItems += GlossaryItem(
 			title = "TPP",
 			description =

obp-api/src/main/scala/code/snippet/ConsumerRegistration.scala

@@ -57,7 +57,7 @@ class ConsumerRegistration extends MdcLoggable {
   private object descriptionVar extends RequestVar("")
   private object devEmailVar extends RequestVar("")
   private object companyVar extends RequestVar("")
-  private object appType extends RequestVar("Unknown")
+  private object appType extends RequestVar("Public")
   private object clientCertificateVar extends RequestVar("")
   private object signingAlgVar extends RequestVar("")
   private object oidcCheckboxVar extends RequestVar(false)

obp-api/src/main/scala/code/snippet/WebUI.scala

@@ -58,11 +58,7 @@ class WebUI extends MdcLoggable{
     * @return html code
     */
   def makeHtml(text: String) = {
-    val hasHtmlTag = """<[^>]*>""".r.findFirstIn(text).isDefined
-    hasHtmlTag match {
-      case false => PegdownOptions.convertGitHubDocMarkdownToHtml(text)
-      case true => text
-    }
+    PegdownOptions.convertGitHubDocMarkdownToHtml(text)
   }
 
   def currentPage = {

obp-api/src/main/scala/code/util/HydraUtil.scala

@@ -78,6 +78,7 @@ object HydraUtil extends MdcLoggable{
     logger.info("createHydraClient process is starting")
     val redirectUrl = consumer.redirectURL.get
     if (StringUtils.isBlank(redirectUrl) || redirectURLRegex.findFirstIn(redirectUrl).isEmpty) {
+      logger.debug(s"createHydraClient process is aborting because of the redirect url: $redirectUrl at consumer.name: ${consumer.name}")
       return None
     }
     val oAuth2Client = new OAuth2Client()
@@ -104,6 +105,7 @@ object HydraUtil extends MdcLoggable{
     oAuth2Client.setTokenEndpointAuthMethod(HydraUtil.hydraTokenEndpointAuthMethod)
 
     val decoratedClient = fun(oAuth2Client)
+    logger.debug(s"oAuth2Client: $oAuth2Client")
     val oAuth2ClientResult = Some(hydraAdmin.createOAuth2Client(decoratedClient))
     logger.info("createHydraClient process is successful.")
     oAuth2ClientResult