Skip to content

Commit f784c89

Browse files
OnitaAndreiOnitaAndrei
authored
Merge pull request #144 from dotkernel/issue-142
identity can no longer be updated
2 parents 4312a7a + 555fafc commit f784c89

File tree

6 files changed

+5
-42
lines changed

6 files changed

+5
-42
lines changed

‎documentation/DotKernel_API.postman_collection.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"header": [],
2020
"body": {
2121
"mode": "raw",
22-
"raw": "{\r\n \"identity\": \"{{$randomUserName}}\",\r\n \"password\": \"123456\",\r\n \"passwordConfirm\": \"123456\"\r\n}",
22+
"raw": "{\r\n \"password\": \"123456\",\r\n \"passwordConfirm\": \"123456\"\r\n}",
2323
"options": {
2424
"raw": {
2525
"language": "json"
@@ -383,7 +383,7 @@
383383
"header": [],
384384
"body": {
385385
"mode": "raw",
386-
"raw": "{\r\n \"identity\": \"{{$randomUserName}}\",\r\n \"password\": \"123456\",\r\n \"passwordConfirm\": \"123456\",\r\n \"firstName\": \"{{$randomFirstName}}\",\r\n \"lastName\": \"{{$randomLastName}}\",\r\n \"roles\": [\r\n {\r\n \"uuid\": \"{{$randomUUID}}\"\r\n }\r\n ]\r\n}",
386+
"raw": "{\r\n \"password\": \"123456\",\r\n \"passwordConfirm\": \"123456\",\r\n \"firstName\": \"{{$randomFirstName}}\",\r\n \"lastName\": \"{{$randomLastName}}\",\r\n \"roles\": [\r\n {\r\n \"uuid\": \"{{$randomUUID}}\"\r\n }\r\n ]\r\n}",
387387
"options": {
388388
"raw": {
389389
"language": "json"
@@ -700,7 +700,7 @@
700700
"header": [],
701701
"body": {
702702
"mode": "raw",
703-
"raw": "{\r\n \"identity\": \"{{$randomUserName}}\",\r\n \"password\": \"123456\",\r\n \"passwordConfirm\": \"123456\",\r\n \"status\": \"active\",\r\n \"detail\": {\r\n \"firstName\": \"{{$randomFirstName}}\",\r\n \"lastName\": \"{{$randomLastName}}\",\r\n \"email\": \"{{$randomExampleEmail}}\"\r\n },\r\n \"roles\": [\r\n {\r\n \"uuid\": \"{{$randomUUID}}\"\r\n }\r\n ]\r\n}",
703+
"raw": "{\r\n \"password\": \"123456\",\r\n \"passwordConfirm\": \"123456\",\r\n \"status\": \"active\",\r\n \"detail\": {\r\n \"firstName\": \"{{$randomFirstName}}\",\r\n \"lastName\": \"{{$randomLastName}}\",\r\n \"email\": \"{{$randomExampleEmail}}\"\r\n },\r\n \"roles\": [\r\n {\r\n \"uuid\": \"{{$randomUUID}}\"\r\n }\r\n ]\r\n}",
704704
"options": {
705705
"raw": {
706706
"language": "json"
@@ -1106,7 +1106,7 @@
11061106
"header": [],
11071107
"body": {
11081108
"mode": "raw",
1109-
"raw": "{\r\n \"identity\": \"{{$randomUserName}}\",\r\n \"password\": \"123456\",\r\n \"passwordConfirm\": \"123456\",\r\n \"detail\": {\r\n \"firstName\": \"{{$randomFirstName}}\",\r\n \"lastName\": \"{{$randomLastName}}\",\r\n \"email\": \"{{$randomExampleEmail}}\"\r\n }\r\n}",
1109+
"raw": "{\r\n \"password\": \"123456\",\r\n \"passwordConfirm\": \"123456\",\r\n \"detail\": {\r\n \"firstName\": \"{{$randomFirstName}}\",\r\n \"lastName\": \"{{$randomLastName}}\",\r\n \"email\": \"{{$randomExampleEmail}}\"\r\n }\r\n}",
11101110
"options": {
11111111
"raw": {
11121112
"language": "json"

‎src/Admin/src/Form/InputFilter/UpdateAdminInputFilter.php‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,6 @@ public function getInputFilter(): InputFilterInterface
5959
$this->inputFilter->add([
6060
'name' => 'uuid',
6161
'required' => false
62-
])->add([
63-
'name' => 'identity',
64-
'required' => false,
65-
'filters' => [
66-
['name' => StringTrim::class],
67-
['name' => StripTags::class]
68-
],
69-
'validators' => [
70-
[
71-
'name' => NotEmpty::class,
72-
'break_chain_on_failure' => true,
73-
'options' => [
74-
'message' => Message::VALIDATOR_SKIP_OR_FILL
75-
]
76-
]
77-
]
7862
])->add([
7963
'name' => 'password',
8064
'required' => false,

‎src/Admin/src/Service/AdminService.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,6 @@ public function getAdmins(array $params = []): AdminCollection
103103
*/
104104
public function updateAdmin(Admin $admin, array $data = []): Admin
105105
{
106-
if (isset($data['identity']) && !is_null($data['identity'])) {
107-
if ($this->exists($data['identity'], $admin->getUuid()->toString())) {
108-
throw new ORMException(Message::DUPLICATE_IDENTITY);
109-
}
110-
$admin->setIdentity($data['identity']);
111-
}
112-
113106
if (isset($data['password']) && !is_null($data['password'])) {
114107
$admin->setPassword(
115108
password_hash($data['password'], PASSWORD_DEFAULT)

‎src/User/src/Form/InputFilter/UpdateAccountInputFilter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function getInputFilter(): InputFilterInterface
2323
{
2424
if (empty($this->inputFilter)) {
2525
$this->inputFilter = (new UpdateUserInputFilter())->getInputFilter();
26-
$this->inputFilter->setValidationGroup(['identity', 'password', 'passwordConfirm', 'detail']);
26+
$this->inputFilter->setValidationGroup(['password', 'passwordConfirm', 'detail']);
2727
}
2828

2929
return $this->inputFilter;

‎src/User/src/Form/InputFilter/UpdateUserInputFilter.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,6 @@ public function getInputFilter(): InputFilterInterface
6161
$this->inputFilter->add([
6262
'name' => 'uuid',
6363
'required' => false
64-
])->add([
65-
'name' => 'identity',
66-
'required' => false,
67-
'filters' => [
68-
['name' => StringTrim::class],
69-
['name' => StripTags::class]
70-
]
7164
])->add([
7265
'name' => 'password',
7366
'required' => false,

‎src/User/src/Service/UserService.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -406,13 +406,6 @@ public function sendWelcomeMail(User $user): bool
406406
*/
407407
public function updateUser(User $user, array $data = []): User
408408
{
409-
if (isset($data['identity']) && !is_null($data['identity'])) {
410-
if ($this->exists($data['identity'], $user->getUuid()->toString())) {
411-
throw new ORMException(Message::DUPLICATE_IDENTITY);
412-
}
413-
$user->setIdentity($data['identity']);
414-
}
415-
416409
if (isset($data['password']) && !is_null($data['password'])) {
417410
$user->setPassword(
418411
password_hash($data['password'], PASSWORD_DEFAULT)

0 commit comments

Comments
 (0)