@@ -3,26 +3,25 @@ |
||
3 | 3 | |
4 | 4 | namespace Canvas\Models; |
5 | 5 | |
6 | +use Baka\Auth\Models\Users as BakUser; |
|
7 | +use Baka\Database\Contracts\HashTableTrait; |
|
8 | +use Canvas\Auth\App as AppAuth; |
|
9 | +use Canvas\Contracts\Notifications\NotifiableTrait; |
|
10 | +use Canvas\Hashing\Password; |
|
11 | +use Canvas\Traits\EventManagerAwareTrait; |
|
12 | +use Canvas\Traits\FileSystemModelTrait; |
|
6 | 13 | use Canvas\Traits\PermissionsTrait; |
7 | 14 | use Canvas\Traits\SubscriptionPlanLimitTrait; |
8 | -use Phalcon\Cashier\Billable; |
|
15 | +use Canvas\Validations\PasswordValidation; |
|
9 | 16 | use Carbon\Carbon; |
17 | +use Exception; |
|
18 | +use Phalcon\Cashier\Billable; |
|
19 | +use Phalcon\Di; |
|
20 | +use Phalcon\Security\Random; |
|
10 | 21 | use Phalcon\Validation; |
11 | 22 | use Phalcon\Validation\Validator\Email; |
12 | 23 | use Phalcon\Validation\Validator\PresenceOf; |
13 | -use Phalcon\Validation\Validator\Regex; |
|
14 | 24 | use Phalcon\Validation\Validator\Uniqueness; |
15 | -use Canvas\Traits\FileSystemModelTrait; |
|
16 | -use Phalcon\Security\Random; |
|
17 | -use Baka\Database\Contracts\HashTableTrait; |
|
18 | -use Canvas\Contracts\Notifications\NotifiableTrait; |
|
19 | -use Canvas\Traits\EventManagerAwareTrait; |
|
20 | -use Phalcon\Di; |
|
21 | -use Canvas\Auth\App as AppAuth; |
|
22 | -use Exception; |
|
23 | -use Canvas\Validations\PasswordValidation; |
|
24 | -use Baka\Auth\Models\Users as BakUser; |
|
25 | -use Canvas\Hashing\Password; |
|
26 | 25 | |
27 | 26 | /** |
28 | 27 | * Class Users. |
@@ -389,7 +389,6 @@ |
||
389 | 389 | * Set the email config array we are going to be sending. |
390 | 390 | * |
391 | 391 | * @todo deprecated move to notifications |
392 | - * @param String $emailAction |
|
393 | 392 | * @param Users $user |
394 | 393 | * @deprecated version 1 |
395 | 394 | * @return void |
@@ -4,30 +4,30 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Api\Controllers; |
6 | 6 | |
7 | -use Canvas\Models\Users; |
|
7 | +use Baka\Auth\Models\Sessions; |
|
8 | +use Baka\Auth\Models\Users as BakaUsers; |
|
9 | +use Canvas\Auth\Factory; |
|
10 | +use Canvas\Exception\ModelException; |
|
11 | +use Canvas\Http\Exception\InternalServerErrorException; |
|
12 | +use Canvas\Http\Exception\NotFoundException; |
|
8 | 13 | use Canvas\Models\Sources; |
9 | 14 | use Canvas\Models\UserLinkedSources; |
10 | -use Canvas\Exception\ModelException; |
|
11 | -use Baka\Auth\Models\Users as BakaUsers; |
|
15 | +use Canvas\Models\Users; |
|
16 | +use Canvas\Notifications\PasswordUpdate; |
|
17 | +use Canvas\Notifications\ResetPassword; |
|
18 | +use Canvas\Notifications\Signup; |
|
19 | +use Canvas\Notifications\UpdateEmail; |
|
12 | 20 | use Canvas\Traits\AuthTrait; |
13 | 21 | use Canvas\Traits\SocialLoginTrait; |
14 | -use Canvas\Http\Exception\NotFoundException; |
|
22 | +use Canvas\Traits\TokenTrait; |
|
23 | +use Canvas\Validation as CanvasValidation; |
|
24 | +use Canvas\Validations\PasswordValidation; |
|
15 | 25 | use Exception; |
16 | 26 | use Phalcon\Http\Response; |
17 | 27 | use Phalcon\Validation\Validator\Confirmation; |
18 | 28 | use Phalcon\Validation\Validator\Email as EmailValidator; |
19 | 29 | use Phalcon\Validation\Validator\PresenceOf; |
20 | 30 | use Phalcon\Validation\Validator\StringLength; |
21 | -use Baka\Auth\Models\Sessions; |
|
22 | -use Canvas\Auth\Factory; |
|
23 | -use Canvas\Http\Exception\InternalServerErrorException; |
|
24 | -use Canvas\Validation as CanvasValidation; |
|
25 | -use Canvas\Notifications\ResetPassword; |
|
26 | -use Canvas\Notifications\PasswordUpdate; |
|
27 | -use Canvas\Notifications\Signup; |
|
28 | -use Canvas\Notifications\UpdateEmail; |
|
29 | -use Canvas\Validations\PasswordValidation; |
|
30 | -use Canvas\Traits\TokenTrait; |
|
31 | 31 | |
32 | 32 | /** |
33 | 33 | * Class AuthController. |
@@ -4,13 +4,13 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Listener; |
6 | 6 | |
7 | -use Phalcon\Events\Event; |
|
8 | -use Canvas\Models\Users; |
|
9 | -use Canvas\Models\Companies; |
|
10 | 7 | use Canvas\Auth\App; |
11 | 8 | use Canvas\Models\Apps; |
9 | +use Canvas\Models\Companies; |
|
12 | 10 | use Canvas\Models\Roles; |
11 | +use Canvas\Models\Users; |
|
13 | 12 | use Canvas\Models\UsersInvite; |
13 | +use Phalcon\Events\Event; |
|
14 | 14 | |
15 | 15 | class User |
16 | 16 | { |