diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ 'names' => array( 'conpherence.pkg.css' => '0b64e988', 'conpherence.pkg.js' => '6249a1cf', - 'core.pkg.css' => '94090cab', + 'core.pkg.css' => '58d21331', 'core.pkg.js' => 'e4260032', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'a4ba74b5', @@ -170,7 +170,7 @@ 'rsrc/css/phui/workboards/phui-workboard.css' => '16441d5e', 'rsrc/css/phui/workboards/phui-workcard.css' => '0c62d7c5', 'rsrc/css/phui/workboards/phui-workpanel.css' => '92197373', - 'rsrc/css/sprite-login.css' => '6dbbbd97', + 'rsrc/css/sprite-login.css' => '587d92d7', 'rsrc/css/sprite-tokens.css' => '9cdfd599', 'rsrc/css/syntax/syntax-default.css' => '9923583c', 'rsrc/externals/d3/d3.min.js' => 'a11a5ff2', @@ -373,7 +373,6 @@ 'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => 'fb20ac8d', 'rsrc/js/application/aphlict/behavior-aphlict-status.js' => '5e2634b9', 'rsrc/js/application/aphlict/behavior-desktop-notifications-control.js' => 'edd1ba66', - 'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18', 'rsrc/js/application/calendar/behavior-day-view.js' => '4b3c4443', 'rsrc/js/application/calendar/behavior-event-all-day.js' => 'b41537c9', 'rsrc/js/application/calendar/behavior-month-view.js' => 'fe33e256', @@ -660,7 +659,6 @@ 'javelin-behavior-maniphest-subpriority-editor' => '71237763', 'javelin-behavior-owners-path-editor' => '7a68dda3', 'javelin-behavior-passphrase-credential-control' => '3cb0b2fc', - 'javelin-behavior-persona-login' => '9414ff18', 'javelin-behavior-phabricator-active-nav' => 'e379b58e', 'javelin-behavior-phabricator-autofocus' => '7319e029', 'javelin-behavior-phabricator-busy-example' => '60479091', @@ -906,7 +904,7 @@ 'releeph-request-differential-create-dialog' => '8d8b92cd', 'releeph-request-typeahead-css' => '667a48ae', 'setup-issue-css' => 'f794cfc3', - 'sprite-login-css' => '6dbbbd97', + 'sprite-login-css' => '587d92d7', 'sprite-tokens-css' => '9cdfd599', 'syntax-default-css' => '9923583c', 'syntax-highlighting-css' => '769d3498', @@ -1666,13 +1664,6 @@ 'javelin-workflow', 'javelin-dom', ), - '9414ff18' => array( - 'javelin-behavior', - 'javelin-resource', - 'javelin-stratcom', - 'javelin-workflow', - 'javelin-util', - ), '949c0fe5' => array( 'javelin-install', ), diff --git a/resources/sprite/login_1x/Persona.png b/resources/sprite/login_1x/Persona.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ 'applications/people/typeahead/PhabricatorPeopleUserFunctionDatasource.php', 'PhabricatorPeopleUserPHIDType' => 'applications/people/phid/PhabricatorPeopleUserPHIDType.php', 'PhabricatorPeopleWelcomeController' => 'applications/people/controller/PhabricatorPeopleWelcomeController.php', - 'PhabricatorPersonaAuthProvider' => 'applications/auth/provider/PhabricatorPersonaAuthProvider.php', 'PhabricatorPhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorPhabricatorAuthProvider.php', 'PhabricatorPhameApplication' => 'applications/phame/application/PhabricatorPhameApplication.php', 'PhabricatorPhameBlogPHIDType' => 'applications/phame/phid/PhabricatorPhameBlogPHIDType.php', @@ -8326,7 +8325,6 @@ 'PhabricatorPeopleUserFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource', 'PhabricatorPeopleUserPHIDType' => 'PhabricatorPHIDType', 'PhabricatorPeopleWelcomeController' => 'PhabricatorPeopleController', - 'PhabricatorPersonaAuthProvider' => 'PhabricatorAuthProvider', 'PhabricatorPhabricatorAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorPhameApplication' => 'PhabricatorApplication', 'PhabricatorPhameBlogPHIDType' => 'PhabricatorPHIDType', diff --git a/src/applications/auth/provider/PhabricatorPersonaAuthProvider.php b/src/applications/auth/provider/PhabricatorPersonaAuthProvider.php deleted file mode 100644 --- a/src/applications/auth/provider/PhabricatorPersonaAuthProvider.php +++ /dev/null @@ -1,81 +0,0 @@ -adapter) { - $adapter = new PhutilPersonaAuthAdapter(); - $this->adapter = $adapter; - } - return $this->adapter; - } - - protected function renderLoginForm( - AphrontRequest $request, - $mode) { - - Javelin::initBehavior( - 'persona-login', - array( - 'loginURI' => PhabricatorEnv::getURI($this->getLoginURI()), - )); - - return $this->renderStandardLoginButton( - $request, - $mode, - array( - 'uri' => $this->getLoginURI(), - 'sigil' => 'persona-login-form', - )); - } - - public function isLoginFormAButton() { - return true; - } - - public function processLoginRequest( - PhabricatorAuthLoginController $controller) { - - $request = $controller->getRequest(); - $adapter = $this->getAdapter(); - - $account = null; - $response = null; - - if (!$request->isAjax()) { - throw new Exception(pht('Expected this request to come via Ajax.')); - } - - $assertion = $request->getStr('assertion'); - if (!$assertion) { - throw new Exception(pht('Expected identity assertion.')); - } - - $adapter->setAssertion($assertion); - $adapter->setAudience(PhabricatorEnv::getURI('/')); - - try { - $account_id = $adapter->getAccountID(); - } catch (Exception $ex) { - // TODO: Handle this in a more user-friendly way. - throw $ex; - } - - return array($this->loadOrCreateAccount($account_id), $response); - } - - protected function getLoginIcon() { - return 'Persona'; - } - -} diff --git a/webroot/rsrc/css/sprite-login.css b/webroot/rsrc/css/sprite-login.css --- a/webroot/rsrc/css/sprite-login.css +++ b/webroot/rsrc/css/sprite-login.css @@ -83,10 +83,6 @@ background-position: 0px -87px; } -.login-Persona { - background-position: -29px -87px; -} - .login-Phabricator { background-position: -58px -87px; } diff --git a/webroot/rsrc/js/application/auth/behavior-persona-login.js b/webroot/rsrc/js/application/auth/behavior-persona-login.js deleted file mode 100644 --- a/webroot/rsrc/js/application/auth/behavior-persona-login.js +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @provides javelin-behavior-persona-login - * @requires javelin-behavior - * javelin-resource - * javelin-stratcom - * javelin-workflow - * javelin-util - */ - -JX.behavior('persona-login', function(config) { - - JX.Stratcom.listen( - 'submit', - 'persona-login-form', - function(e) { - e.kill(); - navigator.id.request(); - }); - - var onloaded = function() { - // Before installing watch(), log the user out, because we know they don't - // have a valid session if they're hitting this page. If we don't do this, - // Persona may immediately trigger a login event, which prevents the user - // from selecting another authentication mechanism. - navigator.id.logout(); - - navigator.id.watch({ - loggedInUser: null, - onlogin: onlogin, - onlogout: JX.bag - }); - }; - - var onlogin = function(assertion) { - new JX.Workflow(config.loginURI, {assertion: assertion}) - .start(); - }; - - var persona_library = 'https://login.persona.org/include.js'; - JX.Resource.load(persona_library, onloaded); -});