Update auth.py

auth.py

@@ -5,7 +5,7 @@ from pydantic import BaseModel
 from sqlalchemy.orm import Session
 from models import User
 from database import get_db
-from jose import jwt
+import jwt
 from passlib.context import CryptContext
 from datetime import datetime, timedelta
 
@@ -59,31 +59,37 @@ class AuthViews:
         db.commit()
         return {"message": "Email verification successful"}
 
-
-    def login(self, form_data: OAuth2PasswordRequestForm = Depends()):
+    # Dependency for verifying the user's token
+def get_current_user(token: str = Depends(verify_token)):
+    if not token:
+        raise HTTPException(status_code=401, detail="Token not valid")
+    return token
+
+# Function to generate JWT tokens
+def create_access_token(self, data: dict, expires_delta: timedelta):
+    to_encode = data.copy()
+    expire = datetime.utcnow() + expires_delta
+    to_encode.update({"exp": expire})
+    encoded_jwt = jwt.encode(to_encode, self.SECRET_KEY, algorithm=self.ALGORITHM)
+    return encoded_jwt
+
+# Your login route
+@app.post("/auth/login", response_model=dict)
+def login(self, form_data: OAuth2PasswordRequestForm = Depends()):
     # Check email verification
-        db_user = database.get_user_by_email(db, form_data.username)
-        if not db_user or not self.pwd_context.verify(form_data.password, db_user.hashed_password):
-            raise HTTPException(status_code=400, detail="Incorrect email or password")
+    db_user = database.get_user_by_email(db, form_data.username)
+    if not db_user or not self.pwd_context.verify(form_data.password, db_user.hashed_password):
+        raise HTTPException(status_code=400, detail="Incorrect email or password")
 
-        if not db_user.is_verified:
-            raise HTTPException(status_code=400, detail="Email not verified")
+    if not db_user.is_verified:
+        raise HTTPException(status_code=400, detail="Email not verified")
 
     # Generate an access token
-        access_token_expires = timedelta(minutes=self.ACCESS_TOKEN_EXPIRE_MINUTES)
-        access_token = jwt.encode(
-            {"sub": db_user.email, "exp": datetime.utcnow() + access_token_expires},
-            self.SECRET_KEY,
-            algorithm=self.ALGORITHM,
-        )
-        return {"access_token": access_token, "token_type": "bearer"}
-
-
-    # Import User model and database functions
-#from app.models import User
-#from app.database import get_user_by_email
+    access_token_expires = timedelta(minutes=self.ACCESS_TOKEN_EXPIRE_MINUTES)
+    access_token = create_access_token({"sub": db_user.email}, access_token_expires)
+    return {"access_token": access_token, "token_type": "bearer"}
 
-# ...
+