From 701bb2ac6ec99d0c754d3bf19216ec79232e10d4 Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Tue, 22 Jul 2014 21:04:13 +1000 Subject: [PATCH] Rename auth classes for consistency Summary: Ref T5655. Depends on D9998. Test Plan: `arc unit` Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: 20after4, epriestley, Korvin Maniphest Tasks: T5655 Differential Revision: https://secure.phabricator.com/D9999 --- src/__phutil_library_map__.php | 68 +++++++++---------- ....php => PhabricatorAmazonAuthProvider.php} | 6 +- ...a.php => PhabricatorAsanaAuthProvider.php} | 7 +- ...p => PhabricatorBitbucketAuthProvider.php} | 6 +- ....php => PhabricatorDisqusAuthProvider.php} | 6 +- ...hp => PhabricatorFacebookAuthProvider.php} | 6 +- ....php => PhabricatorGitHubAuthProvider.php} | 6 +- ....php => PhabricatorGoogleAuthProvider.php} | 6 +- ...RA.php => PhabricatorJIRAAuthProvider.php} | 7 +- ...AP.php => PhabricatorLDAPAuthProvider.php} | 7 +- ....php => PhabricatorOAuth1AuthProvider.php} | 6 +- ....php => PhabricatorOAuth2AuthProvider.php} | 6 +- ...h.php => PhabricatorOAuthAuthProvider.php} | 2 +- ...hp => PhabricatorPasswordAuthProvider.php} | 3 +- ...php => PhabricatorPersonaAuthProvider.php} | 5 +- ....php => PhabricatorTwitchAuthProvider.php} | 6 +- ...php => PhabricatorTwitterAuthProvider.php} | 6 +- ...p => PhabricatorWordPressAuthProvider.php} | 6 +- 18 files changed, 80 insertions(+), 85 deletions(-) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuthAmazon.php => PhabricatorAmazonAuthProvider.php} (89%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuthAsana.php => PhabricatorAsanaAuthProvider.php} (83%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuth1Bitbucket.php => PhabricatorBitbucketAuthProvider.php} (80%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuthDisqus.php => PhabricatorDisqusAuthProvider.php} (85%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuthFacebook.php => PhabricatorFacebookAuthProvider.php} (96%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuthGitHub.php => PhabricatorGitHubAuthProvider.php} (89%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuthGoogle.php => PhabricatorGoogleAuthProvider.php} (91%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuth1JIRA.php => PhabricatorJIRAAuthProvider.php} (97%) rename src/applications/auth/provider/{PhabricatorAuthProviderLDAP.php => PhabricatorLDAPAuthProvider.php} (98%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuth1.php => PhabricatorOAuth1AuthProvider.php} (98%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuth2.php => PhabricatorOAuth2AuthProvider.php} (98%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuth.php => PhabricatorOAuthAuthProvider.php} (98%) rename src/applications/auth/provider/{PhabricatorAuthProviderPassword.php => PhabricatorPasswordAuthProvider.php} (99%) rename src/applications/auth/provider/{PhabricatorAuthProviderPersona.php => PhabricatorPersonaAuthProvider.php} (92%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuthTwitch.php => PhabricatorTwitchAuthProvider.php} (86%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuth1Twitter.php => PhabricatorTwitterAuthProvider.php} (84%) rename src/applications/auth/provider/{PhabricatorAuthProviderOAuthWordPress.php => PhabricatorWordPressAuthProvider.php} (87%) diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 541d2a9b20..0b32f656fa 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -1127,6 +1127,7 @@ phutil_register_library_map(array( 'PhabricatorActionListView' => 'view/layout/PhabricatorActionListView.php', 'PhabricatorActionView' => 'view/layout/PhabricatorActionView.php', 'PhabricatorAllCapsTranslation' => 'infrastructure/internationalization/translation/PhabricatorAllCapsTranslation.php', + 'PhabricatorAmazonAuthProvider' => 'applications/auth/provider/PhabricatorAmazonAuthProvider.php', 'PhabricatorAnchorView' => 'view/layout/PhabricatorAnchorView.php', 'PhabricatorAphlictManagementBuildWorkflow' => 'applications/aphlict/management/PhabricatorAphlictManagementBuildWorkflow.php', 'PhabricatorAphlictManagementDebugWorkflow' => 'applications/aphlict/management/PhabricatorAphlictManagementDebugWorkflow.php', @@ -1240,6 +1241,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationXHProf' => 'applications/xhprof/application/PhabricatorApplicationXHProf.php', 'PhabricatorApplicationsController' => 'applications/meta/controller/PhabricatorApplicationsController.php', 'PhabricatorApplicationsListController' => 'applications/meta/controller/PhabricatorApplicationsListController.php', + 'PhabricatorAsanaAuthProvider' => 'applications/auth/provider/PhabricatorAsanaAuthProvider.php', 'PhabricatorAsanaConfigOptions' => 'applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php', 'PhabricatorAuditActionConstants' => 'applications/audit/constants/PhabricatorAuditActionConstants.php', 'PhabricatorAuditAddCommentController' => 'applications/audit/controller/PhabricatorAuditAddCommentController.php', @@ -1293,23 +1295,6 @@ phutil_register_library_map(array( 'PhabricatorAuthProviderConfigQuery' => 'applications/auth/query/PhabricatorAuthProviderConfigQuery.php', 'PhabricatorAuthProviderConfigTransaction' => 'applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php', 'PhabricatorAuthProviderConfigTransactionQuery' => 'applications/auth/query/PhabricatorAuthProviderConfigTransactionQuery.php', - 'PhabricatorAuthProviderLDAP' => 'applications/auth/provider/PhabricatorAuthProviderLDAP.php', - 'PhabricatorAuthProviderOAuth' => 'applications/auth/provider/PhabricatorAuthProviderOAuth.php', - 'PhabricatorAuthProviderOAuth1' => 'applications/auth/provider/PhabricatorAuthProviderOAuth1.php', - 'PhabricatorAuthProviderOAuth1Bitbucket' => 'applications/auth/provider/PhabricatorAuthProviderOAuth1Bitbucket.php', - 'PhabricatorAuthProviderOAuth1JIRA' => 'applications/auth/provider/PhabricatorAuthProviderOAuth1JIRA.php', - 'PhabricatorAuthProviderOAuth1Twitter' => 'applications/auth/provider/PhabricatorAuthProviderOAuth1Twitter.php', - 'PhabricatorAuthProviderOAuth2' => 'applications/auth/provider/PhabricatorAuthProviderOAuth2.php', - 'PhabricatorAuthProviderOAuthAmazon' => 'applications/auth/provider/PhabricatorAuthProviderOAuthAmazon.php', - 'PhabricatorAuthProviderOAuthAsana' => 'applications/auth/provider/PhabricatorAuthProviderOAuthAsana.php', - 'PhabricatorAuthProviderOAuthDisqus' => 'applications/auth/provider/PhabricatorAuthProviderOAuthDisqus.php', - 'PhabricatorAuthProviderOAuthFacebook' => 'applications/auth/provider/PhabricatorAuthProviderOAuthFacebook.php', - 'PhabricatorAuthProviderOAuthGitHub' => 'applications/auth/provider/PhabricatorAuthProviderOAuthGitHub.php', - 'PhabricatorAuthProviderOAuthGoogle' => 'applications/auth/provider/PhabricatorAuthProviderOAuthGoogle.php', - 'PhabricatorAuthProviderOAuthTwitch' => 'applications/auth/provider/PhabricatorAuthProviderOAuthTwitch.php', - 'PhabricatorAuthProviderOAuthWordPress' => 'applications/auth/provider/PhabricatorAuthProviderOAuthWordPress.php', - 'PhabricatorAuthProviderPassword' => 'applications/auth/provider/PhabricatorAuthProviderPassword.php', - 'PhabricatorAuthProviderPersona' => 'applications/auth/provider/PhabricatorAuthProviderPersona.php', 'PhabricatorAuthRegisterController' => 'applications/auth/controller/PhabricatorAuthRegisterController.php', 'PhabricatorAuthSession' => 'applications/auth/storage/PhabricatorAuthSession.php', 'PhabricatorAuthSessionEngine' => 'applications/auth/engine/PhabricatorAuthSessionEngine.php', @@ -1330,6 +1315,7 @@ phutil_register_library_map(array( 'PhabricatorBaseEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php', 'PhabricatorBaseProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorBaseProtocolAdapter.php', 'PhabricatorBcryptPasswordHasher' => 'infrastructure/util/password/PhabricatorBcryptPasswordHasher.php', + 'PhabricatorBitbucketAuthProvider' => 'applications/auth/provider/PhabricatorBitbucketAuthProvider.php', 'PhabricatorBot' => 'infrastructure/daemon/bot/PhabricatorBot.php', 'PhabricatorBotBaseStreamingProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorBotBaseStreamingProtocolAdapter.php', 'PhabricatorBotChannel' => 'infrastructure/daemon/bot/target/PhabricatorBotChannel.php', @@ -1557,6 +1543,7 @@ phutil_register_library_map(array( 'PhabricatorDifferentialRevisionTestDataGenerator' => 'applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php', 'PhabricatorDiffusionConfigOptions' => 'applications/diffusion/config/PhabricatorDiffusionConfigOptions.php', 'PhabricatorDisabledUserController' => 'applications/auth/controller/PhabricatorDisabledUserController.php', + 'PhabricatorDisqusAuthProvider' => 'applications/auth/provider/PhabricatorDisqusAuthProvider.php', 'PhabricatorDisqusConfigOptions' => 'applications/config/option/PhabricatorDisqusConfigOptions.php', 'PhabricatorDraft' => 'applications/draft/storage/PhabricatorDraft.php', 'PhabricatorDraftDAO' => 'applications/draft/storage/PhabricatorDraftDAO.php', @@ -1584,6 +1571,7 @@ phutil_register_library_map(array( 'PhabricatorExtendingPhabricatorConfigOptions' => 'applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php', 'PhabricatorExternalAccount' => 'applications/people/storage/PhabricatorExternalAccount.php', 'PhabricatorExternalAccountQuery' => 'applications/auth/query/PhabricatorExternalAccountQuery.php', + 'PhabricatorFacebookAuthProvider' => 'applications/auth/provider/PhabricatorFacebookAuthProvider.php', 'PhabricatorFactAggregate' => 'applications/fact/storage/PhabricatorFactAggregate.php', 'PhabricatorFactChartController' => 'applications/fact/controller/PhabricatorFactChartController.php', 'PhabricatorFactController' => 'applications/fact/controller/PhabricatorFactController.php', @@ -1688,8 +1676,10 @@ phutil_register_library_map(array( 'PhabricatorGarbageCollectorDaemon' => 'infrastructure/daemon/garbagecollector/PhabricatorGarbageCollectorDaemon.php', 'PhabricatorGestureExample' => 'applications/uiexample/examples/PhabricatorGestureExample.php', 'PhabricatorGitGraphStream' => 'applications/repository/daemon/PhabricatorGitGraphStream.php', + 'PhabricatorGitHubAuthProvider' => 'applications/auth/provider/PhabricatorGitHubAuthProvider.php', 'PhabricatorGlobalLock' => 'infrastructure/util/PhabricatorGlobalLock.php', 'PhabricatorGlobalUploadTargetView' => 'applications/files/view/PhabricatorGlobalUploadTargetView.php', + 'PhabricatorGoogleAuthProvider' => 'applications/auth/provider/PhabricatorGoogleAuthProvider.php', 'PhabricatorHandleObjectSelectorDataView' => 'applications/phid/handle/view/PhabricatorHandleObjectSelectorDataView.php', 'PhabricatorHandleQuery' => 'applications/phid/query/PhabricatorHandleQuery.php', 'PhabricatorHarbormasterConfigOptions' => 'applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php', @@ -1715,9 +1705,11 @@ phutil_register_library_map(array( 'PhabricatorInternationalizationManagementExtractWorkflow' => 'infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php', 'PhabricatorInternationalizationManagementWorkflow' => 'infrastructure/internationalization/management/PhabricatorInternationalizationManagementWorkflow.php', 'PhabricatorIteratedMD5PasswordHasher' => 'infrastructure/util/password/PhabricatorIteratedMD5PasswordHasher.php', + 'PhabricatorJIRAAuthProvider' => 'applications/auth/provider/PhabricatorJIRAAuthProvider.php', 'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/PhabricatorJavelinLinter.php', 'PhabricatorJumpNavHandler' => 'applications/search/engine/PhabricatorJumpNavHandler.php', 'PhabricatorKeyValueDatabaseCache' => 'applications/cache/PhabricatorKeyValueDatabaseCache.php', + 'PhabricatorLDAPAuthProvider' => 'applications/auth/provider/PhabricatorLDAPAuthProvider.php', 'PhabricatorLegacyEdgeType' => 'infrastructure/edges/type/PhabricatorLegacyEdgeType.php', 'PhabricatorLegalpadConfigOptions' => 'applications/legalpad/config/PhabricatorLegalpadConfigOptions.php', 'PhabricatorLegalpadPHIDTypeDocument' => 'applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php', @@ -1833,6 +1825,9 @@ phutil_register_library_map(array( 'PhabricatorNotificationStatusController' => 'applications/notification/controller/PhabricatorNotificationStatusController.php', 'PhabricatorNotificationStatusView' => 'applications/notification/view/PhabricatorNotificationStatusView.php', 'PhabricatorNotificationTestController' => 'applications/notification/controller/PhabricatorNotificationTestController.php', + 'PhabricatorOAuth1AuthProvider' => 'applications/auth/provider/PhabricatorOAuth1AuthProvider.php', + 'PhabricatorOAuth2AuthProvider' => 'applications/auth/provider/PhabricatorOAuth2AuthProvider.php', + 'PhabricatorOAuthAuthProvider' => 'applications/auth/provider/PhabricatorOAuthAuthProvider.php', 'PhabricatorOAuthClientAuthorization' => 'applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php', 'PhabricatorOAuthClientAuthorizationQuery' => 'applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php', 'PhabricatorOAuthClientController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientController.php', @@ -1891,6 +1886,7 @@ phutil_register_library_map(array( 'PhabricatorPHIDType' => 'applications/phid/type/PhabricatorPHIDType.php', 'PhabricatorPHPMailerConfigOptions' => 'applications/config/option/PhabricatorPHPMailerConfigOptions.php', 'PhabricatorPagedFormExample' => 'applications/uiexample/examples/PhabricatorPagedFormExample.php', + 'PhabricatorPasswordAuthProvider' => 'applications/auth/provider/PhabricatorPasswordAuthProvider.php', 'PhabricatorPasswordHasher' => 'infrastructure/util/password/PhabricatorPasswordHasher.php', 'PhabricatorPasswordHasherTestCase' => 'infrastructure/util/password/__tests__/PhabricatorPasswordHasherTestCase.php', 'PhabricatorPasswordHasherUnavailableException' => 'infrastructure/util/password/PhabricatorPasswordHasherUnavailableException.php', @@ -1936,6 +1932,7 @@ phutil_register_library_map(array( 'PhabricatorPeopleSearchEngine' => 'applications/people/query/PhabricatorPeopleSearchEngine.php', 'PhabricatorPeopleTestDataGenerator' => 'applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php', 'PhabricatorPeopleWelcomeController' => 'applications/people/controller/PhabricatorPeopleWelcomeController.php', + 'PhabricatorPersonaAuthProvider' => 'applications/auth/provider/PhabricatorPersonaAuthProvider.php', 'PhabricatorPhameConfigOptions' => 'applications/phame/config/PhabricatorPhameConfigOptions.php', 'PhabricatorPhamePHIDTypeBlog' => 'applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php', 'PhabricatorPhamePHIDTypePost' => 'applications/phame/phid/PhabricatorPhamePHIDTypePost.php', @@ -2332,6 +2329,8 @@ phutil_register_library_map(array( 'PhabricatorTranslation' => 'infrastructure/internationalization/translation/PhabricatorTranslation.php', 'PhabricatorTranslationsConfigOptions' => 'applications/config/option/PhabricatorTranslationsConfigOptions.php', 'PhabricatorTrivialTestCase' => 'infrastructure/testing/__tests__/PhabricatorTrivialTestCase.php', + 'PhabricatorTwitchAuthProvider' => 'applications/auth/provider/PhabricatorTwitchAuthProvider.php', + 'PhabricatorTwitterAuthProvider' => 'applications/auth/provider/PhabricatorTwitterAuthProvider.php', 'PhabricatorTwoColumnExample' => 'applications/uiexample/examples/PhabricatorTwoColumnExample.php', 'PhabricatorTypeaheadCompositeDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadCompositeDatasource.php', 'PhabricatorTypeaheadDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php', @@ -2379,6 +2378,7 @@ phutil_register_library_map(array( 'PhabricatorUserTitleField' => 'applications/people/customfield/PhabricatorUserTitleField.php', 'PhabricatorUserTransaction' => 'applications/people/storage/PhabricatorUserTransaction.php', 'PhabricatorVCSResponse' => 'applications/repository/response/PhabricatorVCSResponse.php', + 'PhabricatorWordPressAuthProvider' => 'applications/auth/provider/PhabricatorWordPressAuthProvider.php', 'PhabricatorWorker' => 'infrastructure/daemon/workers/PhabricatorWorker.php', 'PhabricatorWorkerActiveTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php', 'PhabricatorWorkerArchiveTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerArchiveTask.php', @@ -3905,6 +3905,7 @@ phutil_register_library_map(array( 'PhabricatorActionListView' => 'AphrontView', 'PhabricatorActionView' => 'AphrontView', 'PhabricatorAllCapsTranslation' => 'PhabricatorTranslation', + 'PhabricatorAmazonAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorAnchorView' => 'AphrontView', 'PhabricatorAphlictManagementBuildWorkflow' => 'PhabricatorAphlictManagementWorkflow', 'PhabricatorAphlictManagementDebugWorkflow' => 'PhabricatorAphlictManagementWorkflow', @@ -4024,6 +4025,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationXHProf' => 'PhabricatorApplication', 'PhabricatorApplicationsController' => 'PhabricatorController', 'PhabricatorApplicationsListController' => 'PhabricatorApplicationsController', + 'PhabricatorAsanaAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorAsanaConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorAuditAddCommentController' => 'PhabricatorAuditController', 'PhabricatorAuditComment' => array( @@ -4081,23 +4083,6 @@ phutil_register_library_map(array( 'PhabricatorAuthProviderConfigQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'PhabricatorAuthProviderConfigTransaction' => 'PhabricatorApplicationTransaction', 'PhabricatorAuthProviderConfigTransactionQuery' => 'PhabricatorApplicationTransactionQuery', - 'PhabricatorAuthProviderLDAP' => 'PhabricatorAuthProvider', - 'PhabricatorAuthProviderOAuth' => 'PhabricatorAuthProvider', - 'PhabricatorAuthProviderOAuth1' => 'PhabricatorAuthProviderOAuth', - 'PhabricatorAuthProviderOAuth1Bitbucket' => 'PhabricatorAuthProviderOAuth1', - 'PhabricatorAuthProviderOAuth1JIRA' => 'PhabricatorAuthProviderOAuth1', - 'PhabricatorAuthProviderOAuth1Twitter' => 'PhabricatorAuthProviderOAuth1', - 'PhabricatorAuthProviderOAuth2' => 'PhabricatorAuthProviderOAuth', - 'PhabricatorAuthProviderOAuthAmazon' => 'PhabricatorAuthProviderOAuth2', - 'PhabricatorAuthProviderOAuthAsana' => 'PhabricatorAuthProviderOAuth2', - 'PhabricatorAuthProviderOAuthDisqus' => 'PhabricatorAuthProviderOAuth2', - 'PhabricatorAuthProviderOAuthFacebook' => 'PhabricatorAuthProviderOAuth2', - 'PhabricatorAuthProviderOAuthGitHub' => 'PhabricatorAuthProviderOAuth2', - 'PhabricatorAuthProviderOAuthGoogle' => 'PhabricatorAuthProviderOAuth2', - 'PhabricatorAuthProviderOAuthTwitch' => 'PhabricatorAuthProviderOAuth2', - 'PhabricatorAuthProviderOAuthWordPress' => 'PhabricatorAuthProviderOAuth2', - 'PhabricatorAuthProviderPassword' => 'PhabricatorAuthProvider', - 'PhabricatorAuthProviderPersona' => 'PhabricatorAuthProvider', 'PhabricatorAuthRegisterController' => 'PhabricatorAuthController', 'PhabricatorAuthSession' => array( 'PhabricatorAuthDAO', @@ -4123,6 +4108,7 @@ phutil_register_library_map(array( 'PhabricatorBarePageView' => 'AphrontPageView', 'PhabricatorBaseEnglishTranslation' => 'PhabricatorTranslation', 'PhabricatorBcryptPasswordHasher' => 'PhabricatorPasswordHasher', + 'PhabricatorBitbucketAuthProvider' => 'PhabricatorOAuth1AuthProvider', 'PhabricatorBot' => 'PhabricatorDaemon', 'PhabricatorBotBaseStreamingProtocolAdapter' => 'PhabricatorBaseProtocolAdapter', 'PhabricatorBotChannel' => 'PhabricatorBotTarget', @@ -4368,6 +4354,7 @@ phutil_register_library_map(array( 'PhabricatorDifferentialRevisionTestDataGenerator' => 'PhabricatorTestDataGenerator', 'PhabricatorDiffusionConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorDisabledUserController' => 'PhabricatorAuthController', + 'PhabricatorDisqusAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorDisqusConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorDraft' => 'PhabricatorDraftDAO', 'PhabricatorDraftDAO' => 'PhabricatorLiskDAO', @@ -4395,6 +4382,7 @@ phutil_register_library_map(array( 'PhabricatorPolicyInterface', ), 'PhabricatorExternalAccountQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', + 'PhabricatorFacebookAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorFactAggregate' => 'PhabricatorFactDAO', 'PhabricatorFactChartController' => 'PhabricatorFactController', 'PhabricatorFactController' => 'PhabricatorController', @@ -4505,8 +4493,10 @@ phutil_register_library_map(array( 'PhabricatorGarbageCollectorDaemon' => 'PhabricatorDaemon', 'PhabricatorGestureExample' => 'PhabricatorUIExample', 'PhabricatorGitGraphStream' => 'PhabricatorRepositoryGraphStream', + 'PhabricatorGitHubAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorGlobalLock' => 'PhutilLock', 'PhabricatorGlobalUploadTargetView' => 'AphrontView', + 'PhabricatorGoogleAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorHandleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'PhabricatorHarbormasterConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorHashTestCase' => 'PhabricatorTestCase', @@ -4529,8 +4519,10 @@ phutil_register_library_map(array( 'PhabricatorInternationalizationManagementExtractWorkflow' => 'PhabricatorInternationalizationManagementWorkflow', 'PhabricatorInternationalizationManagementWorkflow' => 'PhabricatorManagementWorkflow', 'PhabricatorIteratedMD5PasswordHasher' => 'PhabricatorPasswordHasher', + 'PhabricatorJIRAAuthProvider' => 'PhabricatorOAuth1AuthProvider', 'PhabricatorJavelinLinter' => 'ArcanistLinter', 'PhabricatorKeyValueDatabaseCache' => 'PhutilKeyValueCache', + 'PhabricatorLDAPAuthProvider' => 'PhabricatorAuthProvider', 'PhabricatorLegacyEdgeType' => 'PhabricatorEdgeType', 'PhabricatorLegalpadConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorLegalpadPHIDTypeDocument' => 'PhabricatorPHIDType', @@ -4639,6 +4631,9 @@ phutil_register_library_map(array( 'PhabricatorNotificationStatusController' => 'PhabricatorNotificationController', 'PhabricatorNotificationStatusView' => 'AphrontTagView', 'PhabricatorNotificationTestController' => 'PhabricatorNotificationController', + 'PhabricatorOAuth1AuthProvider' => 'PhabricatorOAuthAuthProvider', + 'PhabricatorOAuth2AuthProvider' => 'PhabricatorOAuthAuthProvider', + 'PhabricatorOAuthAuthProvider' => 'PhabricatorAuthProvider', 'PhabricatorOAuthClientAuthorization' => array( 'PhabricatorOAuthServerDAO', 'PhabricatorPolicyInterface', @@ -4695,6 +4690,7 @@ phutil_register_library_map(array( 'PhabricatorPHDConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorPHPMailerConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorPagedFormExample' => 'PhabricatorUIExample', + 'PhabricatorPasswordAuthProvider' => 'PhabricatorAuthProvider', 'PhabricatorPasswordHasher' => 'Phobject', 'PhabricatorPasswordHasherTestCase' => 'PhabricatorTestCase', 'PhabricatorPasswordHasherUnavailableException' => 'Exception', @@ -4747,6 +4743,7 @@ phutil_register_library_map(array( 'PhabricatorPeopleSearchEngine' => 'PhabricatorApplicationSearchEngine', 'PhabricatorPeopleTestDataGenerator' => 'PhabricatorTestDataGenerator', 'PhabricatorPeopleWelcomeController' => 'PhabricatorPeopleController', + 'PhabricatorPersonaAuthProvider' => 'PhabricatorAuthProvider', 'PhabricatorPhameConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorPhamePHIDTypeBlog' => 'PhabricatorPHIDType', 'PhabricatorPhamePHIDTypePost' => 'PhabricatorPHIDType', @@ -5174,6 +5171,8 @@ phutil_register_library_map(array( 'PhabricatorTransformedFile' => 'PhabricatorFileDAO', 'PhabricatorTranslationsConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorTrivialTestCase' => 'PhabricatorTestCase', + 'PhabricatorTwitchAuthProvider' => 'PhabricatorOAuth2AuthProvider', + 'PhabricatorTwitterAuthProvider' => 'PhabricatorOAuth1AuthProvider', 'PhabricatorTwoColumnExample' => 'PhabricatorUIExample', 'PhabricatorTypeaheadCompositeDatasource' => 'PhabricatorTypeaheadDatasource', 'PhabricatorTypeaheadDatasource' => 'Phobject', @@ -5231,6 +5230,7 @@ phutil_register_library_map(array( 'PhabricatorUserTitleField' => 'PhabricatorUserCustomField', 'PhabricatorUserTransaction' => 'PhabricatorApplicationTransaction', 'PhabricatorVCSResponse' => 'AphrontResponse', + 'PhabricatorWordPressAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorWorkerActiveTask' => 'PhabricatorWorkerTask', 'PhabricatorWorkerArchiveTask' => 'PhabricatorWorkerTask', 'PhabricatorWorkerDAO' => 'PhabricatorLiskDAO', diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuthAmazon.php b/src/applications/auth/provider/PhabricatorAmazonAuthProvider.php similarity index 89% rename from src/applications/auth/provider/PhabricatorAuthProviderOAuthAmazon.php rename to src/applications/auth/provider/PhabricatorAmazonAuthProvider.php index 853fd79f81..c35bd547f3 100644 --- a/src/applications/auth/provider/PhabricatorAuthProviderOAuthAmazon.php +++ b/src/applications/auth/provider/PhabricatorAmazonAuthProvider.php @@ -1,7 +1,7 @@ getProviderConfig()->getProperty( self::KEY_REQUIRE_SECURE); - return id(new PhutilAuthAdapterOAuthFacebook()) + return id(new PhutilFacebookAuthAdapter()) ->setRequireSecureBrowsing($require_secure); } diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuthGitHub.php b/src/applications/auth/provider/PhabricatorGitHubAuthProvider.php similarity index 89% rename from src/applications/auth/provider/PhabricatorAuthProviderOAuthGitHub.php rename to src/applications/auth/provider/PhabricatorGitHubAuthProvider.php index 1ee0cdb69b..6a7667e2d6 100644 --- a/src/applications/auth/provider/PhabricatorAuthProviderOAuthGitHub.php +++ b/src/applications/auth/provider/PhabricatorGitHubAuthProvider.php @@ -1,7 +1,7 @@ getProviderConfig()->getProperty(self::PROPERTY_JIRA_URI); @@ -58,7 +57,7 @@ final class PhabricatorAuthProviderOAuth1JIRA protected function newOAuthAdapter() { $config = $this->getProviderConfig(); - return id(new PhutilAuthAdapterOAuthJIRA()) + return id(new PhutilJIRAAuthAdapter()) ->setAdapterDomain($config->getProviderDomain()) ->setJIRABaseURI($config->getProperty(self::PROPERTY_JIRA_URI)) ->setPrivateKey( @@ -143,7 +142,7 @@ final class PhabricatorAuthProviderOAuth1JIRA $config->setProviderDomain($values[$key_name]); $consumer_key = 'phjira.'.Filesystem::readRandomCharacters(16); - list($public, $private) = PhutilAuthAdapterOAuthJIRA::newJIRAKeypair(); + list($public, $private) = PhutilJIRAAuthAdapter::newJIRAKeypair(); $config->setProperty(self::PROPERTY_PUBLIC_KEY, $public); $config->setProperty(self::PROPERTY_PRIVATE_KEY, $private); diff --git a/src/applications/auth/provider/PhabricatorAuthProviderLDAP.php b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php similarity index 98% rename from src/applications/auth/provider/PhabricatorAuthProviderLDAP.php rename to src/applications/auth/provider/PhabricatorLDAPAuthProvider.php index 77e6351a65..5777bfcae8 100644 --- a/src/applications/auth/provider/PhabricatorAuthProviderLDAP.php +++ b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php @@ -1,7 +1,6 @@ setHostname( $conf->getProperty(self::KEY_HOSTNAME)) ->setPort( @@ -160,7 +159,7 @@ final class PhabricatorAuthProviderLDAP $adapter->setLoginPassword($password); // TODO: This calls ldap_bind() eventually, which dumps cleartext - // passwords to the error log. See note in PhutilAuthAdapterLDAP. + // passwords to the error log. See note in PhutilLDAPAuthAdapter. // See T3351. DarkConsoleErrorLogPluginAPI::enableDiscardMode(); diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuth1.php b/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php similarity index 98% rename from src/applications/auth/provider/PhabricatorAuthProviderOAuth1.php rename to src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php index f255ae5556..f2caa197f9 100644 --- a/src/applications/auth/provider/PhabricatorAuthProviderOAuth1.php +++ b/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php @@ -1,7 +1,7 @@ getProviderConfig(); $adapter->setConsumerKey($config->getProperty(self::PROPERTY_CONSUMER_KEY)); $secret = $config->getProperty(self::PROPERTY_CONSUMER_SECRET); diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuth2.php b/src/applications/auth/provider/PhabricatorOAuth2AuthProvider.php similarity index 98% rename from src/applications/auth/provider/PhabricatorAuthProviderOAuth2.php rename to src/applications/auth/provider/PhabricatorOAuth2AuthProvider.php index a2d9ecc831..4343fa9223 100644 --- a/src/applications/auth/provider/PhabricatorAuthProviderOAuth2.php +++ b/src/applications/auth/provider/PhabricatorOAuth2AuthProvider.php @@ -1,7 +1,7 @@ getProviderConfig(); $adapter->setClientID($config->getProperty(self::PROPERTY_APP_ID)); $adapter->setClientSecret( diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuth.php b/src/applications/auth/provider/PhabricatorOAuthAuthProvider.php similarity index 98% rename from src/applications/auth/provider/PhabricatorAuthProviderOAuth.php rename to src/applications/auth/provider/PhabricatorOAuthAuthProvider.php index 0547da8200..d2cc062a5b 100644 --- a/src/applications/auth/provider/PhabricatorAuthProviderOAuth.php +++ b/src/applications/auth/provider/PhabricatorOAuthAuthProvider.php @@ -1,6 +1,6 @@ adapter) { - $adapter = new PhutilAuthAdapterPersona(); + $adapter = new PhutilPersonaAuthAdapter(); $this->adapter = $adapter; } return $this->adapter; diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuthTwitch.php b/src/applications/auth/provider/PhabricatorTwitchAuthProvider.php similarity index 86% rename from src/applications/auth/provider/PhabricatorAuthProviderOAuthTwitch.php rename to src/applications/auth/provider/PhabricatorTwitchAuthProvider.php index e3faed8f5e..28cf4a4648 100644 --- a/src/applications/auth/provider/PhabricatorAuthProviderOAuthTwitch.php +++ b/src/applications/auth/provider/PhabricatorTwitchAuthProvider.php @@ -1,7 +1,7 @@