Rename authlib to osauthlib

dev/dc.local.yml

@@ -9,10 +9,10 @@ services:
                 CONTEXT: "dev"
         volumes:
             - ../../openslides-datastore-service/:/datastore-service
-            - ../../openslides-auth-service/auth/libraries/pip-auth/:/authlib
+            - ../../openslides-auth-service/auth/libraries/pip-auth/:/osauthlib
         environment:
-            - PYTHONPATH=/app:/datastore-service:/authlib
-            - MYPYPATH=/app:/datastore-service:/authlib
+            - PYTHONPATH=/app:/datastore-service:/osauthlib
+            - MYPYPATH=/app:/datastore-service:/osauthlib
     datastore-writer:
         build:
             context: ../../openslides-datastore-service/

openslides_backend/action/actions/user/forget_password_confirm.py

@@ -2,7 +2,7 @@
 from typing import Any
 from urllib.parse import unquote
 
-from authlib.exceptions import InvalidCredentialsException
+from osauthlib.exceptions import InvalidCredentialsException
 
 from openslides_backend.action.util.typing import ActionData
 

openslides_backend/http/views/base_view.py

@@ -4,7 +4,7 @@
 from re import Pattern
 from typing import Any, Optional
 
-from authlib import AUTHENTICATION_HEADER, COOKIE_NAME
+from osauthlib import AUTHENTICATION_HEADER, COOKIE_NAME
 from werkzeug.exceptions import BadRequest as WerkzeugBadRequest
 
 from ...shared.exceptions import View400Exception

openslides_backend/presenter/presenter.py

@@ -1,8 +1,8 @@
 from collections.abc import Callable
 
 import fastjsonschema
-from authlib import AUTHENTICATION_HEADER, COOKIE_NAME
 from fastjsonschema import JsonSchemaException
+from osauthlib import AUTHENTICATION_HEADER, COOKIE_NAME
 
 from ..http.request import Request
 from ..shared.exceptions import PresenterException

openslides_backend/services/auth/adapter.py

@@ -1,6 +1,6 @@
 from urllib import parse
 
-from authlib import (
+from osauthlib import (
     ANONYMOUS_USER,
     AUTHORIZATION_HEADER,
     AuthenticateException,

openslides_backend/services/auth/interface.py

@@ -1,6 +1,6 @@
 from typing import Any, Protocol
 
-from authlib import AUTHENTICATION_HEADER, COOKIE_NAME  # noqa
+from osauthlib import AUTHENTICATION_HEADER, COOKIE_NAME  # noqa
 
 from ..shared.authenticated_service import AuthenticatedServiceInterface
 

openslides_backend/services/shared/authenticated_service.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 from typing import Protocol
 
-from authlib import AUTHENTICATION_HEADER, COOKIE_NAME
+from osauthlib import AUTHENTICATION_HEADER, COOKIE_NAME
 
 
 class AuthenticatedServiceInterface(Protocol):

requirements/export_service_commits.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 export DATASTORE_COMMIT_HASH=2a9b7f015955bcfe4637d9c2c0be428ac3e99a1b
-export AUTH_COMMIT_HASH=934aba47da96c86d12c93c11f9cb3b531865bc10
+export AUTH_COMMIT_HASH=b1bb367491515460df46ec9fac7528b6f383a368

requirements/partial/requirements_packaged_services.txt

@@ -1,2 +1,2 @@
 git+https://github.com/OpenSlides/openslides-datastore-service.git@${DATASTORE_COMMIT_HASH}
-git+https://github.com/OpenSlides/openslides-auth-service.git@${AUTH_COMMIT_HASH}#egg=authlib&subdirectory=auth/libraries/pip-auth
+git+https://github.com/OpenSlides/openslides-auth-service.git@${AUTH_COMMIT_HASH}#egg=osauthlib&subdirectory=auth/libraries/pip-auth

setup.cfg

@@ -81,7 +81,7 @@ ignore_missing_imports = true
 [mypy-pytest]
 ignore_missing_imports = true
 
-[mypy-authlib.*]
+[mypy-osauthlib.*]
 ignore_missing_imports = true
 
 [mypy-aiosmtpd]

tests/util.py

@@ -2,7 +2,7 @@
 from typing import Any, TypedDict, cast
 
 import simplejson as json
-from authlib import AUTHENTICATION_HEADER, COOKIE_NAME, AuthenticateException
+from osauthlib import AUTHENTICATION_HEADER, COOKIE_NAME, AuthenticateException
 from werkzeug.test import Client as WerkzeugClient
 from werkzeug.test import TestResponse
 from werkzeug.wrappers import Response as BaseResponse