Skip to content

Commit

Permalink
Merge pull request #2376 from constantine2nd/develop
Browse files Browse the repository at this point in the history
Provider; Glossary
  • Loading branch information
simonredfern authored Apr 15, 2024
2 parents da3e4ef + ec6fc15 commit a46ef54
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
14 changes: 14 additions & 0 deletions obp-api/src/main/scala/code/api/util/Glossary.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3178,6 +3178,20 @@ object Glossary extends MdcLoggable {
|
|""".stripMargin)

glossaryItems += GlossaryItem(
title = "QWAC",
description =
s"""A Qualified Website Authentication Certificate is a qualified digital certificate under the trust services defined in the European Union eIDAS Regulation.
|A website authentication certificate makes it possible to establish a Transport Layer Security channel with the subject of the certificate, which secures data transferred through the channel.""".stripMargin)

glossaryItems += GlossaryItem(
title = "QSealC",
description =
s"""Qualified electronic Seal Certificate.
|A certificate for electronic seals allows the relying party to validate the identity of the subject of the certificate,
|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 = "Cross-Device Authorization",
description =
Expand Down
5 changes: 5 additions & 0 deletions obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1576,7 +1576,12 @@ def restoreSomeSessions(): Unit = {
* Please note that provider is implicitly defined i.e. not provided via a parameter
*/
def findAuthUserByUsernameLocally(name: String): Box[TheUserType] = {
// 1st try is provider with local_identity_provider or hostname value
find(By(this.username, name), By(this.provider, Constant.localIdentityProvider))
// 2nd try is provider with null value
.or(find(By(this.username, name), NullRef(this.provider)))
// 3rd try is provider with empty string value
.or(find(By(this.username, name), By(this.provider, "")))
}
def findAuthUserByPrimaryKey(key: Long): Box[TheUserType] = {
find(By(this.user, key))
Expand Down

0 comments on commit a46ef54

Please sign in to comment.