MukeshKapoor25 commited on
Commit
2ca6cd8
·
1 Parent(s): 26d5826

feat(service-professional): Remove staff_id/staff_code from OTP login response

Browse files

- Replace staff_id and staff_code fields with partner_id in professional info response
- Update error logging to use partner_id instead of staff_id
- Update login event logging to use partner_id as the standard identifier
- Remove duplicate partner_id entry in JWT token payload
- Consolidate identifier usage across OTP verification flow for consistency

app/auth/controllers/service_professional_router.py CHANGED
@@ -165,7 +165,7 @@ async def verify_service_professional_otp(
165
  access_token_expires = timedelta(hours=settings.TOKEN_EXPIRATION_HOURS)
166
  except Exception as token_error:
167
  logger.error(
168
- f"Error creating access token for service professional {professional_data['staff_id']}: {token_error}",
169
  exc_info=True
170
  )
171
  raise HTTPException(
@@ -175,8 +175,7 @@ async def verify_service_professional_otp(
175
 
176
  # Prepare professional info response
177
  professional_info = {
178
- "staff_id": professional_data["staff_id"],
179
- "staff_code": professional_data["staff_code"],
180
  "name": professional_data["name"],
181
  "phone": professional_data["phone"],
182
  "email": professional_data.get("email"),
@@ -186,11 +185,10 @@ async def verify_service_professional_otp(
186
  }
187
 
188
  logger.info(
189
- f"Service professional logged in via mobile OTP: {professional_data['staff_code']}",
190
  extra={
191
  "event": "service_professional_mobile_otp_login",
192
- "staff_id": professional_data["staff_id"],
193
- "staff_code": professional_data["staff_code"],
194
  "phone": verify_request.phone
195
  }
196
  )
 
165
  access_token_expires = timedelta(hours=settings.TOKEN_EXPIRATION_HOURS)
166
  except Exception as token_error:
167
  logger.error(
168
+ f"Error creating access token for service professional {professional_data['partner_id']}: {token_error}",
169
  exc_info=True
170
  )
171
  raise HTTPException(
 
175
 
176
  # Prepare professional info response
177
  professional_info = {
178
+ "partner_id": professional_data["partner_id"],
 
179
  "name": professional_data["name"],
180
  "phone": professional_data["phone"],
181
  "email": professional_data.get("email"),
 
185
  }
186
 
187
  logger.info(
188
+ f"Service professional logged in via mobile OTP: {professional_data['partner_id']}",
189
  extra={
190
  "event": "service_professional_mobile_otp_login",
191
+ "partner_id": professional_data["partner_id"],
 
192
  "phone": verify_request.phone
193
  }
194
  )
app/auth/services/service_professional_auth_service.py CHANGED
@@ -274,8 +274,7 @@ class ServiceProfessionalAuthService:
274
  # Token payload - use partner_id as the standard identifier
275
  token_data = {
276
  "sub": professional_data["partner_id"],
277
- "partner_id": professional_data["partner_id"], # Standard identifier for SPA-MS
278
- "partner_id": professional_data["partner_id"], # Keep for backward compatibility
279
  "user_type": "service_professional",
280
  "exp": expire,
281
  "iat": datetime.utcnow()
 
274
  # Token payload - use partner_id as the standard identifier
275
  token_data = {
276
  "sub": professional_data["partner_id"],
277
+ "partner_id": professional_data["partner_id"],
 
278
  "user_type": "service_professional",
279
  "exp": expire,
280
  "iat": datetime.utcnow()