Mise à jour vers le nouveau portail de l'API Insee

src/api_insee/api.py

@@ -6,15 +6,12 @@
 
 class ApiInsee():
 
-    def __init__(self, key, secret, format='json', noauth=False):
+    def __init__(self, token: str, format='json', noauth=False):
 
         if noauth:
             self.auth = MockAuth()
         else:
-            self.auth = AuthService(
-                key = key,
-                secret = secret
-            )
+            self.auth = AuthService(token=token)
         self.format = format
 
         self.use('siren', RequestEntrepriseServiceSiren)

src/api_insee/conf.py

@@ -2,9 +2,8 @@
 API_VERSION = {
     "url" : 'https://api.insee.fr',
 
-    "path_token" : '/token',
-    "path_siren" : '/entreprises/sirene/V3.11/siren',
-    "path_siret" : '/entreprises/sirene/V3.11/siret',
-    "path_liens_succession" : '/entreprises/sirene/V3.11/siret/liensSuccession',
+    "path_siren" : '/api-sirene/3.11/siren',
+    "path_siret" : '/api-sirene/3.11/siret',
+    "path_liens_succession" : '/api-sirene/3.11/siret/liensSuccession',
 
 }

src/api_insee/exeptions/auth_exeption.py

@@ -2,24 +2,18 @@
 
 class AuthExeption(Exception):
 
-    credential = None
+    token: str = None
 
-    def __init__(self, credential):
-        self.credential = credential
+    def __init__(self, token):
+        self.token = token
 
     def invalidkeyAndSecret(self):
-        self.message = "Invalid consumer key or secret. key : %s secret : %s" % (
-            self.credential.key,
-            self.credential.secret
-        )
+        self.message = "Invalid consumer key or secret. token : %s" % self.token
 
         return self
 
     def unauthorized(self, reason=False):
-        self.message = "Api connection unauthorized. key : %s secret : %s" % (
-            self.credential.key,
-            self.credential.secret
-        )
+        self.message = "Api connection unauthorized. token : %s" % self.token
 
         if reason:
             self.message += "\n %s" % (reason)

src/api_insee/request/request.py

@@ -154,7 +154,7 @@ def data(self):
     def header(self):
         return {
             'Accept' : self._accept_format,
-            'Authorization' : 'Bearer %s' % (self.token.access_token)
+            'X-INSEE-Api-Key-Integration' : self.token,
         }
 
     @property
@@ -177,7 +177,7 @@ def catchHTTPError(self, error):
             raise RequestExeption(self).badRequest()
 
         elif error.code == 401:
-            raise AuthExeption(self.credentials).unauthorized(error.reason)
+            raise AuthExeption(self.token).unauthorized(error.reason)
 
         else:
             raise error

src/api_insee/utils/auth_service.py

@@ -1,30 +1,12 @@
-from api_insee.utils.client_credentials import ClientCredentials
-from api_insee.utils.client_token import ClientToken
-from api_insee.request.request_token import RequestTokenService
-
 class AuthService():
 
     token = None
 
-    def __init__(self, key=False, secret=False):
-
-        self.credentials = ClientCredentials(
-            key    = key,
-            secret = secret
-        )
-        self.generateToken()
-
-    def generateToken(self):
-        data = RequestTokenService(self.credentials).get()
-        self.token = ClientToken(**data)
+    def __init__(self, token = None):
+        self.token = token
 
 
 class MockAuth(AuthService):
 
     def __init__(self):
-        self.token = ClientToken(
-            token_type='Bearer',
-            expires_in=100000,
-            access_token='No Auth',
-            scope='No Scope'
-        )
+        self.token = "mocked-api-key"

tests/conftest.example.py

@@ -23,8 +23,6 @@
 #  Replace API consumer data with yours
 #
 
-SIRENE_API_CONSUMER_KEY    = "your-key"
-SIRENE_API_CONSUMER_SECRET = "your-secret"
 SIRENE_API_TOKEN           = "your-token"
 
 
@@ -43,4 +41,11 @@ def exec(api_request):
         if request.config.getoption("--api-insee-execute-request"):
             api_request.get()
 
-    return exec
+    return exec
+
+from api_insee import ApiInsee
+
+@pytest.fixture
+def api():
+    api = ApiInsee(token=SIRENE_API_TOKEN)
+    return api

tests/test_csv.py

@@ -26,8 +26,7 @@ def test_request_format_fallback_is_json(api, execute_request):
 def test_request_format_fallback_is_csv(api, execute_request):
 
     api_csv = ApiInsee(
-        key = conf.SIRENE_API_CONSUMER_KEY,
-        secret = conf.SIRENE_API_CONSUMER_SECRET,
+        token=conf.SIRENE_API_TOKEN,
         format = 'csv'
     )
 

tests/test_cursor.py

@@ -2,9 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-import conftest as conf
 
-from api_insee import ApiInsee
 from api_insee.conf import API_VERSION
 import api_insee.criteria as Criteria
 

tests/test_liens_sucession_service.py

@@ -3,7 +3,6 @@
 
 import pytest
 
-from api_insee import ApiInsee
 from api_insee.conf import API_VERSION
 import api_insee.criteria as Criteria
 

tests/test_siren.py

@@ -2,9 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-import conftest as conf
 
-from api_insee import ApiInsee
 from api_insee.conf import API_VERSION
 import api_insee.criteria as Criteria
 

tests/test_siret.py

@@ -2,9 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-import conftest as conf
 
-from api_insee import ApiInsee
 from api_insee.conf import API_VERSION
 import api_insee.criteria as Criteria