TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 20:47:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed idp repo interface to use a pointer for orgID

Browse Source
This commit is contained in:
Iraq Jaber
2025-07-22 14:51:14 +01:00
parent 7fc6123e3f
commit d5a228bb4b
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/v3/domain/id_provider.go
View File

@@ -101,10 +101,10 @@ type IDProviderRepository interface {
idProviderConditions idProviderConditions
idProviderChanges idProviderChanges
Get(ctx context.Context, id IDPIdentifierCondition, instnaceID string, orgID string) (*IdentityProvider, error) Get(ctx context.Context, id IDPIdentifierCondition, instnaceID string, orgID *string) (*IdentityProvider, error)
List(ctx context.Context, conditions ...database.Condition) ([]*IdentityProvider, error) List(ctx context.Context, conditions ...database.Condition) ([]*IdentityProvider, error)
Create(ctx context.Context, idp *IdentityProvider) error Create(ctx context.Context, idp *IdentityProvider) error
Update(ctx context.Context, id IDPIdentifierCondition, instnaceID string, orgID string, changes ...database.Change) (int64, error) Update(ctx context.Context, id IDPIdentifierCondition, instnaceID string, orgID *string, changes ...database.Change) (int64, error)
Delete(ctx context.Context, id IDPIdentifierCondition, instnaceID string, orgID string) (int64, error) Delete(ctx context.Context, id IDPIdentifierCondition, instnaceID string, orgID *string) (int64, error)
} }

8
backend/v3/storage/database/dialect/postgres/migration/003_identity_providers_table/up.sql
View File

