From 6138d5885d236071a595eda30fe8e8eef34b5c93 Mon Sep 17 00:00:00 2001 From: Austin McKinley Date: Mon, 21 Jan 2019 11:56:56 -0800 Subject: [PATCH] Update documentation to reflect bin/auth changes Summary: See https://secure.phabricator.com/D18901#249481. Update the docs and a warning string to reflect the new reality that `bin/auth recover` is now able to recover any account, not just administrators. Test Plan: Mk 1 eyeball Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D20007 --- .../PhabricatorAuthStartController.php | 2 +- ...figuring_accounts_and_registration.diviner | 20 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/applications/auth/controller/PhabricatorAuthStartController.php b/src/applications/auth/controller/PhabricatorAuthStartController.php index 3dc8c61a51..29fa7e0b9f 100644 --- a/src/applications/auth/controller/PhabricatorAuthStartController.php +++ b/src/applications/auth/controller/PhabricatorAuthStartController.php @@ -88,7 +88,7 @@ final class PhabricatorAuthStartController 'This Phabricator install is not configured with any enabled '. 'authentication providers which can be used to log in. If you '. 'have accidentally locked yourself out by disabling all providers, '. - 'you can use `%s` to recover access to an administrative account.', + 'you can use `%s` to recover access to an account.', 'phabricator/bin/auth recover ')); } diff --git a/src/docs/user/configuration/configuring_accounts_and_registration.diviner b/src/docs/user/configuration/configuring_accounts_and_registration.diviner index 8a4c59b193..05d11b11f3 100644 --- a/src/docs/user/configuration/configuring_accounts_and_registration.diviner +++ b/src/docs/user/configuration/configuring_accounts_and_registration.diviner @@ -14,8 +14,6 @@ there is a "Username/Password" authentication provider available, which allows users to log in with a traditional username and password. Other providers support logging in with other credentials. For example: - - **Username/Password:** Users use a username and password to log in or - register. - **LDAP:** Users use LDAP credentials to log in or register. - **OAuth:** Users use accounts on a supported OAuth2 provider (like GitHub, Facebook, or Google) to log in or register. @@ -30,16 +28,16 @@ After you add a provider, you can link it to existing accounts (for example, associate an existing Phabricator account with a GitHub OAuth account) or users can use it to register new accounts (assuming you enable these options). -= Recovering Administrator Accounts = += Recovering Inaccessible Accounts = -If you accidentally lock yourself out of Phabricator, you can use the `bin/auth` -script to recover access to an administrator account. To recover access, run: +If you accidentally lock yourself out of Phabricator (for example, by disabling +all authentication providers), you can use the `bin/auth` +script to recover access to an account. To recover access, run: phabricator/ $ ./bin/auth recover -...where `` is the admin account username you want to recover access -to. This will give you a link which will log you in as the specified -administrative user. +...where `` is the account username you want to recover access +to. This will generate a link which will log you in as the specified user. = Managing Accounts with the Web Console = @@ -57,9 +55,9 @@ To use the CLI script, run: phabricator/ $ ./bin/accountadmin -Some options (like setting passwords and changing certain account flags) are -only available from the CLI. You can also use this script to make a user -an administrator (if you accidentally remove your admin flag) or create an +Some options (like changing certain account flags) are only available from +the CLI. You can also use this script to make a user +an administrator (if you accidentally remove your admin flag) or to create an administrative account. = Next Steps =