D15628.id37661.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D15628.id37661.diff
View Options

	diff --git a/src/auth/PhutilPhabricatorAuthAdapter.php b/src/auth/PhutilPhabricatorAuthAdapter.php
	--- a/src/auth/PhutilPhabricatorAuthAdapter.php
	+++ b/src/auth/PhutilPhabricatorAuthAdapter.php
	@@ -63,7 +63,7 @@
	}

	public function getScope() {
	- return 'whoami';
	+ return '';
	}

	public function getExtraAuthenticateParameters() {
	diff --git a/src/conduit/ConduitClient.php b/src/conduit/ConduitClient.php
	--- a/src/conduit/ConduitClient.php
	+++ b/src/conduit/ConduitClient.php
	@@ -12,6 +12,7 @@
	private $publicKey;
	private $privateKey;
	private $conduitToken;
	+ private $oauthToken;

	const AUTH_ASYMMETRIC = 'asymmetric';

	@@ -54,6 +55,11 @@
	return $this->conduitToken;
	}

	+ public function setOAuthToken($oauth_token) {
	+ $this->oauthToken = $oauth_token;
	+ return $this;
	+ }
	+
	public function callMethodSynchronous($method, array $params) {
	return $this->callMethod($method, $params)->resolve();
	}
	@@ -115,6 +121,10 @@
	$meta['token'] = $this->conduitToken;
	}

	+ if ($this->oauthToken) {
	+ $meta['access_token'] = $this->oauthToken;
	+ }
	+
	if ($meta) {
	$params['__conduit__'] = $meta;
	}