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

feat: remove org (#4148)

Browse Source 
* feat(command): remove org

* refactor: imports, unused code, error handling

* reduce org removed in action

* add org deletion to projections

* add org removal to projections

* add org removal to projections

* org removed projection

* lint import

* projections

* fix: table names in tests

* fix: table names in tests

* logging

* add org state

* fix(domain): add Owner removed to object details

* feat(ListQuery): add with owner removed

* fix(org-delete): add bool to functions to select with owner removed

* fix(org-delete): add bools to user grants with events to determine if dependencies lost owner

* fix(org-delete): add unit tests for owner removed and org removed events

* fix(org-delete): add handling of org remove for grants and members

* fix(org-delete): correction of unit tests for owner removed

* fix(org-delete): update projections, unit tests and get functions

* fix(org-delete): add change date to authnkeys and owner removed to org metadata

* fix(org-delete): include owner removed for login names

* fix(org-delete): some column fixes in projections and build for queries with owner removed

* indexes

* fix(org-delete): include review changes

* fix(org-delete): change user projection name after merge

* fix(org-delete): include review changes for project grant where no project owner is necessary

* fix(org-delete): include auth and adminapi tables with owner removed information

* fix(org-delete): cleanup username and orgdomain uniqueconstraints when org is removed

* fix(org-delete): add permissions for org.remove

* remove unnecessary unique constraints

* fix column order in primary keys

* fix(org-delete): include review changes

* fix(org-delete): add owner removed indexes and chang setup step to create tables

* fix(org-delete): move PK order of instance_id and change added user_grant from review

* fix(org-delete): no params for prepareUserQuery

* change to step 6

* merge main

* fix(org-delete): OldUserName rename to private

* fix linting

* cleanup

* fix: remove org test

* create prerelease

* chore: delete org-delete as prerelease

Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: Livio Spring <livio.a@gmail.com>
Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com>
Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
This commit is contained in:
Silvan
2022-11-30 17:01:17 +01:00
committed by GitHub
parent 21a4e73bb6
commit f3e6f3b23b
304 changed files with 7293 additions and 3286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
internal/command/user_test.go
View File

@@ -8,18 +8,16 @@ import (
"github.com/stretchr/testify/assert"
"golang.org/x/text/language"
"github.com/zitadel/zitadel/internal/repository/member"
"github.com/zitadel/zitadel/internal/repository/org"
"github.com/zitadel/zitadel/internal/repository/project"
"github.com/zitadel/zitadel/internal/command/preparation"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
caos_errs "github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/id"
"github.com/zitadel/zitadel/internal/repository/instance"
"github.com/zitadel/zitadel/internal/repository/member"
"github.com/zitadel/zitadel/internal/repository/org"
"github.com/zitadel/zitadel/internal/repository/project"
"github.com/zitadel/zitadel/internal/repository/user"
)
@@ -59,7 +57,7 @@ func TestCommandSide_UsernameChange(t *testing.T) {
username: "username",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: errors.IsErrorInvalidArgument,
},
},
{
@@ -76,7 +74,7 @@ func TestCommandSide_UsernameChange(t *testing.T) {
username: "username",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: errors.IsErrorInvalidArgument,
},
},
{
@@ -93,7 +91,7 @@ func TestCommandSide_UsernameChange(t *testing.T) {
username: "",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: errors.IsErrorInvalidArgument,
},
},
{
@@ -110,7 +108,7 @@ func TestCommandSide_UsernameChange(t *testing.T) {
username: " ",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: errors.IsErrorInvalidArgument,
},
},
{
@@ -128,7 +126,7 @@ func TestCommandSide_UsernameChange(t *testing.T) {
username: "username",
},
res: res{
err: caos_errs.IsNotFound,
err: errors.IsNotFound,
},
},
{
@@ -161,7 +159,7 @@ func TestCommandSide_UsernameChange(t *testing.T) {
username: "username",
},
res: res{
err: caos_errs.IsPreconditionFailed,
err: errors.IsPreconditionFailed,
},
},
{
@@ -194,7 +192,7 @@ func TestCommandSide_UsernameChange(t *testing.T) {
username: "username ",
},
res: res{
err: caos_errs.IsPreconditionFailed,
err: errors.IsPreconditionFailed,
},
},
{
@@ -227,7 +225,7 @@ func TestCommandSide_UsernameChange(t *testing.T) {
username: "username",
},
res: res{
err: caos_errs.IsPreconditionFailed,
err: errors.IsPreconditionFailed,
},
},
{
@@ -271,7 +269,7 @@ func TestCommandSide_UsernameChange(t *testing.T) {
username: "test@test.ch",
},
res: res{
err: caos_errs.IsPreconditionFailed,
err: errors.IsPreconditionFailed,
},
},
{
@@ -448,7 +446,7 @@ func TestCommandSide_DeactivateUser(t *testing.T) {
userID: "",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: errors.IsErrorInvalidArgument,
},
},
{
@@ -465,7 +463,7 @@ func TestCommandSide_DeactivateUser(t *testing.T) {
userID: "user1",
},
res: res{
err: caos_errs.IsNotFound,
err: errors.IsNotFound,
},
},
{
@@ -502,7 +500,7 @@ func TestCommandSide_DeactivateUser(t *testing.T) {
userID: "user1",
},
res: res{
err: caos_errs.IsPreconditionFailed,
err: errors.IsPreconditionFailed,
},
},
{
@@ -602,7 +600,7 @@ func TestCommandSide_ReactivateUser(t *testing.T) {
userID: "",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: errors.IsErrorInvalidArgument,
},
},
{
@@ -619,7 +617,7 @@ func TestCommandSide_ReactivateUser(t *testing.T) {
userID: "user1",
},
res: res{
err: caos_errs.IsNotFound,
err: errors.IsNotFound,
},
},
{
@@ -651,7 +649,7 @@ func TestCommandSide_ReactivateUser(t *testing.T) {
userID: "user1",
},
res: res{
err: caos_errs.IsPreconditionFailed,
err: errors.IsPreconditionFailed,
},
},
{
@@ -755,7 +753,7 @@ func TestCommandSide_LockUser(t *testing.T) {
userID: "",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: errors.IsErrorInvalidArgument,
},
},
{
@@ -772,7 +770,7 @@ func TestCommandSide_LockUser(t *testing.T) {
userID: "user1",
},
res: res{
err: caos_errs.IsNotFound,
err: errors.IsNotFound,
},
},
{
@@ -809,7 +807,7 @@ func TestCommandSide_LockUser(t *testing.T) {
userID: "user1",
},
res: res{
err: caos_errs.IsPreconditionFailed,
err: errors.IsPreconditionFailed,
},
},
{
@@ -909,7 +907,7 @@ func TestCommandSide_UnlockUser(t *testing.T) {
userID: "",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: errors.IsErrorInvalidArgument,
},
},
{
@@ -926,7 +924,7 @@ func TestCommandSide_UnlockUser(t *testing.T) {
userID: "user1",
},
res: res{
err: caos_errs.IsNotFound,
err: errors.IsNotFound,
},
},
{
@@ -958,7 +956,7 @@ func TestCommandSide_UnlockUser(t *testing.T) {
userID: "user1",
},
res: res{
err: caos_errs.IsPreconditionFailed,
err: errors.IsPreconditionFailed,
},
},
{
@@ -1065,7 +1063,7 @@ func TestCommandSide_RemoveUser(t *testing.T) {
userID: "",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: errors.IsErrorInvalidArgument,
},
},
{
@@ -1082,7 +1080,7 @@ func TestCommandSide_RemoveUser(t *testing.T) {
userID: "user1",
},
res: res{
err: caos_errs.IsNotFound,
err: errors.IsNotFound,
},
},
{
@@ -1116,7 +1114,7 @@ func TestCommandSide_RemoveUser(t *testing.T) {
userID: "user1",
},
res: res{
err: caos_errs.IsPreconditionFailed,
err: errors.IsPreconditionFailed,
},
},
{
@@ -1423,7 +1421,7 @@ func TestCommandSide_AddUserToken(t *testing.T) {
userID: "",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: errors.IsErrorInvalidArgument,
},
},
{
@@ -1440,7 +1438,7 @@ func TestCommandSide_AddUserToken(t *testing.T) {
userID: "user1",
},
res: res{
err: caos_errs.IsNotFound,
err: errors.IsNotFound,
},
},
}
@@ -1497,7 +1495,7 @@ func TestCommands_RevokeAccessToken(t *testing.T) {
},
res{
nil,
caos_errs.IsErrorInvalidArgument,
errors.IsErrorInvalidArgument,
},
},
{
@@ -1529,7 +1527,7 @@ func TestCommands_RevokeAccessToken(t *testing.T) {
},
res{
nil,
caos_errs.IsNotFound,
errors.IsNotFound,
},
},
{
@@ -1624,7 +1622,7 @@ func TestCommandSide_UserDomainClaimedSent(t *testing.T) {
resourceOwner: "org1",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: errors.IsErrorInvalidArgument,
},
},
{
@@ -1641,7 +1639,7 @@ func TestCommandSide_UserDomainClaimedSent(t *testing.T) {
resourceOwner: "org1",
},
res: res{
err: caos_errs.IsNotFound,
err: errors.IsNotFound,
},
},
{