@@ -10,9 +10,9 @@ |
||
10 | 10 | |
11 | 11 | use DateTimeImmutable; |
12 | 12 | use Exception; |
13 | -use stdClass; |
|
14 | 13 | use Waca\DataObject; |
15 | 14 | use Waca\Exceptions\OptimisticLockFailedException; |
15 | +use stdClass; |
|
16 | 16 | |
17 | 17 | class OAuthIdentity extends DataObject |
18 | 18 | { |
@@ -14,8 +14,8 @@ |
||
14 | 14 | use Waca\DataObjects\Request; |
15 | 15 | use Waca\DataObjects\User; |
16 | 16 | use Waca\Exceptions\ApplicationLogicException; |
17 | -use Waca\Helpers\Logger; |
|
18 | 17 | use Waca\Helpers\LogHelper; |
18 | +use Waca\Helpers\Logger; |
|
19 | 19 | use Waca\Helpers\SearchHelpers\JobQueueSearchHelper; |
20 | 20 | use Waca\Helpers\SearchHelpers\LogSearchHelper; |
21 | 21 | use Waca\Helpers\SearchHelpers\RequestSearchHelper; |
@@ -15,27 +15,20 @@ discard block |
||
15 | 15 | use Waca\Pages\PageEmailManagement; |
16 | 16 | use Waca\Pages\PageExpandedRequestList; |
17 | 17 | use Waca\Pages\PageJobQueue; |
18 | -use Waca\Pages\RequestAction\PageCreateRequest; |
|
19 | -use Waca\Pages\UserAuth\PageChangePassword; |
|
20 | -use Waca\Pages\UserAuth\PageForgotPassword; |
|
21 | 18 | use Waca\Pages\PageLog; |
22 | -use Waca\Pages\UserAuth\PageLogin; |
|
23 | -use Waca\Pages\UserAuth\PageLogout; |
|
24 | 19 | use Waca\Pages\PageMain; |
25 | -use Waca\Pages\UserAuth\PageOAuth; |
|
26 | -use Waca\Pages\UserAuth\PageOAuthCallback; |
|
27 | -use Waca\Pages\UserAuth\PagePreferences; |
|
28 | -use Waca\Pages\Registration\PageRegisterStandard; |
|
29 | -use Waca\Pages\Registration\PageRegisterOption; |
|
30 | 20 | use Waca\Pages\PageSearch; |
31 | 21 | use Waca\Pages\PageSiteNotice; |
32 | 22 | use Waca\Pages\PageTeam; |
33 | 23 | use Waca\Pages\PageUserManagement; |
34 | 24 | use Waca\Pages\PageViewRequest; |
35 | 25 | use Waca\Pages\PageWelcomeTemplateManagement; |
26 | +use Waca\Pages\Registration\PageRegisterOption; |
|
27 | +use Waca\Pages\Registration\PageRegisterStandard; |
|
36 | 28 | use Waca\Pages\RequestAction\PageBreakReservation; |
37 | 29 | use Waca\Pages\RequestAction\PageCloseRequest; |
38 | 30 | use Waca\Pages\RequestAction\PageComment; |
31 | +use Waca\Pages\RequestAction\PageCreateRequest; |
|
39 | 32 | use Waca\Pages\RequestAction\PageCustomClose; |
40 | 33 | use Waca\Pages\RequestAction\PageDeferRequest; |
41 | 34 | use Waca\Pages\RequestAction\PageDropRequest; |
@@ -49,6 +42,13 @@ discard block |
||
49 | 42 | use Waca\Pages\Statistics\StatsTemplateStats; |
50 | 43 | use Waca\Pages\Statistics\StatsTopCreators; |
51 | 44 | use Waca\Pages\Statistics\StatsUsers; |
45 | +use Waca\Pages\UserAuth\PageChangePassword; |
|
46 | +use Waca\Pages\UserAuth\PageForgotPassword; |
|
47 | +use Waca\Pages\UserAuth\PageLogin; |
|
48 | +use Waca\Pages\UserAuth\PageLogout; |
|
49 | +use Waca\Pages\UserAuth\PageOAuth; |
|
50 | +use Waca\Pages\UserAuth\PageOAuthCallback; |
|
51 | +use Waca\Pages\UserAuth\PagePreferences; |
|
52 | 52 | use Waca\Tasks\IRoutedTask; |
53 | 53 | use Waca\WebRequest; |
54 | 54 |
@@ -14,7 +14,6 @@ |
||
14 | 14 | use Waca\PdoDatabase; |
15 | 15 | use Waca\Security\CredentialProviders\ICredentialProvider; |
16 | 16 | use Waca\Security\CredentialProviders\PasswordCredentialProvider; |
17 | -use Waca\Security\CredentialProviders\YubikeyCredentialProvider; |
|
18 | 17 | use Waca\SiteConfiguration; |
19 | 18 | |
20 | 19 | class AuthenticationManager |
@@ -16,10 +16,6 @@ discard block |
||
16 | 16 | use Waca\Pages\PageJobQueue; |
17 | 17 | use Waca\Pages\PageLog; |
18 | 18 | use Waca\Pages\PageMain; |
19 | -use Waca\Pages\RequestAction\PageCreateRequest; |
|
20 | -use Waca\Pages\UserAuth\PageChangePassword; |
|
21 | -use Waca\Pages\UserAuth\PageOAuth; |
|
22 | -use Waca\Pages\UserAuth\PagePreferences; |
|
23 | 19 | use Waca\Pages\PageSearch; |
24 | 20 | use Waca\Pages\PageSiteNotice; |
25 | 21 | use Waca\Pages\PageTeam; |
@@ -29,6 +25,7 @@ discard block |
||
29 | 25 | use Waca\Pages\RequestAction\PageBreakReservation; |
30 | 26 | use Waca\Pages\RequestAction\PageCloseRequest; |
31 | 27 | use Waca\Pages\RequestAction\PageComment; |
28 | +use Waca\Pages\RequestAction\PageCreateRequest; |
|
32 | 29 | use Waca\Pages\RequestAction\PageCustomClose; |
33 | 30 | use Waca\Pages\RequestAction\PageDeferRequest; |
34 | 31 | use Waca\Pages\RequestAction\PageDropRequest; |
@@ -42,6 +39,9 @@ discard block |
||
42 | 39 | use Waca\Pages\Statistics\StatsTemplateStats; |
43 | 40 | use Waca\Pages\Statistics\StatsTopCreators; |
44 | 41 | use Waca\Pages\Statistics\StatsUsers; |
42 | +use Waca\Pages\UserAuth\PageChangePassword; |
|
43 | +use Waca\Pages\UserAuth\PageOAuth; |
|
44 | +use Waca\Pages\UserAuth\PagePreferences; |
|
45 | 45 | |
46 | 46 | class RoleConfiguration |
47 | 47 | { |