From 948a240282f4b72867204b876997573e7b9aa6f4 Mon Sep 17 00:00:00 2001 From: AMiR Date: Mon, 20 May 2024 21:58:55 +0330 Subject: [PATCH] "fix(param):prevent admin to get password in login response" --- param/admin/admin/login.go | 16 ++++++++++++++-- service/admin/admin/login.go | 12 +++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/param/admin/admin/login.go b/param/admin/admin/login.go index 28b17ef..c6d3015 100644 --- a/param/admin/admin/login.go +++ b/param/admin/admin/login.go @@ -8,6 +8,18 @@ type LoginWithPhoneNumberRequest struct { } type LoginWithPhoneNumberResponse struct { - Admin entity.Admin `json:"admin"` - Tokens Tokens `json:"tokens"` + AdminInfo AdminInfo `json:"admin_info"` + Tokens Tokens `json:"tokens"` +} + +type AdminInfo struct { + ID uint `json:"id"` + FirstName string `json:"first_name"` + LastName string `json:"last_name"` + PhoneNumber string `json:"phone_number"` + Role entity.AdminRole `json:"role"` + Description string `json:"description"` + Email string `json:"email"` + Gender entity.Gender `json:"gender"` + Status entity.AdminStatus `json:"status"` } diff --git a/service/admin/admin/login.go b/service/admin/admin/login.go index 46c6c21..8b6ae2d 100644 --- a/service/admin/admin/login.go +++ b/service/admin/admin/login.go @@ -35,7 +35,17 @@ func (s Service) LoginWithPhoneNumber(ctx context.Context, req adminserviceparam } return adminserviceparam.LoginWithPhoneNumberResponse{ - Admin: admin, + AdminInfo: adminserviceparam.AdminInfo{ + ID: admin.ID, + FirstName: admin.FirstName, + LastName: admin.LastName, + PhoneNumber: admin.PhoneNumber, + Role: admin.Role, + Description: admin.Description, + Email: admin.Email, + Gender: admin.Gender, + Status: admin.Status, + }, Tokens: adminserviceparam.Tokens{ AccessToken: accessToken, RefreshToken: refreshToken,