View Options

	diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuthFacebook.php b/src/applications/auth/provider/PhabricatorAuthProviderOAuthFacebook.php
	index 10f7a5921e..e3a9b66ef7 100644
	--- a/src/applications/auth/provider/PhabricatorAuthProviderOAuthFacebook.php
	+++ b/src/applications/auth/provider/PhabricatorAuthProviderOAuthFacebook.php
	@@ -1,126 +1,128 @@
	<?php

	final class PhabricatorAuthProviderOAuthFacebook
	extends PhabricatorAuthProviderOAuth {

	const KEY_REQUIRE_SECURE = 'oauth:facebook:require-secure';

	public function getProviderName() {
	return pht('Facebook');
	}

	public function getConfigurationHelp() {
	- $uri = new PhutilURI(PhabricatorEnv::getProductionURI('/'));
	+ $uri = PhabricatorEnv::getProductionURI($this->getLoginURI());
	return pht(
	'To configure Facebook OAuth, create a new Facebook Application here:'.
	"\n\n".
	'https://developers.facebook.com/apps'.
	"\n\n".
	'You should use these settings in your application:'.
	"\n\n".
	- " - Site URL: Set this to your full domain with protocol. For ".
	- " this Phabricator install, the correct value is: `%s`\n".
	- " - Site Domain: Set this to the full domain without a protocol. ".
	- " For this Phabricator install, the correct value is: `%s`\n\n".
	+ " - Site URL: Set this to `%s`\n".
	+ " - Valid OAuth redirect URIs: You should also set this to `%s`\n".
	+ " - Client OAuth Login: Set this to OFF.\n".
	+ " - Embedded browser OAuth Login: Set this to OFF.\n".
	+ "\n\n".
	+ "Some of these settings may be in the Advanced tab.\n\n".
	"After creating your new application, copy the App ID and ".
	"App Secret to the fields above.",
	(string)$uri,
	- $uri->getDomain());
	+ (string)$uri);
	}

	public function getDefaultProviderConfig() {
	return parent::getDefaultProviderConfig()
	->setProperty(self::KEY_REQUIRE_SECURE, 1);
	}

	protected function newOAuthAdapter() {
	$require_secure = $this->getProviderConfig()->getProperty(
	self::KEY_REQUIRE_SECURE);

	return id(new PhutilAuthAdapterOAuthFacebook())
	->setRequireSecureBrowsing($require_secure);
	}

	protected function getLoginIcon() {
	return 'Facebook';
	}

	public function readFormValuesFromProvider() {
	$require_secure = $this->getProviderConfig()->getProperty(
	self::KEY_REQUIRE_SECURE);

	return parent::readFormValuesFromProvider() + array(
	self::KEY_REQUIRE_SECURE => $require_secure,
	);
	}

	public function readFormValuesFromRequest(AphrontRequest $request) {
	return parent::readFormValuesFromRequest($request) + array(
	self::KEY_REQUIRE_SECURE => $request->getBool(self::KEY_REQUIRE_SECURE),
	);
	}

	public function extendEditForm(
	AphrontRequest $request,
	AphrontFormView $form,
	array $values,
	array $issues) {

	parent::extendEditForm($request, $form, $values, $issues);

	$key_require = self::KEY_REQUIRE_SECURE;
	$v_require = idx($values, $key_require);

	$form
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->addCheckbox(
	$key_require,
	$v_require,
	pht(
	"%s ".
	"Require users to enable 'secure browsing' on Facebook in order ".
	"to use Facebook to authenticate with Phabricator. This ".
	"improves security by preventing an attacker from capturing ".
	"an insecure Facebook session and escalating it into a ".
	"Phabricator session. Enabling it is recommended.",
	phutil_tag('strong', array(), pht('Require Secure Browsing:')))));
	}

	public function renderConfigPropertyTransactionTitle(
	PhabricatorAuthProviderConfigTransaction $xaction) {

	$author_phid = $xaction->getAuthorPHID();
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();
	$key = $xaction->getMetadataValue(
	PhabricatorAuthProviderConfigTransaction::PROPERTY_KEY);

	switch ($key) {
	case self::KEY_REQUIRE_SECURE:
	if ($new) {
	return pht(
	'%s turned "Require Secure Browsing" on.',
	$xaction->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s turned "Require Secure Browsing" off.',
	$xaction->renderHandleLink($author_phid));
	}
	}

	return parent::renderConfigPropertyTransactionTitle($xaction);
	}

	public static function getFacebookApplicationID() {
	$providers = PhabricatorAuthProvider::getAllProviders();
	$fb_provider = idx($providers, 'facebook:facebook.com');
	if (!$fb_provider) {
	return null;
	}

	return $fb_provider->getProviderConfig()->getProperty(
	PhabricatorAuthProviderOAuth::PROPERTY_APP_ID);
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 15:28 (3 w, 23 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1125993
Default Alt Text: (4 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions