fix: pytest failure with user info

hotosm · Mar 12, 2024 · 82a54bf · 82a54bf
1 parent 41e9efe
commit 82a54bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/backend/app/auth/auth_routes.py b/src/backend/app/auth/auth_routes.py
@@ -168,7 +168,7 @@ async def get_or_create_user(
             {
                 "user_id": user_data.id,
                 "username": user_data.username,
-                "profile_img": user_data.img_url or None,
+                "profile_img": user_data.profile_img or None,
                 "role": "MAPPER",
                 "mapping_level": "BEGINNER",
                 "current_date": datetime.now(timezone.utc),
@@ -197,7 +197,7 @@ async def get_or_create_user(
             {
                 "id": row.id,
                 "username": row.username,
-                "img_url": row.profile_img,
+                "profile_img": row.profile_img,
                 "role": row.role,
                 "project_id": row.project_id,
                 "project_role": row.project_role,

diff --git a/src/backend/app/auth/osm.py b/src/backend/app/auth/osm.py
@@ -41,7 +41,7 @@ class AuthUser(BaseModel):
 
     id: int
     username: str
-    img_url: Optional[str] = None
+    profile_img: Optional[str] = None
     role: Optional[UserRole] = UserRole.MAPPER
 
 

diff --git a/src/backend/tests/conftest.py b/src/backend/tests/conftest.py
@@ -99,7 +99,7 @@ async def admin_user(db):
         ),
     )
     # Upgrade role from default MAPPER (if user already exists)
-    db_user.role = UserRole.ADMIN
+    db_user["role"] = UserRole.ADMIN
     db.commit()
     return db_user
 
@@ -175,8 +175,8 @@ async def project(db, admin_user, organisation):
             project_metadata,
             odkproject["id"],
             AuthUser(
-                username=admin_user.username,
-                id=admin_user.id,
+                username=admin_user["username"],
+                id=admin_user["id"],
                 role=UserRole.ADMIN,
             ),
         )

diff --git a/src/frontend/src/utilfunctions/login.ts b/src/frontend/src/utilfunctions/login.ts
@@ -42,7 +42,7 @@ export const createLoginWindow = (redirectTo) => {
                     username: userRes.username,
                     osm_oauth_token: res.access_token,
                     id: userRes.id,
-                    picture: userRes.img_url,
+                    picture: userRes.profile_img,
                     redirect_to: redirectTo,
                     role: userRes.role,
                   }).toString();