Merge branch 'tibor' into 'master'
API 1.0.34+2 registration with email fix See merge request bossanyit/aitrainer_server!53
This commit is contained in:
commit
a148a58346
@ -144,7 +144,7 @@ class CustomerController ( private val customerRepository: CustomerRepository) {
|
|||||||
dateAdd = nowFormatted
|
dateAdd = nowFormatted
|
||||||
firstname = ""
|
firstname = ""
|
||||||
name = ""
|
name = ""
|
||||||
email = ""
|
email = newUser.username
|
||||||
}
|
}
|
||||||
|
|
||||||
val returnCustomer: Customer? = customerRepository.findByEmail(newUser.username).let {
|
val returnCustomer: Customer? = customerRepository.findByEmail(newUser.username).let {
|
||||||
|
@ -210,13 +210,14 @@ class CustomerTests {
|
|||||||
val newCustomer: Customer = response.body as Customer
|
val newCustomer: Customer = response.body as Customer
|
||||||
assertEquals(response.statusCode, HttpStatus.OK)
|
assertEquals(response.statusCode, HttpStatus.OK)
|
||||||
assertEquals(newCustomer.firebaseUid, "3Firebase8Uid1")
|
assertEquals(newCustomer.firebaseUid, "3Firebase8Uid1")
|
||||||
|
assertEquals(newCustomer.email, "bosi2@example.com")
|
||||||
assertTrue(newCustomer.dateAdd != null)
|
assertTrue(newCustomer.dateAdd != null)
|
||||||
|
|
||||||
/* val json2 = "{\"username\":\"bosi2@example.com\",\"password\":\"934345\",\"firebaseUid\":\"3Firebase8Uid3\"}"
|
/* val json2 = "{\"username\":\"bosi2@example.com\",\"password\":\"934345\",\"firebaseUid\":\"3Firebase8Uid3\"}"
|
||||||
response = customerController.registration(json2)
|
response = customerController.registration(json2)
|
||||||
assertEquals(response.statusCode, HttpStatus.BAD_REQUEST)*/
|
assertEquals(response.statusCode, HttpStatus.BAD_REQUEST)*/
|
||||||
|
|
||||||
customerRepository.delete(newCustomer)
|
// customerRepository.delete(newCustomer)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
Loading…
Reference in New Issue
Block a user