use preferred_username-claim2 (#348)

Author: ciur

docker/prod/Dockerfile

@@ -6,7 +6,7 @@ COPY ui/ .
 RUN npm install
 RUN npm run build
 
-FROM papermerge/auth-server:0.9.0build9 as auth_server
+FROM papermerge/auth-server:0.9.0build10 as auth_server
 FROM python:3.10 as papermerge_core
 
 ENV CORE_APP=/core_app

papermerge/core/auth/__init__.py

@@ -35,7 +35,7 @@ def extract_token_data(token: str = Depends(oauth2_scheme)) -> types.TokenData:
             )
         token_scopes = data.get("scopes", [])
         groups = data.get("groups", [])
-        username = data.get("username", None)
+        username = data.get("preferred_username", None)
         email = data.get("email", None)
 
         return types.TokenData(

tests/conftest.py

@@ -47,7 +47,7 @@ def auth_api_client(user: User):
 
     middle_part = base64.encode({
         'sub': str(user.id),
-        'username': user.username,
+        'preferred_username': user.username,
         'email': user.email,
         'scopes': list(SCOPES.keys())
     })

tests/core/routes/conftest.py

@@ -12,7 +12,7 @@ def b64e(s):
 def token():
     data = {
         'sub': '100',
-        'username': 'montaigne',
+        'preferred_username': 'montaigne',
         'email': 'montaingne@mail.com'
     }
     json_str = json.dumps(data)