diff --git a/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php --- a/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php +++ b/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php @@ -46,7 +46,7 @@ 60 * 5); if (count($failed_attempts) > 5) { - $this->logFailure(); + $this->logFailure($request); throw new ConduitException('ERR-RATE-LIMIT'); } @@ -56,13 +56,13 @@ trim($token)); if (!$info || $info->getDateCreated() < time() - (60 * 15)) { - $this->logFailure(); + $this->logFailure($request, $info); throw new ConduitException('ERR-BAD-TOKEN'); } else { - $log = id(new PhabricatorUserLog()) - ->setActorPHID($info->getUserPHID()) - ->setUserPHID($info->getUserPHID()) - ->setAction(PhabricatorUserLog::ACTION_CONDUIT_CERTIFICATE) + $log = PhabricatorUserLog::initializeNewLog( + $request->getUser(), + $info->getUserPHID(), + PhabricatorUserLog::ACTION_CONDUIT_CERTIFICATE) ->save(); } @@ -79,11 +79,14 @@ ); } - private function logFailure() { + private function logFailure( + ConduitAPIRequest $request, + PhabricatorConduitCertificateToken $info = null) { - $log = id(new PhabricatorUserLog()) - ->setUserPHID('-') - ->setAction(PhabricatorUserLog::ACTION_CONDUIT_CERTIFICATE_FAILURE) + $log = PhabricatorUserLog::initializeNewLog( + $request->getUser(), + $info ? $info->getUserPHID() : '-', + PhabricatorUserLog::ACTION_CONDUIT_CERTIFICATE_FAILURE) ->save(); }