Skip to content

Commit f5fa8e9

Browse files
bugfix/Fix term and conditions multiple saving
1 parent 464e3c7 commit f5fa8e9

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ def restoreSomeSessions(): Unit = {
10451045
.map(_.agreementHash).getOrElse(HashUtil.Sha256Hash("not set"))
10461046
val agreementText = getWebUiPropsValue("webui_terms_and_conditions", "not set")
10471047
val hashedAgreementText = HashUtil.Sha256Hash(agreementText)
1048-
if(hashedAgreementTextOfUser == hashedAgreementText) { // Chech terms and conditions
1048+
if(hashedAgreementTextOfUser == hashedAgreementText) { // Check terms and conditions
10491049
val hashedAgreementTextOfUser =
10501050
UserAgreementProvider.userAgreementProvider.vend.getUserAgreement(userId, "privacy_conditions")
10511051
.map(_.agreementHash).getOrElse(HashUtil.Sha256Hash("not set"))

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ class TermsAndConditions extends MdcLoggable {
7070
val agreementText = getWebUiPropsValue("webui_terms_and_conditions", "not set")
7171
// val hashedAgreementText = HashUtil.Sha256Hash(agreementText)
7272
UserAgreementProvider.userAgreementProvider.vend.createOrUpdateUserAgreement(
73-
AuthUser.currentUser.flatMap(_.user.foreign.map(_.userId)).getOrElse(""), "terms_and_conditions", agreementText)
73+
AuthUser.currentUser.flatMap(_.user.foreign.map(_.userId)).getOrElse(""),
74+
"terms_and_conditions",
75+
agreementText)
7476
S.redirectTo("/")
7577
}
7678
}

obp-api/src/main/scala/code/users/UserAgreement.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ object UserAgreement extends UserAgreement with LongKeyedMetaMapper[UserAgreemen
8282
agreement =>
8383
tryo {
8484
val hash = HashUtil.Sha256Hash(agreement.agreementText)
85-
agreement.AgreementHash(hash ).save
85+
agreement.AgreementHash(hash)
8686
}
8787
)
8888

0 commit comments

Comments
 (0)