diff --git a/obp-api/src/main/scala/code/api/oauth1.0.scala b/obp-api/src/main/scala/code/api/oauth1.0.scala index c84f22613..3484ff3b0 100644 --- a/obp-api/src/main/scala/code/api/oauth1.0.scala +++ b/obp-api/src/main/scala/code/api/oauth1.0.scala @@ -39,7 +39,7 @@ import code.model.{Consumer, TokenType, UserX} import code.nonce.Nonces import code.token.Tokens import code.users.Users -import code.util.Helper.MdcLoggable +import code.util.Helper.{MdcLoggable, ObpS} import com.openbankproject.commons.model.User import net.liftweb.common._ import net.liftweb.http.rest.RestHelper @@ -282,7 +282,7 @@ object OAuthHandshake extends RestHelper with MdcLoggable { val sRequest = S.request val urlParams: Map[String, List[String]] = sRequest.map(_.params).getOrElse(Map.empty) - val sUri = S.uri + val sUri = ObpS.uri //are all the necessary OAuth parameters present? val missingParams = missingOAuthParameters(parameters,requestType) @@ -547,7 +547,7 @@ object OAuthHandshake extends RestHelper with MdcLoggable { val sRequest = S.request val urlParams: Map[String, List[String]] = sRequest.map(_.params).getOrElse(Map.empty) - val sUri = S.uri + val sUri = ObpS.uri // Please note that after this point S.request for instance cannot be used directly // If you need it later assign it to some variable and pass it diff --git a/obp-api/src/main/scala/code/model/dataAccess/Admin.scala b/obp-api/src/main/scala/code/model/dataAccess/Admin.scala index 5e9261266..1aae0567c 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/Admin.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/Admin.scala @@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/) */ package code.model.dataAccess +import code.util.Helper.ObpS import net.liftweb.mapper._ import net.liftweb.common._ import net.liftweb.http.SessionVar @@ -68,7 +69,7 @@ object Admin extends Admin with MetaMegaProtoUser[Admin]{ } override def loginXhtml = { - (
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 917a7cd70..472916ad9 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala @@ -435,7 +435,7 @@ import net.liftweb.util.Helpers._ override def loginXhtml = { val loginXml = Templates(List("templates-hidden","_login")).map({ - "form [action]" #> {S.uri} & + "form [action]" #> {ObpS.uri} & "#loginText * " #> {S.?("log.in")} & "#usernameText * " #> {S.?("username")} & "#passwordText * " #> {S.?("password")} & @@ -583,7 +583,7 @@ import net.liftweb.util.Helpers._

Recover Password

Enter your email address or username and we'll email you a link to reset your password
- +
@@ -744,7 +744,7 @@ import net.liftweb.util.Helpers._ override def signupXhtml (user:AuthUser) = {
- +

{signupFormTitle}

{legalNoticeDiv}
@@ -1539,7 +1539,7 @@ def restoreSomeSessions(): Unit = { override def passwordResetXhtml = {

{if(ObpS.queryString.isDefined) Helper.i18n("set.your.password") else S.?("reset.your.password")}

- +
diff --git a/obp-api/src/main/scala/code/snippet/Nav.scala b/obp-api/src/main/scala/code/snippet/Nav.scala index d8667c48a..47ea20a87 100644 --- a/obp-api/src/main/scala/code/snippet/Nav.scala +++ b/obp-api/src/main/scala/code/snippet/Nav.scala @@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/) */ package code.snippet +import code.util.Helper.ObpS import net.liftweb.http.S import net.liftweb.http.LiftRules import net.liftweb.util.Helpers._ @@ -72,7 +73,7 @@ class Nav { } def markIfSelected(href : String) : Box[String]= { - val currentHref = S.uri + val currentHref = ObpS.uri if(href.equals(currentHref)) Full("selected") else Empty } diff --git a/obp-api/src/main/scala/code/snippet/WebUI.scala b/obp-api/src/main/scala/code/snippet/WebUI.scala index 2ba7641b0..59cde0751 100644 --- a/obp-api/src/main/scala/code/snippet/WebUI.scala +++ b/obp-api/src/main/scala/code/snippet/WebUI.scala @@ -89,7 +89,7 @@ class WebUI extends MdcLoggable{ val hyphenLocale = locale.replace("_", "-") if (supportedLocales.contains(locale) || supportedLocales.contains(hyphenLocale) ) {""} else {"none"} } - val page = Constant.HostName + S.uri + val page = Constant.HostName + ObpS.uri val language = I18NUtil.currentLocale().getLanguage() "#es a [href]" #> scala.xml.Unparsed(s"${page}?${replaceLocale("locale=es_ES")}") & diff --git a/obp-api/src/main/scala/code/util/Helper.scala b/obp-api/src/main/scala/code/util/Helper.scala index fdbc0d57a..1a1b7a99c 100644 --- a/obp-api/src/main/scala/code/util/Helper.scala +++ b/obp-api/src/main/scala/code/util/Helper.scala @@ -483,8 +483,15 @@ object Helper extends Loggable { logger.debug(s"ObpS.${methodName} validation failed. The input key is: ${if (args.length>0)args.apply(0) else ""}, value is:$result") } resultAfterChecked - } else if (methodName.equals("uri") && result.isInstanceOf[String] || - methodName.equals("uriAndQueryString") && result.isInstanceOf[Box[String]] && result.asInstanceOf[Box[String]].isDefined || + } else if (methodName.equals("uri") && result.isInstanceOf[String]){ + val resultAfterChecked = Full(result.asInstanceOf[String]).filter(APIUtil.basicUriAndQueryStringValidation(_)) + if(resultAfterChecked.isDefined) { + resultAfterChecked.head + }else{ + logger.debug(s"ObpS.${methodName} validation failed. The value is:$result") + resultAfterChecked.getOrElse("") + } + } else if (methodName.equals("uriAndQueryString") && result.isInstanceOf[Box[String]] && result.asInstanceOf[Box[String]].isDefined || methodName.equals("queryString") && result.isInstanceOf[Box[String]]&&result.asInstanceOf[Box[String]].isDefined){ val resultAfterChecked = result.asInstanceOf[Box[String]].filter(APIUtil.basicUriAndQueryStringValidation(_)) if(resultAfterChecked.isEmpty) {
Admin Log In
{userNameFieldString}
{S.?("password")}