Merge pull request #69 from hotosm/hotfix

Hotfix

.env.sample

@@ -27,3 +27,19 @@ STATIC_BASE_URL=http://localhost:9000/frontendstatic/
 
 # use development for frontend as dev else live ["development", "live"]
 DOCKER_TARGET=development
+
+# For Frontend
+SITE_NAME="DTM-Drone Tasking Manager"
+BASE_URL=http://localhost:${BACKEND_WEB_APP_PORT:-8000}/api
+API_URL_V1=http://localhost:${BACKEND_WEB_APP_PORT:-8000}/api
+
+DEBUG=False
+
+#SMTP Configuration
+SMTP_TLS=True
+SMTP_SSL=False
+SMTP_PORT=587
+SMTP_HOST=smtp.gmail.com
+SMTP_USER=[email protected]
+SMTP_PASSWORD=xxxxxxxxxx
+EMAILS_FROM_EMAIL=[email protected]

src/backend/app/users/user_crud.py

@@ -7,6 +7,8 @@
 from app.users.user_schemas import AuthUser, ProfileUpdate
 from databases import Database
 from fastapi import HTTPException
+from pydantic import EmailStr
+
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
@@ -77,16 +79,10 @@ async def get_user_by_email(db: Database, email: str):
     return result
 
 
-async def get_user_by_username(db: Database, username: str):
-    query = "SELECT * FROM users WHERE username = :username LIMIT 1;"
-    result = await db.fetch_one(query, {"username": username})
-    return result
-
-
 async def authenticate(
-    db: Database, username: str, password: str
+    db: Database, email: EmailStr, password: str
 ) -> db_models.DbUser | None:
-    db_user = await get_user_by_username(db, username)
+    db_user = await get_user_by_email(db, email)
     if not db_user:
         return None
     if not verify_password(password, db_user["password"]):
@@ -105,7 +101,7 @@ async def get_or_create_user(
                     id, name, email_address, profile_img, is_active, is_superuser, date_registered
                     )
                 VALUES (
-                    :user_id, :name, :email_address, :profile_img, False, False, now()
+                    :user_id, :name, :email_address, :profile_img, True, False, now()
                     )
             ON CONFLICT (id)
                 DO UPDATE SET profile_img = :profile_img;

src/backend/app/users/user_routes.py

@@ -1,11 +1,9 @@
-from typing import Any
 from datetime import timedelta
 from fastapi import APIRouter, Response, HTTPException, Depends
 from typing import Annotated
 from fastapi.security import OAuth2PasswordRequestForm
 from app.users.user_schemas import (
     Token,
-    UserPublic,
     ProfileUpdate,
     AuthUser,
 )
@@ -59,14 +57,6 @@ def update_token(current_user: CurrentUser):
     return Token(access_token=access_token, refresh_token=refresh_token)
 
 
-@router.get("/me", response_model=UserPublic)
-def read_user_me(current_user: CurrentUser) -> Any:
-    """
-    Get current user.
-    """
-    return current_user
-
-
 @router.post("/{user_id}/profile")
 async def update_user_profile(
     user_id: str,

src/backend/app/users/user_schemas.py

@@ -14,7 +14,6 @@ class AuthUser(BaseModel):
 
 
 class UserBase(BaseModel):
-    username: str
     email_address: EmailStr
     is_active: bool = True
     is_superuser: bool = False