Merge branch 'personal-token-types' into 'master'

fix: remove personal token types

See merge request postgres-ai/database-lab!766

Author: agneum

engine/internal/platform/platform.go

@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
-	"time"
 
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/client/platform"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
@@ -42,8 +41,6 @@ type Service struct {
 // Token defines verified Platform Token.
 type Token struct {
 	OrganizationID uint
-	TokenType      string
-	ValidUntil     *time.Time
 }
 
 // New creates a new platform service.
@@ -84,8 +81,6 @@ func New(ctx context.Context, cfg Config, instanceID string) (*Service, error) {
 
 		s.token = Token{
 			OrganizationID: platformToken.OrganizationID,
-			TokenType:      platformToken.TokenType,
-			ValidUntil:     platformToken.ValidUntil,
 		}
 	}
 
@@ -100,16 +95,16 @@ func (s *Service) Reload(newService *Service) {
 // IsAllowedToken checks if the Platform Personal Token is allowed.
 func (s *Service) IsAllowedToken(ctx context.Context, personalToken string) bool {
 	if !s.IsPersonalTokenEnabled() {
-		return true
+		return false
 	}
 
 	platformToken, err := s.Client.CheckPlatformToken(ctx, platform.TokenCheckRequest{Token: personalToken})
 	if err != nil {
 		return false
 	}
 
-	if platformToken.TokenType != platform.PersonalType {
-		log.Dbg(fmt.Sprintf("Non-personal token given: %s", platformToken.TokenType))
+	if !platformToken.Personal {
+		log.Dbg("Non-personal token given")
 
 		return false
 	}

engine/pkg/client/platform/client_test.go

@@ -11,7 +11,6 @@ import (
 	"io"
 	"net/http"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -128,13 +127,8 @@ func TestClientChecksPlatformToken(t *testing.T) {
 }
 
 func TestClientChecksPlatformSEToken(t *testing.T) {
-	validDateTime, err := time.Parse(time.RFC3339, "2006-01-02T15:04:05-07:00")
-	require.NoError(t, err)
-
 	expectedResponse := TokenCheckResponse{
 		OrganizationID: 2,
-		TokenType:      HashType,
-		ValidUntil:     &validDateTime,
 	}
 
 	testClient := NewTestClient(func(req *http.Request) *http.Response {
@@ -158,8 +152,6 @@ func TestClientChecksPlatformSEToken(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.Equal(t, expectedResponse.OrganizationID, platformToken.OrganizationID)
-	assert.Equal(t, expectedResponse.ValidUntil, platformToken.ValidUntil)
-	assert.Equal(t, expectedResponse.TokenType, platformToken.TokenType)
 	assert.False(t, platformToken.Personal)
 }
 

engine/pkg/client/platform/token.go

@@ -8,24 +8,12 @@ package platform
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"github.com/pkg/errors"
 
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
 )
 
-const (
-	// PersonalType defines personal type of the Platform token.
-	PersonalType = "personal"
-
-	// AdminType defines administrative type of the Platform token.
-	AdminType = "admin"
-
-	// HashType defines hash type of the Platform token.
-	HashType = "hash"
-)
-
 // TokenCheckRequest represents a token checking request.
 type TokenCheckRequest struct {
 	Token string `json:"token"`
@@ -34,10 +22,8 @@ type TokenCheckRequest struct {
 // TokenCheckResponse represents response of a token checking request.
 type TokenCheckResponse struct {
 	APIResponse
-	OrganizationID uint       `json:"org_id"`
-	Personal       bool       `json:"is_personal"`
-	TokenType      string     `json:"token_type"`
-	ValidUntil     *time.Time `json:"valid_until"`
+	OrganizationID uint `json:"org_id"`
+	Personal       bool `json:"is_personal"`
 }
 
 // CheckPlatformToken makes an HTTP request to check the Platform Access Token.