chore: change naming

This commit is contained in:
Florian Schade
2026-02-25 14:02:09 +01:00
committed by Christian Richter
parent 7350050a05
commit 910298aa05
2 changed files with 11 additions and 6 deletions
@@ -26,13 +26,17 @@ var ErrInvalidSessionOrSubject = errors.New("invalid session or subject")
func NewSuSe(key string) (SuSe, error) {
var subject, session string
switch keys := strings.Split(strings.Join(strings.Fields(key), ""), "."); {
// key: '.session'
case len(keys) == 2 && keys[0] == "" && keys[1] != "":
session = keys[1]
// key: 'subject.'
case len(keys) == 2 && keys[0] != "" && keys[1] == "":
subject = keys[0]
// key: 'subject.session'
case len(keys) == 2 && keys[0] != "" && keys[1] != "":
subject = keys[0]
session = keys[1]
// key: 'session'
case len(keys) == 1 && keys[0] != "":
session = keys[0]
default:
@@ -46,8 +50,8 @@ func NewSuSe(key string) (SuSe, error) {
type LogoutMode int
const (
// LogoutModeUnknown is used when the logout mode cannot be determined
LogoutModeUnknown LogoutMode = iota
// LogoutModeUndefined is used when the logout mode cannot be determined
LogoutModeUndefined LogoutMode = iota
// LogoutModeSession is used when the logout mode is determined by the session id
LogoutModeSession
// LogoutModeSubject is used when the logout mode is determined by the subject
@@ -62,7 +66,7 @@ func GetLogoutMode(suse SuSe) LogoutMode {
case suse.Subject != "":
return LogoutModeSubject
default:
return LogoutModeUnknown
return LogoutModeUndefined
}
}
@@ -91,6 +95,7 @@ func GetLogoutRecords(suse SuSe, mode LogoutMode, store microstore.Store) ([]*mi
return nil, fmt.Errorf("%w: cannot determine logout mode", ErrSuspiciousCacheResult)
}
// the go micro memory store requires a limit to work, why???
records, err := store.Read(key, append(opts, microstore.ReadLimit(1000))...)
if err != nil {
return nil, err
@@ -107,7 +107,7 @@ func TestGetLogoutMode(t *testing.T) {
{
name: "key variation: 'empty'",
suSe: SuSe{Session: "", Subject: ""},
want: LogoutModeUnknown,
want: LogoutModeUndefined,
},
}
@@ -155,7 +155,7 @@ func TestGetLogoutRecords(t *testing.T) {
{
name: "fails if mode is unknown",
suSe: SuSe{Session: "session-a"},
mode: LogoutModeUnknown,
mode: LogoutModeUndefined,
store: func(t *testing.T) store.Store {
return sessionStore
},
@@ -192,7 +192,7 @@ func TestGetLogoutRecords(t *testing.T) {
store: func(t *testing.T) store.Store {
s := mocks.NewStore(t)
s.EXPECT().Read(mock.Anything, mock.Anything).Return([]*store.Record{
&store.Record{Key: "invalid.record.key"},
{Key: "invalid.record.key"},
}, nil)
return s
},