Merge pull request #2377 from constantine2nd/develop

Improve application access text
OpenBankProject · Apr 18, 2024 · b1cbd29 · b1cbd29
2 parents a46ef54 + c25a4ec
commit b1cbd29
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/obp-api/src/main/scala/code/api/util/Glossary.scala b/obp-api/src/main/scala/code/api/util/Glossary.scala
@@ -3192,6 +3192,21 @@ object Glossary extends MdcLoggable  {
 					 |as well as the authenticity and integrity of the sealed data, and also prove it to third parties.
 					 |The electronic seal provides strong evidence, capable of having legal effect, that given data is originated by the legal entity identified in the certificate.""".stripMargin)
 
+		glossaryItems += GlossaryItem(
+			title = "CRL",
+			description =
+				s"""Certificate Revocation List.
+					 |CRL issuers issue CRLs. The CRL issuer is either the CA (certification authority) or an entity that has been authorized by the CA to issue CRLs.
+					 |CAs publish CRLs to provide status information about the certificates they issued.
+					 |However, a CA may delegate this responsibility to another trusted authority.
+					 |It is described in RFC 5280.""".stripMargin)
+
+		glossaryItems += GlossaryItem(
+			title = "OCSP",
+			description =
+				s"""The Online Certificate Status Protocol (OCSP) is an Internet protocol used for obtaining the revocation status of an X.509 digital certificate.
+					 |It is described in RFC 6960 and is on the Internet standards track. It was created as an alternative to certificate revocation lists (CRL),""".stripMargin)
+
 		glossaryItems += GlossaryItem(
 			title = "Cross-Device Authorization",
 			description =

diff --git a/obp-api/src/main/scala/code/model/BankingData.scala b/obp-api/src/main/scala/code/model/BankingData.scala
@@ -250,7 +250,7 @@ case class BankAccountExtended(val bankAccount: BankAccount) extends MdcLoggable
         grantedViews <- Views.views.vend.grantAccessToMultipleViews(viewUIDs, otherUser, callContext) ?~ "could not save the privilege"
       } yield grantedViews
     else
-      Failure(UserLacksPermissionCanGrantAccessToViewForTargetAccount + s"Current ViewIds${viewUIDs.map(_.viewId.value)} and current UserId${user.userId}")
+      Failure(UserLacksPermissionCanGrantAccessToViewForTargetAccount + s"Current ViewIds${viewUIDs.map(_.viewId.value).mkString(", ")} and current UserId${user.userId}")
   }
 
   /**

diff --git a/obp-api/src/main/scala/code/snippet/ConsentScreen.scala b/obp-api/src/main/scala/code/snippet/ConsentScreen.scala
@@ -77,10 +77,7 @@ class ConsentScreen extends MdcLoggable {
     val username = AuthUser.getCurrentUser.map(_.name).getOrElse("")
     val oidcProviderDescription = getWebUiPropsValue("webui_hydra_oidc_client", "OpenID Connect Provider")
     "#username *" #> username &
-    "#username_2 *" #> username &
       "#consumer_description_1 *" #> oidcProviderDescription &
-      "#consumer_description_2 *" #> oidcProviderDescription &
-      "#consumer_description_3 *" #> oidcProviderDescription &
     "form" #> {
       "#skip_consent_screen_checkbox" #> SHtml.checkbox(skipConsentScreenVar, skipConsentScreenVar(_)) &
         "#allow_access_to_consent" #> SHtml.submit(s"Allow access", () => submitAllowAction) &

diff --git a/obp-api/src/main/webapp/consent-screen.html b/obp-api/src/main/webapp/consent-screen.html
@@ -34,14 +34,8 @@
                 }
             </style>
             <div id="data-area-explanation">
-                <h1>An application requests access to your data!</h1>
-                <p>Hi <span id="username" class="reset-style"></span>, application <strong><span id="consumer_description_1" class="reset-style"></span></strong> wants access resources on your behalf and to:</p>
-                <ul>
-                    <li>openid</li>
-                </ul>
-                <p>Confirm or Deny Applicaiton Access.</p>
-                <p>Dear <span id="username_2" class="reset-style"></span>, <span id="consumer_description_2" class="reset-style"></span> is requesting access to your user profile.</p>
-                <p><span id="consumer_description_3" class="reset-style"></span> will be able to act on your behalf.</p>
+                <h1>Confirm Application Access</h1>
+                <p>Hi <span id="username" class="reset-style"></span>, the <strong><span id="consumer_description_1" class="reset-style"></span></strong> wants to act on your behalf.</p>
             </div>
 
             <form method="post">