added user details

app.py

@@ -283,7 +283,8 @@ Parameters:
 @app.post("/auth/login",tags=["Authentication"])
 def login(user:UserBody):
     user ={"email":user.email,"password":user.password,"firstName":user.firstName,"lastName":user.lastName}
-    user_id= login_user(db_uri=MONGO_URI,db_name="crayonics",collection_name="Users",document=user)
+    print(user)
+    user_id= login_user(db_uri=MONGO_URI,db_name="crayonics",collection_name="users",document=user)
     
     if user_id != False:
         refreshToken=create_refreshToken(db_uri=MONGO_URI,user_id=user_id)
@@ -337,7 +338,6 @@ def refresh_access_token(refresh_token:Token, authorization: str = Header(...)):
     # Here, you would validate the token (e.g., check with a JWT library)
     decoded_user_id,decoded_access_token = decode_jwt(token) 
     is_valid = verify_access_token(db_uri=MONGO_URI, user_id=decoded_user_id, access_token=decoded_access_token)
-    print(decoded_user_id,decoded_access_token)
     if is_valid != True:  # Example check
         raise HTTPException(status_code=401, detail="Invalid token")
     new_access_token = create_accessToken(db_uri=MONGO_URI,user_id=decoded_user_id,refresh_token=refresh_token.refreshToken)
@@ -346,6 +346,21 @@ def refresh_access_token(refresh_token:Token, authorization: str = Header(...)):
     return {"accessToken":newly_encoded_access_token}
 
 
+@app.get("/user/user-details",tags=["user"])
+def get_user_details(authorization: str = Header(...)):
+    # Extract the token from the Authorization header (Bearer token)
+    token = authorization.split("Bearer ")[-1]
+    
+    # Here, you would validate the token (e.g., check with a JWT library)
+    decoded_user_id,decoded_access_token = decode_jwt(token) 
+    is_valid = verify_access_token(db_uri=MONGO_URI, user_id=decoded_user_id, access_token=decoded_access_token)
+    if is_valid != True:  # Example check
+        raise HTTPException(status_code=401, detail="Invalid token")
+    doc = {"user_id":decoded_user_id}
+    user_info = user_details_func(db_uri=MONGO_URI,document=doc)
+    return { "userInfo": user_info}
+
+
 
 
 @app.get("/protected-route")
@@ -360,3 +375,6 @@ def protected_route(authorization: str = Header(...)):
         raise HTTPException(status_code=401, detail="Invalid token")
     
     return {"message": "Access granted", "verification": "verified"}
+
+
+

tokenManagement.py

@@ -77,7 +77,7 @@ def create_refreshToken(db_uri: str, user_id: str) -> str:
     # Insert the document
     result = collection.insert_one({"user_id":user_id,"current_time":current_time,"expire_at":expire_at,"previous_access_token":"None"})
     streaks_doc={}
-    streaks_doc['user_id'] = user_id
+    streaks_doc['user_id'] = str(user_id)
     streaks_manager(db_uri=db_uri,document=streaks_doc)
     client.close()
     return str(result.inserted_id)
@@ -121,29 +121,35 @@ def verify_access_token(db_uri: str, user_id: str, access_token: str) -> bool:
     client = MongoClient(db_uri)
     db = client["crayonics"]
     collection = db["AccessToken"]
-    doc = collection.find_one({"user_id":user_id})
+    docs = collection.find({"user_id":user_id})
+    for doc in docs:
+        print("doc=", doc,"user access token =" , access_token)
 
-    
-    if doc==None:
-        return False
-    else:
-        if str(doc['_id']) == access_token:
-            if isexpired(doc['expire_at']):
-                streaks_doc={}
-                streaks_doc['user_id'] = user_id
-                streaks_manager(db_uri=db_uri,document=streaks_doc)
-                return False
+        if doc==None:
+            return False
+        else:
+            if str(doc['_id']) == access_token:
+                print("accesstoke is correct")
+                if isexpired(doc['expire_at'])!=False:
+                    print("isexpired!=False")
+                    streaks_doc={}
+                    streaks_doc['user_id'] = str(user_id)
+                    streaks_manager(db_uri=db_uri,document=streaks_doc)
+                    pass
+                else:
+                    streaks_doc={}
+                    print("isexpired!=True")
+                    streaks_doc['user_id'] = str(user_id)
+                    streaks_manager(db_uri=db_uri,document=streaks_doc)
+                    return True
             else:
+                print("doc=", str(doc['_id']),"user access token =" , access_token)
+                print("accesstoken is wrong")
                 streaks_doc={}
-                streaks_doc['user_id'] = user_id
+                streaks_doc['user_id'] = str(user_id)
                 streaks_manager(db_uri=db_uri,document=streaks_doc)
-                return True
-        else:
-            streaks_doc={}
-            streaks_doc['user_id'] = user_id
-            streaks_manager(db_uri=db_uri,document=streaks_doc)
-            return False
-    
+                pass
+    return False    
 
 
 
@@ -180,4 +186,3 @@ def logout_func(db_uri: str, refresh_token: str) -> str:
     # Close the connection
     
     
-    

utils.py

@@ -1,3 +1,5 @@
+from bson import ObjectId
+import json
 import requests
 from pymongo import MongoClient
 from password import *
@@ -201,21 +203,51 @@ def login_user(db_uri: str, db_name: str, collection_name: str, document: dict)
     collection = db[collection_name]
     
     # Insert the document
-    s = collection.find_one({"email":document.get("email")})
+    s = collection.find_one({"email":document["email"]})
     print(s)
     print(document.get('email'))
     if s==None:
-        return "User Doesn;t exist"
+        return False
     else:
 
         if check_password(password=document['password'],hashed_password=s['password']):
-            streaks_doc['user_id'] = s.get("_id")
+            streaks_doc['user_id'] = str(s["_id"])
             streaks_manager(db_uri=db_uri,document=streaks_doc)
             return str(s['_id'])
         else:
-            return "Wrong Password"
+            return False
     # Close the connection
     
     
     
 
+
+
+def user_details_func(db_uri: str, document: dict) -> str:
+    streaks_doc={}
+
+    # Connect to MongoDB
+    client = MongoClient(db_uri)
+    db = client["crayonics"]
+    collection = db["users"]
+    streaks_collection = db["Streaks"]
+    
+    # Insert the document
+    doc = collection.find_one({"_id":ObjectId(document.get("user_id"))})
+    
+    if doc==None:
+        return None
+    else:  
+        streaks_collection_doc = streaks_collection.find_one(filter={"user_id":document.get("user_id")})
+        streaks_doc['user_id'] = document.get("user_id")
+        streaks_manager(db_uri=db_uri,document=streaks_doc)
+        
+        streaks_collection_doc.pop("_id")
+        doc['user_id'] = str(doc['_id'])
+        doc.pop('_id')
+        doc.pop('password')
+        streaks_collection_doc.pop('user_id')
+        doc['streak_dates'] =streaks_collection_doc['streak_dates']
+        return doc
+        
+