From 1cc8cf0535e060d61939825321d87e5ca4cf19e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Thu, 9 Mar 2023 08:27:02 +0100 Subject: [PATCH] refactor/Tweak names --- .../main/resources/i18n/lift-core_es_ES.properties | 2 +- .../scala/code/model/dataAccess/AuthUser.scala | 2 +- .../scala/code/snippet/ConsumerRegistration.scala | 2 +- .../scala/code/snippet/OpenIDConnectSnippet.scala | 6 +++--- obp-api/src/main/scala/code/snippet/WebUI.scala | 14 +++++++------- obp-api/src/main/scala/code/util/HydraUtil.scala | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties index 5819be481..3d3dd7a07 100644 --- a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties +++ b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties @@ -39,7 +39,7 @@ register_for_an_account = Registrar una cuenta nueva # Explore APIs Section explore_api_title = Explorar los titulos de las API explore_api_accounts_title = Cuentas -explore_api_accounts = Acceso a cuentas (XS21) y tarjetas. Proporcionar acceso de grano fino a los invitados (auditor, contable o p\u00fablico). +explore_api_accounts = Acceso a cuentas (XS2A) y tarjetas. Proporcionar acceso de grano fino a los invitados (auditor, contable o p\u00fablico). explore_api_branches_title = Sucursales, cajeros y productos explore_api_branches = Acceda a los datos abiertos relacionados con los bancos, incluidas las sucursales y los cajeros autom\u00e1ticos, as\u00ed como la geolocalizaci\u00f3n y los horarios de apertura. explore_api_transactions_title = Transacciones diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala index 9d637ebf7..fdb2d86cd 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala @@ -1005,7 +1005,7 @@ def restoreSomeSessions(): Unit = { * case5: UnKnow error --> UnexpectedErrorDuringLogin */ override def login: NodeSeq = { - // This query parameter is specific to Hydra ORA login request + // This query parameter is specific to ORY Hydra login request val loginChallenge: Box[String] = S.param("login_challenge").or(S.getSessionAttribute("login_challenge")) def redirectUri(): String = { loginRedirect.get match { diff --git a/obp-api/src/main/scala/code/snippet/ConsumerRegistration.scala b/obp-api/src/main/scala/code/snippet/ConsumerRegistration.scala index 391de43d0..5c8e11ba8 100644 --- a/obp-api/src/main/scala/code/snippet/ConsumerRegistration.scala +++ b/obp-api/src/main/scala/code/snippet/ConsumerRegistration.scala @@ -249,7 +249,7 @@ class ConsumerRegistration extends MdcLoggable { } def showRegistrationResults(consumer : Consumer) = { - // Create client at Hydra ORA side and update our consumer with a new Client ID + // Create client at ORY Hydra side and update our consumer with a new Client ID val updatedConsumer = createHydraClient(consumer).flatMap { c => Consumers.consumers.vend .updateConsumer(consumer.id.get,Some(c.getClientId),None,None,None,None,None,None,None,None) diff --git a/obp-api/src/main/scala/code/snippet/OpenIDConnectSnippet.scala b/obp-api/src/main/scala/code/snippet/OpenIDConnectSnippet.scala index 60a685ae6..1f0e9cfce 100644 --- a/obp-api/src/main/scala/code/snippet/OpenIDConnectSnippet.scala +++ b/obp-api/src/main/scala/code/snippet/OpenIDConnectSnippet.scala @@ -25,7 +25,7 @@ class OpenIDConnectSnippet extends MdcLoggable{ if (APIUtil.getPropsValue("openid_connect_1.client_id").isEmpty) "*" #> NodeSeq.Empty // In case of a url ends with something like this: user_mgt/login?login_challenge=f587e7ac91044fe5aa138d6a1ab46250 - // we know that we just Hydra OIDC button and Hydra ORA is using OBP-API for login request so hide the OIDC buttons + // we know that we just Hydra OIDC button and ORY Hydra is using OBP-API for login request so hide the OIDC buttons else if(S.param("login_challenge").isDefined) "*" #> NodeSeq.Empty else @@ -35,7 +35,7 @@ class OpenIDConnectSnippet extends MdcLoggable{ if (APIUtil.getPropsValue("openid_connect_2.client_id").isEmpty) "*" #> NodeSeq.Empty // In case of a url ends with something like this: user_mgt/login?login_challenge=f587e7ac91044fe5aa138d6a1ab46250 - // we know that we just Hydra OIDC button and Hydra ORA is using OBP-API for login request so hide the OIDC buttons + // we know that we just Hydra OIDC button and ORY Hydra is using OBP-API for login request so hide the OIDC buttons else if(S.param("login_challenge").isDefined) "*" #> NodeSeq.Empty else @@ -47,7 +47,7 @@ class OpenIDConnectSnippet extends MdcLoggable{ if (oidc1 && oidc2) "*" #> NodeSeq.Empty // In case of a url ends with something like this: user_mgt/login?login_challenge=f587e7ac91044fe5aa138d6a1ab46250 - // we know that we just Hydra OIDC button and Hydra ORA is using OBP-API for login request so hide the OIDC buttons + // we know that we just Hydra OIDC button and ORY Hydra is using OBP-API for login request so hide the OIDC buttons else if(S.param("login_challenge").isDefined) "*" #> NodeSeq.Empty else diff --git a/obp-api/src/main/scala/code/snippet/WebUI.scala b/obp-api/src/main/scala/code/snippet/WebUI.scala index bc33c8700..9deffa9cf 100644 --- a/obp-api/src/main/scala/code/snippet/WebUI.scala +++ b/obp-api/src/main/scala/code/snippet/WebUI.scala @@ -220,27 +220,27 @@ class WebUI extends MdcLoggable{ - private def getBaseUrlWithQ = { + private def getBaseUrlWithQuery = { val tags = S.attr("tags") openOr "" val locale = S.locale.toString // Note the Props value might contain a query parameter e.g. ?psd2=true val baseUrl = getWebUiPropsValue("webui_api_explorer_url", "") // hack (we should use url operators instead) so we can add further query parameters if one is already included in the the baseUrl - val baseUrlWithQ = baseUrl.contains("?") match { + val baseUrlWithQuery = baseUrl.contains("?") match { case true => baseUrl + s"&tags=$tags${brandString}&locale=${locale}" // ? found so add & instead case false => baseUrl + s"?tags=$tags${brandString}&locale=${locale}" // ? not found so add it. } - baseUrlWithQ + baseUrlWithQuery } def apiExplorerLink: CssSel = { - val baseUrlWithQ: String = getBaseUrlWithQ - ".api-explorer-link a [href]" #> scala.xml.Unparsed(baseUrlWithQ) + val baseUrlWithQuery: String = getBaseUrlWithQuery + ".api-explorer-link a [href]" #> scala.xml.Unparsed(baseUrlWithQuery) } def dynamicEntityApiExplorerLink: CssSel = { - val baseUrlWithQ: String = s"$getBaseUrlWithQ#group-Dynamic-Entity-Manage" - ".api-explorer-link-dynamic-entity a [href]" #> scala.xml.Unparsed(baseUrlWithQ) + val baseUrlWithQuery: String = s"$getBaseUrlWithQuery#group-Dynamic-Entity-Manage" + ".api-explorer-link-dynamic-entity a [href]" #> scala.xml.Unparsed(baseUrlWithQuery) } def wrapPropsUrlLocaleParameter (propsKey: String) = { diff --git a/obp-api/src/main/scala/code/util/HydraUtil.scala b/obp-api/src/main/scala/code/util/HydraUtil.scala index 7a32bc04c..69956c5fe 100644 --- a/obp-api/src/main/scala/code/util/HydraUtil.scala +++ b/obp-api/src/main/scala/code/util/HydraUtil.scala @@ -77,7 +77,7 @@ object HydraUtil extends MdcLoggable{ return None } val oAuth2Client = new OAuth2Client() - // Hydra ORA: It is no longer possible to set an OAuth2 Client ID as a user. The system will generate a unique ID for you. + // ORY Hydra: It is no longer possible to set an OAuth2 Client ID as a user. The system will generate a unique ID for you. // oAuth2Client.setClientId(consumer.key.get) oAuth2Client.setClientSecret(consumer.secret.get) oAuth2Client.setClientName(consumer.name.get)