commonground-api-common 1.13.4__py3-none-any.whl → 2.0.1__py3-none-any.whl

{commonground_api_common-1.13.4.dist-info → commonground_api_common-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonground-api-common
-Version: 1.13.4
+Version: 2.0.1
 Summary: Commonground API tooling
 Home-page: https://github.com/maykinmedia/commonground-api-common
 Author: Maykin Media, VNG-Realisatie
@@ -9,7 +9,6 @@ License: EUPL 1.2
 Keywords: openapi,swagger,django
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.2
 Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: Unix
@@ -20,35 +19,27 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: django>=3.2.0
-Requires-Dist: django-filter>=2.0
+Requires-Dist: django>=4.2.0
+Requires-Dist: django-filter<=25.1,>=23.1
 Requires-Dist: django-solo
-Requires-Dist: djangorestframework>=3.11.0
-Requires-Dist: djangorestframework-camel-case>=1.2.0
+Requires-Dist: djangorestframework>=3.15.0
+Requires-Dist: djangorestframework_camel_case>=1.2.0
 Requires-Dist: django-rest-framework-condition
 Requires-Dist: drf-yasg>=1.20.0
-Requires-Dist: drf-nested-routers>=0.93.3
-Requires-Dist: gemma-zds-client>=0.14.0
+Requires-Dist: drf-nested-routers>=0.94.1
 Requires-Dist: iso-639
 Requires-Dist: isodate
-Requires-Dist: notifications-api-common>=0.2.2
+Requires-Dist: notifications-api-common>=0.3.0
+Requires-Dist: zgw-consumers>=0.35.1
 Requires-Dist: oyaml
-Requires-Dist: PyJWT>=2.0.0
+Requires-Dist: PyJWT>=2.0.1
 Requires-Dist: requests
+Requires-Dist: requests-mock
 Requires-Dist: coreapi
-Provides-Extra: coverage
-Requires-Dist: pytest-cov; extra == "coverage"
-Provides-Extra: docs
-Requires-Dist: psycopg2; extra == "docs"
-Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: sphinx-rtd-theme; extra == "docs"
-Provides-Extra: markdown_docs
+Requires-Dist: ape-pie
+Provides-Extra: markdown-docs
 Requires-Dist: django-markup<=1.3; extra == "markdown-docs"
 Requires-Dist: markdown; extra == "markdown-docs"
-Provides-Extra: pep8
-Requires-Dist: flake8; extra == "pep8"
-Provides-Extra: release
-Requires-Dist: bump2version; extra == "release"
 Provides-Extra: tests
 Requires-Dist: psycopg2; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
@@ -59,6 +50,19 @@ Requires-Dist: isort; extra == "tests"
 Requires-Dist: black; extra == "tests"
 Requires-Dist: requests-mock; extra == "tests"
 Requires-Dist: freezegun; extra == "tests"
+Requires-Dist: zgw-consumers-oas; extra == "tests"
+Provides-Extra: testutils
+Requires-Dist: zgw-consumers-oas; extra == "testutils"
+Provides-Extra: pep8
+Requires-Dist: flake8; extra == "pep8"
+Provides-Extra: coverage
+Requires-Dist: pytest-cov; extra == "coverage"
+Provides-Extra: docs
+Requires-Dist: psycopg2; extra == "docs"
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-rtd-theme; extra == "docs"
+Provides-Extra: release
+Requires-Dist: bump2version; extra == "release"
 
 ===================================================
 Commonground-API-common - Tooling voor RESTful APIs
@@ -97,9 +101,6 @@ Features
     * ``UniekeIdentificatieValidator`` (in combinatie met organisatie)
     * ``InformatieObjectUniqueValidator`` om te valideren dat M2M entries
       slechts eenmalig voorkomen
-    * ``ObjectInformatieObjectValidator`` om te valideren dat de synchronisatie
-      van een object-informatieobject relatie pas kan nadat deze relatie in het
-      DRC gemaakt is
     * ``IsImmutableValidator`` - valideer dat bepaalde velden niet gewijzigd
       worden bij een (partial) update, maar wel mogen gezet worden bij een create
     * ``ResourceValidator`` - valideer dat een URL een bepaalde resource ontsluit

{commonground_api_common-1.13.4.dist-info → commonground_api_common-2.0.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
-commonground_api_common-1.13.4.data/scripts/generate_schema,sha256=UKhznmbHX1zUjPx8G3XtxUPQiqnyd3TOIXs27Tnjl7U,952
-commonground_api_common-1.13.4.data/scripts/patch_content_types,sha256=dpGpYrZOZe8O5CHWd0F0QnP6Wk_7lK6DyuVZpBPr4mY,319
-commonground_api_common-1.13.4.data/scripts/use_external_components,sha256=xvvbngO2aDUagVXv4xRUqPaVtH_eOaVMWLQ8lyAPhEA,369
-vng_api_common/__init__.py,sha256=Gra4o8i--fyNCOTGnifCcG2dIC3_llV16Cw1aadiFd8,23
-vng_api_common/admin.py,sha256=oWKpUl5yjeYOIsh60ruCmBDyPURGq4ALle4zGhlUQsE,902
+commonground_api_common-2.0.1.data/scripts/generate_schema,sha256=UKhznmbHX1zUjPx8G3XtxUPQiqnyd3TOIXs27Tnjl7U,952
+commonground_api_common-2.0.1.data/scripts/patch_content_types,sha256=dpGpYrZOZe8O5CHWd0F0QnP6Wk_7lK6DyuVZpBPr4mY,319
+commonground_api_common-2.0.1.data/scripts/use_external_components,sha256=xvvbngO2aDUagVXv4xRUqPaVtH_eOaVMWLQ8lyAPhEA,369
+vng_api_common/__init__.py,sha256=wAxkK8w13vqoF47A8iqWdSlIgRRXmZiQ0R4wePZfzhs,22
+vng_api_common/admin.py,sha256=iFtUPGf-ha0I-bXgq8QIFrP23Kzk_H3FlgAjt0U-ip0,259
 vng_api_common/apps.py,sha256=wOQuxUImMpH39R0JrDdCZp5ADaUM8jU8vFPFW9froSs,3458
 vng_api_common/checks.py,sha256=tOyfV7MMLGh4anrd_W30LvJCxiyQ4sFs1mGd9mtrEc0,1175
 vng_api_common/choices.py,sha256=dboFRoM34GpRUpxB9WexexccopcQSogu1QIyY4B9ACY,541
-vng_api_common/client.py,sha256=IChAkSlxmu0_ZHLmfCo_lGH8MMnbahCkcYXm3_ujUAo,1203
+vng_api_common/client.py,sha256=EZWygrJum6pLeKS77mzynfV9kq0gPTjXXSHEpeyEZHg,1888
 vng_api_common/compat.py,sha256=n4jDFSPzXnh-D_VXjftKMCJYj_q_t6eJrUTWLayl8jQ,768
 vng_api_common/constants.py,sha256=yYtnYId9alRuhGBoqaO8lkXYi_ATi2FW-wEDGRpiRuQ,10948
 vng_api_common/decorators.py,sha256=_p-mAyi5Na_-ll00ErcQ3mRoZNCsJzYDAliXn50Bmes,278
@@ -20,22 +20,22 @@ vng_api_common/filtersets.py,sha256=Ioarp5t_cz6Hf3iIcP2Rc0D7tGYhcMQPVdIJJ2dvtv8,
 vng_api_common/generators.py,sha256=tD7ZyyFgCQ3KiktpBFtn5YiVdl3jioGxzyvkEZFYdQQ,4911
 vng_api_common/geo.py,sha256=AZbrw0rwGYOmaSUk8JJSkx-4_tVrfT_cgggh9omRwhU,1862
 vng_api_common/middleware.py,sha256=2DRw0hPpvUMqwoH1Ze8S7tDB16lmj4Bnd6vN5ijkGM8,875
-vng_api_common/mocks.py,sha256=JjpJyVmHReRUXbwDi2cnmuq4NYI1hLRr_W962TIhN6Y,6118
-vng_api_common/models.py,sha256=JmUfkM1PuiqW3wuTA-chMtcDGvohy4j0JsB95s7VK4Q,5041
-vng_api_common/oas.py,sha256=FiqBZ3n36q-fPRZEgpmLDxjnqmoAKmaTKZ-FlFcuRp0,2712
+vng_api_common/mocks.py,sha256=0sELLs-uy2ndu29m5P6FN_p1ehNhYv7IoRayYPs379Y,6200
+vng_api_common/models.py,sha256=3WgpCWQpkCOrMCtqp7EbnP681II43Sg_cch8ZOm4EcU,1707
+vng_api_common/oas.py,sha256=v_M_nsPRk12VF4lFa3Kw2c-wUThfY8PJ6JlEgeUhz9E,2618
 vng_api_common/pagination.py,sha256=sI6VJ5AHDBhtNRQ8OFrD2heQK-NxaL_6n73ijiqWDLc,255
 vng_api_common/permissions.py,sha256=ayDxk9Wt8j0yO57FhZ8XaRkPET4lAqd8SSw3m4o3EGs,7562
 vng_api_common/polymorphism.py,sha256=N-x39pG2unD4N0ZbxFvuhE8ibPaJ0eKeqfvAJW3NnEU,6623
-vng_api_common/routers.py,sha256=Tq_V-ewibFfcMl-0TS91_jvel6SxQGF-649GSKqlexE,1906
+vng_api_common/routers.py,sha256=hEnhBulkgMM-7W_lYaykKTgTBj3-avl7DGsR9P7BbTU,1897
 vng_api_common/schema.py,sha256=1Bt9dH67AOLpfPNF7Q4IH1cXJeaIevSamZQzJ8DJ7ks,6144
 vng_api_common/scopes.py,sha256=PGs6CkXorAAdWXGFY1bSy-jmsPn122Njen9aFFOpFIQ,2351
 vng_api_common/search.py,sha256=yehS6boCOk1JXLCqAMU-B62hWtbTBSf_WKIVGPgp0Mg,1045
 vng_api_common/serializers.py,sha256=7_7IotlRfVb0woe6Wy79l_el3sPzrSY8-bfiYLbEUqs,10162
 vng_api_common/urls.py,sha256=9IWHYLlEIIHNaZ_Zq02qNQ2HJpETb7o-89r7yBM_tQs,270
-vng_api_common/utils.py,sha256=CFmG4xVabUA4GcWiOEbGSaL5mdFi8njsspTXRl8yjCY,9057
-vng_api_common/validators.py,sha256=iYtOZs9Lqm4FDZ0PMfT44wxqlHN58RRd42Bv46iNn0I,12164
+vng_api_common/utils.py,sha256=zrtpssOA-NcJHhAlxioBiXeY3G2R_uf0l8oWkDD_EiE,8511
+vng_api_common/validators.py,sha256=Y1OQrmnH3U01hnCizWc_xjpSSGUWKlwiFxeHHGCThpI,11012
 vng_api_common/version.py,sha256=yJV9_yTM7Qnzg0zGNkJQkN9Uai3I_ZUkcyseJRPRk5I,129
-vng_api_common/views.py,sha256=2fraDBtq9x2hMauRuOKkn6cDUw0IYdzfPKTxFFRRFXk,7309
+vng_api_common/views.py,sha256=seRGa-_2BPtrtHP6C6mmQCnT10q9ECfRHa8lpwyEcmM,7230
 vng_api_common/viewsets.py,sha256=z5pzvSymFiiuCjP_-uuW-3OJKZY_psPAt8fWeWySU0c,2278
 vng_api_common/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/api/permissions.py,sha256=okbwiscxlAtbQWTCRDLL2reOxgj0rRDZeDcrtXAYq00,739
@@ -75,10 +75,11 @@ vng_api_common/audittrails/migrations/0018_auto_20221212_0745.py,sha256=pf4NBYI0
 vng_api_common/audittrails/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/audittrails/migrations/_operations.py,sha256=UOMv0zAK8CIQ73cSu6wwQG_hkW46Isdy7JCnljn8GII,3280
 vng_api_common/authorizations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vng_api_common/authorizations/admin.py,sha256=BmJQgNH7KlDB3flAXrSMm_w0NowpJrDYWDY61RZcKCI,795
-vng_api_common/authorizations/middleware.py,sha256=XcHXBvzGdVXSxDgiVaz6IAZQPS-pFsrJnCzepug1Ddw,8100
-vng_api_common/authorizations/models.py,sha256=ahwEMG5R6ILTlrnKo5TggYp52Z7dAJMk2QSZyZW8Qa0,4236
+vng_api_common/authorizations/admin.py,sha256=Tk0yYKbb005E0XZaYYWbucMf_K5M8Hhz62wSBDi8rhM,813
+vng_api_common/authorizations/middleware.py,sha256=KJ3znCXPRMOVqSur62SmBjvC6RcKxtcWq1rzaHdYR98,8416
+vng_api_common/authorizations/models.py,sha256=0bcZwRc0ntIlPzUM7I8R5yhQRrnXvAZ_l9FpTnpbnxk,5207
 vng_api_common/authorizations/serializers.py,sha256=3HeKWEqhI3UWwI8SttC4rEID-Epbk7SWsC-bEjolbaw,5151
+vng_api_common/authorizations/utils.py,sha256=VCXdU4q3CQ1cvuYkg1dPWSbZym1Ufoz5gSmbHYkQcgw,521
 vng_api_common/authorizations/validators.py,sha256=u7fKm0QgGy8fiAeYmIEB9Gy-yIE9C-tC2ZpnNQBXPso,2816
 vng_api_common/authorizations/migrations/0001_initial.py,sha256=ooAZtQeDtWgDxXzAP-KnSyyFYLRPM-PMrK5RgOnTPjQ,4360
 vng_api_common/authorizations/migrations/0002_authorizationsconfig.py,sha256=m4taH6ClHI-YHYGGOKaq_qYXGx9lq1InXOGLQKg9MSw,1364
@@ -95,6 +96,7 @@ vng_api_common/authorizations/migrations/0012_auto_20200619_0545.py,sha256=ECvJJ
 vng_api_common/authorizations/migrations/0013_auto_20201207_0846.py,sha256=fyJ0HpQMM0d1UyK9AK5_c7S_as_NejzrOdbMYiIogOA,1788
 vng_api_common/authorizations/migrations/0014_auto_20201221_0905.py,sha256=pkg7Y9yvUIY-QB9elvCxfR7OZJ3xMBIha_4WSZeDlwY,1659
 vng_api_common/authorizations/migrations/0015_auto_20220318_1608.py,sha256=jR1MDuqapBZU4bYVx0V3MRauRpDk_DtCVcBSe7gmtUA,1751
+vng_api_common/authorizations/migrations/0016_remove_authorizationsconfig_api_root_and_more.py,sha256=-UbTWExHaPL0O8585mm4_OFCm8xJXAmfwmU7V0ysSgg,2407
 vng_api_common/authorizations/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/caching/__init__.py,sha256=v_FC6HaHESwr_J94TWzaQBKtIjDLnsQADvqHylEW7g8,687
 vng_api_common/caching/decorators.py,sha256=lU5dnBjD9aHjoYaV32FlYxY7VFZPdMZe26fVDa_h3Q4,1804
@@ -104,7 +106,7 @@ vng_api_common/caching/models.py,sha256=RroS9HFiKNXDV59Odh0x8BO8Az8E81v4gwuprF1A
 vng_api_common/caching/registry.py,sha256=mY1r99x7m0DQ1BN9lZF2zMjFj_oDNq7urxDkOH7-8Yg,6205
 vng_api_common/caching/signals.py,sha256=78ej5cVan-JpNHKzZNAfs0m2ON_TXKphe8ZKtP-6FVY,4615
 vng_api_common/conf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vng_api_common/conf/api.py,sha256=m7ITWOQTZL0_4gh7f0K_MYcFp8KcoT-IxyhzZGrBS_8,4436
+vng_api_common/conf/api.py,sha256=bRc488POvBdKeaKVit7s1_LFP-BRLpETmTzcQ6JD614,4372
 vng_api_common/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/db/operations.py,sha256=3vj9zD4EntMSmYsNGN1pRDjAcVM68MESDdoAk9wl0U0,3333
 vng_api_common/inspectors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -122,7 +124,7 @@ vng_api_common/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 vng_api_common/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/management/commands/generate_autorisaties.py,sha256=kMaZQo6e6vCXA9y0e6P2PlxObyjHMyNynRcM4WtzVZI,1130
 vng_api_common/management/commands/generate_notificaties.py,sha256=0p7CkLkQo-BeV2IljGv0rcRNw2aWY_HwlvybjggZ_gs,1090
-vng_api_common/management/commands/generate_swagger.py,sha256=t9_w2cEEa8ibMzFgg6Nl-8amgVj3qOc4hD44R89arHk,6134
+vng_api_common/management/commands/generate_swagger.py,sha256=DyRRSDMFEZeXSJp_PWiMc6vYFK3GPEO4WIRWZV-tlm0,6120
 vng_api_common/management/commands/patch_error_contenttypes.py,sha256=xyFIQ4JRutLZCTcLrWqon0FDeAJCw1bkVg4jM8-EM24,2025
 vng_api_common/management/commands/use_external_components.py,sha256=FLkhZ5jAIZoAXQWwxqu4yT94LiBJ4GRr6g4ZRp7b_Eg,2936
 vng_api_common/migrations/0001_initial.py,sha256=frE83rux6uVHK4v-1fsb_1C00TBQQ6koFBA3DoVPHmk,895
@@ -130,15 +132,14 @@ vng_api_common/migrations/0002_apicredential.py,sha256=AYgkLMizI0g-Ogth8j_FVJHTD
 vng_api_common/migrations/0003_auto_20190417_1145.py,sha256=0ABqDggAdjmZxhSsLrMb2ZBwTcR1BOWo1Tn8StfiG0A,1001
 vng_api_common/migrations/0004_auto_20190517_0903.py,sha256=-Qcei-AJx4SXbEYMojmYInhV74uKtDncGP1PLs6hn0M,707
 vng_api_common/migrations/0005_auto_20190614_1346.py,sha256=5n8SVpbEJzLrSx-7d446Vy1--SaDfO05hAltrSRQx6o,2949
+vng_api_common/migrations/0006_delete_apicredential.py,sha256=VMVwH4vj9Zq-oF_Z1Do9wobgePtkujwd8bO8M57ACt0,3621
 vng_api_common/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/notifications/__init__.py,sha256=UvHr_M8s-dZjCQOp60rLDqP_T3D0CgRIqc8ry5bIM8c,229
 vng_api_common/notifications/apps.py,sha256=7grk1hxQn5usAWV-sWATmNJ4TwSvT3izXVvV-L-zb_s,208
-vng_api_common/notifications/constants.py,sha256=R9c0Ejzw2nt-PRk0dCFbC8ugP_mTdgNJHnZ7gvzrTVE,156
-vng_api_common/notifications/handlers.py,sha256=-r52nIKbHdFUxE7hob9PiFRe0D3cizhkxbW8qhpK-Ks,2005
-vng_api_common/notifications/models.py,sha256=Ez3JYeM7BNSiFYtxAtVxWUWDc8t7jOFQlRTjrtE6SlI,2942
+vng_api_common/notifications/handlers.py,sha256=xjuE_qn5h4gbRNGMsTaCTrHIjXTBcF8na6oMURGAuUU,2089
 vng_api_common/notifications/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/notifications/api/urls.py,sha256=c1T_6tuRpgN0V80Xg_ehZzGGlF1FNMmHdBEPAjR736I,164
-vng_api_common/notifications/api/views.py,sha256=8LMh4XU_qCQURx7BLn6HnaFt1auUXlF7PHlOrcJSZ0w,2303
+vng_api_common/notifications/api/views.py,sha256=EvppqaANutuOIrkNepavmzFTX6fxo32c6l5c6DKHe8k,2326
 vng_api_common/notifications/migrations/0001_initial.py,sha256=zEIVIB--6FStaTl3r9GCXxHL1cSCWRO3T90rEpJr3hY,3049
 vng_api_common/notifications/migrations/0002_subscription__subscription.py,sha256=eqaj6-FAl7vuCswdvin9Lf8nzjP8U6WqVQO4opNKKCc,550
 vng_api_common/notifications/migrations/0003_auto_20190319_1048.py,sha256=C-ccYUwQPNCjTctpDDFhnQbm_OcpAlTjYQbEuiEi-ys,987
@@ -149,6 +150,7 @@ vng_api_common/notifications/migrations/0007_auto_20190429_1442.py,sha256=S9Q_WC
 vng_api_common/notifications/migrations/0008_auto_20190502_0415.py,sha256=Wwh3BsSg0r1I7HZZmrcCHEQMLmaeWEjbqYKapVafb2s,523
 vng_api_common/notifications/migrations/0009_auto_20190729_0427.py,sha256=Bfw-Axr9lNiXL8Ghns3RK33Dmjvpd_E5MWC740WJlb8,529
 vng_api_common/notifications/migrations/0010_auto_20220704_1419.py,sha256=Y57o91fbzWZyQO4tgg9Tn4r99hRErRlcrzpLii9Tm3I,1593
+vng_api_common/notifications/migrations/0011_remove_subscription_config_and_more.py,sha256=3FA3rlpRDp8FB8Azl22pv7C4i1oUAQkRHHK9PRpNeJU,499
 vng_api_common/notifications/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/static/vng_api_common/css/screen.css,sha256=1Zt-yVFbm8qR9LakcYTF5x8p_91r8dMA-VRjIadYeP0,4674
 vng_api_common/static/vng_api_common/css/admin/admin_overrides.css,sha256=81xuIyYfiTgq8O9h5NsSf-v8Sx885ICSEx1f-5fWy4U,1748
@@ -187,9 +189,9 @@ vng_api_common/templatetags/vng_api_common.py,sha256=j4Fu4rNErLcXStBbuZ9Zd_xD_ft
 vng_api_common/tests/__init__.py,sha256=zBI2etwu2lEkKkIN1_cPuugJgPcoohQuJbdiUGtoceU,426
 vng_api_common/tests/auth.py,sha256=IKDWTEFv4Bign4F70-ibsFcnJqRxEJaXvqaPQJWa1xY,4544
 vng_api_common/tests/caching.py,sha256=zfIw5cRRvO9cekHZZKfRqZc8cx5IfJUYNmcH6cuIMg4,624
-vng_api_common/tests/schema.py,sha256=9LFgEXzcYGkHZtlpCiHNCWywR5lF7Pl0S43cwlwKDgQ,1954
+vng_api_common/tests/schema.py,sha256=irt_kIp1uJsnYIJlrpk0-qM9W6i44WyX3GSiJvGUfdU,2288
 vng_api_common/tests/urls.py,sha256=PFrYzQbBC0TFPMEn3uPhcBG0IQs9JsEPqckicJT1UA4,2159
-commonground_api_common-1.13.4.dist-info/METADATA,sha256=Rvx7_yFH4rnQfECFINzFJxtkysviCExbotrYUUJ3yCc,6529
-commonground_api_common-1.13.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-commonground_api_common-1.13.4.dist-info/top_level.txt,sha256=vPismc83zPzWXTmlNCCwfDlFV9iygJYxNJW5iDjKTgw,15
-commonground_api_common-1.13.4.dist-info/RECORD,,
+commonground_api_common-2.0.1.dist-info/METADATA,sha256=-xJGeWAsWqA4c1ZWjSmfVaEJl7AcHAyvGuGwLbgyAws,6497
+commonground_api_common-2.0.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+commonground_api_common-2.0.1.dist-info/top_level.txt,sha256=vPismc83zPzWXTmlNCCwfDlFV9iygJYxNJW5iDjKTgw,15
+commonground_api_common-2.0.1.dist-info/RECORD,,

{commonground_api_common-1.13.4.dist-info → commonground_api_common-2.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

vng_api_common/__init__.py

@@ -1 +1 @@
-__version__ = "1.13.4"
+__version__ = "2.0.1"

vng_api_common/admin.py

@@ -1,29 +1,10 @@
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _
 
-from .models import APICredential, JWTSecret
+from .models import JWTSecret
 
 
 @admin.register(JWTSecret)
 class JWTSecretAdmin(admin.ModelAdmin):
     list_display = ("identifier",)
     search_fields = ("identifier",)
-
-
-@admin.register(APICredential)
-class APICredentialAdmin(admin.ModelAdmin):
-    list_display = ("label", "api_root", "client_id", "user_id")
-    search_fields = ("label", "api_root")
-    fieldsets = (
-        (_("external API"), {"fields": ["api_root", "label"]}),
-        (
-            _("credentials"),
-            {
-                "description": _(
-                    "Credentials that indicate how this API or application identifies itself at the external "
-                    "API."
-                ),
-                "fields": ["client_id", "secret", "user_id", "user_representation"],
-            },
-        ),
-    )

vng_api_common/authorizations/admin.py

@@ -7,7 +7,7 @@ from .models import Applicatie, AuthorizationsConfig, Autorisatie
 
 @admin.register(AuthorizationsConfig)
 class AuthorizationsConfigAdmin(SingletonModelAdmin):
-    list_display = ("api_root", "component")
+    list_display = ("authorizations_api_service", "component")
 
 
 @admin.register(Autorisatie)

vng_api_common/authorizations/middleware.py

@@ -8,9 +8,10 @@ from django.utils.translation import gettext as _
 
 import jwt
 from djangorestframework_camel_case.util import underscoreize
+from requests import RequestException
 from rest_framework.exceptions import PermissionDenied
-from zds_client.client import ClientError
 
+from vng_api_common.client import ClientError, to_internal_data
 from vng_api_common.constants import VertrouwelijkheidsAanduiding
 
 from ..models import JWTSecret
@@ -51,10 +52,18 @@ class JWTAuth:
 
     def _request_auth(self) -> list:
         client = AuthorizationsConfig.get_client()
+
+        if not client:
+            logger.warning("Authorization component can't be accessed")
+            return []
+
         try:
-            response = client.list(
-                "applicatie", query_params={"clientIds": self.client_id}
-            )
+            response = client.get("applicaties", params={"clientIds": self.client_id})
+
+            data = to_internal_data(response)
+        except RequestException:
+            logger.warning("Authorization component can't be accessed")
+            return []
         except ClientError as exc:
             response = exc.args[0]
             # friendly debug - hint at where the problem is located
@@ -64,10 +73,10 @@ class JWTAuth:
                     "authorizations could not be retrieved"
                 )
                 raise PermissionDenied(detail=detail, code="not_authenticated_for_ac")
-            logger.warn("Authorization component can't be accessed")
+            logger.warning("Authorization component can't be accessed")
             return []
 
-        return underscoreize(response["results"])
+        return underscoreize(data["results"])
 
     def _get_auth(self):
         return Applicatie.objects.filter(client_ids__contains=[self.client_id])

vng_api_common/authorizations/migrations/0016_remove_authorizationsconfig_api_root_and_more.py

@@ -0,0 +1,76 @@
+# Generated by Django 5.1.2 on 2024-10-25 14:07
+
+import logging
+
+import django.db.models.deletion
+from django.db import migrations, models
+from django.utils.text import slugify
+
+from zgw_consumers.constants import APITypes, AuthTypes
+
+logger = logging.getLogger(__name__)
+
+
+def migrate_authorization_config_to_service(apps, _) -> None:
+    AuthorizationsConfig = apps.get_model("authorizations", "AuthorizationsConfig")
+    Service = apps.get_model("zgw_consumers", "Service")
+
+    service_label = "Authorization API service"
+
+    config, _ = AuthorizationsConfig.objects.get_or_create()
+    service, created = Service.objects.get_or_create(
+        api_root=config.api_root,
+        defaults=dict(
+            label="Authorization API service",
+            slug=slugify(service_label),
+            api_type=APITypes.ac,
+            auth_type=AuthTypes.zgw,
+        ),
+    )
+    config.authorizations_api_service = service
+    config.save()
+
+    if created:
+        logger.info(f"Created new Service for {config.api_root}")
+    else:
+        logger.info(f"Existing service found for {config.api_root}")
+
+
+def migrate_authorization_config_to_config(apps, _) -> None:
+    AuthorizationsConfig = apps.get_model("authorizations", "AuthorizationsConfig")
+
+    config, _ = AuthorizationsConfig.objects.get_or_create()
+    if config.authorizations_api_service:
+        config.api_root = config.authorizations_api_service.api_root
+    config.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("authorizations", "0015_auto_20220318_1608"),
+        ("zgw_consumers", "0022_set_default_service_slug"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="authorizationsconfig",
+            name="authorizations_api_service",
+            field=models.ForeignKey(
+                blank=True,
+                limit_choices_to={"api_type": "ac", "auth_type": "zgw"},
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="zgw_consumers.service",
+                verbose_name="autorisations api service",
+            ),
+        ),
+        migrations.RunPython(
+            migrate_authorization_config_to_service,
+            reverse_code=migrate_authorization_config_to_config,
+        ),
+        migrations.RemoveField(
+            model_name="authorizationsconfig",
+            name="api_root",
+        ),
+    ]

vng_api_common/authorizations/models.py

@@ -1,17 +1,28 @@
 import uuid
+from typing import Optional
 
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+from solo.models import SingletonModel
+from zgw_consumers.constants import APITypes, AuthTypes
+
+from vng_api_common.client import Client, get_client
+
 from ..constants import ComponentTypes, VertrouwelijkheidsAanduiding
 from ..decorators import field_default
 from ..fields import VertrouwelijkheidsAanduidingField
-from ..models import APIMixin, ClientConfig
+from ..models import APIMixin
+
 
+class AuthorizationsConfigManager(models.Manager):
+    def get_queryset(self):
+        qs = super().get_queryset()
+        return qs.select_related("authorizations_api_service")
 
-@field_default("api_root", "https://autorisaties-api.vng.cloud/api/v1")
-class AuthorizationsConfig(ClientConfig):
+
+class AuthorizationsConfig(SingletonModel):
     component = models.CharField(
         _("component"),
         max_length=50,
@@ -19,9 +30,33 @@ class AuthorizationsConfig(ClientConfig):
         default=ComponentTypes.zrc,
     )
 
+    authorizations_api_service = models.ForeignKey(
+        "zgw_consumers.Service",
+        limit_choices_to=dict(
+            api_type=APITypes.ac,
+            auth_type=AuthTypes.zgw,
+        ),
+        verbose_name=_("autorisations api service"),
+        on_delete=models.SET_NULL,
+        blank=True,
+        null=True,
+    )
+
+    objects = AuthorizationsConfigManager()
+
     class Meta:
         verbose_name = _("Autorisatiecomponentconfiguratie")
 
+    @classmethod
+    def get_client(cls) -> Optional[Client]:
+        """
+        Construct a client, prepared with the required auth.
+        """
+        config = cls.get_solo()
+        if config.authorizations_api_service:
+            return get_client(config.authorizations_api_service.api_root)
+        return None
+
 
 class ApplicatieManager(models.Manager):
     def get_by_natural_key(self, uuid):

vng_api_common/authorizations/utils.py

@@ -0,0 +1,17 @@
+def generate_jwt(client_id, secret, user_id, user_representation):
+    from zgw_consumers.client import ZGWAuth
+
+    class FakeService:
+        def __init__(self, **kwargs):
+            for key, value in kwargs.items():
+                setattr(self, key, value)
+
+    auth = ZGWAuth(
+        service=FakeService(  # type: ignore
+            client_id=client_id,
+            secret=secret,
+            user_id=user_id,
+            user_representation=user_representation,
+        )
+    )
+    return f"Bearer {auth._token}"

vng_api_common/client.py

@@ -1,44 +1,73 @@
 """
-Interface to get a zds_client object for a given URL.
+Interface to get a client object for a given URL.
 """
 
-from typing import Optional
+import logging
+from typing import Any, Optional
 
-from django.apps import apps
 from django.conf import settings
 from django.utils.module_loading import import_string
 
-from zds_client import Client
+from ape_pie import APIClient
+from requests import JSONDecodeError, RequestException, Response
 
+logger = logging.getLogger(__name__)
 
-def get_client(url: str, url_is_api_root=False) -> Optional[Client]:
-    """
-    Get a client instance for the given URL.
 
-    If the setting CUSTOM_CLIENT_FETCHER is defined, then this callable is invoked.
-    Otherwise we fall back on the default implementation.
+class ClientError(RuntimeError):
+    pass
 
-    If no suitable client is found, ``None`` is returned.
-    """
-    custom_client_fetcher = getattr(settings, "CUSTOM_CLIENT_FETCHER", None)
-    if custom_client_fetcher:
-        client_getter = import_string(custom_client_fetcher)
-        return client_getter(url)
 
-    # default implementation
-    Client = import_string(settings.ZDS_CLIENT_CLASS)
+# TODO: use more approriate method name
+def to_internal_data(response: Response) -> dict | list | None:
+    try:
+        response_json = response.json()
+    except JSONDecodeError:
+        logger.exception("Unable to parse json from response")
+        response_json = None
 
-    if url_is_api_root and not url.endswith("/"):
-        url = f"{url}/"
+    try:
+        response.raise_for_status()
+    except RequestException as exc:
+        if response.status_code >= 500:
+            raise
+        raise ClientError(response_json if response_json is not None else {}) from exc
 
-    client = Client.from_url(url)
-    if client is None:
-        return None
+    assert response_json
+    return response_json
+
+
+class Client(APIClient):
+    def request(
+        self, method: str | bytes, url: str | bytes, *args, **kwargs
+    ) -> Response:
+
+        headers = kwargs.pop("headers", {})
+        headers.setdefault("Accept", "application/json")
+        headers.setdefault("Content-Type", "application/json")
+
+        kwargs["headers"] = headers
+
+        data = kwargs.get("data", {})
 
-    APICredential = apps.get_model("vng_api_common", "APICredential")
+        if data:
+            kwargs["json"] = data
 
-    if url_is_api_root:
-        client.base_url = url
+        return super().request(method, url, *args, **kwargs)
+
+
+def get_client(url: str) -> Client | None:
+    """
+    Get a client instance for the given URL.
+    If no suitable client is found, ``None`` is returned.
+    """
+    from zgw_consumers.client import build_client
+    from zgw_consumers.models import Service
+
+    service: Optional[Service] = Service.get_service(url)
+
+    if not service:
+        logger.warning(f"No service configured for {url}")
+        return None
 
-    client.auth = APICredential.get_auth(url)
-    return client
+    return build_client(service, client_factory=Client)

vng_api_common/conf/api.py

@@ -4,7 +4,6 @@ __all__ = [
     "BASE_SWAGGER_SETTINGS",
     "COMMON_SPEC",
     "LINK_FETCHER",
-    "ZDS_CLIENT_CLASS",
     "GEMMA_URL_TEMPLATE",
     "GEMMA_URL_COMPONENTTYPE",
     "GEMMA_URL_INFORMATIEMODEL",
@@ -94,8 +93,6 @@ REDOC_SETTINGS = {"EXPAND_RESPONSES": "200,201", "SPEC_URL": "openapi.json"}
 # See: https://github.com/Rebilly/ReDoc#redoc-options-object
 LINK_FETCHER = "requests.get"
 
-ZDS_CLIENT_CLASS = "zds_client.Client"
-
 GEMMA_URL_TEMPLATE = "https://www.gemmaonline.nl/index.php/{informatiemodel}_{versie}/doc/{componenttype}/{component}"
 GEMMA_URL_COMPONENTTYPE = "objecttype"
 GEMMA_URL_INFORMATIEMODEL = "Rgbz"

vng_api_common/management/commands/generate_swagger.py

@@ -47,7 +47,7 @@ class Row:
 
 class Command(generate_swagger.Command):
     """
-    Patches to the provided command to modify the schema for ZDS needs.
+    Patches to the provided command to modify the schema.
     """
 
     leave_locale_alone = True