mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-22 14:52:40 +01:00
Make arc patch show the superior error message if you are not authenticated
Summary: ...by making requireAuthentication return true if conduit is required. Test Plan: mv ~/.arcrc ~/.arcrcbak; arc patch D12121; <verify error message> Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Maniphest Tasks: T1522 Differential Revision: https://secure.phabricator.com/D3014
This commit is contained in:
parent
5be656aa57
commit
333bb09e04
1 changed files with 19 additions and 15 deletions
|
@ -265,24 +265,28 @@ abstract class ArcanistBaseWorkflow {
|
|||
}
|
||||
|
||||
$this->establishConduit();
|
||||
|
||||
$credentials = $this->conduitCredentials;
|
||||
|
||||
try {
|
||||
if (!$credentials) {
|
||||
throw new Exception(
|
||||
"Set conduit credentials with setConduitCredentials() before ".
|
||||
"authenticating conduit!");
|
||||
}
|
||||
|
||||
if (empty($credentials['user']) || empty($credentials['certificate'])) {
|
||||
throw new Exception(
|
||||
"Credentials must include a 'user' and a 'certificate'.");
|
||||
if (empty($credentials['user'])) {
|
||||
throw new ConduitClientException('ERR-INVALID-USER',
|
||||
'Empty user in credentials.');
|
||||
}
|
||||
if (empty($credentials['certificate'])) {
|
||||
throw new ConduitClientException('ERR-NO-CERTIFICATE',
|
||||
'Empty certificate in credentials.');
|
||||
}
|
||||
|
||||
$description = idx($credentials, 'description', '');
|
||||
$user = $credentials['user'];
|
||||
$certificate = $credentials['certificate'];
|
||||
|
||||
try {
|
||||
$connection = $this->getConduit()->callMethodSynchronous(
|
||||
'conduit.connect',
|
||||
array(
|
||||
|
|
Loading…
Reference in a new issue