munawwirul_jamal/simrsx-be
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into feat/trx-orders

Browse Source
This commit is contained in:
munawwirul_jamal
2025-11-03 14:58:22 +07:00
parent 388072ef51 9c39966bea
commit 09a71f1ab3
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/lib/auth/tycovar.go
+7 -7
View File
@@ -13,13 +13,13 @@ type AuthInfo struct {
User_Name string User_Name string
User_ContractPosition_code string User_ContractPosition_code string
Employee_Position_Code *string Employee_Position_Code *string
Employee_Id *int Employee_Id *uint
Doctor_Id *int Doctor_Id *uint
Nurse_Id *int Nurse_Id *uint
Midwife_Id *int Midwife_Id *uint
Nutritionist_Id *int Nutritionist_Id *uint
Laborant_Id *int Laborant_Id *uint
Pharmachist_Id *int Pharmachist_Id *uint
Intern_Position_Code *string Intern_Position_Code *string
Roles []string Roles []string
// User_DivisionPositions []DivisionPosition // User_DivisionPositions []DivisionPosition
internal/use-case/main-use-case/authentication/case.go
+15 -7
View File
@@ -308,14 +308,14 @@ func ExtractToken(r *http.Request, tokenType TokenType) (data *pa.AuthInfo, err
data.User_ContractPosition_code = checkStrClaims(claims, "contractPosition_code") data.User_ContractPosition_code = checkStrClaims(claims, "contractPosition_code")
data.Employee_Position_Code = checkStrPtrClaims(claims, "employee_position_code") data.Employee_Position_Code = checkStrPtrClaims(claims, "employee_position_code")
data.Doctor_Id = checkIntPtrClaims(claims, "doctor_id") data.Doctor_Id = checkUntPtrClaims(claims, "doctor_id")
data.Nurse_Id = checkIntPtrClaims(claims, "nurse_id") data.Nurse_Id = checkUntPtrClaims(claims, "nurse_id")
data.Midwife_Id = checkIntPtrClaims(claims, "midwife_id") data.Midwife_Id = checkUntPtrClaims(claims, "midwife_id")
data.Nutritionist_Id = checkIntPtrClaims(claims, "nutritionist_id") data.Nutritionist_Id = checkUntPtrClaims(claims, "nutritionist_id")
data.Laborant_Id = checkIntPtrClaims(claims, "laborant_id") data.Laborant_Id = checkUntPtrClaims(claims, "laborant_id")
data.Pharmachist_Id = checkIntPtrClaims(claims, "pharmachist_id") data.Pharmachist_Id = checkUntPtrClaims(claims, "pharmachist_id")
data.Intern_Position_Code = checkStrPtrClaims(claims, "intern_position_code") data.Intern_Position_Code = checkStrPtrClaims(claims, "intern_position_code")
data.Employee_Id = checkIntPtrClaims(claims, "employee_id") data.Employee_Id = checkUntPtrClaims(claims, "employee_id")
return return
} }
return nil, d.FieldError{Code: "token", Message: "token-invalid"} return nil, d.FieldError{Code: "token", Message: "token-invalid"}
@@ -354,3 +354,11 @@ func checkIntPtrClaims(claim map[string]interface{}, key string) *int {
} }
return nil return nil
} }
func checkUntPtrClaims(claim map[string]interface{}, key string) *uint {
if v, exist := claim[key]; exist && v != nil {
val := uint(v.(float64))
return &val
}
return nil
}