refactor errors

core/user.go

@@ -1,10 +1,9 @@
 package core
 
 import (
-	"errors"
 	"github.com/google/uuid"
-	"go-nkode/py-builtin"
 	"go-nkode/util"
+	"log"
 )
 
 type User struct {
@@ -61,31 +60,27 @@ func (u *User) GetLoginInterface() ([]int, error) {
 	return u.Interface.IdxInterface, nil
 }
 
-var KeyIndexOutOfRange = errors.New("one or more keys is out of range")
-
 func ValidKeyEntry(user User, customer Customer, selectedKeys []int) ([]int, error) {
-	validKeys := py_builtin.All[int](selectedKeys, func(idx int) bool {
-		return 0 <= idx && idx < user.Kp.NumbOfKeys
-	})
-	if !validKeys {
-		panic(KeyIndexOutOfRange)
+	if validKeys := user.Kp.ValidKeySelections(selectedKeys); !validKeys {
+
+		return nil, ErrKeyIndexOutOfRange
 	}
 
-	var err error
 	passcodeLen := len(selectedKeys)
-	err = customer.NKodePolicy.ValidLength(passcodeLen)
-	if err != nil {
+	if err := customer.NKodePolicy.ValidLength(passcodeLen); err != nil {
 		return nil, err
 	}
 
 	setVals, err := customer.Attributes.SetValsForKp(user.Kp)
 	if err != nil {
-		return nil, err
+		log.Printf("fatal error in validate key entry;invalid user keypad dimensions for user %s with error %v", user.Email, err)
+		return nil, ErrInternalValidKeyEntry
 	}
 
 	passcodeSetVals, err := user.DecipherMask(setVals, passcodeLen)
 	if err != nil {
-		return nil, err
+		log.Printf("fatal error in validate key entry;something when wrong deciphering mask;user email %s; error %v", user.Email, err)
+		return nil, ErrInternalValidKeyEntry
 	}
 	presumedAttrIdxVals := make([]int, passcodeLen)
 
@@ -93,11 +88,13 @@ func ValidKeyEntry(user User, customer Customer, selectedKeys []int) ([]int, err
 		keyNumb := selectedKeys[idx]
 		setIdx, err := customer.Attributes.IndexOfSet(passcodeSetVals[idx])
 		if err != nil {
-			return nil, err
+			log.Printf("fatal error in validate key entry;something when wrong getting the IndexOfSet;user email %s; error %v", user.Email, err)
+			return nil, ErrInternalValidKeyEntry
 		}
 		selectedAttrIdx, err := user.Interface.GetAttrIdxByKeyNumbSetIdx(setIdx, keyNumb)
 		if err != nil {
-			return nil, err
+			log.Printf("fatal error in validate key entry;something when wrong getting the GetAttrIdxByKeyNumbSetIdx;user email %s; error %v", user.Email, err)
+			return nil, ErrInternalValidKeyEntry
 		}
 		presumedAttrIdxVals[idx] = selectedAttrIdx
 	}