mirror of
https://github.com/OpenBankProject/OBP-API.git
synced 2026-02-06 15:27:01 +00:00
refactor/Tweak names
This commit is contained in:
parent
af06824298
commit
1cc8cf0535
@ -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
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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) = {
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user