From 83d138759ce8e1298cc627c9c4520659d7ecf41c Mon Sep 17 00:00:00 2001
From: David Douard <david.douard@sdfa3.org>
Date: Fri, 30 Aug 2019 10:12:41 +0200
Subject: [PATCH] phabricator: kill PhabricatorLister's api_token argument

stick to the existing credentials mechanism provided by ListerHttpTransport.
---
 swh/lister/phabricator/lister.py            |  6 +-----
 swh/lister/phabricator/tests/test_lister.py | 11 ++++++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/swh/lister/phabricator/lister.py b/swh/lister/phabricator/lister.py
index 9b8059e..c9ceadc 100644
--- a/swh/lister/phabricator/lister.py
+++ b/swh/lister/phabricator/lister.py
@@ -18,13 +18,11 @@ class PhabricatorLister(IndexingHttpLister):
     MODEL = PhabricatorModel
     LISTER_NAME = 'phabricator'
 
-    def __init__(self, forge_url, instance=None, api_token=None,
-                 override_config=None):
+    def __init__(self, forge_url, instance=None, override_config=None):
         if forge_url.endswith("/"):
             forge_url = forge_url[:-1]
         self.forge_url = forge_url
         api_baseurl = '%s/api/diffusion.repository.search' % forge_url
-        self.api_token = api_token
         if not instance:
             instance = urllib.parse.urlparse(forge_url).hostname
         self.instance = instance
@@ -63,8 +61,6 @@ class PhabricatorLister(IndexingHttpLister):
         """
         params = {}
         params['headers'] = self.request_headers() or {}
-        if self.api_token:
-            return self._build_query_params(params, self.api_token)
         instance_creds = self.request_instance_credentials()
         if not instance_creds:
             raise ValueError(
diff --git a/swh/lister/phabricator/tests/test_lister.py b/swh/lister/phabricator/tests/test_lister.py
index e4d6cce..c7e77aa 100644
--- a/swh/lister/phabricator/tests/test_lister.py
+++ b/swh/lister/phabricator/tests/test_lister.py
@@ -28,9 +28,14 @@ class PhabricatorListerTester(HttpListerTester, unittest.TestCase):
 
         """
         if override_config or self.fl is None:
-            self.fl = self.Lister(forge_url='https://fakeurl', instance='fake',
-                                  api_token='a-1',
-                                  override_config=override_config)
+            credentials = {'phabricator': {'fake': [
+                {'password': 'toto'}
+            ]}}
+            override_config = dict(credentials=credentials,
+                                   **(override_config or {}))
+            self.fl = self.Lister(
+                forge_url='https://fakeurl', instance='fake',
+                override_config=override_config)
             self.fl.INITIAL_BACKOFF = 1
 
         self.fl.reset_backoff()