update-delete

app/api/v1/endpoints/auth.py

@@ -15,11 +15,11 @@ async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends(
     if not user:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Incorrect username or password",
+            detail="Incorrect email or password",
             headers={"WWW-Authenticate": "Bearer"},
         )
     access_token_expires = timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
     access_token = create_access_token(
-        data={"sub": user["username"]}, expires_delta=access_token_expires
+        data={"sub": user["email"]}, expires_delta=access_token_expires
     )
     return {"access_token": access_token, "token_type": "bearer"}

app/api/v1/endpoints/ocrtemplate.py

@@ -9,6 +9,10 @@ router = APIRouter()
 
 # In-memory storage for simplicity; replace with your database logic
 templates = {}
+@router.get("/all", response_model=List[OCRTemplateInDB])
+async def get_all_templates_endpoint():
+    templates = await get_all_templates()
+    return templates
 
 @router.post("/", response_model=OCRTemplate)
 async def create_OCR_template(template: OCRTemplate, current_user: User = Depends(get_current_user)):
@@ -16,6 +20,12 @@ async def create_OCR_template(template: OCRTemplate, current_user: User = Depend
     template = await create_template(template, current_user['user_id'])
     return template
 
+@router.post("/templateForAll", response_model=OCRTemplate)
+async def create_OCR_template(template: OCRTemplate, current_user: User = Depends(get_current_user)):
+    
+    template = await create_template(template, current_user['user_id'], templateForAll=True)
+    return template
+
 @router.get("/", response_model=List[Union[OCRTemplateInDB, dict]])
 async def get_OCR_templates_for_user(template_name:Optional[bool] = False, current_user: User = Depends(get_current_user)):
     
@@ -30,6 +40,8 @@ async def get_template(template_name: str, current_user: dict = Depends(get_curr
         raise HTTPException(status_code=404, detail="Template not found")
     return template
 
+
+
 @router.put("/templates", response_model=OCRTemplate)
 async def update_template_endpoint(template: OCRTemplate, user: str = Depends(get_current_user)):
     print("Updating template:", template)

app/api/v1/endpoints/user.py

@@ -1,24 +1,41 @@
 # app/api/v1/endpoints/user.py
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends, HTTPException, Form
 from app.models import users
 from app.crud.users import *
 from app.core.security import get_password_hash
 from app.dependencies import get_current_user
+from pydantic import EmailStr
 
 router = APIRouter()
 
 @router.post("/")
-async def register_user(user: users.User):
+async def register_user(  first_name: str = Form(...),
+    surname: str = Form(...),
+    email: EmailStr = Form(...),
+    phone: str = Form(...),
+    country: str = Form(...),
+    address: str = Form(...),
+    password: str = Form(...)):
 
-    db_user = await get_user_by_username(user.username)
-    if db_user:
-        raise HTTPException(status_code=400, detail="Username already exists")
+    # db_user = await get_user_by_username(user.username)
+    # if db_user:
+    #     raise HTTPException(status_code=400, detail="Username already exists")
     
-    db_user = await get_user_by_email(user.email)
+    db_user = await get_user_by_email(email)
     if db_user:
-        raise HTTPException(status_code=400, detail="Email already exists")
+        raise HTTPException(status_code=400, detail="Email already exists! Please try another one.")
     
+    user = User(
+        first_name=first_name,
+        surname=surname,
+        phone=phone,
+        country=country,
+        address=address,
+        email=email,
+        password=password
+    )
     user_in_db = UserInDB(**user.dict(), hashed_password=get_password_hash(user.password))
+    print("User in db:", user_in_db)
 
     user = await create_user(user_in_db)
 

app/crud/ocrtemplate.py

@@ -9,23 +9,38 @@ from pymongo import ReturnDocument
 
 
 
-async def create_template(template: OCRTemplate, user_id: str):
+async def create_template(template: OCRTemplate, user_id: str, templateForAll: Optional[bool] = False):
     existing_template = await get_template_by_name_and_user(template.template_name, user_id)
     if existing_template:
         raise HTTPException(status_code=401, detail="Template already exists")
 
     template_dict = template.dict()
-    template_dict["user_id"] = user_id
+    if templateForAll:
+        template_dict["user_id"] = "all"
+    else:
+        template_dict["user_id"] = user_id
     db = get_database(settings.MongoDB_NAME)
     template = await db["templates"].insert_one(template_dict)
     if template:
         return OCRTemplate(**template_dict)
     return None
 
+async def get_all_templates():
+    db = get_database(settings.MongoDB_NAME)
+    templates = await db["templates"].find().to_list(1000)
+    return [OCRTemplateInDB(**template) for template in templates]
 
 async def get_all_templates_by_user_id(user_id: str, template_name: Optional[bool] = False)->  Union[List[OCRTemplateInDB], List[dict]]:
     db = get_database(settings.MongoDB_NAME)
-    templates = await db["templates"].find({"user_id": user_id}).to_list(1000)
+
+    # Query to find templates with user_id equal to the given user_id or "all"
+    templates = await db["templates"].find({
+        "$or": [
+            {"user_id": user_id},
+            {"user_id": "all"}
+        ]
+    }).to_list(1000)
+    # templates = await db["templates"].find({"user_id": user_id}).to_list(1000)
 
     if template_name:
         # Return only the template_name field

app/crud/users.py

@@ -29,7 +29,7 @@ async def get_user_by_email(email: str):
     return user
 
 async def authenticate_user(username: str, password: str):
-    user = await get_user_by_username(username)
+    user = await get_user_by_email(username)
     print("User:", user)
     if user and verify_password(password, user["password"]):
         return user

app/dependencies.py

@@ -3,7 +3,7 @@ from fastapi import Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordBearer
 from jose import JWTError, jwt
 from app.models.token import TokenData
-from app.crud.users import get_user_by_username
+from app.crud.users import get_user_by_username, get_user_by_email
 from app.core.config import settings
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
@@ -16,13 +16,13 @@ async def get_current_user(token: str = Depends(oauth2_scheme)):
     )
     try:
         payload = jwt.decode(token, settings.SECRET_KEY, algorithms=[settings.ALGORITHM])
-        username: str = payload.get("sub")
-        if username is None:
+        email: str = payload.get("sub")
+        if email is None:
             raise credentials_exception
-        token_data = TokenData(username=username)
+        token_data = TokenData(email=email)
     except JWTError:
         raise credentials_exception
-    user = await get_user_by_username(username=token_data.username)
+    user = await get_user_by_email(email)
     if user is None:
         raise credentials_exception
     return user

app/main.py

@@ -55,7 +55,7 @@ app = FastAPI(lifespan=lifespan)
 
 
 
-app.add_middleware(BasicAuthMiddleware, username=os.getenv("fastapiusername"), password=os.getenv("fastapipassword"))
+# app.add_middleware(BasicAuthMiddleware, username=os.getenv("fastapiusername"), password=os.getenv("fastapipassword"))
 # Allow CORS for specific origin with credentials
 origins = [
     os.getenv("client")

app/models/token.py

@@ -8,3 +8,4 @@ class Token(BaseModel):
 
 class TokenData(BaseModel):
     username: Optional[str] = None
+    email: Optional[str] = None

app/models/users.py

@@ -5,8 +5,13 @@ from datetime import timedelta, datetime
 import uuid
 
 class User(BaseModel):
-    user_id: str = Field(default_factory=uuid.uuid4())
-    username: str
+    user_id: str = Field(default_factory=lambda: str(uuid.uuid4()))
+    first_name: str
+    surname: str
+    phone: str
+    country: str
+    address: str
+    # username: str
     email: EmailStr
     password: str
 
@@ -14,3 +19,4 @@ class UserInDB(User):
     is_validated: bool = Field(default=False)
     created_at: datetime = Field(default_factory=datetime.utcnow)
     updated_at: Optional[str] = None
+