From 619b28a3cd2b9a46bb553baf1b647b25405620df Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Tue, 27 Oct 2020 17:07:02 +0100 Subject: [PATCH] #264 Lower case user login on oauth --- app/org/thp/cortex/services/mappers/GroupUserMapper.scala | 2 +- app/org/thp/cortex/services/mappers/SimpleUserMapper.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/org/thp/cortex/services/mappers/GroupUserMapper.scala b/app/org/thp/cortex/services/mappers/GroupUserMapper.scala index 7af37d489..5768d5b30 100644 --- a/app/org/thp/cortex/services/mappers/GroupUserMapper.scala +++ b/app/org/thp/cortex/services/mappers/GroupUserMapper.scala @@ -55,7 +55,7 @@ class GroupUserMapper( .flatMap(o => (jsValue \ o).asOpt[String]) .orElse(defaultOrganization) .fold[JsResult[String]](JsError())(o => JsSuccess(o)) - } yield Fields(Json.obj("login" -> login, "name" -> name, "roles" -> roles, "organization" -> organization)) + } yield Fields(Json.obj("login" -> login.toLowerCase, "name" -> name, "roles" -> roles, "organization" -> organization)) fields match { case JsSuccess(f, _) => Future.successful(f) case JsError(errors) => Future.failed(AuthenticationError(s"User info fails: ${errors.map(_._1).mkString}")) diff --git a/app/org/thp/cortex/services/mappers/SimpleUserMapper.scala b/app/org/thp/cortex/services/mappers/SimpleUserMapper.scala index 9e1665e8a..0a317f414 100644 --- a/app/org/thp/cortex/services/mappers/SimpleUserMapper.scala +++ b/app/org/thp/cortex/services/mappers/SimpleUserMapper.scala @@ -42,7 +42,7 @@ class SimpleUserMapper( .flatMap(o => (jsValue \ o).asOpt[String]) .orElse(defaultOrganization) .fold[JsResult[String]](JsError())(o => JsSuccess(o)) - } yield Fields(Json.obj("login" -> login, "name" -> name, "roles" -> roles, "organization" -> organization)) + } yield Fields(Json.obj("login" -> login.toLowerCase, "name" -> name, "roles" -> roles, "organization" -> organization)) fields match { case JsSuccess(f, _) => Future.successful(f) case JsError(errors) => Future.failed(AuthenticationError(s"User info fails: ${errors.map(_._1).mkString}"))