From 375584300d1d925c1376972cc6ff5aa7c38e2ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Thu, 30 Apr 2020 12:56:32 +0200 Subject: [PATCH] feature/OpenID Connect - show email in case of Google --- obp-api/src/main/scala/code/api/openidconnect.scala | 2 +- obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/obp-api/src/main/scala/code/api/openidconnect.scala b/obp-api/src/main/scala/code/api/openidconnect.scala index 3d2f3db29..71e0749f7 100644 --- a/obp-api/src/main/scala/code/api/openidconnect.scala +++ b/obp-api/src/main/scala/code/api/openidconnect.scala @@ -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() 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 f1d942a1e..fbae6e21a 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala @@ -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("/")+