Page MenuHomePhabricator
Files F15354468

D21012.diff
No OneTemporary
Actions

D21012.diff
View Options

diff --git a/src/applications/auth/adapter/PhutilAuthAdapter.php b/src/applications/auth/adapter/PhutilAuthAdapter.php
--- a/src/applications/auth/adapter/PhutilAuthAdapter.php
+++ b/src/applications/auth/adapter/PhutilAuthAdapter.php
@@ -2,7 +2,7 @@
/**
* Abstract interface to an identity provider or authentication source, like
- * Twitter, Facebook or Google.
+ * Twitter, Facebook, or Google.
*
* Generally, adapters are handed some set of credentials particular to the
* provider they adapt, and they turn those credentials into standard
@@ -17,13 +17,32 @@
*/
abstract class PhutilAuthAdapter extends Phobject {
+ final public function getAccountIdentifiers() {
+ $result = $this->newAccountIdentifiers();
+ assert_instances_of($result, 'PhabricatorExternalAccountIdentifier');
+ return $result;
+ }
+
+ protected function newAccountIdentifiers() {
+ $identifiers = array();
+
+ $raw_identifier = $this->getAccountID();
+ if ($raw_identifier !== null) {
+ $identifiers[] = $this->newAccountIdentifier($raw_identifier);
+ }
+
+ return $identifiers;
+ }
+
/**
- * Get a unique identifier associated with the identity. For most providers,
- * this is an account ID.
+ * Get a unique identifier associated with the account.
*
- * The account ID needs to be unique within this adapter's configuration, such
- * that `<adapterKey, accountID>` is globally unique and always identifies the
- * same identity.
+ * This identifier should be permanent, immutable, and uniquely identify
+ * the account. If possible, it should be nonsensitive. For providers that
+ * have a GUID or PHID value for accounts, these are the best values to use.
+ *
+ * You can implement @{method:newAccountIdentifiers} instead if a provider
+ * is unable to emit identifiers with all of these properties.
*
* If the adapter was unable to authenticate an identity, it should return
* `null`.
@@ -31,7 +50,9 @@
* @return string|null Unique account identifier, or `null` if authentication
* failed.
*/
- abstract public function getAccountID();
+ public function getAccountID() {
+ throw new PhutilMethodNotImplementedException();
+ }
/**
diff --git a/src/applications/auth/controller/PhabricatorAuthController.php b/src/applications/auth/controller/PhabricatorAuthController.php
--- a/src/applications/auth/controller/PhabricatorAuthController.php
+++ b/src/applications/auth/controller/PhabricatorAuthController.php
@@ -197,22 +197,6 @@
return array($account, $provider, $response);
}
- $other_account = id(new PhabricatorExternalAccount())->loadAllWhere(
- 'accountType = %s AND accountDomain = %s AND accountID = %s
- AND id != %d',
- $account->getAccountType(),
- $account->getAccountDomain(),
- $account->getAccountID(),
- $account->getID());
-
- if ($other_account) {
- $response = $this->renderError(
- pht(
- 'The account you are attempting to register with already belongs '.
- 'to another user.'));
- return array($account, $provider, $response);
- }
-
$config = $account->getProviderConfig();
if (!$config->getIsEnabled()) {
$response = $this->renderError(

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 12, 4:05 AM (3 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7572542
Default Alt Text
D21012.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility