Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
Doorcode
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Guardians of the Kretschmar Elock System
Doorcode
Commits
271e93ba
Commit
271e93ba
authored
May 30, 2020
by
Jacob Priddy
👌
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Losten up user create requirements
parent
628e1f6d
Pipeline
#10702
passed with stages
in 2 minutes and 58 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
17 deletions
+8
-17
src/backend/app/Http/Controllers/UsersController.php
src/backend/app/Http/Controllers/UsersController.php
+2
-2
src/backend/src/UseCases/Users/CreateUser/CreateUser.php
src/backend/src/UseCases/Users/CreateUser/CreateUser.php
+4
-4
src/backend/src/UseCases/Users/CreateUser/CreateUserUseCase.php
...ckend/src/UseCases/Users/CreateUser/CreateUserUseCase.php
+2
-2
src/backend/tests/Feature/Api/Users/CreateUserApiTest.php
src/backend/tests/Feature/Api/Users/CreateUserApiTest.php
+0
-9
No files found.
src/backend/app/Http/Controllers/UsersController.php
View file @
271e93ba
...
...
@@ -85,10 +85,10 @@ class UsersController extends ApiController
'first_name'
=>
'required|string|max:255'
,
'last_name'
=>
'required|string|max:255'
,
'display_name'
=>
'required|string|max:255'
,
'emplid'
=>
'nullable|string|max:7|min:6'
,
'email'
=>
'required|email|max:255'
,
'emplid'
=>
'nullable|string|max:7|min:6'
,
'password'
=>
'nullable|string|min:15|max:255'
,
'doorcode'
=>
'
required
|string|numeric|digits_between:4,255'
,
'doorcode'
=>
'
nullable
|string|numeric|digits_between:4,255'
,
'expires_at'
=>
'nullable|string|date|max:255'
,
]);
...
...
src/backend/src/UseCases/Users/CreateUser/CreateUser.php
View file @
271e93ba
...
...
@@ -39,6 +39,8 @@ class CreateUser implements CreateUserUseCase
$password
=
$attributes
[
'password'
]
??
''
;
$doorcode
=
$attributes
[
'doorcode'
]
??
null
;
// ID, createdAt, and updatedAt will get overwritten
$user
=
new
User
(
0
,
...
...
@@ -48,10 +50,8 @@ class CreateUser implements CreateUserUseCase
$attributes
[
'email'
],
$emplid
,
Password
::
hash
(
$password
),
HashedSearchable
::
hash
(
$this
->
salt
,
$attributes
[
'doorcode'
]),
$expires
,
null
,
null
HashedSearchable
::
hash
(
$this
->
salt
,
$doorcode
),
$expires
);
...
...
src/backend/src/UseCases/Users/CreateUser/CreateUserUseCase.php
View file @
271e93ba
...
...
@@ -13,11 +13,11 @@ interface CreateUserUseCase
* last_name
* display_name
* email
* password
* doorcode
* Optional attributes
* emplid
* expires_at
* password
* doorcode
*
* @param array $attributes
* @param Presenter $presenter
...
...
src/backend/tests/Feature/Api/Users/CreateUserApiTest.php
View file @
271e93ba
...
...
@@ -98,15 +98,6 @@ class CreateUserApiTest extends AuthenticatesWithApplicationTestCase
],
[
'email'
=>
[
'The email field is required.'
]],
],
[
[
'first_name'
=>
$user
->
getFirstName
(),
'last_name'
=>
$user
->
getLastName
(),
'display_name'
=>
$user
->
getDisplayName
(),
'email'
=>
$user
->
getEmail
(),
],
[
'doorcode'
=>
[
'The doorcode field is required.'
]],
],
// emplid is too small
[
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment