added additional parameters for token generation

app/services/merchant_services.py

@@ -211,12 +211,26 @@ async def login_service(identifier: str, otp: str) -> dict:
     otp_data = await get_otp(f"otp:login:{identifier}")
     if not otp_data or otp_data.get("otp") != otp:
         raise HTTPException(status_code=400, detail="Invalid or expired OTP")
-    # Generate tokens
-    tokens = generate_tokens(identifier)
-    
+
+    # Fetch merchant details after OTP verification
+    if "@" in identifier:
+        merchant = await get_merchant_by_email(identifier)
+    else:
+        merchant = await get_merchant_by_mobile(identifier)
+
+    if not merchant:
+        raise HTTPException(status_code=404, detail="Merchant not found")
+
+    merchant_id = merchant.get("merchant_id")
+    merchant_name = merchant.get("merchant_name")
+    role = merchant.get("role", "admin")  # Default to "admin" if role is not set
+
+    # Generate tokens with merchant_id and role in the payload
+    tokens = generate_tokens(identifier, merchant_id=merchant_id, role=role)
+
     await set_otp(f"token:login:access:{identifier}", {"access_token": tokens['access_token'], "expiry_duration": 30 * 60}) # 30 minutes
-    await set_otp(f"token:login:refresh:{identifier}", {"refresh_token": tokens['refresh_token'], "expiry_duration": 1 * 24 * 60 * 60})# 1day
-    
+    await set_otp(f"token:login:refresh:{identifier}", {"refresh_token": tokens['refresh_token'], "expiry_duration": 1 * 24 * 60 * 60}) # 1 day
+
     return tokens
 
 async def refresh_token_service(identifier: str, refresh_token: str) -> dict:
@@ -234,10 +248,25 @@ async def refresh_token_service(identifier: str, refresh_token: str) -> dict:
     if not token_data or token_data["refresh_token"] != refresh_token:
         raise HTTPException(status_code=400, detail="Invalid or expired refresh token")
    
-    tokens = generate_tokens(identifier)
+    # Fetch merchant details after OTP verification
+    if "@" in identifier:
+        merchant = await get_merchant_by_email(identifier)
+    else:
+        merchant = await get_merchant_by_mobile(identifier)
+
+    if not merchant:
+        raise HTTPException(status_code=404, detail="Merchant not found")
+
+    merchant_id = merchant.get("merchant_id")
+    merchant_name = merchant.get("merchant_name")
+    role = merchant.get("role", "admin")  # Default to "admin" if role is not set
+
+    # Generate tokens with merchant_id and role in the payload
+    tokens = generate_tokens(identifier, merchant_id=merchant_id, role=role)
+
     await set_otp(f"token:login:access:{identifier}", {"access_token": tokens['access_token'], "expiry_duration": 30 * 60}) # 30 minutes
-    await set_otp(f"token:login:refresh:{identifier}", {"refresh_token": tokens['refresh_token'], "expiry_duration": 1 * 24 * 60 * 60})# 1day
-    
+    await set_otp(f"token:login:refresh:{identifier}", {"refresh_token": tokens['refresh_token'], "expiry_duration": 1 * 24 * 60 * 60}) # 1 day
+
     return tokens
 
 async def logout_service(identifier: str) -> dict: