use new api for dns list

srgvg · May 8, 2020 · 15004e3 · 15004e3
1 parent 3f0d9c1
commit 15004e3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/gandi/cli/core/base.py b/gandi/cli/core/base.py
@@ -136,10 +136,17 @@ def json_call(cls, method, url, **kwargs):
                          "'gandi setup' command")
                 sys.exit(1)
             if send_key:
+                #print(url)
                 if 'headers' in kwargs:
-                    kwargs['headers'].update({'X-Api-Key': apikey})
+                    if url.startswith('https://api.gandi.net/v5/domain'):
+                        kwargs['headers'].update({'authorization': 'apikey ' + apikey})
+                    else:
+                        kwargs['headers'].update({'X-Api-Key': apikey})
                 else:
-                    kwargs['headers'] = {'X-Api-Key': apikey}
+                    if url.startswith('https://api.gandi.net/v5/domain'):
+                        kwargs['headers'] = {'authorization': 'apikey ' + apikey}
+                    else:
+                        kwargs['headers'] = {'X-Api-Key': apikey}
         except MissingConfiguration:
             if not empty_key:
                 return []

diff --git a/gandi/cli/modules/dns.py b/gandi/cli/modules/dns.py
@@ -35,7 +35,8 @@ def get_sort_url(cls, url, sort_by=None):
     @classmethod
     def list(cls):
         """List domains."""
-        return cls.json_get('%s/domains' % cls.api_url)
+        api_url = 'https://api.gandi.net/v5/domain'
+        return cls.json_get('%s/domains' % api_url)
 
     @classmethod
     def type_list(cls):