Merge branch 'dev' into feat/trx-orders

internal/lib/auth/tycovar.go

@@ -13,13 +13,13 @@ type AuthInfo struct {
 	User_Name                  string
 	User_ContractPosition_code string
 	Employee_Position_Code     *string
-	Employee_Id                *int
-	Doctor_Id                  *int
-	Nurse_Id                   *int
-	Midwife_Id                 *int
-	Nutritionist_Id            *int
-	Laborant_Id                *int
-	Pharmachist_Id             *int
+	Employee_Id                *uint
+	Doctor_Id                  *uint
+	Nurse_Id                   *uint
+	Midwife_Id                 *uint
+	Nutritionist_Id            *uint
+	Laborant_Id                *uint
+	Pharmachist_Id             *uint
 	Intern_Position_Code       *string
 	Roles                      []string
 	// User_DivisionPositions     []DivisionPosition

internal/use-case/main-use-case/authentication/case.go

@@ -308,14 +308,14 @@ func ExtractToken(r *http.Request, tokenType TokenType) (data *pa.AuthInfo, err
 
 		data.User_ContractPosition_code = checkStrClaims(claims, "contractPosition_code")
 		data.Employee_Position_Code = checkStrPtrClaims(claims, "employee_position_code")
-		data.Doctor_Id = checkIntPtrClaims(claims, "doctor_id")
-		data.Nurse_Id = checkIntPtrClaims(claims, "nurse_id")
-		data.Midwife_Id = checkIntPtrClaims(claims, "midwife_id")
-		data.Nutritionist_Id = checkIntPtrClaims(claims, "nutritionist_id")
-		data.Laborant_Id = checkIntPtrClaims(claims, "laborant_id")
-		data.Pharmachist_Id = checkIntPtrClaims(claims, "pharmachist_id")
+		data.Doctor_Id = checkUntPtrClaims(claims, "doctor_id")
+		data.Nurse_Id = checkUntPtrClaims(claims, "nurse_id")
+		data.Midwife_Id = checkUntPtrClaims(claims, "midwife_id")
+		data.Nutritionist_Id = checkUntPtrClaims(claims, "nutritionist_id")
+		data.Laborant_Id = checkUntPtrClaims(claims, "laborant_id")
+		data.Pharmachist_Id = checkUntPtrClaims(claims, "pharmachist_id")
 		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 nil, d.FieldError{Code: "token", Message: "token-invalid"}
@@ -354,3 +354,11 @@ func checkIntPtrClaims(claim map[string]interface{}, key string) *int {
 	}
 	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
+}