feat(scim): generate scim_users, scim_tokens ids app-side

Author: xlgmokha

internal/api/scim/helpers_test.go

@@ -91,8 +91,8 @@ func grantToken(t *testing.T, db *storage.Connection, provider string) string {
 
 	token, digest := NewToken()
 	require.NoError(t, db.RawQuery(
-		"INSERT INTO scim_tokens (sso_provider_id, token_hash, prefix) VALUES (?, ?, ?)",
-		provider, digest, token[:12],
+		"INSERT INTO scim_tokens (id, sso_provider_id, token_hash, prefix) VALUES (?, ?, ?, ?)",
+		uuid.Must(uuid.NewV4()), provider, digest, token[:12],
 	).Exec())
 
 	return token

internal/api/scim/user_repository.go

@@ -8,6 +8,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/gofrs/uuid"
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgerrcode"
 	"github.com/supabase/auth/internal/api/scim/core"
@@ -95,7 +96,7 @@ func (r *userRepository) Create(ctx context.Context, user *core.User) (*core.Use
 	}
 
 	var rows []scimUser
-	if err := r.db.WithContext(ctx).RawQuery("INSERT INTO scim_users (sso_provider_id, resource) VALUES (?, ?) RETURNING id, resource, active, created_at, updated_at", r.tenant(ctx), resource).All(&rows); err != nil {
+	if err := r.db.WithContext(ctx).RawQuery("INSERT INTO scim_users (id, sso_provider_id, resource) VALUES (?, ?, ?) RETURNING id, resource, active, created_at, updated_at", uuid.Must(uuid.NewV4()), r.tenant(ctx), resource).All(&rows); err != nil {
 		return nil, r.buildError("creating", err)
 	}
 	return r.mapFrom(&rows[0])

internal/api/scim_test.go

@@ -202,7 +202,7 @@ func TestSCIM(t *testing.T) {
 
 		t.Run("Authentication", func(t *testing.T) {
 			provider, token := createProvider(t, conn)
-			require.NoError(t, conn.RawQuery("INSERT INTO scim_users (sso_provider_id, resource) VALUES (?, ?)", provider, `{"userName":"bjensen@example.com"}`).Exec())
+			require.NoError(t, conn.RawQuery("INSERT INTO scim_users (id, sso_provider_id, resource) VALUES (?, ?, ?)", uuid.Must(uuid.NewV4()), provider, `{"userName":"bjensen@example.com"}`).Exec())
 
 			get := func(t *testing.T, authorization string) *httptest.ResponseRecorder {
 				t.Helper()
@@ -271,7 +271,7 @@ func createProvider(t *testing.T, conn *storage.Connection) (provider, token str
 	})
 
 	token, digest := scim.NewToken()
-	require.NoError(t, conn.RawQuery("INSERT INTO scim_tokens (sso_provider_id, token_hash, prefix) VALUES (?, ?, ?)", provider, digest, token[:12]).Exec())
+	require.NoError(t, conn.RawQuery("INSERT INTO scim_tokens (id, sso_provider_id, token_hash, prefix) VALUES (?, ?, ?, ?)", uuid.Must(uuid.NewV4()), provider, digest, token[:12]).Exec())
 
 	return provider, token
 }