Add GetPrefix method to AccessKey and update tests for consistency

Author: klaidliadon

access_key.go

@@ -41,6 +41,14 @@ func (a AccessKey) GetProjectID() (projectID uint64, err error) {
 	return 0, errors.Join(errs...)
 }
 
+func (a AccessKey) GetPrefix() string {
+	parts := strings.Split(a.String(), Separator)
+	if len(parts) < 2 {
+		return ""
+	}
+	return strings.Join(parts[:len(parts)-1], Separator)
+}
+
 func NewAccessKey(ctx context.Context, projectID uint64) AccessKey {
 	version, ok := GetVersion(ctx)
 	if !ok {
@@ -55,14 +63,6 @@ func NewAccessKey(ctx context.Context, projectID uint64) AccessKey {
 	return ""
 }
 
-func GetAccessKeyPrefix(accessKey AccessKey) string {
-	parts := strings.Split(accessKey.String(), Separator)
-	if len(parts) < 2 {
-		return ""
-	}
-	return strings.Join(parts[:len(parts)-1], Separator)
-}
-
 type Encoding interface {
 	Version() byte
 	Encode(ctx context.Context, projectID uint64) AccessKey

access_key_test.go

@@ -33,15 +33,15 @@ func TestAccessKeyEncoding(t *testing.T) {
 		ctx := authcontrol.WithVersion(context.Background(), 2)
 		projectID := uint64(12345)
 		accessKey := authcontrol.NewAccessKey(ctx, projectID)
-		t.Log("=> k", accessKey, "| prefix =>", authcontrol.GetAccessKeyPrefix(accessKey))
+		t.Log("=> k", accessKey, "| prefix =>", accessKey.GetPrefix())
 		outID, err := accessKey.GetProjectID()
 		require.NoError(t, err)
 		require.Equal(t, projectID, outID)
 
 		ctx = authcontrol.WithPrefix(ctx, "newprefix:dev")
 
 		accessKey2 := authcontrol.NewAccessKey(ctx, projectID)
-		t.Log("=> k", accessKey2, "| prefix =>", authcontrol.GetAccessKeyPrefix(accessKey2))
+		t.Log("=> k", accessKey2, "| prefix =>", accessKey2.GetPrefix())
 		outID, err = accessKey2.GetProjectID()
 		require.NoError(t, err)
 		require.Equal(t, projectID, outID)
@@ -55,5 +55,5 @@ func TestAccessKeyEncoding(t *testing.T) {
 func TestDecode(t *testing.T) {
 	ctx := authcontrol.WithVersion(context.Background(), 2)
 	accessKey := authcontrol.NewAccessKey(ctx, 237)
-	t.Log("=> k", accessKey, "| prefix =>", authcontrol.GetAccessKeyPrefix(accessKey))
+	t.Log("=> k", accessKey, "| prefix =>", accessKey.GetPrefix())
 }

middleware_test.go

@@ -325,8 +325,7 @@ func TestCustomErrHandler(t *testing.T) {
 
 	r.Handle("/*", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
 
-	var claims map[string]any
-	claims = map[string]any{"service": "client_service"}
+	claims := map[string]any{"service": "client_service"}
 
 	// Valid Request
 	ok, err := executeRequest(t, ctx, r, fmt.Sprintf("/rpc/%s/%s", ServiceName, MethodName), accessKey(AccessKey), jwt(authcontrol.S2SToken(JWTSecret, claims)))