bearer: Move ResolveIssuer from package to struct

Signed-off-by: Evgenii Baidakov <evgenii@nspcc.io>
nspcc-dev · Jul 26, 2023 · ecef897 · ecef897
1 parent 7e7ba51
commit ecef897
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/bearer/bearer.go b/bearer/bearer.go
@@ -354,7 +354,8 @@ func (b Token) SigningKeyBytes() []byte {
 // Returns zero user.ID if Token is unsigned or key has incorrect format.
 //
 // See also SigningKeyBytes.
-func ResolveIssuer(b Token) (usr user.ID) {
+func (b Token) ResolveIssuer() user.ID {
+	var usr user.ID
 	binKey := b.SigningKeyBytes()
 
 	if len(binKey) != 0 {
@@ -363,5 +364,5 @@ func ResolveIssuer(b Token) (usr user.ID) {
 		}
 	}
 
-	return
+	return usr
 }
diff --git a/bearer/bearer_test.go b/bearer/bearer_test.go
@@ -360,7 +360,7 @@ func TestResolveIssuer(t *testing.T) {
 
 	var val bearer.Token
 
-	require.Zero(t, bearer.ResolveIssuer(val))
+	require.Zero(t, val.ResolveIssuer())
 
 	var m acl.BearerToken
 
@@ -371,11 +371,11 @@ func TestResolveIssuer(t *testing.T) {
 
 	require.NoError(t, val.Unmarshal(m.StableMarshal(nil)))
 
-	require.Zero(t, bearer.ResolveIssuer(val))
+	require.Zero(t, val.ResolveIssuer())
 
 	require.NoError(t, val.Sign(signer))
 
 	usr := signer.UserID()
 
-	require.Equal(t, usr, bearer.ResolveIssuer(val))
+	require.Equal(t, usr, val.ResolveIssuer())
 }