artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 17:17:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature/OpenID Connect - show email in case of Google

Browse Source
This commit is contained in:
Marko Milić 2020-04-30 12:56:32 +02:00
parent acf8207f67
commit 375584300d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
obp-api/src/main/scala/code/api/openidconnect.scala
View File

@ -168,7 +168,7 @@ object OpenIdConnect extends OBPRestHelper with MdcLoggable {
.username(user.idGivenByProvider)
.provider(user.provider)
// No need to store password, so store dummy string instead
.password(generateUUID())
.password(Helpers.randomString(40))
.validated(true)
// Save the user in order to be able to log in
newUser.saveMe()

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

@ -316,7 +316,8 @@ import net.liftweb.util.Helpers._
*
*/
def getCurrentUserUsername: String = {
getCurrentUser match{
getCurrentUser match {
case Full(user) if user.provider.contains("google") => user.emailAddress
case Full(user) => user.name
case _ => "" //TODO need more error handling for different user cases
}
@ -396,7 +397,7 @@ import net.liftweb.util.Helpers._
//override def def passwordResetMailBody(user: TheUserType, resetLink: String): Elem = { }
/**
* Overriden to use the hostname set in the props file
* Overridden to use the hostname set in the props file
*/
override def sendValidationEmail(user: TheUserType) {
val resetLink = APIUtil.getPropsValue("hostname", "ERROR")+"/"+validateUserPath.mkString("/")+