@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Update Tokens for handleRequest
Summary: Update callsites
Test Plan: View tokens leaders and givens. Gave a new token to a task.
Reviewers: btrahan, epriestley
Reviewed By: epriestley
Subscribers: epriestley, Korvin
Maniphest Tasks: T8628
Differential Revision: https://secure.phabricator.com/D13678
+23
-31
+11
-17
src/applications/tokens/controller/PhabricatorTokenGiveController.php
+11
-17
src/applications/tokens/controller/PhabricatorTokenGiveController.php
···
2
2
3
3
final class PhabricatorTokenGiveController extends PhabricatorTokenController {
4
4
5
-
private $phid;
6
-
7
-
public function willProcessRequest(array $data) {
8
-
$this->phid = $data['phid'];
9
-
}
10
-
11
-
public function processRequest() {
12
-
$request = $this->getRequest();
13
-
$user = $request->getUser();
5
+
public function handleRequest(AphrontRequest $request) {
6
+
$viewer = $request->getViewer();
7
+
$phid = $request->getURIData('phid');
14
8
15
9
$handle = id(new PhabricatorHandleQuery())
16
-
->setViewer($user)
17
-
->withPHIDs(array($this->phid))
10
+
->setViewer($viewer)
11
+
->withPHIDs(array($phid))
18
12
->executeOne();
19
13
if (!$handle->isComplete()) {
20
14
return new Aphront404Response();
21
15
}
22
16
23
17
$current = id(new PhabricatorTokenGivenQuery())
24
-
->setViewer($user)
25
-
->withAuthorPHIDs(array($user->getPHID()))
18
+
->setViewer($viewer)
19
+
->withAuthorPHIDs(array($viewer->getPHID()))
26
20
->withObjectPHIDs(array($handle->getPHID()))
27
21
->execute();
28
22
···
39
33
$content_source = PhabricatorContentSource::newFromRequest($request);
40
34
41
35
$editor = id(new PhabricatorTokenGivenEditor())
42
-
->setActor($user)
36
+
->setActor($viewer)
43
37
->setContentSource($content_source);
44
38
if ($is_give) {
45
39
$token_phid = $request->getStr('tokenPHID');
···
57
51
$dialog = $this->buildRescindTokenDialog(head($current));
58
52
}
59
53
60
-
$dialog->setUser($user);
54
+
$dialog->setUser($viewer);
61
55
$dialog->addCancelButton($done_uri);
62
56
63
57
return id(new AphrontDialogResponse())->setDialog($dialog);
64
58
}
65
59
66
60
private function buildGiveTokenDialog() {
67
-
$user = $this->getRequest()->getUser();
61
+
$viewer = $this->getViewer();
68
62
69
63
$tokens = id(new PhabricatorTokenQuery())
70
-
->setViewer($user)
64
+
->setViewer($viewer)
71
65
->execute();
72
66
73
67
$buttons = array();
+8
-9
src/applications/tokens/controller/PhabricatorTokenGivenController.php
+8
-9
src/applications/tokens/controller/PhabricatorTokenGivenController.php
···
6
6
return true;
7
7
}
8
8
9
-
public function processRequest() {
10
-
$request = $this->getRequest();
11
-
$user = $request->getUser();
9
+
public function handleRequest(AphrontRequest $request) {
10
+
$viewer = $request->getViewer();
12
11
13
12
$pager = id(new AphrontCursorPagerView())
14
13
->readFromRequest($request);
15
14
16
15
$tokens_given = id(new PhabricatorTokenGivenQuery())
17
-
->setViewer($user)
16
+
->setViewer($viewer)
18
17
->executeWithCursorPager($pager);
19
18
20
19
$handles = array();
21
20
if ($tokens_given) {
22
21
$object_phids = mpull($tokens_given, 'getObjectPHID');
23
-
$user_phids = mpull($tokens_given, 'getAuthorPHID');
24
-
$handle_phids = array_merge($object_phids, $user_phids);
22
+
$viewer_phids = mpull($tokens_given, 'getAuthorPHID');
23
+
$handle_phids = array_merge($object_phids, $viewer_phids);
25
24
$handles = id(new PhabricatorHandleQuery())
26
-
->setViewer($user)
25
+
->setViewer($viewer)
27
26
->withPHIDs($handle_phids)
28
27
->execute();
29
28
}
···
32
31
if ($tokens_given) {
33
32
$token_phids = mpull($tokens_given, 'getTokenPHID');
34
33
$tokens = id(new PhabricatorTokenQuery())
35
-
->setViewer($user)
34
+
->setViewer($viewer)
36
35
->withPHIDs($token_phids)
37
36
->execute();
38
37
$tokens = mpull($tokens, null, 'getPHID');
···
53
52
pht(
54
53
'Given by %s on %s',
55
54
$handles[$token_given->getAuthorPHID()]->renderLink(),
56
-
phabricator_date($token_given->getDateCreated(), $user)));
55
+
phabricator_date($token_given->getDateCreated(), $viewer)));
57
56
58
57
$list->addItem($item);
59
58
}
+4
-5
src/applications/tokens/controller/PhabricatorTokenLeaderController.php
+4
-5
src/applications/tokens/controller/PhabricatorTokenLeaderController.php
···
7
7
return true;
8
8
}
9
9
10
-
public function processRequest() {
11
-
$request = $this->getRequest();
12
-
$user = $request->getUser();
10
+
public function handleRequest(AphrontRequest $request) {
11
+
$viewer = $request->getViewer();
13
12
14
13
$pager = new PHUIPagerView();
15
14
$pager->setURI($request->getRequestURI(), 'page');
16
15
$pager->setOffset($request->getInt('page'));
17
16
18
17
$query = id(new PhabricatorTokenReceiverQuery());
19
-
$objects = $query->setViewer($user)->executeWithOffsetPager($pager);
18
+
$objects = $query->setViewer($viewer)->executeWithOffsetPager($pager);
20
19
$counts = $query->getTokenCounts();
21
20
22
21
$handles = array();
···
24
23
if ($counts) {
25
24
$phids = mpull($objects, 'getPHID');
26
25
$handles = id(new PhabricatorHandleQuery())
27
-
->setViewer($user)
26
+
->setViewer($viewer)
28
27
->withPHIDs($phids)
29
28
->execute();
30
29
}