From d36449e026d04f2a6f4cf5d0838421e99630d454 Mon Sep 17 00:00:00 2001
From: Niraj Adhikari <nrjadkry@gmail.com>
Date: Wed, 10 Jul 2024 17:07:37 +0545
Subject: [PATCH 1/3] update: env sample

---
 .env.sample | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.env.sample b/.env.sample
index dc32064a..aaaa406b 100644
--- a/.env.sample
+++ b/.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=xxx@gmail.com
+SMTP_PASSWORD=xxxxxxxxxx
+EMAILS_FROM_EMAIL=xxxxxxxx@gmail.com

From ba8a58742df15f7525de19242de1787e054b6def Mon Sep 17 00:00:00 2001
From: Niraj Adhikari <nrjadkry@gmail.com>
Date: Wed, 10 Jul 2024 17:08:09 +0545
Subject: [PATCH 2/3] update: authenticate function

---
 src/backend/app/users/user_crud.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/backend/app/users/user_crud.py b/src/backend/app/users/user_crud.py
index 06da4bec..427e9ee8 100644
--- a/src/backend/app/users/user_crud.py
+++ b/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")
 
@@ -84,9 +86,9 @@ async def get_user_by_username(db: Database, username: str):
 
 
 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 +107,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;

From 892cde9f3c493b00c8cc2207cdfedf04afdc6c22 Mon Sep 17 00:00:00 2001
From: Niraj Adhikari <nrjadkry@gmail.com>
Date: Wed, 10 Jul 2024 17:11:59 +0545
Subject: [PATCH 3/3] remove username from users

---
 src/backend/app/users/user_crud.py    |  6 ------
 src/backend/app/users/user_routes.py  | 10 ----------
 src/backend/app/users/user_schemas.py |  1 -
 3 files changed, 17 deletions(-)

diff --git a/src/backend/app/users/user_crud.py b/src/backend/app/users/user_crud.py
index 427e9ee8..af521924 100644
--- a/src/backend/app/users/user_crud.py
+++ b/src/backend/app/users/user_crud.py
@@ -79,12 +79,6 @@ 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, email: EmailStr, password: str
 ) -> db_models.DbUser | None:
diff --git a/src/backend/app/users/user_routes.py b/src/backend/app/users/user_routes.py
index 7badc219..3e3f8f9f 100644
--- a/src/backend/app/users/user_routes.py
+++ b/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,
diff --git a/src/backend/app/users/user_schemas.py b/src/backend/app/users/user_schemas.py
index 3bcf5e5d..61cfa2c9 100644
--- a/src/backend/app/users/user_schemas.py
+++ b/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