fixes

Signed-off-by: Grant Linville <grant@acorn.io>

Author: g-linville

pkg/jwt/persistent/persistent.go

@@ -30,13 +30,15 @@ type TokenService struct {
 	gatewayClient     *client.Client
 	credOnlyGPTClient *gptscript.GPTScript
 	serverURL         string
+	authEnabled       bool
 }
 
-func NewTokenService(serverURL string, gatewayClient *client.Client, credOnlyGPTClient *gptscript.GPTScript) (*TokenService, error) {
+func NewTokenService(serverURL string, gatewayClient *client.Client, credOnlyGPTClient *gptscript.GPTScript, authEnabled bool) (*TokenService, error) {
 	t := &TokenService{
 		gatewayClient:     gatewayClient,
 		credOnlyGPTClient: credOnlyGPTClient,
 		serverURL:         serverURL,
+		authEnabled:       authEnabled,
 	}
 	return t, nil
 }
@@ -201,9 +203,14 @@ func (t *TokenService) AuthenticateRequest(req *http.Request) (*authenticator.Re
 			},
 		}, true, nil
 	default:
+		uid := tokenContext.AuthProviderUserID
+		if !t.authEnabled {
+			uid = tokenContext.UserID
+		}
+
 		return &authenticator.Response{
 			User: &user.DefaultInfo{
-				UID:    tokenContext.AuthProviderUserID,
+				UID:    uid,
 				Name:   tokenContext.UserName,
 				Groups: tokenContext.UserGroups,
 				Extra: map[string][]string{

pkg/services/config.go

@@ -462,7 +462,7 @@ func New(ctx context.Context, config Config) (*Services, error) {
 		return nil, err
 	}
 
-	persistentTokenServer, err := persistent.NewTokenService(config.Hostname, gatewayClient, credOnlyGPTscriptClient)
+	persistentTokenServer, err := persistent.NewTokenService(config.Hostname, gatewayClient, credOnlyGPTscriptClient, config.EnableAuthentication)
 	if err != nil {
 		return nil, fmt.Errorf("failed to setup persistent token service: %w", err)
 	}