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

More tests fixed. just a few left to do

Browse Source
This commit is contained in:
Petar Bozin 2017-04-07 12:51:03 +02:00
parent 11d12f983d
commit 1b473c0c24
5 changed files with 45 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/code/api/directlogin.scala
View File

@ -323,7 +323,7 @@ object DirectLogin extends RestHelper with Loggable {
val password = directLoginParameters.getOrElse("password", "")
var userId = for {id <- AuthUser.getResourceUserId(username, password)} yield id
println("======================> " + username +":"+ password +":"+ userId +".")
if (userId.isEmpty) {
if ( ! AuthUser.externalUserHelper(username, password).isEmpty)
userId = for {id <- AuthUser.getResourceUserId(username, password)} yield id

12
src/main/scala/code/api/v2_0_0/APIMethods200.scala
View File

@ -1414,18 +1414,16 @@ trait APIMethods200 {
postedData.username,
postedData.password
)
//AuthUser.create
//.firstName(postedData.first_name)
//.lastName(postedData.last_name)
//.username(postedData.username)
//.email(postedData.email)
//.password(postedData.password)
//.validated(true) // TODO Get this from Props
.firstName(postedData.first_name)
.lastName(postedData.last_name)
println("---::-------------------> " + userCreated)
if(userCreated.validate.size > 0){
Full(errorJsonResponse(userCreated.validate.map(_.msg).mkString(";")))
}
else
{
userCreated.validated(true)
userCreated.saveMe()
if (userCreated.saved_?) {
val json = JSONFactory200.createUserJSONfromAuthUser(userCreated)

93
src/main/scala/code/model/dataAccess/AuthUser.scala
View File

@ -85,45 +85,16 @@ class AuthUser extends MegaProtoUser[AuthUser] with Logger {
//override def validations = valUnique(S.?("unique.username")) _ :: super.validations
//override val fieldId = Some(Text("txtUsername"))
override def get = Users.users.vend.getResourceUserByUserId(resourceUserId.get) match {
case Full(u) => println("++++++++++++++++++++++> " + u); u.name
case Empty => println("+++++++++++++++++++++++get"); ""
case Full(u) => u.name
case Empty => ""
}
override def defaultValue = Users.users.vend.getResourceUserByUserId(resourceUserId.get) match {
case Full(u) => println("++++++++++++++++++++++> " + u); u.name
case Empty => println("+++++++++++++++++++++++defaultValue" + Users.users.vend.getResourceUserByUserId(resourceUserId.get)); ""
case Full(u) => u.name
case Empty => ""
}
override def set(u: String) = {println("#########################################################" + u); u}
override def set(u: String) = u
}
//lazy val username = new Username()
//class Username {
// def apply( name: String ) : String =
// Users.users.vend.getResourceUserByUserId(resourceUserId.get) match {
// case Full(u) => u.name
// case Empty => println("++++++++++++++++++++++++"); ""
// }
//
// def get : String =
// Users.users.vend.getResourceUserByUserId(resourceUserId.get) match {
// case Full(u) => u.name
// case Empty => println("++++++++++++++++++++++++"); ""
// }
//}
//class Username {
//private final var username_ = Users.users.vend.getResourceUserByUserId(resourceUserId.get).get.name
//def apply( u: String ) : Box[String] = {
// Users.users.vend.getUserByUserId(resourceUserId.get).map { u =>
// u.name
// }
//}
//def obj : Box[String] = Users.users.vend.getUserByUserId(resourceUserId.get).map { u =>
// u.name
//}
//def get : String = Users.users.vend.getResourceUserByUserId(resourceUserId.get).get.name
//def defined_? : Boolean = Users.users.vend.getResourceUserByUserId(resourceUserId.get).isDefined
//}
override lazy val password = new MyPasswordNew
class MyPasswordNew extends MappedPassword(this) {
@ -182,6 +153,7 @@ class AuthUser extends MegaProtoUser[AuthUser] with Logger {
}
def getProvider() = {
println("++++++++++++++++++++++++++++++++++++++ " + provider.get)
if(provider.get == null) {
Props.get("hostname","")
} else if ( provider.get == "" || provider.get == Props.get("hostname","") ) {
@ -500,38 +472,38 @@ import net.liftweb.util.Helpers._
val generatedId = java.util.UUID.randomUUID.toString
Users.users.vend.getResourceUserByUserId(resourceUserId.get) match {
case Full(u) => AuthUser.find(By(AuthUser.resourceUserId, resourceUserId.get)).get
case Empty =>
val au = Users.users.vend.createResourceUser(
prov,
Some(generatedId),
Some(uname),
Some(mail),
Some(generatedId)) match {
case Empty => null
case Full(r) if r.userId == generatedId =>
AuthUser.create
.firstName(uname)
.email(mail)
.password(pass)
.resourceUserId(r.userId)
case Full(r) if r.userId != generatedId =>
null
}
val validationErrors = au.validate
if(validationErrors.nonEmpty) {
au
}
(Users.users.vend.getResourceUserByUserId(resourceUserId.get) :: Nil) match {
case List(Empty) =>
val tempAu = AuthUser.create
.firstName(uname)
.email(mail)
.password(pass)
val validationErrors = tempAu.validate
if(validationErrors.nonEmpty)
tempAu
else {
val au = Users.users.vend.createResourceUser(
prov,
Some(uname),
Some(uname),
Some(mail),
Some(generatedId)) match {
case Empty => null
case Full(r) if r.userId == generatedId =>
tempAu.resourceUserId(r.userId)
case Full(r) if r.userId != generatedId =>
null
}
au.saveMe
}
case _ => AuthUser.find(By(AuthUser.resourceUserId, resourceUserId.get)).get
}
}
def getResourceUserId(username: String, password: String): Box[Long] = {
println("=================================> " + findUserByUsername(username))
findUserByUsername(username) match {
case Full(u) if u.getProvider() == Props.get("hostname","") =>
if (
@ -844,7 +816,10 @@ import net.liftweb.util.Helpers._
case Full(i) => i
case Empty => ""
}
find(By(this.resourceUserId, findId))
println(":-------------------------------------> "+ findId)
val res = find(By(this.resourceUserId, findId))
println(":-------------------------------------> "+ res)
res
}
//overridden to allow redirect to loginRedirect after signup. This is mostly to allow

3
src/test/scala/code/api/directloginTest.scala
View File

@ -36,6 +36,7 @@ class directloginTest extends ServerSetup with BeforeAndAfter {
) .firstName(randomString(10))
.lastName(randomString(10))
.validated(true)
.saveMe
if (Consumers.consumers.vend.getConsumerByConsumerKey(KEY).isEmpty)
Consumers.consumers.vend.createConsumer(Some(KEY), Some(SECRET), Some(true), Some("test application"), None, None, None, None, None).get
@ -49,6 +50,7 @@ class directloginTest extends ServerSetup with BeforeAndAfter {
) .firstName(randomString(10))
.lastName(randomString(10))
.validated(true)
.saveMe
if (Consumers.consumers.vend.getConsumerByConsumerKey(KEY_DISABLED).isEmpty)
Consumers.consumers.vend.createConsumer(Some(KEY_DISABLED), Some(SECRET_DISABLED), Some(false), Some("test application disabled"), None, None, None, None, None).get
@ -217,6 +219,7 @@ class directloginTest extends ServerSetup with BeforeAndAfter {
val response = makePostRequestAdditionalHeader(request, "", validHeaders)
var token = "INVALID"
Then("We should get a 200 - OK and a token")
println("-------------------> " + response.body )
response.code should equal(200)
response.body match {
case JObject(List(JField(name, JString(value)))) =>

3
src/test/scala/code/api/v2_0_0/CreateUserTest.scala
View File

@ -71,7 +71,8 @@ class CreateUserTest extends V200ServerSetup with BeforeAndAfter {
scenario("we create an user with email, first name, last name, username and password", CreateUser) {
When("we create a new user")
val params = Map("email" -> EMAIL,
val params = Map(
"email" -> EMAIL,
"username" -> USERNAME,
"password" -> PASSWORD,
"first_name" -> FIRSTNAME,