mirror of
https://github.com/OpenBankProject/OBP-API.git
synced 2026-02-06 14:46:49 +00:00
Merge pull request #2194 from constantine2nd/develop
Take the local_identity_provider value if any
This commit is contained in:
commit
8ec5e19ddd
@ -1132,7 +1132,7 @@ personal_data_collection_consent_country_waiver_list = Austria, Belgium, Bulgari
|
||||
|
||||
# Local identity provider url
|
||||
# it defaults to the hostname props value
|
||||
# local_identity_provider=this is the hostname of the local obp server including scheme
|
||||
# local_identity_provider=strongly recomended to use top level domain name so that all nodes in the cluster share same provider name
|
||||
|
||||
|
||||
# enable dynamic code sandbox, default is false, this will make sandbox works for code running in Future, will make performance lower than disable
|
||||
|
||||
@ -322,15 +322,13 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga
|
||||
override def displayName = S.?("provider")
|
||||
override val fieldId = Some(Text("txtProvider"))
|
||||
override def validations = validUri(this) _ :: super.validations
|
||||
override def defaultValue: String = Constant.HostName
|
||||
override def defaultValue: String = Constant.localIdentityProvider
|
||||
}
|
||||
|
||||
|
||||
def getProvider() = {
|
||||
if(provider.get == null) {
|
||||
Constant.HostName
|
||||
} else if ( provider.get == "" || provider.get == Constant.HostName ) {
|
||||
Constant.HostName
|
||||
if(provider.get == null || provider.get == "") {
|
||||
Constant.localIdentityProvider
|
||||
} else {
|
||||
provider.get
|
||||
}
|
||||
|
||||
@ -69,7 +69,7 @@ class ResourceUser extends LongKeyedMapper[ResourceUser] with User with ManyToMa
|
||||
override def defaultValue = ""
|
||||
}
|
||||
object provider_ extends MappedString(this, 100){
|
||||
override def defaultValue = Constant.HostName
|
||||
override def defaultValue: String = Constant.localIdentityProvider
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
Reference in New Issue
Block a user