@@ -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,30 +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\Login\PageOtpLogin; |
|
| 20 | -use Waca\Pages\UserAuth\Login\PagePasswordLogin; |
|
| 21 | -use Waca\Pages\UserAuth\Login\PageU2FLogin; |
|
| 22 | -use Waca\Pages\UserAuth\PageChangePassword; |
|
| 23 | -use Waca\Pages\UserAuth\PageForgotPassword; |
|
| 24 | 18 | use Waca\Pages\PageLog; |
| 25 | -use Waca\Pages\UserAuth\PageLogout; |
|
| 26 | 19 | use Waca\Pages\PageMain; |
| 27 | -use Waca\Pages\UserAuth\MultiFactor\PageMultiFactor; |
|
| 28 | -use Waca\Pages\UserAuth\PageOAuth; |
|
| 29 | -use Waca\Pages\UserAuth\PageOAuthCallback; |
|
| 30 | -use Waca\Pages\UserAuth\PagePreferences; |
|
| 31 | -use Waca\Pages\Registration\PageRegisterStandard; |
|
| 32 | -use Waca\Pages\Registration\PageRegisterOption; |
|
| 33 | 20 | use Waca\Pages\PageSearch; |
| 34 | 21 | use Waca\Pages\PageSiteNotice; |
| 35 | 22 | use Waca\Pages\PageTeam; |
| 36 | 23 | use Waca\Pages\PageUserManagement; |
| 37 | 24 | use Waca\Pages\PageViewRequest; |
| 38 | 25 | use Waca\Pages\PageWelcomeTemplateManagement; |
| 26 | +use Waca\Pages\Registration\PageRegisterOption; |
|
| 27 | +use Waca\Pages\Registration\PageRegisterStandard; |
|
| 39 | 28 | use Waca\Pages\RequestAction\PageBreakReservation; |
| 40 | 29 | use Waca\Pages\RequestAction\PageCloseRequest; |
| 41 | 30 | use Waca\Pages\RequestAction\PageComment; |
| 31 | +use Waca\Pages\RequestAction\PageCreateRequest; |
|
| 42 | 32 | use Waca\Pages\RequestAction\PageCustomClose; |
| 43 | 33 | use Waca\Pages\RequestAction\PageDeferRequest; |
| 44 | 34 | use Waca\Pages\RequestAction\PageDropRequest; |
@@ -52,6 +42,16 @@ discard block |
||
| 52 | 42 | use Waca\Pages\Statistics\StatsTemplateStats; |
| 53 | 43 | use Waca\Pages\Statistics\StatsTopCreators; |
| 54 | 44 | use Waca\Pages\Statistics\StatsUsers; |
| 45 | +use Waca\Pages\UserAuth\Login\PageOtpLogin; |
|
| 46 | +use Waca\Pages\UserAuth\Login\PagePasswordLogin; |
|
| 47 | +use Waca\Pages\UserAuth\Login\PageU2FLogin; |
|
| 48 | +use Waca\Pages\UserAuth\MultiFactor\PageMultiFactor; |
|
| 49 | +use Waca\Pages\UserAuth\PageChangePassword; |
|
| 50 | +use Waca\Pages\UserAuth\PageForgotPassword; |
|
| 51 | +use Waca\Pages\UserAuth\PageLogout; |
|
| 52 | +use Waca\Pages\UserAuth\PageOAuth; |
|
| 53 | +use Waca\Pages\UserAuth\PageOAuthCallback; |
|
| 54 | +use Waca\Pages\UserAuth\PagePreferences; |
|
| 55 | 55 | use Waca\Tasks\IRoutedTask; |
| 56 | 56 | use Waca\WebRequest; |
| 57 | 57 | |
@@ -16,11 +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\MultiFactor\PageMultiFactor; |
|
| 22 | -use Waca\Pages\UserAuth\PageOAuth; |
|
| 23 | -use Waca\Pages\UserAuth\PagePreferences; |
|
| 24 | 19 | use Waca\Pages\PageSearch; |
| 25 | 20 | use Waca\Pages\PageSiteNotice; |
| 26 | 21 | use Waca\Pages\PageTeam; |
@@ -30,6 +25,7 @@ discard block |
||
| 30 | 25 | use Waca\Pages\RequestAction\PageBreakReservation; |
| 31 | 26 | use Waca\Pages\RequestAction\PageCloseRequest; |
| 32 | 27 | use Waca\Pages\RequestAction\PageComment; |
| 28 | +use Waca\Pages\RequestAction\PageCreateRequest; |
|
| 33 | 29 | use Waca\Pages\RequestAction\PageCustomClose; |
| 34 | 30 | use Waca\Pages\RequestAction\PageDeferRequest; |
| 35 | 31 | use Waca\Pages\RequestAction\PageDropRequest; |
@@ -43,6 +39,10 @@ discard block |
||
| 43 | 39 | use Waca\Pages\Statistics\StatsTemplateStats; |
| 44 | 40 | use Waca\Pages\Statistics\StatsTopCreators; |
| 45 | 41 | use Waca\Pages\Statistics\StatsUsers; |
| 42 | +use Waca\Pages\UserAuth\MultiFactor\PageMultiFactor; |
|
| 43 | +use Waca\Pages\UserAuth\PageChangePassword; |
|
| 44 | +use Waca\Pages\UserAuth\PageOAuth; |
|
| 45 | +use Waca\Pages\UserAuth\PagePreferences; |
|
| 46 | 46 | |
| 47 | 47 | class RoleConfiguration |
| 48 | 48 | { |
@@ -9,14 +9,14 @@ |
||
| 9 | 9 | namespace Waca\Security\CredentialProviders; |
| 10 | 10 | |
| 11 | 11 | use DateTimeImmutable; |
| 12 | -use u2flib_server\Error; |
|
| 13 | -use u2flib_server\U2F; |
|
| 14 | 12 | use Waca\DataObjects\User; |
| 15 | 13 | use Waca\Exceptions\ApplicationLogicException; |
| 16 | 14 | use Waca\Exceptions\OptimisticLockFailedException; |
| 17 | 15 | use Waca\PdoDatabase; |
| 18 | 16 | use Waca\SiteConfiguration; |
| 19 | 17 | use Waca\WebRequest; |
| 18 | +use u2flib_server\Error; |
|
| 19 | +use u2flib_server\U2F; |
|
| 20 | 20 | |
| 21 | 21 | class U2FCredentialProvider extends CredentialProviderBase |
| 22 | 22 | { |