@@ -1,9 +1,9 @@
CREATE TYPE idp_state AS ENUM ( CREATE TYPE zitadel.idp_state AS ENUM (
'active', 'active',
'inactive' 'inactive'
); );
CREATE TYPE idp_type AS ENUM ( CREATE TYPE zitadel.idp_type AS ENUM (
'oidc', 'oidc',
'oauth', 'oauth',
'saml', 'saml',
@@ -18,9 +18,9 @@ CREATE TABLE zitadel.identity_providers (
instance_id TEXT NOT NULL instance_id TEXT NOT NULL
, org_id TEXT , org_id TEXT
, id TEXT NOT NULL CHECK (id <> '') , id TEXT NOT NULL CHECK (id <> '')
, state idp_state NOT NULL DEFAULT 'active' , state zitadel.idp_state NOT NULL DEFAULT 'active'
, name TEXT NOT NULL CHECK (name <> '') , name TEXT NOT NULL CHECK (name <> '')
, type idp_type NOT NULL , type zitadel.idp_type NOT NULL
, allow_creation BOOLEAN NOT NULL DEFAULT TRUE , allow_creation BOOLEAN NOT NULL DEFAULT TRUE
, allow_auto_creation BOOLEAN NOT NULL DEFAULT TRUE , allow_auto_creation BOOLEAN NOT NULL DEFAULT TRUE
, allow_auto_update BOOLEAN NOT NULL DEFAULT TRUE , allow_auto_update BOOLEAN NOT NULL DEFAULT TRUE

12
backend/v3/storage/database/repository/id_provider.go
View File

@@ -26,12 +26,12 @@ const queryIDProviderStmt = `SELECT instance_id, org_id, id, state, name, type,
` allow_auto_update, allow_linking, styling_type, payload, created_at, updated_at` + ` allow_auto_update, allow_linking, styling_type, payload, created_at, updated_at` +
` FROM zitadel.identity_providers` ` FROM zitadel.identity_providers`
func (i *idProvider) Get(ctx context.Context, id domain.IDPIdentifierCondition, instnaceID string, orgID string) (*domain.IdentityProvider, error) { func (i *idProvider) Get(ctx context.Context, id domain.IDPIdentifierCondition, instnaceID string, orgID *string) (*domain.IdentityProvider, error) {
builder := database.StatementBuilder{} builder := database.StatementBuilder{}
builder.WriteString(queryIDProviderStmt) builder.WriteString(queryIDProviderStmt)
conditions := []database.Condition{id, i.InstanceIDCondition(instnaceID), i.OrgIDCondition(orgID)} conditions := []database.Condition{id, i.InstanceIDCondition(instnaceID), i.OrgIDCondition(*orgID)}
writeCondition(&builder, database.And(conditions...)) writeCondition(&builder, database.And(conditions...))
@@ -83,7 +83,7 @@ func (i *idProvider) Create(ctx context.Context, idp *domain.IdentityProvider) e
return nil return nil
} }
func (i *idProvider) Update(ctx context.Context, id domain.IDPIdentifierCondition, instnaceID string, orgID string, changes ...database.Change) (int64, error) { func (i *idProvider) Update(ctx context.Context, id domain.IDPIdentifierCondition, instnaceID string, orgID *string, changes ...database.Change) (int64, error) {
if changes == nil { if changes == nil {
return 0, errors.New("Update must contain at least one change") return 0, errors.New("Update must contain at least one change")
} }
@@ -93,7 +93,7 @@ func (i *idProvider) Update(ctx context.Context, id domain.IDPIdentifierConditio
conditions := []database.Condition{ conditions := []database.Condition{
id, id,
i.InstanceIDCondition(instnaceID), i.InstanceIDCondition(instnaceID),
i.OrgIDCondition(orgID), i.OrgIDCondition(*orgID),
} }
database.Changes(changes).Write(&builder) database.Changes(changes).Write(&builder)
writeCondition(&builder, database.And(conditions...)) writeCondition(&builder, database.And(conditions...))
@@ -103,7 +103,7 @@ func (i *idProvider) Update(ctx context.Context, id domain.IDPIdentifierConditio
return i.client.Exec(ctx, stmt, builder.Args()...) return i.client.Exec(ctx, stmt, builder.Args()...)
} }
func (i *idProvider) Delete(ctx context.Context, id domain.IDPIdentifierCondition, instnaceID string, orgID string) (int64, error) { func (i *idProvider) Delete(ctx context.Context, id domain.IDPIdentifierCondition, instnaceID string, orgID *string) (int64, error) {
builder := database.StatementBuilder{} builder := database.StatementBuilder{}
builder.WriteString(`DELETE FROM zitadel.identity_providers`) builder.WriteString(`DELETE FROM zitadel.identity_providers`)
@@ -111,7 +111,7 @@ func (i *idProvider) Delete(ctx context.Context, id domain.IDPIdentifierConditio
conditions := []database.Condition{ conditions := []database.Condition{
id, id,
i.InstanceIDCondition(instnaceID), i.InstanceIDCondition(instnaceID),
i.OrgIDCondition(orgID), i.OrgIDCondition(*orgID),
} }
writeCondition(&builder, database.And(conditions...)) writeCondition(&builder, database.And(conditions...))

14
backend/v3/storage/database/repository/id_provider_test.go
View File

@@ -330,7 +330,7 @@ func TestCreateIDProvider(t *testing.T) {
idp, err = idpRepo.Get(ctx, idp, err = idpRepo.Get(ctx,
idpRepo.IDCondition(idp.ID), idpRepo.IDCondition(idp.ID),
idp.InstanceID, idp.InstanceID,
idp.OrgID, &idp.OrgID,
) )
require.NoError(t, err) require.NoError(t, err)
@@ -585,7 +585,7 @@ func TestUpdateIDProvider(t *testing.T) {
rowsAffected, err := idpRepo.Update(ctx, rowsAffected, err := idpRepo.Update(ctx,
idpRepo.IDCondition(createdIDP.ID), idpRepo.IDCondition(createdIDP.ID),
createdIDP.InstanceID, createdIDP.InstanceID,
createdIDP.OrgID, &createdIDP.OrgID,
tt.update..., tt.update...,
) )
afterUpdate := time.Now() afterUpdate := time.Now()
@@ -601,7 +601,7 @@ func TestUpdateIDProvider(t *testing.T) {
idp, err := idpRepo.Get(ctx, idp, err := idpRepo.Get(ctx,
organizationRepo.IDCondition(createdIDP.ID), organizationRepo.IDCondition(createdIDP.ID),
createdIDP.InstanceID, createdIDP.InstanceID,
createdIDP.OrgID, &createdIDP.OrgID,
) )
require.NoError(t, err) require.NoError(t, err)
@@ -848,7 +848,7 @@ func TestGetIDProvider(t *testing.T) {
returnedIDP, err := idpRepo.Get(ctx, returnedIDP, err := idpRepo.Get(ctx,
tt.idpIdentifierCondition, tt.idpIdentifierCondition,
idp.InstanceID, idp.InstanceID,
idp.OrgID, &idp.OrgID,
) )
if err != nil { if err != nil {
require.ErrorIs(t, tt.err, err) require.ErrorIs(t, tt.err, err)
@@ -1830,7 +1830,7 @@ func TestDeleteIDProvider(t *testing.T) {
affectedRows, err := idpRepo.Delete(ctx, affectedRows, err := idpRepo.Delete(ctx,
idpRepo.NameCondition(name), idpRepo.NameCondition(name),
instanceId, instanceId,
orgId, &orgId,
) )
assert.Equal(t, int64(1), affectedRows) assert.Equal(t, int64(1), affectedRows)
require.NoError(t, err) require.NoError(t, err)
@@ -1853,7 +1853,7 @@ func TestDeleteIDProvider(t *testing.T) {
noOfDeletedRows, err := idpRepo.Delete(ctx, noOfDeletedRows, err := idpRepo.Delete(ctx,
tt.idpIdentifierCondition, tt.idpIdentifierCondition,
instanceId, instanceId,
orgId, &orgId,
) )
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, noOfDeletedRows, tt.noOfDeletedRows) assert.Equal(t, noOfDeletedRows, tt.noOfDeletedRows)
@@ -1862,7 +1862,7 @@ func TestDeleteIDProvider(t *testing.T) {
organization, err := idpRepo.Get(ctx, organization, err := idpRepo.Get(ctx,
tt.idpIdentifierCondition, tt.idpIdentifierCondition,
instanceId, instanceId,
orgId, &orgId,
) )
require.ErrorIs(t, err, new(database.NoRowFoundError)) require.ErrorIs(t, err, new(database.NoRowFoundError))
assert.Nil(t, organization) assert.Nil(t, organization)