From fa9f581d564dcbb746eda1e15c3d51bc364b2749 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Wed, 27 Apr 2022 01:01:45 +0200 Subject: [PATCH] chore(v2): move to new org (#3499) * chore: move to new org * logging * fix: org rename caos -> zitadel Co-authored-by: adlerhurst --- .github/ISSUE_TEMPLATE/config.yml | 4 +- .goreleaser.yaml | 8 +-- CONTRIBUTING.md | 8 +-- README.md | 18 +++--- SECURITY.md | 2 +- build/zitadel/Dockerfile | 32 +++++------ build/zitadel/generate-grpc.sh | 4 +- cmd/admin/admin.go | 10 ++-- cmd/admin/initialise/config.go | 4 +- cmd/admin/initialise/init.go | 4 +- cmd/admin/initialise/verify_database.go | 2 +- cmd/admin/initialise/verify_grant.go | 2 +- cmd/admin/initialise/verify_user.go | 2 +- cmd/admin/initialise/verify_zitadel.go | 4 +- cmd/admin/key/key.go | 8 +-- cmd/admin/key/key_test.go | 4 +- cmd/admin/setup/03.go | 12 ++-- cmd/admin/setup/config.go | 14 ++--- cmd/admin/setup/setup.go | 10 ++-- cmd/admin/start/config.go | 34 +++++------ cmd/admin/start/encryption_keys.go | 4 +- cmd/admin/start/flags.go | 2 +- cmd/admin/start/start.go | 56 +++++++++---------- cmd/admin/start/start_from_init.go | 8 +-- cmd/zitadel.go | 4 +- .../guides/authentication/serviceusers.md | 4 +- docs/docs/guides/customization/texts.md | 8 +-- docs/docs/guides/installation/crd.md | 2 +- docs/docs/guides/installation/gitops.md | 2 +- docs/docs/guides/solution-scenarios/b2b.mdx | 2 +- docs/docs/legal/terms-of-service.md | 2 +- .../quickstarts/call-zitadel-api/dot-net.md | 4 +- docs/docs/quickstarts/call-zitadel-api/go.md | 18 +++--- docs/docs/quickstarts/introduction.mdx | 10 ++-- docs/docs/quickstarts/libs.md | 2 +- docs/docs/quickstarts/login/angular.md | 10 ++-- docs/docs/quickstarts/login/nextjs.md | 2 +- docs/docs/quickstarts/secure-api/go.md | 14 ++--- docs/docusaurus.config.js | 6 +- go.mod | 6 +- go.sum | 8 +-- internal/actions/actions.go | 2 +- internal/actions/api.go | 2 +- internal/actions/context.go | 2 +- internal/admin/repository/administrator.go | 2 +- .../eventsourcing/eventstore/administrator.go | 6 +- .../eventsourcing/handler/handler.go | 8 +-- .../eventsourcing/handler/styling.go | 22 ++++---- .../repository/eventsourcing/repository.go | 12 ++-- .../repository/eventsourcing/spooler/lock.go | 2 +- .../eventsourcing/spooler/spooler.go | 10 ++-- .../eventsourcing/view/error_event.go | 2 +- .../repository/eventsourcing/view/sequence.go | 4 +- .../repository/eventsourcing/view/styling.go | 8 +-- internal/api/api.go | 18 +++--- internal/api/assets/asset.go | 16 +++--- .../api/assets/generator/asset_generator.go | 12 ++-- internal/api/assets/login_policy.go | 12 ++-- internal/api/assets/user_avatar.go | 8 +-- internal/api/authz/authorization.go | 4 +- internal/api/authz/authorization_test.go | 2 +- internal/api/authz/context.go | 8 +-- internal/api/authz/permissions.go | 4 +- internal/api/authz/permissions_test.go | 2 +- internal/api/authz/token.go | 4 +- internal/api/authz/token_test.go | 2 +- internal/api/grpc/action/action.go | 8 +-- internal/api/grpc/admin/custom_text.go | 10 ++-- .../api/grpc/admin/custom_text_converter.go | 6 +- internal/api/grpc/admin/domain_policy.go | 10 ++-- internal/api/grpc/admin/failed_event.go | 4 +- .../api/grpc/admin/failed_event_converter.go | 6 +- .../grpc/admin/failed_event_converter_test.go | 6 +- internal/api/grpc/admin/features.go | 8 +-- internal/api/grpc/admin/iam_member.go | 6 +- .../api/grpc/admin/iam_member_converter.go | 10 ++-- .../grpc/admin/iam_member_converter_test.go | 4 +- internal/api/grpc/admin/iam_settings.go | 6 +- .../api/grpc/admin/iam_settings_converter.go | 18 +++--- internal/api/grpc/admin/idp.go | 10 ++-- internal/api/grpc/admin/idp_converter.go | 14 ++--- internal/api/grpc/admin/idp_converter_test.go | 6 +- internal/api/grpc/admin/information.go | 2 +- internal/api/grpc/admin/instance.go | 6 +- internal/api/grpc/admin/instance_converter.go | 8 +-- internal/api/grpc/admin/label_policy.go | 6 +- .../api/grpc/admin/label_policy_converter.go | 4 +- internal/api/grpc/admin/language.go | 8 +-- internal/api/grpc/admin/lockout.go | 6 +- internal/api/grpc/admin/lockout_converter.go | 4 +- internal/api/grpc/admin/login_policy.go | 16 +++--- .../api/grpc/admin/login_policy_converter.go | 10 ++-- .../api/grpc/admin/notification_provider.go | 8 +-- internal/api/grpc/admin/oidc_settings.go | 6 +- .../api/grpc/admin/oidc_settings_converter.go | 10 ++-- internal/api/grpc/admin/org.go | 16 +++--- internal/api/grpc/admin/org_converter.go | 12 ++-- internal/api/grpc/admin/password_age.go | 6 +- .../api/grpc/admin/password_age_converter.go | 4 +- .../api/grpc/admin/password_complexity.go | 6 +- .../admin/password_complexity_converter.go | 4 +- internal/api/grpc/admin/privacy_policy.go | 6 +- .../grpc/admin/privacy_policy_converter.go | 4 +- internal/api/grpc/admin/server.go | 16 +++--- internal/api/grpc/admin/sms.go | 8 +-- internal/api/grpc/admin/sms_converter.go | 12 ++-- internal/api/grpc/admin/user_converter.go | 8 +-- internal/api/grpc/admin/view.go | 4 +- internal/api/grpc/admin/view_converter.go | 6 +- internal/api/grpc/auth/avatar.go | 6 +- internal/api/grpc/auth/email.go | 10 ++-- internal/api/grpc/auth/email_converter.go | 4 +- internal/api/grpc/auth/features.go | 4 +- internal/api/grpc/auth/idp.go | 6 +- internal/api/grpc/auth/idp_converter.go | 10 ++-- internal/api/grpc/auth/information.go | 2 +- internal/api/grpc/auth/language.go | 4 +- internal/api/grpc/auth/metadata_converter.go | 10 ++-- internal/api/grpc/auth/multi_factor.go | 14 ++--- internal/api/grpc/auth/password.go | 6 +- internal/api/grpc/auth/password_complexity.go | 6 +- internal/api/grpc/auth/passwordless.go | 18 +++--- internal/api/grpc/auth/permission.go | 10 ++-- .../api/grpc/auth/permission_converter.go | 10 ++-- internal/api/grpc/auth/phone.go | 10 ++-- internal/api/grpc/auth/phone_converter.go | 4 +- internal/api/grpc/auth/profile.go | 8 +-- internal/api/grpc/auth/profile_converter.go | 8 +-- internal/api/grpc/auth/refresh_token.go | 10 ++-- internal/api/grpc/auth/server.go | 18 +++--- internal/api/grpc/auth/user.go | 20 +++---- internal/api/grpc/auth/user_grant.go | 8 +-- internal/api/grpc/authn/converter.go | 8 +-- internal/api/grpc/change/changes.go | 8 +-- .../api/grpc/client/middleware/tracing.go | 2 +- internal/api/grpc/errors/caos_errors.go | 6 +- internal/api/grpc/errors/caos_errors_test.go | 2 +- internal/api/grpc/features/features.go | 8 +-- internal/api/grpc/header.go | 2 +- internal/api/grpc/idp/converter.go | 10 ++-- internal/api/grpc/instance/converter.go | 8 +-- internal/api/grpc/management/actions.go | 8 +-- .../api/grpc/management/actions_converter.go | 12 ++-- internal/api/grpc/management/auth_checks.go | 4 +- internal/api/grpc/management/custom_text.go | 10 ++-- .../grpc/management/custom_text_converter.go | 6 +- internal/api/grpc/management/features.go | 6 +- internal/api/grpc/management/flow.go | 8 +-- internal/api/grpc/management/iam.go | 2 +- internal/api/grpc/management/idp.go | 10 ++-- internal/api/grpc/management/idp_converter.go | 18 +++--- .../api/grpc/management/idp_converter_test.go | 6 +- internal/api/grpc/management/information.go | 8 +-- internal/api/grpc/management/language.go | 4 +- internal/api/grpc/management/org.go | 20 +++---- internal/api/grpc/management/org_converter.go | 16 +++--- internal/api/grpc/management/policy_label.go | 8 +-- .../grpc/management/policy_label_converter.go | 4 +- .../api/grpc/management/policy_lockout.go | 8 +-- .../management/policy_lockout_converter.go | 4 +- internal/api/grpc/management/policy_login.go | 16 +++--- .../grpc/management/policy_login_converter.go | 10 ++-- .../grpc/management/policy_password_age.go | 8 +-- .../policy_password_age_converter.go | 4 +- .../management/policy_password_complexity.go | 8 +-- .../policy_password_complexity_converter.go | 4 +- .../api/grpc/management/policy_privacy.go | 8 +-- .../management/policy_privacy_converter.go | 4 +- internal/api/grpc/management/project.go | 14 ++--- .../grpc/management/project_application.go | 16 +++--- .../project_application_converter.go | 16 +++--- .../api/grpc/management/project_converter.go | 18 +++--- internal/api/grpc/management/project_grant.go | 12 ++-- .../management/project_grant_converter.go | 18 +++--- internal/api/grpc/management/server.go | 14 ++--- internal/api/grpc/management/user.go | 32 +++++------ .../api/grpc/management/user_converter.go | 22 ++++---- internal/api/grpc/management/user_grant.go | 10 ++-- .../grpc/management/user_grant_converter.go | 16 +++--- internal/api/grpc/member/converter.go | 10 ++-- internal/api/grpc/metadata/metadata.go | 8 +-- internal/api/grpc/object/converter.go | 6 +- internal/api/grpc/org/converter.go | 10 ++-- internal/api/grpc/policy/domain_policy.go | 6 +- internal/api/grpc/policy/label_policy.go | 8 +-- internal/api/grpc/policy/login_policy.go | 8 +-- internal/api/grpc/policy/multi_factor.go | 4 +- .../api/grpc/policy/password_age_policy.go | 6 +- .../grpc/policy/password_complexity_policy.go | 6 +- .../grpc/policy/password_lockout_policy.go | 6 +- internal/api/grpc/policy/privacy_policy.go | 6 +- internal/api/grpc/policy/second_factor.go | 4 +- internal/api/grpc/project/application.go | 12 ++-- internal/api/grpc/project/converter.go | 12 ++-- internal/api/grpc/server/gateway.go | 4 +- .../server/middleware/auth_interceptor.go | 8 +-- .../middleware/auth_interceptor_test.go | 2 +- .../server/middleware/cache_interceptor.go | 4 +- .../server/middleware/error_interceptor.go | 5 +- .../server/middleware/instance_interceptor.go | 2 +- .../middleware/instance_interceptor_test.go | 2 +- .../server/middleware/metrics_interceptor.go | 4 +- .../api/grpc/server/middleware/mock_test.go | 2 +- .../server/middleware/service_interceptor.go | 4 +- .../api/grpc/server/middleware/tracing.go | 2 +- .../middleware/translation_interceptor.go | 4 +- .../api/grpc/server/middleware/translator.go | 6 +- internal/api/grpc/server/probes.go | 8 +-- internal/api/grpc/server/probes_test.go | 2 +- internal/api/grpc/server/server.go | 10 ++-- internal/api/grpc/settings/converter.go | 6 +- internal/api/grpc/system/failed_event.go | 4 +- .../api/grpc/system/failed_event_converter.go | 6 +- .../system/failed_event_converter_test.go | 8 +-- internal/api/grpc/system/instance.go | 10 ++-- .../api/grpc/system/instance_converter.go | 12 ++-- internal/api/grpc/system/server.go | 14 ++--- internal/api/grpc/system/view.go | 4 +- internal/api/grpc/system/view_converter.go | 6 +- internal/api/grpc/text/custom_text.go | 8 +-- internal/api/grpc/user/converter.go | 10 ++-- internal/api/grpc/user/membership.go | 12 ++-- .../api/grpc/user/personal_access_token.go | 6 +- internal/api/grpc/user/query.go | 8 +-- internal/api/grpc/user/refresh_token.go | 6 +- internal/api/grpc/user/session.go | 8 +-- internal/api/grpc/user/user_grant.go | 10 ++-- internal/api/http/cookie.go | 2 +- internal/api/http/domain_check.go | 2 +- internal/api/http/marshal.go | 2 +- .../api/http/middleware/auth_interceptor.go | 6 +- .../api/http/middleware/cache_interceptor.go | 2 +- .../api/http/middleware/cors_interceptor.go | 2 +- .../http/middleware/instance_interceptor.go | 4 +- .../middleware/instance_interceptor_test.go | 2 +- .../http/middleware/metrics_interceptor.go | 5 +- .../api/http/middleware/security_headers.go | 2 +- .../http/middleware/telemetry_interceptor.go | 5 +- .../api/http/middleware/user_agent_cookie.go | 6 +- internal/api/http/parser.go | 2 +- internal/api/oidc/auth_request.go | 18 +++--- internal/api/oidc/auth_request_converter.go | 14 ++--- internal/api/oidc/client.go | 18 +++--- internal/api/oidc/client_converter.go | 10 ++-- internal/api/oidc/key.go | 18 +++--- internal/api/oidc/op.go | 28 +++++----- internal/api/ui/console/console.go | 10 ++-- internal/api/ui/login/auth_request.go | 4 +- .../api/ui/login/change_password_handler.go | 4 +- internal/api/ui/login/custom_action.go | 10 ++-- .../api/ui/login/external_login_handler.go | 18 +++--- .../api/ui/login/external_register_handler.go | 12 ++-- .../api/ui/login/init_password_handler.go | 8 +-- internal/api/ui/login/init_user_handler.go | 4 +- internal/api/ui/login/jwt_handler.go | 14 ++--- internal/api/ui/login/link_users_handler.go | 4 +- internal/api/ui/login/login.go | 24 ++++---- internal/api/ui/login/login_handler.go | 6 +- .../api/ui/login/login_success_handler.go | 2 +- internal/api/ui/login/mail_verify_handler.go | 2 +- .../api/ui/login/mfa_init_done_handler.go | 2 +- internal/api/ui/login/mfa_init_u2f.go | 4 +- .../api/ui/login/mfa_init_verify_handler.go | 6 +- internal/api/ui/login/mfa_prompt_handler.go | 4 +- internal/api/ui/login/mfa_verify_handler.go | 4 +- .../api/ui/login/mfa_verify_u2f_handler.go | 4 +- .../password_complexity_policy_handler.go | 4 +- internal/api/ui/login/password_handler.go | 2 +- .../api/ui/login/password_reset_handler.go | 4 +- .../ui/login/passwordless_login_handler.go | 2 +- .../ui/login/passwordless_prompt_handler.go | 2 +- .../passwordless_registration_handler.go | 10 ++-- internal/api/ui/login/policy_handler.go | 4 +- internal/api/ui/login/register_handler.go | 6 +- .../api/ui/login/register_option_handler.go | 2 +- internal/api/ui/login/register_org_handler.go | 8 +-- internal/api/ui/login/renderer.go | 18 +++--- internal/api/ui/login/resources_handler.go | 6 +- internal/api/ui/login/select_user_handler.go | 4 +- .../api/ui/login/username_change_handler.go | 2 +- internal/auth/repository/auth_request.go | 2 +- .../eventsourcing/eventstore/auth_request.go | 40 ++++++------- .../eventstore/auth_request_test.go | 24 ++++---- .../eventsourcing/eventstore/org.go | 16 +++--- .../eventsourcing/eventstore/refresh_token.go | 24 ++++---- .../eventsourcing/eventstore/token.go | 20 +++---- .../eventsourcing/eventstore/user.go | 16 +++--- .../eventsourcing/eventstore/user_session.go | 8 +-- .../eventsourcing/handler/handler.go | 12 ++-- .../eventsourcing/handler/idp_config.go | 20 +++---- .../eventsourcing/handler/idp_providers.go | 28 +++++----- .../handler/org_project_mapping.go | 16 +++--- .../eventsourcing/handler/refresh_token.go | 20 +++---- .../repository/eventsourcing/handler/token.go | 30 +++++----- .../repository/eventsourcing/handler/user.go | 30 +++++----- .../handler/user_external_idps.go | 30 +++++----- .../eventsourcing/handler/user_session.go | 20 +++---- .../repository/eventsourcing/repository.go | 22 ++++---- .../repository/eventsourcing/spooler/lock.go | 2 +- .../eventsourcing/spooler/spooler.go | 12 ++-- .../eventsourcing/view/error_event.go | 2 +- .../eventsourcing/view/external_idps.go | 10 ++-- .../eventsourcing/view/idp_configs.go | 12 ++-- .../eventsourcing/view/idp_providers.go | 12 ++-- .../eventsourcing/view/org_project_mapping.go | 10 ++-- .../eventsourcing/view/refresh_token.go | 12 ++-- .../repository/eventsourcing/view/sequence.go | 4 +- .../repository/eventsourcing/view/token.go | 10 ++-- .../repository/eventsourcing/view/user.go | 12 ++-- .../eventsourcing/view/user_session.go | 10 ++-- .../repository/eventsourcing/view/view.go | 6 +- internal/auth/repository/org.go | 4 +- internal/auth/repository/refresh_token.go | 2 +- internal/auth/repository/token.go | 3 +- internal/auth/repository/user_session.go | 3 +- .../auth_request/repository/cache/cache.go | 6 +- internal/auth_request/repository/gen_mock.go | 2 +- .../repository/mock/repository.mock.go | 4 +- .../auth_request/repository/repository.go | 2 +- internal/authz/authz.go | 10 ++-- .../eventstore/token_verifier.go | 26 ++++----- .../eventstore/user_membership.go | 10 ++-- .../eventsourcing/handler/handler.go | 8 +-- .../eventsourcing/handler/user_membership.go | 40 ++++++------- .../repository/eventsourcing/repository.go | 20 +++---- .../repository/eventsourcing/spooler/lock.go | 2 +- .../eventsourcing/spooler/spooler.go | 11 ++-- .../eventsourcing/view/application.go | 6 +- .../eventsourcing/view/error_event.go | 2 +- .../repository/eventsourcing/view/sequence.go | 4 +- .../repository/eventsourcing/view/token.go | 10 ++-- .../eventsourcing/view/user_membership.go | 12 ++-- .../repository/eventsourcing/view/view.go | 4 +- internal/authz/repository/user_membership.go | 2 +- internal/cache/bigcache/bigcache_test.go | 7 ++- internal/cache/bigcache/cache.go | 4 +- internal/cache/bigcache/config.go | 3 +- internal/cache/config/config.go | 8 +-- internal/cache/fastcache/config.go | 2 +- internal/cache/fastcache/fastcache.go | 3 +- internal/cache/fastcache/fastcache_test.go | 7 ++- internal/cache/generate.go | 2 +- internal/cache/mock/cache.mock.go | 2 +- internal/command/auth_checks.go | 5 +- internal/command/command.go | 34 +++++------ internal/command/converter.go | 4 +- internal/command/crypto.go | 8 +-- internal/command/custom_login_text.go | 8 +-- internal/command/custom_login_text_model.go | 6 +- internal/command/custom_message_text_model.go | 6 +- internal/command/custom_text_model.go | 6 +- internal/command/debug_notification_model.go | 6 +- internal/command/email.go | 6 +- .../command/existing_label_policies_model.go | 6 +- internal/command/features_model.go | 6 +- internal/command/flow_model.go | 6 +- internal/command/identity_provider_model.go | 6 +- internal/command/idp_config_model.go | 6 +- .../instancce_policy_password_age_model.go | 8 +-- internal/command/instance.go | 24 ++++---- internal/command/instance_converter.go | 6 +- .../command/instance_custom_login_text.go | 10 ++-- .../instance_custom_login_text_model.go | 6 +- .../instance_custom_login_text_test.go | 12 ++-- .../command/instance_custom_message_text.go | 8 +-- .../instance_custom_message_text_model.go | 6 +- .../instance_custom_message_text_test.go | 10 ++-- internal/command/instance_custom_text.go | 10 ++-- .../command/instance_custom_text_model.go | 6 +- .../instance_debug_notification_file.go | 12 ++-- .../instance_debug_notification_file_model.go | 8 +-- .../instance_debug_notification_file_test.go | 16 +++--- .../instance_debug_notification_log.go | 12 ++-- .../instance_debug_notification_log_model.go | 8 +-- .../instance_debug_notification_log_test.go | 16 +++--- internal/command/instance_domain.go | 16 +++--- internal/command/instance_domain_model.go | 8 +-- internal/command/instance_domain_policy.go | 6 +- internal/command/instance_domain_test.go | 16 +++--- internal/command/instance_email_template.go | 8 +-- internal/command/instance_features.go | 10 ++-- internal/command/instance_features_model.go | 10 ++-- internal/command/instance_features_test.go | 10 ++-- internal/command/instance_idp_config.go | 16 +++--- internal/command/instance_idp_config_model.go | 10 ++-- internal/command/instance_idp_config_test.go | 22 ++++---- internal/command/instance_idp_jwt_config.go | 4 +- .../command/instance_idp_jwt_config_model.go | 8 +-- .../command/instance_idp_jwt_config_test.go | 16 +++--- internal/command/instance_idp_oidc_config.go | 4 +- .../command/instance_idp_oidc_config_model.go | 12 ++-- .../command/instance_idp_oidc_config_test.go | 16 +++--- internal/command/instance_label_policy.go | 6 +- internal/command/instance_lockout_policy.go | 6 +- internal/command/instance_login_policy.go | 8 +-- internal/command/instance_member.go | 16 +++--- internal/command/instance_member_model.go | 6 +- internal/command/instance_member_test.go | 18 +++--- internal/command/instance_model.go | 6 +- internal/command/instance_oidc_settings.go | 6 +- .../command/instance_oidc_settings_model.go | 8 +-- .../command/instance_oidc_settings_test.go | 12 ++-- .../command/instance_password_age_policy.go | 6 +- .../instance_password_complexity_policy.go | 6 +- internal/command/instance_policy_domain.go | 10 ++-- .../command/instance_policy_domain_model.go | 8 +-- .../command/instance_policy_domain_test.go | 16 +++--- internal/command/instance_policy_label.go | 12 ++-- .../command/instance_policy_label_model.go | 8 +-- .../command/instance_policy_label_test.go | 20 +++---- internal/command/instance_policy_login.go | 12 ++-- .../instance_policy_login_factors_model.go | 8 +-- ...ce_policy_login_identity_provider_model.go | 6 +- .../command/instance_policy_login_model.go | 10 ++-- .../command/instance_policy_login_test.go | 18 +++--- .../command/instance_policy_mail_template.go | 10 ++-- .../instance_policy_mail_template_model.go | 8 +-- .../instance_policy_mail_template_test.go | 16 +++--- .../command/instance_policy_password_age.go | 10 ++-- .../instance_policy_password_age_test.go | 16 +++--- .../instance_policy_password_complexity.go | 10 ++-- ...stance_policy_password_complexity_model.go | 8 +-- ...nstance_policy_password_complexity_test.go | 16 +++--- .../instance_policy_password_lockout.go | 10 ++-- .../instance_policy_password_lockout_model.go | 8 +-- .../instance_policy_password_lockout_test.go | 16 +++--- internal/command/instance_policy_privacy.go | 10 ++-- .../command/instance_policy_privacy_model.go | 8 +-- .../command/instance_policy_privacy_test.go | 16 +++--- internal/command/instance_privacy_policy.go | 6 +- .../instance_secret_generator_model.go | 8 +-- internal/command/instance_settings.go | 16 +++--- internal/command/instance_settings_test.go | 14 ++--- .../command/instance_smtp_config_model.go | 8 +-- internal/command/jwt_config_model.go | 6 +- internal/command/key_pair.go | 8 +-- internal/command/key_pair_model.go | 6 +- internal/command/main_test.go | 26 ++++----- internal/command/member_model.go | 6 +- internal/command/metadata_model.go | 6 +- internal/command/oidc_config_model.go | 8 +-- internal/command/org.go | 20 +++---- internal/command/org_action.go | 10 ++-- internal/command/org_action_model.go | 6 +- internal/command/org_action_test.go | 20 +++---- internal/command/org_converter.go | 2 +- internal/command/org_custom_login_text.go | 8 +-- .../command/org_custom_login_text_model.go | 6 +- .../command/org_custom_login_text_test.go | 10 ++-- internal/command/org_custom_message_model.go | 6 +- internal/command/org_custom_message_text.go | 8 +-- .../command/org_custom_message_text_test.go | 10 ++-- internal/command/org_domain.go | 18 +++--- internal/command/org_domain_model.go | 8 +-- internal/command/org_domain_test.go | 26 ++++----- internal/command/org_features.go | 8 +-- internal/command/org_features_model.go | 8 +-- internal/command/org_features_test.go | 22 ++++---- internal/command/org_flow.go | 6 +- internal/command/org_flow_model.go | 6 +- internal/command/org_flow_test.go | 10 ++-- internal/command/org_idp_config.go | 14 ++--- internal/command/org_idp_config_model.go | 8 +-- internal/command/org_idp_config_test.go | 22 ++++---- internal/command/org_idp_jwt_config.go | 4 +- internal/command/org_idp_jwt_config_model.go | 6 +- internal/command/org_idp_jwt_config_test.go | 16 +++--- internal/command/org_idp_oidc_config.go | 4 +- internal/command/org_idp_oidc_config_model.go | 10 ++-- internal/command/org_idp_oidc_config_test.go | 16 +++--- internal/command/org_member.go | 12 ++-- internal/command/org_member_model.go | 4 +- internal/command/org_member_test.go | 22 ++++---- internal/command/org_model.go | 6 +- internal/command/org_policy_domain.go | 10 ++-- internal/command/org_policy_domain_model.go | 6 +- internal/command/org_policy_domain_test.go | 14 ++--- internal/command/org_policy_label.go | 8 +-- internal/command/org_policy_label_model.go | 6 +- internal/command/org_policy_label_test.go | 20 +++---- internal/command/org_policy_lockout.go | 6 +- internal/command/org_policy_lockout_model.go | 6 +- internal/command/org_policy_lockout_test.go | 14 ++--- internal/command/org_policy_login.go | 12 ++-- .../command/org_policy_login_factors_model.go | 10 ++-- ...rg_policy_login_identity_provider_model.go | 4 +- internal/command/org_policy_login_model.go | 8 +-- internal/command/org_policy_login_test.go | 18 +++--- internal/command/org_policy_mail_template.go | 6 +- .../command/org_policy_mail_template_model.go | 6 +- .../command/org_policy_mail_template_test.go | 14 ++--- internal/command/org_policy_password_age.go | 6 +- .../command/org_policy_password_age_model.go | 6 +- .../command/org_policy_password_age_test.go | 14 ++--- .../command/org_policy_password_complexity.go | 6 +- .../org_policy_password_complexity_model.go | 6 +- .../org_policy_password_complexity_test.go | 14 ++--- internal/command/org_policy_privacy.go | 6 +- internal/command/org_policy_privacy_model.go | 6 +- internal/command/org_policy_privacy_test.go | 14 ++--- internal/command/org_test.go | 22 ++++---- internal/command/phone.go | 8 +-- internal/command/phone_test.go | 2 +- internal/command/policy_label_model.go | 6 +- .../command/policy_login_factors_model.go | 6 +- internal/command/policy_login_model.go | 6 +- .../command/policy_mail_template_model.go | 6 +- internal/command/policy_org_model.go | 6 +- internal/command/policy_password_age_model.go | 6 +- .../policy_password_complexity_model.go | 8 +-- .../command/policy_password_lockout_model.go | 6 +- internal/command/policy_privacy_model.go | 6 +- internal/command/preparation/command.go | 4 +- internal/command/preparation/command_test.go | 2 +- internal/command/preparation_test.go | 4 +- internal/command/project.go | 14 ++--- internal/command/project_application.go | 10 ++-- internal/command/project_application_api.go | 18 +++--- .../command/project_application_api_model.go | 8 +-- .../command/project_application_api_test.go | 20 +++---- internal/command/project_application_key.go | 6 +- .../command/project_application_key_model.go | 6 +- .../command/project_application_key_test.go | 16 +++--- internal/command/project_application_model.go | 6 +- internal/command/project_application_oidc.go | 22 ++++---- .../command/project_application_oidc_model.go | 8 +-- .../command/project_application_oidc_test.go | 20 +++---- internal/command/project_application_test.go | 13 +++-- internal/command/project_converter.go | 2 +- internal/command/project_grant.go | 12 ++-- internal/command/project_grant_member.go | 12 ++-- .../command/project_grant_member_model.go | 6 +- internal/command/project_grant_member_test.go | 21 +++---- internal/command/project_grant_model.go | 8 +-- internal/command/project_grant_test.go | 20 +++---- internal/command/project_member.go | 12 ++-- internal/command/project_member_model.go | 4 +- internal/command/project_member_test.go | 23 ++++---- internal/command/project_model.go | 6 +- internal/command/project_role.go | 10 ++-- internal/command/project_role_model.go | 6 +- internal/command/project_role_test.go | 17 +++--- internal/command/project_test.go | 20 +++---- internal/command/sms_config.go | 10 ++-- internal/command/sms_config_model.go | 8 +-- internal/command/sms_config_test.go | 18 +++--- internal/command/smtp.go | 10 ++-- internal/command/smtp_test.go | 14 ++--- internal/command/statics.go | 4 +- internal/command/unique_constraints_model.go | 22 ++++---- internal/command/user.go | 22 ++++---- internal/command/user_converter.go | 6 +- internal/command/user_domain_policy.go | 6 +- internal/command/user_domain_policy_test.go | 14 ++--- internal/command/user_grant.go | 10 ++-- internal/command/user_grant_converter.go | 2 +- internal/command/user_grant_model.go | 10 ++-- internal/command/user_grant_test.go | 22 ++++---- internal/command/user_human.go | 14 ++--- .../command/user_human_access_token_model.go | 6 +- internal/command/user_human_address.go | 6 +- internal/command/user_human_address_model.go | 6 +- internal/command/user_human_adress_test.go | 12 ++-- internal/command/user_human_avatar.go | 6 +- internal/command/user_human_avatar_test.go | 14 ++--- internal/command/user_human_email.go | 14 ++--- internal/command/user_human_email_model.go | 8 +-- internal/command/user_human_email_test.go | 14 ++--- internal/command/user_human_init.go | 12 ++-- internal/command/user_human_init_model.go | 8 +-- internal/command/user_human_init_test.go | 14 ++--- internal/command/user_human_model.go | 8 +-- internal/command/user_human_otp.go | 12 ++-- internal/command/user_human_otp_model.go | 8 +-- internal/command/user_human_otp_test.go | 14 ++--- internal/command/user_human_password.go | 14 ++--- internal/command/user_human_password_model.go | 8 +-- internal/command/user_human_password_test.go | 14 ++--- internal/command/user_human_phone.go | 14 ++--- internal/command/user_human_phone_model.go | 8 +-- internal/command/user_human_phone_test.go | 14 ++--- internal/command/user_human_profile.go | 6 +- internal/command/user_human_profile_model.go | 6 +- internal/command/user_human_profile_test.go | 12 ++-- internal/command/user_human_refresh_token.go | 8 +-- .../command/user_human_refresh_token_model.go | 6 +- .../command/user_human_refresh_token_test.go | 20 +++---- internal/command/user_human_test.go | 24 ++++---- internal/command/user_human_webauthn.go | 16 +++--- internal/command/user_human_webauthn_model.go | 8 +-- internal/command/user_idp_link.go | 10 ++-- internal/command/user_idp_link_model.go | 6 +- internal/command/user_idp_link_test.go | 16 +++--- internal/command/user_machine.go | 8 +-- internal/command/user_machine_key.go | 8 +-- internal/command/user_machine_key_model.go | 6 +- internal/command/user_machine_model.go | 6 +- internal/command/user_machine_test.go | 18 +++--- internal/command/user_membership.go | 10 ++-- internal/command/user_metadata.go | 8 +-- internal/command/user_metadata_model.go | 6 +- internal/command/user_metadata_test.go | 12 ++-- internal/command/user_model.go | 8 +-- .../user_password_complexity_policy.go | 6 +- .../user_password_complexity_policy_test.go | 14 ++--- .../command/user_personal_access_token.go | 8 +-- .../user_personal_access_token_model.go | 6 +- .../user_personal_access_token_test.go | 18 +++--- internal/command/user_test.go | 26 ++++----- internal/config/config.go | 2 +- .../config/systemdefaults/system_defaults.go | 2 +- internal/crypto/aes.go | 2 +- internal/crypto/code.go | 2 +- internal/crypto/code_mocker.go | 2 +- internal/crypto/crypto.go | 2 +- internal/crypto/database/database.go | 4 +- internal/crypto/database/database_test.go | 4 +- internal/crypto/file/file.go | 4 +- internal/crypto/key.go | 4 +- internal/database/config.go | 2 +- internal/database/database.go | 2 +- internal/domain/action.go | 2 +- internal/domain/application_api.go | 4 +- internal/domain/application_key.go | 4 +- internal/domain/application_oauth.go | 8 +-- internal/domain/application_oidc.go | 6 +- internal/domain/application_oidc_test.go | 2 +- internal/domain/auth_request.go | 2 +- internal/domain/authn_key.go | 6 +- internal/domain/browser_info.go | 2 +- internal/domain/custom_login_text.go | 2 +- internal/domain/custom_message_text.go | 2 +- internal/domain/custom_text.go | 2 +- internal/domain/expiration.go | 2 +- internal/domain/features.go | 2 +- internal/domain/human.go | 6 +- internal/domain/human_address.go | 2 +- internal/domain/human_email.go | 4 +- internal/domain/human_otp.go | 6 +- internal/domain/human_password.go | 7 ++- internal/domain/human_phone.go | 6 +- internal/domain/human_phone_test.go | 2 +- internal/domain/human_profile.go | 2 +- internal/domain/human_web_auth_n.go | 2 +- internal/domain/idp_config.go | 4 +- internal/domain/key_pair.go | 5 +- internal/domain/machine.go | 2 +- internal/domain/machine_key.go | 4 +- internal/domain/member.go | 2 +- internal/domain/metadata.go | 4 +- internal/domain/mfa.go | 2 +- internal/domain/oidc_settings.go | 2 +- internal/domain/org.go | 2 +- internal/domain/org_domain.go | 6 +- internal/domain/policy_domain.go | 2 +- internal/domain/policy_label.go | 4 +- internal/domain/policy_label_test.go | 2 +- internal/domain/policy_login.go | 2 +- internal/domain/policy_mail_template.go | 2 +- internal/domain/policy_password_age.go | 2 +- internal/domain/policy_password_complexity.go | 5 +- internal/domain/policy_password_lockout.go | 2 +- internal/domain/policy_privacy.go | 2 +- internal/domain/project.go | 2 +- internal/domain/project_grant.go | 2 +- internal/domain/project_grant_member.go | 2 +- internal/domain/project_role.go | 2 +- internal/domain/refresh_token.go | 4 +- internal/domain/roles.go | 2 +- internal/domain/token.go | 2 +- internal/domain/user_grant.go | 2 +- internal/domain/user_idp_link.go | 2 +- internal/errors/already_exists_test.go | 2 +- internal/errors/caos_error_test.go | 2 +- internal/errors/deadline_exceeded_test.go | 2 +- internal/errors/error_test.go | 2 +- internal/errors/generate/error_test.go.tmpl | 2 +- internal/errors/internal_test.go | 2 +- internal/errors/invalid_argument_test.go | 2 +- internal/errors/not_found_test.go | 2 +- internal/errors/permission_denied_test.go | 2 +- internal/errors/precondition_failed_test.go | 2 +- internal/errors/unauthenticated_test.go | 2 +- internal/errors/unavailable_test.go | 2 +- internal/errors/unimplemented_test.go | 2 +- internal/errors/unknown_test.go | 2 +- internal/eventstore/aggregate.go | 2 +- internal/eventstore/config.go | 2 +- internal/eventstore/event_base.go | 6 +- internal/eventstore/eventstore.go | 6 +- internal/eventstore/eventstore_test.go | 8 +-- internal/eventstore/example_test.go | 8 +-- .../handler/crdb/current_sequence.go | 4 +- .../eventstore/handler/crdb/db_mock_test.go | 2 +- .../eventstore/handler/crdb/failed_stmt.go | 6 +- .../eventstore/handler/crdb/handler_stmt.go | 8 +-- .../handler/crdb/handler_stmt_test.go | 8 +-- internal/eventstore/handler/crdb/init.go | 6 +- internal/eventstore/handler/crdb/lock.go | 6 +- internal/eventstore/handler/crdb/lock_test.go | 2 +- internal/eventstore/handler/crdb/reduce.go | 4 +- internal/eventstore/handler/crdb/statement.go | 6 +- .../eventstore/handler/crdb/statement_test.go | 4 +- internal/eventstore/handler/handler.go | 2 +- .../eventstore/handler/handler_projection.go | 4 +- .../handler/handler_projection_test.go | 6 +- internal/eventstore/handler/reduce.go | 2 +- internal/eventstore/handler/statement.go | 4 +- internal/eventstore/local_crdb_test.go | 4 +- .../eventstore/repository/mock/gen_mock.go | 2 +- .../repository/mock/repository.mock.go | 4 +- .../repository/mock/repository.mock.impl.go | 2 +- .../eventstore/repository/search_query.go | 2 +- internal/eventstore/repository/sql/crdb.go | 6 +- .../eventstore/repository/sql/crdb_test.go | 2 +- .../repository/sql/local_crdb_test.go | 4 +- internal/eventstore/repository/sql/query.go | 6 +- .../eventstore/repository/sql/query_test.go | 4 +- internal/eventstore/repository/version.go | 2 +- internal/eventstore/search_query.go | 4 +- internal/eventstore/search_query_test.go | 4 +- internal/eventstore/subscription.go | 4 +- internal/eventstore/v1/eventstore.go | 6 +- internal/eventstore/v1/gen_mock.go | 2 +- .../v1/internal/repository/gen_mock.go | 2 +- .../v1/internal/repository/mock/repository.go | 2 +- .../repository/mock/repository.mock.go | 4 +- .../v1/internal/repository/repository.go | 2 +- .../internal/repository/sql/db_mock_test.go | 2 +- .../v1/internal/repository/sql/filter.go | 8 +-- .../v1/internal/repository/sql/filter_test.go | 4 +- .../v1/internal/repository/sql/query.go | 6 +- .../v1/internal/repository/sql/query_test.go | 4 +- internal/eventstore/v1/locker/lock.go | 4 +- .../eventstore/v1/mock/eventstore.mock.go | 6 +- internal/eventstore/v1/models/aggregate.go | 2 +- .../eventstore/v1/models/aggregate_creator.go | 2 +- .../eventstore/v1/models/aggregate_test.go | 2 +- internal/eventstore/v1/models/event.go | 2 +- internal/eventstore/v1/models/filter.go | 2 +- internal/eventstore/v1/models/search_query.go | 4 +- .../eventstore/v1/models/search_query_old.go | 2 +- .../eventstore/v1/models/search_query_test.go | 2 +- internal/eventstore/v1/models/version.go | 2 +- internal/eventstore/v1/query/handler.go | 6 +- .../eventstore/v1/sdk/append_event_error.go | 2 +- internal/eventstore/v1/sdk/sdk.go | 4 +- internal/eventstore/v1/sdk/sdk_test.go | 4 +- internal/eventstore/v1/spooler/config.go | 8 +-- internal/eventstore/v1/spooler/spooler.go | 12 ++-- .../eventstore/v1/spooler/spooler_test.go | 14 ++--- internal/eventstore/v1/subscription.go | 2 +- internal/eventstore/version.go | 2 +- internal/form/parser.go | 3 +- internal/i18n/i18n.go | 8 +-- internal/iam/model/iam.go | 4 +- internal/iam/model/iam_member.go | 2 +- internal/iam/model/idp_config.go | 4 +- internal/iam/model/idp_config_view.go | 6 +- internal/iam/model/idp_provider_view.go | 4 +- internal/iam/model/label_policy.go | 2 +- internal/iam/model/label_policy_view.go | 2 +- internal/iam/model/login_policy.go | 4 +- internal/iam/model/login_policy_view.go | 4 +- internal/iam/model/mail_template.go | 2 +- internal/iam/model/mail_text.go | 2 +- internal/iam/model/message_text_view.go | 2 +- internal/iam/model/mfa_view.go | 2 +- internal/iam/model/org_iam_policy.go | 2 +- internal/iam/model/password_age_policy.go | 2 +- .../iam/model/password_age_policy_view.go | 3 +- .../iam/model/password_complexity_policy.go | 5 +- .../model/password_complexity_policy_view.go | 2 +- internal/iam/model/password_lockout_policy.go | 2 +- .../iam/model/password_lockout_policy_view.go | 3 +- internal/iam/model/privacy_policy_view.go | 2 +- .../eventsourcing/model/iam_member.go | 4 +- .../eventsourcing/model/org_iam_policy.go | 6 +- .../iam/repository/view/idp_provider_view.go | 10 ++-- internal/iam/repository/view/idp_view.go | 10 ++-- .../iam/repository/view/model/idp_config.go | 16 +++--- .../repository/view/model/idp_config_query.go | 6 +- .../iam/repository/view/model/idp_provider.go | 14 ++--- .../view/model/idp_provider_query.go | 6 +- .../iam/repository/view/model/label_policy.go | 14 ++--- .../view/model/label_policy_query.go | 6 +- .../view/model/password_complexity_policy.go | 16 +++--- internal/iam/repository/view/styling.go | 10 ++-- internal/id/gen_mock.go | 2 +- internal/id/mock/generator.mock.go | 2 +- internal/migration/command.go | 10 ++-- internal/migration/migration.go | 6 +- internal/notification/channels/fs/channel.go | 8 +-- internal/notification/channels/gen_mock.go | 4 +- internal/notification/channels/log/channel.go | 4 +- .../channels/mock/channel.mock.go | 4 +- .../channels/mock/message.mock.go | 2 +- .../notification/channels/smtp/channel.go | 8 +-- .../notification/channels/twilio/channel.go | 8 +-- internal/notification/messages/email.go | 2 +- internal/notification/messages/sms.go | 2 +- internal/notification/notification.go | 12 ++-- .../eventsourcing/handler/handler.go | 12 ++-- .../eventsourcing/handler/notification.go | 46 +++++++-------- .../eventsourcing/handler/notify_user.go | 32 +++++------ .../repository/eventsourcing/repository.go | 14 ++--- .../repository/eventsourcing/spooler/lock.go | 2 +- .../eventsourcing/spooler/spooler.go | 14 ++--- .../eventsourcing/view/error_event.go | 2 +- .../eventsourcing/view/notification.go | 4 +- .../eventsourcing/view/notify_user.go | 10 ++-- .../repository/eventsourcing/view/sequence.go | 4 +- internal/notification/senders/chain.go | 2 +- internal/notification/senders/debug.go | 6 +- internal/notification/senders/email.go | 8 +-- internal/notification/senders/sms.go | 6 +- .../notification/templates/templateData.go | 4 +- internal/notification/types/domain_claimed.go | 18 +++--- .../types/email_verification_code.go | 22 ++++---- internal/notification/types/init_code.go | 22 ++++---- internal/notification/types/password_code.go | 24 ++++---- .../types/passwordless_registration_link.go | 22 ++++---- .../types/phone_verification_code.go | 18 +++--- internal/notification/types/templateData.go | 6 +- internal/notification/types/user_email.go | 14 ++--- internal/notification/types/user_phone.go | 14 ++--- internal/org/model/domain.go | 6 +- internal/org/model/org.go | 4 +- .../repository/eventsourcing/model/domain.go | 8 +-- .../eventsourcing/model/domain_policy.go | 4 +- .../repository/eventsourcing/model/member.go | 4 +- .../org/repository/eventsourcing/model/org.go | 12 ++-- .../eventsourcing/model/org_test.go | 6 +- internal/org/repository/view/query.go | 6 +- internal/project/model/api_config.go | 10 ++-- internal/project/model/application.go | 2 +- internal/project/model/application_test.go | 3 +- internal/project/model/oidc_config.go | 12 ++-- .../project/model/org_project_mapping_view.go | 2 +- internal/project/model/project.go | 4 +- internal/project/model/project_grant.go | 2 +- .../project/model/project_grant_member.go | 2 +- .../model/project_grant_member_view.go | 4 +- internal/project/model/project_grant_view.go | 4 +- internal/project/model/project_member.go | 2 +- internal/project/model/project_member_view.go | 4 +- internal/project/model/project_role.go | 2 +- internal/project/model/project_role_view.go | 4 +- internal/project/model/project_view.go | 4 +- .../eventsourcing/model/api_config.go | 6 +- .../eventsourcing/model/application.go | 4 +- .../eventsourcing/model/oidc_config.go | 12 ++-- .../repository/eventsourcing/model/project.go | 10 ++-- .../eventsourcing/model/project_grant.go | 4 +- .../model/project_grant_member.go | 4 +- .../eventsourcing/model/project_member.go | 4 +- .../eventsourcing/model/project_test.go | 6 +- .../repository/view/model/application.go | 16 +++--- .../repository/view/model/application_test.go | 8 +-- .../view/model/org_project_mapping_query.go | 6 +- .../project/repository/view/model/project.go | 14 ++--- .../repository/view/model/project_grant.go | 12 ++-- .../view/model/project_grant_member.go | 10 ++-- .../view/model/project_grant_member_test.go | 6 +- .../view/model/project_grant_test.go | 8 +-- .../repository/view/model/project_member.go | 10 ++-- .../view/model/project_member_test.go | 6 +- .../repository/view/model/project_test.go | 8 +-- .../view/org_project_mapping_view.go | 10 ++-- internal/project/repository/view/query.go | 6 +- internal/proto/struct.go | 2 +- .../protoc/protoc-gen-authoption/README.md | 2 +- .../authoption/options.proto | 2 +- internal/protoc/protoc-gen-authoption/main.go | 4 +- .../templates/auth_method_mapping.go.tmpl | 4 +- internal/query/action.go | 8 +-- internal/query/action_flow.go | 8 +-- internal/query/action_flow_test.go | 2 +- internal/query/action_test.go | 4 +- internal/query/app.go | 10 ++-- internal/query/app_test.go | 4 +- internal/query/authn_key.go | 8 +-- internal/query/authn_key_test.go | 4 +- internal/query/changes.go | 12 ++-- internal/query/current_sequence.go | 6 +- internal/query/custom_text.go | 10 ++-- internal/query/custom_text_test.go | 2 +- internal/query/failed_events.go | 4 +- internal/query/features.go | 8 +-- internal/query/features_test.go | 4 +- internal/query/iam_member.go | 6 +- internal/query/idp.go | 10 ++-- internal/query/idp_login_policy_link.go | 8 +-- internal/query/idp_login_policy_link_test.go | 2 +- internal/query/idp_test.go | 6 +- internal/query/idp_user_link.go | 8 +-- internal/query/idp_user_link_test.go | 2 +- internal/query/instance.go | 8 +-- internal/query/instance_domain.go | 6 +- internal/query/instance_test.go | 4 +- internal/query/key.go | 10 ++-- internal/query/key_test.go | 6 +- internal/query/label_policy.go | 8 +-- internal/query/languages.go | 4 +- internal/query/lockout_policy.go | 8 +-- internal/query/lockout_policy_test.go | 4 +- internal/query/login_name.go | 2 +- internal/query/login_policy.go | 8 +-- internal/query/login_policy_test.go | 4 +- internal/query/mail_template.go | 8 +-- internal/query/member.go | 2 +- internal/query/member_roles.go | 4 +- internal/query/message_text.go | 8 +-- internal/query/message_text_test.go | 4 +- internal/query/notification_provider.go | 8 +-- internal/query/notification_provider_test.go | 4 +- internal/query/oidc_settings.go | 6 +- internal/query/oidc_settings_test.go | 2 +- internal/query/org.go | 8 +-- internal/query/org_domain.go | 8 +-- internal/query/org_domain_test.go | 2 +- internal/query/org_iam_policy.go | 8 +-- internal/query/org_iam_policy_test.go | 4 +- internal/query/org_member.go | 6 +- internal/query/org_test.go | 4 +- internal/query/password_age_policy.go | 8 +-- internal/query/password_age_policy_test.go | 4 +- internal/query/password_complexity_policy.go | 8 +-- .../query/password_complexity_policy_test.go | 4 +- internal/query/privacy_policy.go | 8 +-- internal/query/privacy_policy_test.go | 4 +- internal/query/project.go | 8 +-- internal/query/project_grant.go | 8 +-- internal/query/project_grant_member.go | 6 +- internal/query/project_grant_test.go | 4 +- internal/query/project_member.go | 6 +- internal/query/project_role.go | 6 +- internal/query/project_role_test.go | 2 +- internal/query/project_test.go | 4 +- internal/query/projection/action.go | 12 ++-- internal/query/projection/action_test.go | 12 ++-- internal/query/projection/app.go | 12 ++-- internal/query/projection/app_test.go | 12 ++-- internal/query/projection/authn_key.go | 14 ++--- internal/query/projection/authn_key_test.go | 14 ++--- internal/query/projection/custom_text.go | 14 ++--- internal/query/projection/custom_text_test.go | 12 ++-- .../query/projection/debug_notification.go | 14 ++--- .../debug_notification_provider_test.go | 12 ++-- internal/query/projection/domain_policy.go | 16 +++--- .../query/projection/domain_policy_test.go | 14 ++--- internal/query/projection/event_test.go | 6 +- internal/query/projection/executer_test.go | 2 +- internal/query/projection/feature.go | 16 +++--- internal/query/projection/feature_test.go | 14 ++--- internal/query/projection/flow.go | 10 ++-- internal/query/projection/flow_test.go | 12 ++-- internal/query/projection/idp.go | 16 +++--- .../query/projection/idp_login_policy_link.go | 16 +++--- .../projection/idp_login_policy_link_test.go | 14 ++--- internal/query/projection/idp_test.go | 14 ++--- internal/query/projection/idp_user_link.go | 14 ++--- .../query/projection/idp_user_link_test.go | 14 ++--- internal/query/projection/instance.go | 10 ++-- internal/query/projection/instance_domain.go | 10 ++-- .../query/projection/instance_domain_test.go | 10 ++-- internal/query/projection/instance_member.go | 12 ++-- .../query/projection/instance_member_test.go | 12 ++-- internal/query/projection/instance_test.go | 12 ++-- internal/query/projection/key.go | 12 ++-- internal/query/projection/key_test.go | 14 ++--- internal/query/projection/label_policy.go | 16 +++--- .../query/projection/label_policy_test.go | 14 ++--- internal/query/projection/lockout_policy.go | 16 +++--- .../query/projection/lockout_policy_test.go | 14 ++--- internal/query/projection/login_name.go | 16 +++--- internal/query/projection/login_name_test.go | 14 ++--- internal/query/projection/login_policy.go | 14 ++--- .../query/projection/login_policy_test.go | 14 ++--- internal/query/projection/mail_template.go | 16 +++--- .../query/projection/mail_template_test.go | 14 ++--- internal/query/projection/member.go | 8 +-- .../query/projection/message_text_test.go | 14 ++--- internal/query/projection/message_texts.go | 16 +++--- internal/query/projection/oidc_settings.go | 12 ++-- .../query/projection/oidc_settings_test.go | 10 ++-- internal/query/projection/org.go | 12 ++-- internal/query/projection/org_domain.go | 12 ++-- internal/query/projection/org_domain_test.go | 12 ++-- internal/query/projection/org_member.go | 12 ++-- internal/query/projection/org_member_test.go | 12 ++-- internal/query/projection/org_test.go | 12 ++-- .../query/projection/password_age_policy.go | 16 +++--- .../projection/password_age_policy_test.go | 14 ++--- .../projection/password_complexity_policy.go | 16 +++--- .../password_complexity_policy_test.go | 14 ++--- internal/query/projection/privacy_policy.go | 16 +++--- .../query/projection/privacy_policy_test.go | 14 ++--- internal/query/projection/project.go | 12 ++-- internal/query/projection/project_grant.go | 12 ++-- .../query/projection/project_grant_member.go | 16 +++--- .../projection/project_grant_member_test.go | 14 ++--- .../query/projection/project_grant_test.go | 12 ++-- internal/query/projection/project_member.go | 16 +++--- .../query/projection/project_member_test.go | 14 ++--- internal/query/projection/project_role.go | 10 ++-- .../query/projection/project_role_test.go | 10 ++-- internal/query/projection/project_test.go | 12 ++-- internal/query/projection/projection.go | 8 +-- internal/query/projection/secret_generator.go | 10 ++-- .../query/projection/secret_generator_test.go | 12 ++-- internal/query/projection/sms.go | 12 ++-- internal/query/projection/sms_test.go | 12 ++-- internal/query/projection/smtp.go | 12 ++-- internal/query/projection/smtp_test.go | 10 ++-- internal/query/projection/user.go | 12 ++-- internal/query/projection/user_auth_method.go | 12 ++-- .../query/projection/user_auth_method_test.go | 12 ++-- internal/query/projection/user_grant.go | 16 +++--- internal/query/projection/user_grant_test.go | 16 +++--- internal/query/projection/user_metadata.go | 10 ++-- .../query/projection/user_metadata_test.go | 10 ++-- .../projection/user_personal_access_token.go | 10 ++-- .../user_personal_access_token_test.go | 10 ++-- internal/query/projection/user_test.go | 12 ++-- internal/query/query.go | 22 ++++---- internal/query/search_query.go | 2 +- internal/query/search_query_test.go | 2 +- internal/query/secret_generator_test.go | 4 +- internal/query/secret_generators.go | 10 ++-- internal/query/sms.go | 10 ++-- internal/query/sms_test.go | 6 +- internal/query/smtp.go | 8 +-- internal/query/smtp_test.go | 4 +- internal/query/user.go | 8 +-- internal/query/user_auth_method.go | 8 +-- internal/query/user_auth_method_test.go | 4 +- internal/query/user_grant.go | 8 +-- internal/query/user_grant_test.go | 4 +- internal/query/user_membership.go | 6 +- internal/query/user_metadata.go | 6 +- internal/query/user_metadata_test.go | 2 +- internal/query/user_personal_access_token.go | 6 +- .../query/user_personal_access_token_test.go | 2 +- internal/query/user_test.go | 4 +- internal/query/zitadel_permission.go | 4 +- internal/renderer/renderer.go | 8 +-- internal/repository/action/action.go | 6 +- internal/repository/action/aggregate.go | 2 +- internal/repository/action/eventstore.go | 2 +- internal/repository/asset/asset.go | 6 +- internal/repository/features/features.go | 8 +-- internal/repository/flow/flow.go | 8 +-- internal/repository/idpconfig/idp_config.go | 8 +-- internal/repository/idpconfig/jwt_config.go | 6 +- internal/repository/idpconfig/oidc_config.go | 10 ++-- internal/repository/instance/aggregate.go | 2 +- internal/repository/instance/custom_text.go | 6 +- .../instance/debug_notification_file.go | 6 +- .../instance/debug_notification_log.go | 6 +- internal/repository/instance/domain.go | 6 +- .../instance/event_default_language.go | 6 +- .../instance/event_iam_project_set.go | 6 +- internal/repository/instance/event_org_set.go | 6 +- internal/repository/instance/events_step.go | 8 +-- internal/repository/instance/eventstore.go | 2 +- internal/repository/instance/features.go | 6 +- internal/repository/instance/idp_config.go | 8 +-- .../repository/instance/idp_jwt_config.go | 6 +- .../repository/instance/idp_oidc_config.go | 10 ++-- internal/repository/instance/instance.go | 6 +- internal/repository/instance/member.go | 6 +- .../instance/migrate_unique_constraints.go | 6 +- internal/repository/instance/oidc_settings.go | 6 +- internal/repository/instance/policy_domain.go | 6 +- internal/repository/instance/policy_label.go | 6 +- internal/repository/instance/policy_login.go | 8 +-- .../instance/policy_login_factors.go | 8 +-- .../policy_login_identity_provider.go | 8 +-- .../instance/policy_mail_template.go | 6 +- .../repository/instance/policy_mail_text.go | 6 +- .../instance/policy_password_age.go | 6 +- .../instance/policy_password_complexity.go | 6 +- .../instance/policy_password_lockout.go | 6 +- .../repository/instance/policy_privacy.go | 6 +- .../repository/instance/secret_generator.go | 8 +-- internal/repository/instance/sms.go | 8 +-- internal/repository/instance/smtp_config.go | 8 +-- internal/repository/keypair/aggregate.go | 2 +- internal/repository/keypair/eventstore.go | 2 +- internal/repository/keypair/key_pair.go | 10 ++-- internal/repository/member/events.go | 6 +- internal/repository/metadata/metadata.go | 6 +- internal/repository/org/aggregate.go | 2 +- internal/repository/org/custom_text.go | 6 +- internal/repository/org/domain.go | 10 ++-- internal/repository/org/eventstore.go | 2 +- internal/repository/org/features.go | 6 +- internal/repository/org/flow.go | 8 +-- internal/repository/org/idp_config.go | 8 +-- internal/repository/org/idp_jwt_config.go | 6 +- internal/repository/org/idp_oidc_config.go | 10 ++-- internal/repository/org/member.go | 6 +- internal/repository/org/org.go | 6 +- internal/repository/org/policy_domain.go | 6 +- internal/repository/org/policy_label.go | 6 +- internal/repository/org/policy_login.go | 8 +-- .../repository/org/policy_login_factors.go | 8 +-- .../org/policy_login_identity_provider.go | 8 +-- .../repository/org/policy_mail_template.go | 6 +- internal/repository/org/policy_mail_text.go | 6 +- .../repository/org/policy_password_age.go | 6 +- .../org/policy_password_complexity.go | 6 +- .../repository/org/policy_password_lockout.go | 6 +- internal/repository/org/policy_privacy.go | 6 +- internal/repository/policy/custom_text.go | 6 +- internal/repository/policy/label.go | 8 +-- internal/repository/policy/login.go | 8 +-- internal/repository/policy/mail_template.go | 6 +- internal/repository/policy/mail_text.go | 6 +- internal/repository/policy/policy_domain.go | 6 +- .../repository/policy/policy_login_factors.go | 8 +-- .../policy/policy_login_identity_provider.go | 8 +-- .../repository/policy/policy_password_age.go | 6 +- .../policy/policy_password_complexity.go | 6 +- .../policy/policy_password_lockout.go | 6 +- internal/repository/policy/policy_privacy.go | 6 +- internal/repository/project/aggregate.go | 2 +- internal/repository/project/api_config.go | 10 ++-- internal/repository/project/application.go | 6 +- internal/repository/project/eventstore.go | 2 +- internal/repository/project/grant.go | 6 +- internal/repository/project/grant_member.go | 8 +-- internal/repository/project/key.go | 8 +-- internal/repository/project/member.go | 6 +- internal/repository/project/oidc_config.go | 10 ++-- internal/repository/project/project.go | 8 +-- internal/repository/project/role.go | 6 +- .../repository/settings/debug_notification.go | 6 +- internal/repository/user/aggregate.go | 2 +- internal/repository/user/eventstore.go | 2 +- internal/repository/user/human.go | 10 ++-- internal/repository/user/human_address.go | 6 +- internal/repository/user/human_avatar.go | 6 +- internal/repository/user/human_email.go | 8 +-- .../repository/user/human_external_idp.go | 6 +- internal/repository/user/human_mfa_events.go | 4 +- internal/repository/user/human_mfa_otp.go | 8 +-- .../repository/user/human_mfa_passwordless.go | 10 ++-- internal/repository/user/human_mfa_u2f.go | 6 +- .../repository/user/human_mfa_web_auth_n.go | 8 +-- internal/repository/user/human_password.go | 10 ++-- internal/repository/user/human_phone.go | 8 +-- internal/repository/user/human_profile.go | 8 +-- .../repository/user/human_refresh_token.go | 6 +- internal/repository/user/machine.go | 6 +- internal/repository/user/machine_key.go | 8 +-- internal/repository/user/metadata.go | 6 +- .../repository/user/personal_access_token.go | 6 +- internal/repository/user/user.go | 8 +-- internal/repository/usergrant/aggregate.go | 2 +- internal/repository/usergrant/eventstore.go | 2 +- internal/repository/usergrant/user_grant.go | 6 +- internal/static/config/config.go | 8 +-- internal/static/database/crdb.go | 4 +- internal/static/database/crdb_test.go | 2 +- internal/static/mock/storage_mock.go | 2 +- internal/static/mock/storage_mock.impl.go | 4 +- internal/static/s3/config.go | 6 +- internal/static/s3/minio.go | 8 +-- internal/telemetry/http_handler.go | 3 +- internal/telemetry/metrics/config/config.go | 6 +- internal/telemetry/metrics/otel/config.go | 2 +- .../telemetry/metrics/otel/open_telemetry.go | 4 +- internal/telemetry/tracing/caller.go | 2 +- internal/telemetry/tracing/config/config.go | 10 ++-- .../telemetry/tracing/google/google_tracer.go | 6 +- internal/telemetry/tracing/log/config.go | 4 +- internal/telemetry/tracing/otel/config.go | 2 +- .../telemetry/tracing/otel/open_telemetry.go | 2 +- internal/telemetry/tracing/span.go | 2 +- internal/user/model/address.go | 2 +- internal/user/model/email.go | 5 +- internal/user/model/external_idp.go | 2 +- internal/user/model/external_idp_view.go | 4 +- internal/user/model/notify_user.go | 2 +- internal/user/model/password.go | 4 +- internal/user/model/phone.go | 9 +-- internal/user/model/phone_test.go | 3 +- internal/user/model/profile.go | 2 +- internal/user/model/refresh_token.go | 3 +- internal/user/model/refresh_token_view.go | 4 +- internal/user/model/token.go | 3 +- internal/user/model/token_view.go | 4 +- internal/user/model/user_membership_view.go | 4 +- internal/user/model/user_session_view.go | 4 +- internal/user/model/user_view.go | 8 +-- .../repository/eventsourcing/model/address.go | 6 +- .../eventsourcing/model/address_test.go | 2 +- .../eventsourcing/model/auth_request.go | 6 +- .../repository/eventsourcing/model/email.go | 8 +-- .../eventsourcing/model/email_test.go | 2 +- .../eventsourcing/model/external_idp.go | 6 +- .../eventsourcing/model/external_idp_test.go | 3 +- .../repository/eventsourcing/model/otp.go | 10 ++-- .../eventsourcing/model/otp_test.go | 6 +- .../eventsourcing/model/password.go | 8 +-- .../eventsourcing/model/password_test.go | 2 +- .../repository/eventsourcing/model/phone.go | 8 +-- .../eventsourcing/model/phone_test.go | 2 +- .../repository/eventsourcing/model/profile.go | 2 +- .../eventsourcing/model/profile_test.go | 2 +- .../repository/eventsourcing/model/token.go | 10 ++-- .../repository/eventsourcing/model/user.go | 14 ++--- .../eventsourcing/model/user_human.go | 14 ++--- .../eventsourcing/model/user_machine.go | 10 ++-- .../eventsourcing/model/web_auth_n.go | 8 +-- .../eventsourcing/model/web_auth_n_test.go | 4 +- .../user/repository/view/external_idp_view.go | 10 ++-- .../view/model/external_idp_query.go | 6 +- .../repository/view/model/external_idps.go | 10 ++-- .../user/repository/view/model/notify_user.go | 14 ++--- .../view/model/notify_user_query.go | 6 +- .../repository/view/model/notify_user_test.go | 6 +- .../repository/view/model/refresh_token.go | 12 ++-- .../view/model/refresh_token_query.go | 6 +- internal/user/repository/view/model/token.go | 12 ++-- .../user/repository/view/model/token_query.go | 6 +- internal/user/repository/view/model/user.go | 18 +++--- .../repository/view/model/user_membership.go | 22 ++++---- .../view/model/user_membership_query.go | 6 +- .../user/repository/view/model/user_query.go | 6 +- .../repository/view/model/user_session.go | 16 +++--- .../view/model/user_session_query.go | 6 +- .../view/model/user_session_test.go | 8 +-- .../user/repository/view/model/user_test.go | 10 ++-- internal/user/repository/view/notify_user.go | 10 ++-- internal/user/repository/view/query.go | 6 +- .../repository/view/refresh_token_view.go | 10 ++-- internal/user/repository/view/token_view.go | 10 ++-- .../user/repository/view/user_session_view.go | 10 ++-- internal/user/repository/view/user_view.go | 10 ++-- .../repository/view/usermembership_view.go | 10 ++-- internal/view/model/general_query.go | 2 +- internal/view/repository/db_mock_test.go | 3 +- internal/view/repository/failed_events.go | 6 +- internal/view/repository/general_query.go | 4 +- internal/view/repository/query.go | 4 +- internal/view/repository/query_test.go | 7 ++- internal/view/repository/requests.go | 4 +- internal/view/repository/requests_test.go | 7 ++- internal/view/repository/sequence.go | 6 +- internal/webauthn/converter.go | 2 +- internal/webauthn/webauthn.go | 10 ++-- main.go | 2 +- openapi/handler.go | 2 +- pkg/grpc/app/application.go | 2 +- pkg/grpc/auth/changes.go | 2 +- pkg/grpc/management/app.go | 2 +- pkg/grpc/management/changes.go | 2 +- proto/zitadel/action.proto | 2 +- proto/zitadel/admin.proto | 4 +- proto/zitadel/app.proto | 2 +- proto/zitadel/auth.proto | 4 +- proto/zitadel/auth_n_key.proto | 2 +- proto/zitadel/change.proto | 4 +- proto/zitadel/features.proto | 2 +- proto/zitadel/idp.proto | 2 +- proto/zitadel/instance.proto | 2 +- proto/zitadel/management.proto | 4 +- proto/zitadel/member.proto | 2 +- proto/zitadel/message.proto | 2 +- proto/zitadel/metadata.proto | 2 +- proto/zitadel/object.proto | 4 +- proto/zitadel/options.proto | 2 +- proto/zitadel/org.proto | 2 +- proto/zitadel/policy.proto | 2 +- proto/zitadel/project.proto | 2 +- proto/zitadel/settings.proto | 2 +- proto/zitadel/system.proto | 4 +- proto/zitadel/text.proto | 2 +- proto/zitadel/user.proto | 2 +- tools/go.mod | 2 +- tools/install.sh | 2 +- 1284 files changed, 5073 insertions(+), 5040 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 4895ffce1..56f57dbf7 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,8 +1,8 @@ blank_issues_enabled: true contact_links: - name: 🚀 Feature Request - url: https://github.com/caos/zitadel/discussions/categories/ideas + url: https://github.com/zitadel/zitadel/discussions/categories/ideas about: Tell us about your idea in the discussions - name: ❓ Questions - url: https://github.com/caos/zitadel/discussions/categories/q-a + url: https://github.com/zitadel/zitadel/discussions/categories/q-a about: Ask for help in our Q&A discussions diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 9d545a257..5cd5b3b3e 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -27,8 +27,8 @@ builds: dist: .artifacts/goreleaser dockers: - image_templates: - - ghcr.io/caos/zitadel:{{ .Tag }}-amd64 - - ghcr.io/caos/zitadel:{{ .ShortCommit }}-amd64 + - ghcr.io/zitadel/zitadel:{{ .Tag }}-amd64 + - ghcr.io/zitadel/zitadel:{{ .ShortCommit }}-amd64 - europe-docker.pkg.dev/zitadel-common/zitadel-repo/zitadel:{{ .Tag }}-amd64 - europe-docker.pkg.dev/zitadel-common/zitadel-repo/zitadel:{{ .ShortCommit }}-amd64 use: buildx @@ -36,8 +36,8 @@ dockers: build_flag_templates: - "--platform=linux/amd64" - image_templates: - - ghcr.io/caos/zitadel:{{ .Tag }}-arm64 - - ghcr.io/caos/zitadel:{{ .ShortCommit }}-arm64 + - ghcr.io/zitadel/zitadel:{{ .Tag }}-arm64 + - ghcr.io/zitadel/zitadel:{{ .ShortCommit }}-arm64 use: buildx dockerfile: build/Dockerfile build_flag_templates: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 330057b4e..ca09080e5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,13 +2,13 @@ ## Did you find a bug? -Please file an issue [here](https://github.com/caos/zitadel/issues/new?assignees=&labels=bug&template=bug_report.md&title=). +Please file an issue [here](https://github.com/zitadel/zitadel/issues/new?assignees=&labels=bug&template=bug_report.md&title=). Bugs are evaluated every day as soon as possible. ## Enhancement -Do you miss a feature? Please file an issue [here](https://github.com/caos/zitadel/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=) +Do you miss a feature? Please file an issue [here](https://github.com/zitadel/zitadel/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=) Enhancements are discussed and evaluated every Wednesday by the ZITADEL core team. @@ -16,8 +16,8 @@ Enhancements are discussed and evaluated every Wednesday by the ZITADEL core tea We add the label "good first issue" for problems we think are a good starting point to contribute to ZITADEL. -* [Issues for first time contributors](https://github.com/caos/zitadel/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) -* [All issues](https://github.com/caos/zitadel/issues) +* [Issues for first time contributors](https://github.com/zitadel/zitadel/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) +* [All issues](https://github.com/zitadel/zitadel/issues) ### Make a PR diff --git a/README.md b/README.md index 1c6f254e2..2ec2ea784 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ Zitadel Logo [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) -[![Release](https://github.com/caos/zitadel/actions/workflows/zitadel.yml/badge.svg)](https://github.com/caos/zitadel/actions) -[![license](https://badgen.net/github/license/caos/zitadel/)](https://github.com/caos/zitadel/blob/main/LICENSE) -[![release](https://badgen.net/github/release/caos/zitadel/stable)](https://github.com/caos/zitadel/releases) -[![Go Report Card](https://goreportcard.com/badge/github.com/caos/zitadel)](https://goreportcard.com/report/github.com/caos/zitadel) -[![codecov](https://codecov.io/gh/caos/zitadel/branch/main/graph/badge.svg)](https://codecov.io/gh/caos/zitadel) +[![Release](https://github.com/zitadel/zitadel/actions/workflows/zitadel.yml/badge.svg)](https://github.com/zitadel/zitadel/actions) +[![license](https://badgen.net/github/license/zitadel/zitadel/)](https://github.com/zitadel/zitadel/blob/main/LICENSE) +[![release](https://badgen.net/github/release/zitadel/zitadel/stable)](https://github.com/zitadel/zitadel/releases) +[![Go Report Card](https://goreportcard.com/badge/github.com/zitadel/zitadel)](https://goreportcard.com/report/github.com/zitadel/zitadel) +[![codecov](https://codecov.io/gh/zitadel/zitadel/branch/main/graph/badge.svg)](https://codecov.io/gh/zitadel/zitadel) [![discord](https://badgen.net/discord/online-members/erh5Brh7jE)](https://discord.gg/erh5Brh7jE) [![OpenID Connect Certified](./docs/static/logos/oidc-cert.png)](https://openid.net/certification/#OPs) @@ -41,11 +41,11 @@ You can run an automatically operated **ZITADEL** instance on a CNCF compliant K ### Quickstarts -See our [Documentation](https://docs.zitadel.ch/docs/quickstarts/introduction) to get started with ZITADEL quickly. Let us know, if you are missing a language or framework in the [Q&A](https://github.com/caos/zitadel/discussions/1717). +See our [Documentation](https://docs.zitadel.ch/docs/quickstarts/introduction) to get started with ZITADEL quickly. Let us know, if you are missing a language or framework in the [Q&A](https://github.com/zitadel/zitadel/discussions/1717). ### Client libraries -* [Go](https://github.com/caos/zitadel-go) client library +* [Go](https://github.com/zitadel/zitadel-go) client library * [.NET](https://github.com/caos/zitadel-net) client library * [Dart](https://github.com/caos/zitadel-dart) client library * [Elixir](https://github.com/jshmrtn/zitadel_api) client library (maintained by [jshmrtn]([jshmrtn](https://github.com/jshmrtn))) @@ -121,8 +121,8 @@ Customize login and console with your design ## Other CAOS Projects * [**ORBOS**](https://github.com/caos/orbos/) - GitOps everything -* [**OIDC for GO**](https://github.com/caos/oidc) - OpenID Connect SDK (client and server) for Go -* [**ZITADEL Tools**](https://github.com/caos/zitadel-tools) - Go tool to convert key file to privately signed JWT +* [**OIDC for GO**](https://github.com/zitadel/oidc) - OpenID Connect SDK (client and server) for Go +* [**ZITADEL Tools**](https://github.com/zitadel/zitadel-tools) - Go tool to convert key file to privately signed JWT ## Usage Data diff --git a/SECURITY.md b/SECURITY.md index 97100efb4..059404f81 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -33,7 +33,7 @@ TBD ## Public Disclosure -All accepted and mitigated vulnerabilities will be published on [ZITADEL's GitHub Security Page](https://github.com/caos/zitadel/security/advisories). +All accepted and mitigated vulnerabilities will be published on [ZITADEL's GitHub Security Page](https://github.com/zitadel/zitadel/security/advisories). ### Timing diff --git a/build/zitadel/Dockerfile b/build/zitadel/Dockerfile index eea5666eb..faaa0f663 100644 --- a/build/zitadel/Dockerfile +++ b/build/zitadel/Dockerfile @@ -5,8 +5,8 @@ ARG GO_VERSION=1.17 ## Speed up this step by mounting your local go mod pkg directory ####################### FROM golang:${GO_VERSION} as go-dep -RUN mkdir -p src/github.com/caos/zitadel -WORKDIR /go/src/github.com/caos/zitadel +RUN mkdir -p src/github.com/zitadel/zitadel +WORKDIR /go/src/github.com/zitadel/zitadel #download modules COPY . . @@ -71,21 +71,21 @@ COPY . . ## copy for local dev ####################### FROM scratch as go-copy -COPY --from=go-stub /go/src/github.com/caos/zitadel/internal/api/ui/login/statik/statik.go internal/api/ui/login/statik/statik.go -COPY --from=go-stub /go/src/github.com/caos/zitadel/internal/notification/statik/statik.go internal/notification/statik/statik.go -COPY --from=go-stub /go/src/github.com/caos/zitadel/internal/statik/statik.go internal/statik/statik.go -COPY --from=go-stub /go/src/github.com/caos/zitadel/openapi/statik/statik.go openapi/statik/statik.go +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/internal/api/ui/login/statik/statik.go internal/api/ui/login/statik/statik.go +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/internal/notification/statik/statik.go internal/notification/statik/statik.go +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/internal/statik/statik.go internal/statik/statik.go +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/openapi/statik/statik.go openapi/statik/statik.go -COPY --from=go-stub /go/src/github.com/caos/zitadel/pkg/grpc pkg/grpc -COPY --from=go-stub /go/src/github.com/caos/zitadel/openapi/v2/zitadel openapi/v2/zitadel -COPY --from=go-stub /go/src/github.com/caos/zitadel/openapi/statik/statik.go openapi/statik/statik.go -COPY --from=go-stub /go/src/github.com/caos/zitadel/internal/protoc/protoc-gen-authoption/templates.gen.go internal/protoc/protoc-gen-authoption/templates.gen.go -COPY --from=go-stub /go/src/github.com/caos/zitadel/internal/protoc/protoc-gen-authoption/authoption/options.pb.go internal/protoc/protoc-gen-authoption/authoption/options.pb.go -COPY --from=go-stub /go/src/github.com/caos/zitadel/docs/apis/proto docs/docs/apis/proto -COPY --from=go-stub /go/src/github.com/caos/zitadel/docs/apis/assets docs/docs/apis/assets +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/pkg/grpc pkg/grpc +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/openapi/v2/zitadel openapi/v2/zitadel +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/openapi/statik/statik.go openapi/statik/statik.go +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/internal/protoc/protoc-gen-authoption/templates.gen.go internal/protoc/protoc-gen-authoption/templates.gen.go +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/internal/protoc/protoc-gen-authoption/authoption/options.pb.go internal/protoc/protoc-gen-authoption/authoption/options.pb.go +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/docs/apis/proto docs/docs/apis/proto +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/docs/apis/assets docs/docs/apis/assets -COPY --from=go-stub /go/src/github.com/caos/zitadel/internal/api/assets/authz.go ./internal/api/assets/authz.go -COPY --from=go-stub /go/src/github.com/caos/zitadel/internal/api/assets/router.go ./internal/api/assets/router.go +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/internal/api/assets/authz.go ./internal/api/assets/authz.go +COPY --from=go-stub /go/src/github.com/zitadel/zitadel/internal/api/assets/router.go ./internal/api/assets/router.go ####################### ## Go test @@ -100,4 +100,4 @@ RUN go install github.com/rakyll/statik \ ## Go test results ####################### FROM scratch as go-codecov -COPY --from=go-test /go/src/github.com/caos/zitadel/profile.cov profile.cov +COPY --from=go-test /go/src/github.com/zitadel/zitadel/profile.cov profile.cov diff --git a/build/zitadel/generate-grpc.sh b/build/zitadel/generate-grpc.sh index 47dd542d3..89d0efa41 100755 --- a/build/zitadel/generate-grpc.sh +++ b/build/zitadel/generate-grpc.sh @@ -4,8 +4,8 @@ set -eux echo "Generate grpc" -OPENAPI_PATH=${GOPATH}/src/github.com/caos/zitadel/openapi/v2 -ZITADEL_PATH=${GOPATH}/src/github.com/caos/zitadel +OPENAPI_PATH=${GOPATH}/src/github.com/zitadel/zitadel/openapi/v2 +ZITADEL_PATH=${GOPATH}/src/github.com/zitadel/zitadel GRPC_PATH=${ZITADEL_PATH}/pkg/grpc PROTO_PATH=/proto/include/zitadel DOCS_PATH=${ZITADEL_PATH}/docs/apis/proto diff --git a/cmd/admin/admin.go b/cmd/admin/admin.go index f577df5d1..dcf5ca966 100644 --- a/cmd/admin/admin.go +++ b/cmd/admin/admin.go @@ -3,13 +3,13 @@ package admin import ( _ "embed" - "github.com/caos/logging" "github.com/spf13/cobra" + "github.com/zitadel/logging" - "github.com/caos/zitadel/cmd/admin/initialise" - "github.com/caos/zitadel/cmd/admin/key" - "github.com/caos/zitadel/cmd/admin/setup" - "github.com/caos/zitadel/cmd/admin/start" + "github.com/zitadel/zitadel/cmd/admin/initialise" + "github.com/zitadel/zitadel/cmd/admin/key" + "github.com/zitadel/zitadel/cmd/admin/setup" + "github.com/zitadel/zitadel/cmd/admin/start" ) func New() *cobra.Command { diff --git a/cmd/admin/initialise/config.go b/cmd/admin/initialise/config.go index 9cd260b0f..9519b15ea 100644 --- a/cmd/admin/initialise/config.go +++ b/cmd/admin/initialise/config.go @@ -1,9 +1,9 @@ package initialise import ( - "github.com/caos/logging" - "github.com/caos/zitadel/internal/database" "github.com/spf13/viper" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/database" ) type Config struct { diff --git a/cmd/admin/initialise/init.go b/cmd/admin/initialise/init.go index 268a5c4eb..385e2c759 100644 --- a/cmd/admin/initialise/init.go +++ b/cmd/admin/initialise/init.go @@ -4,11 +4,11 @@ import ( "database/sql" _ "embed" - "github.com/caos/logging" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/database" + "github.com/zitadel/zitadel/internal/database" ) func New() *cobra.Command { diff --git a/cmd/admin/initialise/verify_database.go b/cmd/admin/initialise/verify_database.go index 8111fa52c..06fb1857a 100644 --- a/cmd/admin/initialise/verify_database.go +++ b/cmd/admin/initialise/verify_database.go @@ -5,9 +5,9 @@ import ( _ "embed" "fmt" - "github.com/caos/logging" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/zitadel/logging" ) var ( diff --git a/cmd/admin/initialise/verify_grant.go b/cmd/admin/initialise/verify_grant.go index af65284ef..f9e1e1e24 100644 --- a/cmd/admin/initialise/verify_grant.go +++ b/cmd/admin/initialise/verify_grant.go @@ -5,9 +5,9 @@ import ( _ "embed" "fmt" - "github.com/caos/logging" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/zitadel/logging" ) var ( diff --git a/cmd/admin/initialise/verify_user.go b/cmd/admin/initialise/verify_user.go index 5a0f4f31c..1ad3c2d1b 100644 --- a/cmd/admin/initialise/verify_user.go +++ b/cmd/admin/initialise/verify_user.go @@ -4,9 +4,9 @@ import ( "database/sql" _ "embed" - "github.com/caos/logging" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/zitadel/logging" ) var ( diff --git a/cmd/admin/initialise/verify_zitadel.go b/cmd/admin/initialise/verify_zitadel.go index 9a6a0bcab..f7b610e72 100644 --- a/cmd/admin/initialise/verify_zitadel.go +++ b/cmd/admin/initialise/verify_zitadel.go @@ -4,11 +4,11 @@ import ( "database/sql" _ "embed" - "github.com/caos/logging" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/database" + "github.com/zitadel/zitadel/internal/database" ) const ( diff --git a/cmd/admin/key/key.go b/cmd/admin/key/key.go index f5fb49249..784f7a1c0 100644 --- a/cmd/admin/key/key.go +++ b/cmd/admin/key/key.go @@ -9,11 +9,11 @@ import ( "github.com/spf13/viper" "sigs.k8s.io/yaml" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" - "github.com/caos/zitadel/internal/crypto" - cryptoDB "github.com/caos/zitadel/internal/crypto/database" - "github.com/caos/zitadel/internal/database" + "github.com/zitadel/zitadel/internal/crypto" + cryptoDB "github.com/zitadel/zitadel/internal/crypto/database" + "github.com/zitadel/zitadel/internal/database" ) const ( diff --git a/cmd/admin/key/key_test.go b/cmd/admin/key/key_test.go index 47b1b0020..c4e25e683 100644 --- a/cmd/admin/key/key_test.go +++ b/cmd/admin/key/key_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" - caos_errors "github.com/caos/zitadel/internal/errors" + caos_errors "github.com/zitadel/zitadel/internal/errors" - "github.com/caos/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/crypto" ) func Test_keysFromArgs(t *testing.T) { diff --git a/cmd/admin/setup/03.go b/cmd/admin/setup/03.go index 2459f2dc6..72cf4a9f7 100644 --- a/cmd/admin/setup/03.go +++ b/cmd/admin/setup/03.go @@ -5,12 +5,12 @@ import ( "database/sql" "fmt" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/crypto" - crypto_db "github.com/caos/zitadel/internal/crypto/database" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/crypto" + crypto_db "github.com/zitadel/zitadel/internal/crypto/database" + "github.com/zitadel/zitadel/internal/eventstore" ) type DefaultInstance struct { diff --git a/cmd/admin/setup/config.go b/cmd/admin/setup/config.go index ccdd89ff5..21c3d3028 100644 --- a/cmd/admin/setup/config.go +++ b/cmd/admin/setup/config.go @@ -3,16 +3,16 @@ package setup import ( "bytes" - "github.com/caos/logging" "github.com/mitchellh/mapstructure" "github.com/spf13/viper" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/config/hook" - "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/database" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/config/hook" + "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/database" ) type Config struct { diff --git a/cmd/admin/setup/setup.go b/cmd/admin/setup/setup.go index f64f65e8a..46b490b5c 100644 --- a/cmd/admin/setup/setup.go +++ b/cmd/admin/setup/setup.go @@ -5,14 +5,14 @@ import ( _ "embed" "strings" - "github.com/caos/logging" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/zitadel/logging" - "github.com/caos/zitadel/cmd/admin/key" - "github.com/caos/zitadel/internal/database" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/migration" + "github.com/zitadel/zitadel/cmd/admin/key" + "github.com/zitadel/zitadel/internal/database" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/migration" ) var ( diff --git a/cmd/admin/start/config.go b/cmd/admin/start/config.go index c9171d3f2..0853d3ac3 100644 --- a/cmd/admin/start/config.go +++ b/cmd/admin/start/config.go @@ -1,27 +1,27 @@ package start import ( - "github.com/caos/logging" "github.com/mitchellh/mapstructure" "github.com/spf13/viper" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/config/hook" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/config/hook" - admin_es "github.com/caos/zitadel/internal/admin/repository/eventsourcing" - internal_authz "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/api/oidc" - "github.com/caos/zitadel/internal/api/ui/console" - "github.com/caos/zitadel/internal/api/ui/login" - auth_es "github.com/caos/zitadel/internal/auth/repository/eventsourcing" - "github.com/caos/zitadel/internal/authz" - "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/database" - "github.com/caos/zitadel/internal/notification" - "github.com/caos/zitadel/internal/query/projection" - static_config "github.com/caos/zitadel/internal/static/config" + admin_es "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing" + internal_authz "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/api/oidc" + "github.com/zitadel/zitadel/internal/api/ui/console" + "github.com/zitadel/zitadel/internal/api/ui/login" + auth_es "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing" + "github.com/zitadel/zitadel/internal/authz" + "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/database" + "github.com/zitadel/zitadel/internal/notification" + "github.com/zitadel/zitadel/internal/query/projection" + static_config "github.com/zitadel/zitadel/internal/static/config" ) type Config struct { diff --git a/cmd/admin/start/encryption_keys.go b/cmd/admin/start/encryption_keys.go index 81028fc17..9ec58d1a2 100644 --- a/cmd/admin/start/encryption_keys.go +++ b/cmd/admin/start/encryption_keys.go @@ -1,8 +1,8 @@ package start import ( - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/cmd/admin/start/flags.go b/cmd/admin/start/flags.go index 0d96229e6..c50a9c1ed 100644 --- a/cmd/admin/start/flags.go +++ b/cmd/admin/start/flags.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/caos/zitadel/cmd/admin/key" + "github.com/zitadel/zitadel/cmd/admin/key" ) func startFlags(cmd *cobra.Command) { diff --git a/cmd/admin/start/start.go b/cmd/admin/start/start.go index 5fd683270..702c775c6 100644 --- a/cmd/admin/start/start.go +++ b/cmd/admin/start/start.go @@ -12,40 +12,40 @@ import ( "syscall" "time" - "github.com/caos/logging" - "github.com/caos/oidc/v2/pkg/op" "github.com/gorilla/mux" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/zitadel/logging" + "github.com/zitadel/oidc/v2/pkg/op" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" - "github.com/caos/zitadel/cmd/admin/key" - admin_es "github.com/caos/zitadel/internal/admin/repository/eventsourcing" - "github.com/caos/zitadel/internal/api" - "github.com/caos/zitadel/internal/api/assets" - internal_authz "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/admin" - "github.com/caos/zitadel/internal/api/grpc/auth" - "github.com/caos/zitadel/internal/api/grpc/management" - "github.com/caos/zitadel/internal/api/grpc/system" - "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/api/oidc" - "github.com/caos/zitadel/internal/api/ui/console" - "github.com/caos/zitadel/internal/api/ui/login" - auth_es "github.com/caos/zitadel/internal/auth/repository/eventsourcing" - "github.com/caos/zitadel/internal/authz" - authz_repo "github.com/caos/zitadel/internal/authz/repository" - "github.com/caos/zitadel/internal/command" - cryptoDB "github.com/caos/zitadel/internal/crypto/database" - "github.com/caos/zitadel/internal/database" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/notification" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/static" - "github.com/caos/zitadel/internal/webauthn" - "github.com/caos/zitadel/openapi" + "github.com/zitadel/zitadel/cmd/admin/key" + admin_es "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing" + "github.com/zitadel/zitadel/internal/api" + "github.com/zitadel/zitadel/internal/api/assets" + internal_authz "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/admin" + "github.com/zitadel/zitadel/internal/api/grpc/auth" + "github.com/zitadel/zitadel/internal/api/grpc/management" + "github.com/zitadel/zitadel/internal/api/grpc/system" + "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/api/oidc" + "github.com/zitadel/zitadel/internal/api/ui/console" + "github.com/zitadel/zitadel/internal/api/ui/login" + auth_es "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing" + "github.com/zitadel/zitadel/internal/authz" + authz_repo "github.com/zitadel/zitadel/internal/authz/repository" + "github.com/zitadel/zitadel/internal/command" + cryptoDB "github.com/zitadel/zitadel/internal/crypto/database" + "github.com/zitadel/zitadel/internal/database" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/notification" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/webauthn" + "github.com/zitadel/zitadel/openapi" ) func New() *cobra.Command { diff --git a/cmd/admin/start/start_from_init.go b/cmd/admin/start/start_from_init.go index ca2bfc979..92bc612d6 100644 --- a/cmd/admin/start/start_from_init.go +++ b/cmd/admin/start/start_from_init.go @@ -1,12 +1,12 @@ package start import ( - "github.com/caos/logging" - "github.com/caos/zitadel/cmd/admin/initialise" - "github.com/caos/zitadel/cmd/admin/key" - "github.com/caos/zitadel/cmd/admin/setup" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/cmd/admin/initialise" + "github.com/zitadel/zitadel/cmd/admin/key" + "github.com/zitadel/zitadel/cmd/admin/setup" ) func NewStartFromInit() *cobra.Command { diff --git a/cmd/zitadel.go b/cmd/zitadel.go index fbf281f1d..736bc10e9 100644 --- a/cmd/zitadel.go +++ b/cmd/zitadel.go @@ -7,11 +7,11 @@ import ( "io" "strings" - "github.com/caos/logging" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/zitadel/logging" - "github.com/caos/zitadel/cmd/admin" + "github.com/zitadel/zitadel/cmd/admin" ) var ( diff --git a/docs/docs/guides/authentication/serviceusers.md b/docs/docs/guides/authentication/serviceusers.md index 695e5dbbc..0db1bbfab 100644 --- a/docs/docs/guides/authentication/serviceusers.md +++ b/docs/docs/guides/authentication/serviceusers.md @@ -57,7 +57,7 @@ With this token you can make subsequent requests, just like a human user. In this exercise we will authenticate a service user and receive an access_token to use against a API. -> **Information:** Are you stuck? Don't hesitate to reach out to us on [Github Discussions](https://github.com/caos/zitadel/discussions) or [contact us](https://zitadel.ch/contact/) privately. +> **Information:** Are you stuck? Don't hesitate to reach out to us on [Github Discussions](https://github.com/zitadel/zitadel/discussions) or [contact us](https://zitadel.ch/contact/) privately. ### 1. Generate a private-public key pair in ZITADEL @@ -111,7 +111,7 @@ Payload Please refer to [JWT_with_Private_Key](../../apis/openidoauth/authn-methods#jwt-with-private-key) in the documentation for further information. -If you use Go, you might want to use the [provided tool](https://github.com/caos/zitadel-tools) to generate a JWT from the downloaded json. There are many [libraries](https://jwt.io/#libraries-io) to generate and sign JWT. +If you use Go, you might want to use the [provided tool](https://github.com/zitadel/zitadel-tools) to generate a JWT from the downloaded json. There are many [libraries](https://jwt.io/#libraries-io) to generate and sign JWT. ### 3. With this JWT, request an OAuth token from ZITADEL diff --git a/docs/docs/guides/customization/texts.md b/docs/docs/guides/customization/texts.md index 9723916d9..f57808811 100644 --- a/docs/docs/guides/customization/texts.md +++ b/docs/docs/guides/customization/texts.md @@ -36,10 +36,10 @@ If you need support for a specific language we highly recommend you to write tra ZITADEL loads translations from three files: - - [Console translations](https://github.com/caos/zitadel/tree/main/console/src/assets/i18n) - - [Login interface texts](https://github.com/caos/zitadel/tree/main/internal/ui/login/static/i18n) - - [Email Notifcation texts](https://github.com/caos/zitadel/tree/main/internal/notification/static/i18n) - - [Common translations](https://github.com/caos/zitadel/tree/main/internal/static/i18n) for success or error toasts + - [Console translations](https://github.com/zitadel/zitadel/tree/main/console/src/assets/i18n) + - [Login interface texts](https://github.com/zitadel/zitadel/tree/main/internal/ui/login/static/i18n) + - [Email Notifcation texts](https://github.com/zitadel/zitadel/tree/main/internal/notification/static/i18n) + - [Common translations](https://github.com/zitadel/zitadel/tree/main/internal/static/i18n) for success or error toasts Make sure you set the locale as the name. Later on, language header will determine which file gets displayed. diff --git a/docs/docs/guides/installation/crd.md b/docs/docs/guides/installation/crd.md index c8f662b7f..e67b29b66 100644 --- a/docs/docs/guides/installation/crd.md +++ b/docs/docs/guides/installation/crd.md @@ -10,7 +10,7 @@ First, download the template configuration files [database.yml](./templates/crd/ ```bash # Download the zitadelctl binary -curl -s https://api.github.com/repos/caos/zitadel/releases/latest | grep "browser_download_url.*zitadelctl-$(uname | awk '{print tolower($0)}')-amd64" | cut -d '"' -f 4 | sudo wget -i - -O /usr/local/bin/zitadelctl && sudo chmod +x /usr/local/bin/zitadelctl && sudo chown $(id -u):$(id -g) /usr/local/bin/zitadelctl +curl -s https://api.github.com/repos/zitadel/zitadel/releases/latest | grep "browser_download_url.*zitadelctl-$(uname | awk '{print tolower($0)}')-amd64" | cut -d '"' -f 4 | sudo wget -i - -O /usr/local/bin/zitadelctl && sudo chmod +x /usr/local/bin/zitadelctl && sudo chown $(id -u):$(id -g) /usr/local/bin/zitadelctl sudo chmod +x /usr/local/bin/zitadelctl sudo chown $(id -u):$(id -g) /usr/local/bin/zitadelctl diff --git a/docs/docs/guides/installation/gitops.md b/docs/docs/guides/installation/gitops.md index 362b1e888..4b7ee4d33 100644 --- a/docs/docs/guides/installation/gitops.md +++ b/docs/docs/guides/installation/gitops.md @@ -12,7 +12,7 @@ Now open a terminal and execute the following commands. ```bash # Download the zitadelctl binary -curl -s https://api.github.com/repos/caos/zitadel/releases/latest | grep "browser_download_url.*zitadelctl-$(uname | awk '{print tolower($0)}')-amd64" | cut -d '"' -f 4 | sudo wget -i - -O /usr/local/bin/zitadelctl && sudo chmod +x /usr/local/bin/zitadelctl && sudo chown $(id -u):$(id -g) /usr/local/bin/zitadelctl +curl -s https://api.github.com/repos/zitadel/zitadel/releases/latest | grep "browser_download_url.*zitadelctl-$(uname | awk '{print tolower($0)}')-amd64" | cut -d '"' -f 4 | sudo wget -i - -O /usr/local/bin/zitadelctl && sudo chmod +x /usr/local/bin/zitadelctl && sudo chown $(id -u):$(id -g) /usr/local/bin/zitadelctl sudo chmod +x /usr/local/bin/zitadelctl sudo chown $(id -u):$(id -g) /usr/local/bin/zitadelctl diff --git a/docs/docs/guides/solution-scenarios/b2b.mdx b/docs/docs/guides/solution-scenarios/b2b.mdx index 01ef70c53..15e789cba 100644 --- a/docs/docs/guides/solution-scenarios/b2b.mdx +++ b/docs/docs/guides/solution-scenarios/b2b.mdx @@ -56,7 +56,7 @@ In our sample scenario, we assume to have the following users: - **Bill:** is employed at Octagon as Administrator of the Portal Application. Bill also uses a Microsoft Account in combination with a Security Key to secure his account. After having determined the constellation of the organizations and its users, all the necessary data (Portal project with roles and app, users, login requirements, identity providers, branding) should be set up in [Console](https://console.zitadel.ch/org). -A B2B sample application for NextJS can be found in our [Example Repo](https://github.com/caos/zitadel-examples). +A B2B sample application for NextJS can be found in our [Example Repo](https://github.com/zitadel/zitadel-examples). To allow another organization to use a project, a project grant has to be created. Upon creation, roles for a grant can be limited to a subset of the total project roles. diff --git a/docs/docs/legal/terms-of-service.md b/docs/docs/legal/terms-of-service.md index bf12f57c2..1afbc6bbf 100644 --- a/docs/docs/legal/terms-of-service.md +++ b/docs/docs/legal/terms-of-service.md @@ -61,7 +61,7 @@ The [Annex of the data processing agreement](data-processing-agreement#annex-reg We offer Support Services directly related to the use of our Services. The Description of Support Services is available as [Annex](support-services) to this document. -Customers without a Subscription or a Subscription plan that does not include Support Services should post inquiries and issues regarding ZITADEL from customers to our [GitHub Discussions](https://github.com/caos/zitadel/discussions), whenever feasible. +Customers without a Subscription or a Subscription plan that does not include Support Services should post inquiries and issues regarding ZITADEL from customers to our [GitHub Discussions](https://github.com/zitadel/zitadel/discussions), whenever feasible. If you need support integrating or setting up ZITADEL, please contact our consulting team. diff --git a/docs/docs/quickstarts/call-zitadel-api/dot-net.md b/docs/docs/quickstarts/call-zitadel-api/dot-net.md index 5b1a22b96..3203219fa 100644 --- a/docs/docs/quickstarts/call-zitadel-api/dot-net.md +++ b/docs/docs/quickstarts/call-zitadel-api/dot-net.md @@ -111,12 +111,12 @@ If you encountered an error (e.g. `code = PermissionDenied desc = No matching pe ensure your service user has the required permissions by assigning the `ORG_OWNER` or `ORG_OWNER_VIEWER` role and check the mentioned [guides](#prerequisites) at the beginning. -If you've run into any other problem, don't hesitate to contact us or raise an issue on [ZITADEL](https://github.com/caos/zitadel/issues) or in the [SDK](https://github.com/caos/zitadel-go/issues). +If you've run into any other problem, don't hesitate to contact us or raise an issue on [ZITADEL](https://github.com/zitadel/zitadel/issues) or in the [SDK](https://github.com/zitadel/zitadel-go/issues). ### Whats next? Now you can proceed implementing our APIs by adding more calls. -Checkout more [examples from the SDK](https://github.com/caos/zitadel-go/blob/main/example) or refer to our [API Docs](../../apis/introduction). +Checkout more [examples from the SDK](https://github.com/zitadel/zitadel-go/blob/main/example) or refer to our [API Docs](../../apis/introduction). > This guide will be updated soon to show you how to use the SDK for your own API as well. diff --git a/docs/docs/quickstarts/call-zitadel-api/go.md b/docs/docs/quickstarts/call-zitadel-api/go.md index d669f1ee3..6a94eb100 100644 --- a/docs/docs/quickstarts/call-zitadel-api/go.md +++ b/docs/docs/quickstarts/call-zitadel-api/go.md @@ -9,7 +9,7 @@ At the end of the guide you should have an application able to read the details ## Prerequisites -The client [SDK](https://github.com/caos/zitadel-go) will handle all necessary OAuth 2.0 requests and send the required headers to the ZITADEL API using our [OIDC client library](https://github.com/caos/oidc). +The client [SDK](https://github.com/zitadel/zitadel-go) will handle all necessary OAuth 2.0 requests and send the required headers to the ZITADEL API using our [OIDC client library](https://github.com/zitadel/oidc). All that is required, is a service account with an Org Owner (or another role, depending on the needed api requests) role assigned and its key JSON. However, we recommend you read the guide on [how to access ZITADEL API](../../guides/api/access-zitadel-apis) and the associated guides for a basic knowledge of : @@ -25,7 +25,7 @@ However, we recommend you read the guide on [how to access ZITADEL API](../../gu You need to add the SDK into Go Modules by: ```bash -go get github.com/caos/zitadel-go +go get github.com/zitadel/zitadel-go ``` ### Create example client @@ -40,12 +40,12 @@ import ( "context" "log" - "github.com/caos/oidc/pkg/oidc" + "github.com/zitadel/oidc/pkg/oidc" - "github.com/caos/zitadel-go/pkg/client/management" - "github.com/caos/zitadel-go/pkg/client/middleware" - "github.com/caos/zitadel-go/pkg/client/zitadel" - pb "github.com/caos/zitadel-go/pkg/client/zitadel/management" + "github.com/zitadel/zitadel-go/pkg/client/management" + "github.com/zitadel/zitadel-go/pkg/client/middleware" + "github.com/zitadel/zitadel-go/pkg/client/zitadel" + pb "github.com/zitadel/zitadel-go/pkg/client/zitadel/management" ) @@ -123,7 +123,7 @@ If you encountered an error (e.g. `code = PermissionDenied desc = No matching pe ensure your service user has the required permissions by assigning the `ORG_OWNER` or `ORG_OWNER_VIEWER` role and check the mentioned [guides](#prerequisites) at the beginning. -If you've run into any other problem, don't hesitate to contact us or raise an issue on [ZITADEL](https://github.com/caos/zitadel/issues) or in the [SDK](https://github.com/caos/zitadel-go/issues). +If you've run into any other problem, don't hesitate to contact us or raise an issue on [ZITADEL](https://github.com/zitadel/zitadel/issues) or in the [SDK](https://github.com/zitadel/zitadel-go/issues). ### Whats next? @@ -137,6 +137,6 @@ Now you can proceed implementing our APIs by adding more calls or trying to over log.Printf("%s was created on: %s", respOverwrite.Org.Name, respOverwrite.Org.Details.CreationDate.AsTime()) } ``` -Checkout more [examples from the SDK](https://github.com/caos/zitadel-go/blob/main/example) or refer to our [API Docs](../../apis/introduction). +Checkout more [examples from the SDK](https://github.com/zitadel/zitadel-go/blob/main/example) or refer to our [API Docs](../../apis/introduction). > This guide will be updated soon to show you how to use the SDK for your own API as well. diff --git a/docs/docs/quickstarts/introduction.mdx b/docs/docs/quickstarts/introduction.mdx index 3d46b3044..f55a5b492 100644 --- a/docs/docs/quickstarts/introduction.mdx +++ b/docs/docs/quickstarts/introduction.mdx @@ -6,7 +6,7 @@ import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; import {Card, CardWrapper} from '../../src/components/card'; -Get started with ZITADEL quickly by reading a quickstart or by cloning an example from our [ZITADEL examples](https://github.com/caos/zitadel-examples) repo. +Get started with ZITADEL quickly by reading a quickstart or by cloning an example from our [ZITADEL examples](https://github.com/zitadel/zitadel-examples) repo. @@ -33,9 +33,9 @@ Get started with ZITADEL quickly by reading a quickstart or by cloning an exampl ## Clone a sample project - - - + + + ## Libraries @@ -43,7 +43,7 @@ Get started with ZITADEL quickly by reading a quickstart or by cloning an exampl | Language | Description | Link | | ------------ | ---------------------|-------------| -| Go | Go client library for ZITADEL. | [https://github.com/caos/zitadel-go](https://github.com/caos/zitadel-go) +| Go | Go client library for ZITADEL. | [https://github.com/zitadel/zitadel-go](https://github.com/zitadel/zitadel-go) | .Net | Authentication / Authorization library written in dotnet for the asp.net web application package. | [https://github.com/caos/zitadel-net](https://github.com/caos/zitadel-net) | Dart | Dart library for ZITADEL, contains gRPC and API access elements. | [https://github.com/caos/zitadel-dart](https://github.com/caos/zitadel-dart) | | Elixir | API Client for the ZITADEL API. | [https://github.com/jshmrtn/zitadel_api](https://github.com/jshmrtn/zitadel_api) | diff --git a/docs/docs/quickstarts/libs.md b/docs/docs/quickstarts/libs.md index bb55a3e7b..a99112dd8 100644 --- a/docs/docs/quickstarts/libs.md +++ b/docs/docs/quickstarts/libs.md @@ -5,7 +5,7 @@ title: Libraries | Language | Description | Link | | ------------ | ---------------------|-------------| -| Go | Go client library for ZITADEL. | [https://github.com/caos/zitadel-go](https://github.com/caos/zitadel-go) +| Go | Go client library for ZITADEL. | [https://github.com/zitadel/zitadel-go](https://github.com/zitadel/zitadel-go) | .Net | Authentication / Authorization library written in dotnet for the asp.net web application package. | [https://github.com/caos/zitadel-net](https://github.com/caos/zitadel-net) | Dart | Dart library for ZITADEL, contains gRPC and API access elements. | [https://github.com/caos/zitadel-dart](https://github.com/caos/zitadel-dart) | | Elixir | API Client for the ZITADEL API. | [https://github.com/jshmrtn/zitadel_api](https://github.com/jshmrtn/zitadel_api) | diff --git a/docs/docs/quickstarts/login/angular.md b/docs/docs/quickstarts/login/angular.md index 5df74e926..d6635485a 100644 --- a/docs/docs/quickstarts/login/angular.md +++ b/docs/docs/quickstarts/login/angular.md @@ -7,7 +7,7 @@ It shows how to add user login to your application and fetch some data from the At the end of the guide, your application has login functionality and has access to the current user's profile. -> This documentation refers to our [example](https://github.com/caos/zitadel-examples/tree/main/angular) in GitHub. Note that we've written ZITADEL Console in Angular, so you can also use that as a reference. +> This documentation refers to our [example](https://github.com/zitadel/zitadel-examples/tree/main/angular) in GitHub. Note that we've written ZITADEL Console in Angular, so you can also use that as a reference. ## Setup Application and Get Keys @@ -22,7 +22,7 @@ We recommend you use [Authorization Code](../../apis/openidoauth/grant-types#aut With the Redirect URIs field, you tell ZITADEL where it is allowed to redirect users to after authentication. For development, you can set dev mode to `true` to enable insecure HTTP and redirect to a `localhost` URI. -> If you are following along with the [example](https://github.com/caos/zitadel-examples/tree/main/angular), set dev mode to `true` and the Redirect URIs to . +> If you are following along with the [example](https://github.com/zitadel/zitadel-examples/tree/main/angular), set dev mode to `true` and the Redirect URIs to . If you want to redirect the users back to a route on your application after they have logged out, add an optional redirect in the Post Logout URIs field. @@ -158,7 +158,7 @@ const newState = setState ? await this.statehandler.createState().toPromise() : ... ``` -If you decide to use the _StatehandlerService_, provide it in the `app.module`. Make sure it gets initialized first using Angular’s `APP_INITIALIZER`. You find the service implementation in the [example](https://github.com/caos/zitadel-examples/tree/main/angular). +If you decide to use the _StatehandlerService_, provide it in the `app.module`. Make sure it gets initialized first using Angular’s `APP_INITIALIZER`. You find the service implementation in the [example](https://github.com/zitadel/zitadel-examples/tree/main/angular). ```ts @@ -305,12 +305,12 @@ And in your HTML file: You have successfully integrated your Angular application with ZITADEL! -If you get stuck, consider checking out our [example](https://github.com/caos/zitadel-examples/tree/main/angular) application. It includes all the mentioned functionality of this quickstart. You can simply start by cloning the repository and replacing the _AuthConfig_ in the _AppModule_ by your own configuration. If you run into issues, contact us or raise an issue on [GitHub](https://github.com/caos/zitadel). +If you get stuck, consider checking out our [example](https://github.com/zitadel/zitadel-examples/tree/main/angular) application. It includes all the mentioned functionality of this quickstart. You can simply start by cloning the repository and replacing the _AuthConfig_ in the _AppModule_ by your own configuration. If you run into issues, contact us or raise an issue on [GitHub](https://github.com/zitadel/zitadel). ![App in console](/img/angular/app-screen.png) ### What's next? -Now that you have enabled authentication, it's time to add authorization to your application using ZITADEL APIs. Refer to the [docs](../../apis/introduction) or check out our ZITADEL Console code on [GitHub](https://github.com/caos/zitadel) which is using gRPC to access data. +Now that you have enabled authentication, it's time to add authorization to your application using ZITADEL APIs. Refer to the [docs](../../apis/introduction) or check out our ZITADEL Console code on [GitHub](https://github.com/zitadel/zitadel) which is using gRPC to access data. For more information about creating an Angular application, refer to [Angular](https://angular.io/start) and for more information about the OAuth/OIDC library used above, consider reading their docs at [angular-oauth2-oidc](https://github.com/manfredsteyer/angular-oauth2-oidc). diff --git a/docs/docs/quickstarts/login/nextjs.md b/docs/docs/quickstarts/login/nextjs.md index 7ea3d5958..ea80fa83b 100644 --- a/docs/docs/quickstarts/login/nextjs.md +++ b/docs/docs/quickstarts/login/nextjs.md @@ -4,7 +4,7 @@ title: Next.js This is our Zitadel [Next.js](https://nextjs.org/) template. It shows how to authenticate as a user and retrieve user information from the OIDC endpoint. -> The template code is part of our zitadel-example repo. Take a look [here](https://github.com/caos/zitadel-examples/tree/main/nextjs). +> The template code is part of our zitadel-example repo. Take a look [here](https://github.com/zitadel/zitadel-examples/tree/main/nextjs). ## Getting Started diff --git a/docs/docs/quickstarts/secure-api/go.md b/docs/docs/quickstarts/secure-api/go.md index 0e34c25e7..f677a28e4 100644 --- a/docs/docs/quickstarts/secure-api/go.md +++ b/docs/docs/quickstarts/secure-api/go.md @@ -9,8 +9,8 @@ At the end of the guide you should have an API with a protected endpoint. ## Prerequisites -The client [SDK](https://github.com/caos/zitadel-go) will provides an interceptor for both GRPC and HTTP. -This will handle the OAuth 2.0 introspection request including authentication using JWT with Private Key using our [OIDC client library](https://github.com/caos/oidc). +The client [SDK](https://github.com/zitadel/zitadel-go) will provides an interceptor for both GRPC and HTTP. +This will handle the OAuth 2.0 introspection request including authentication using JWT with Private Key using our [OIDC client library](https://github.com/zitadel/oidc). All that is required, is an API and its key JSON. But for complete ## Go Setup @@ -20,7 +20,7 @@ All that is required, is an API and its key JSON. But for complete You need to add the SDK into Go Modules by: ```bash -go get github.com/caos/zitadel-go +go get github.com/zitadel/zitadel-go ``` ### Create example API @@ -37,10 +37,10 @@ import ( "net/http" "time" - api_mw "github.com/caos/zitadel-go/pkg/api/middleware" - http_mw "github.com/caos/zitadel-go/pkg/api/middleware/http" - "github.com/caos/zitadel-go/pkg/client" - "github.com/caos/zitadel-go/pkg/client/middleware" + api_mw "github.com/zitadel/zitadel-go/pkg/api/middleware" + http_mw "github.com/zitadel/zitadel-go/pkg/api/middleware/http" + "github.com/zitadel/zitadel-go/pkg/client" + "github.com/zitadel/zitadel-go/pkg/client/middleware" ) func main() { diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js index 7afb17ad1..95cf3f573 100644 --- a/docs/docusaurus.config.js +++ b/docs/docusaurus.config.js @@ -65,7 +65,7 @@ module.exports = { position: "left", }, { - href: "https://github.com/caos/zitadel", + href: "https://github.com/zitadel/zitadel", label: "GitHub", position: "right", }, @@ -78,7 +78,7 @@ module.exports = { items: [ { label: "GitHub Discussions", - href: "https://github.com/caos/zitadel/discussions", + href: "https://github.com/zitadel/zitadel/discussions", }, { label: "Twitter", @@ -141,7 +141,7 @@ module.exports = { { docs: { sidebarPath: require.resolve("./sidebars.js"), - editUrl: "https://github.com/caos/zitadel/edit/main/docs/", + editUrl: "https://github.com/zitadel/zitadel/edit/main/docs/", remarkPlugins: [require("mdx-mermaid")], }, theme: { diff --git a/go.mod b/go.mod index adcc1f1b3..60c0bd82e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/caos/zitadel +module github.com/zitadel/zitadel go 1.17 @@ -12,8 +12,6 @@ require ( github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b github.com/allegro/bigcache v1.2.1 github.com/boombuler/barcode v1.0.1 - github.com/caos/logging v0.3.1 - github.com/caos/oidc/v2 v2.0.0-dynamic-issuer.1 github.com/cockroachdb/cockroach-go/v2 v2.2.4 github.com/dop251/goja v0.0.0-20211129110639-4739a1d10a51 github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d @@ -50,6 +48,8 @@ require ( github.com/stretchr/testify v1.7.1 github.com/superseriousbusiness/exifremove v0.0.0-20210330092427-6acd27eac203 github.com/ttacon/libphonenumber v1.2.1 + github.com/zitadel/logging v0.3.3 + github.com/zitadel/oidc/v2 v2.0.0-dynamic-issuer.2 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.27.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.27.0 go.opentelemetry.io/otel v1.2.0 diff --git a/go.sum b/go.sum index 166e96dec..8bae227c6 100644 --- a/go.sum +++ b/go.sum @@ -123,10 +123,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/caos/logging v0.3.1 h1:892AMeHs09D0e3ZcGB+QDRsZ5+2xtPAsAhOy8eKfztc= -github.com/caos/logging v0.3.1/go.mod h1:B8QNS0WDmR2Keac52Fw+XN4ZJkzLDGrcRIPB2Ux4uRo= -github.com/caos/oidc/v2 v2.0.0-dynamic-issuer.1 h1:xJuhRlhJf9huGX/+c/mEN2QaFiYlSMHd4QfsWkDoCGI= -github.com/caos/oidc/v2 v2.0.0-dynamic-issuer.1/go.mod h1:bdIIx0WCNjbGqpi7o4PifypVoeCAD3yTncL03rogNKw= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -939,6 +935,10 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +github.com/zitadel/logging v0.3.3 h1:/nAoki9HFJK+qMLBVY5Jhbfp/6o3YLK49Tw5j2oRhjM= +github.com/zitadel/logging v0.3.3/go.mod h1:aPpLQhE+v6ocNK0TWrBrd363hZ95KcI17Q1ixAQwZF0= +github.com/zitadel/oidc/v2 v2.0.0-dynamic-issuer.2 h1:Ep0vWTOaacMZbOL9o3CB/H7uG5byFXzxlph12pD8g1g= +github.com/zitadel/oidc/v2 v2.0.0-dynamic-issuer.2/go.mod h1:uoJw5Xc6HXfnQbNZiLbld9dED0/8UMu0M4gOipTRZBA= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= diff --git a/internal/actions/actions.go b/internal/actions/actions.go index b2d2a230b..de854f411 100644 --- a/internal/actions/actions.go +++ b/internal/actions/actions.go @@ -4,10 +4,10 @@ import ( "errors" "time" - "github.com/caos/logging" "github.com/dop251/goja" "github.com/dop251/goja_nodejs/console" "github.com/dop251/goja_nodejs/require" + "github.com/zitadel/logging" ) var ErrHalt = errors.New("interrupt") diff --git a/internal/actions/api.go b/internal/actions/api.go index 6204ef38e..b22df5291 100644 --- a/internal/actions/api.go +++ b/internal/actions/api.go @@ -1,7 +1,7 @@ package actions import ( - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" "golang.org/x/text/language" ) diff --git a/internal/actions/context.go b/internal/actions/context.go index 3564bf4d9..7386a9b07 100644 --- a/internal/actions/context.go +++ b/internal/actions/context.go @@ -3,7 +3,7 @@ package actions import ( "encoding/json" - "github.com/caos/oidc/v2/pkg/oidc" + "github.com/zitadel/oidc/v2/pkg/oidc" ) type Context map[string]interface{} diff --git a/internal/admin/repository/administrator.go b/internal/admin/repository/administrator.go index 1f776d350..7a58b75a6 100644 --- a/internal/admin/repository/administrator.go +++ b/internal/admin/repository/administrator.go @@ -3,7 +3,7 @@ package repository import ( "context" - "github.com/caos/zitadel/internal/view/model" + "github.com/zitadel/zitadel/internal/view/model" ) type AdministratorRepository interface { diff --git a/internal/admin/repository/eventsourcing/eventstore/administrator.go b/internal/admin/repository/eventsourcing/eventstore/administrator.go index 1056cc0d9..1d48ca580 100644 --- a/internal/admin/repository/eventsourcing/eventstore/administrator.go +++ b/internal/admin/repository/eventsourcing/eventstore/administrator.go @@ -3,9 +3,9 @@ package eventstore import ( "context" - "github.com/caos/zitadel/internal/admin/repository/eventsourcing/view" - view_model "github.com/caos/zitadel/internal/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing/view" + view_model "github.com/zitadel/zitadel/internal/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) var dbList = []string{"auth", "authz", "adminapi", "notification"} diff --git a/internal/admin/repository/eventsourcing/handler/handler.go b/internal/admin/repository/eventsourcing/handler/handler.go index 2dbf4591f..28e3f8a4d 100644 --- a/internal/admin/repository/eventsourcing/handler/handler.go +++ b/internal/admin/repository/eventsourcing/handler/handler.go @@ -3,10 +3,10 @@ package handler import ( "time" - "github.com/caos/zitadel/internal/admin/repository/eventsourcing/view" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing/view" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/static" ) type Configs map[string]*Config diff --git a/internal/admin/repository/eventsourcing/handler/styling.go b/internal/admin/repository/eventsourcing/handler/styling.go index e5d8eef4b..9d3f650ba 100644 --- a/internal/admin/repository/eventsourcing/handler/styling.go +++ b/internal/admin/repository/eventsourcing/handler/styling.go @@ -7,20 +7,20 @@ import ( "io" "strings" - "github.com/caos/logging" "github.com/lucasb-eyer/go-colorful" "github.com/muesli/gamut" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - iam_model "github.com/caos/zitadel/internal/iam/repository/view/model" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + iam_model "github.com/zitadel/zitadel/internal/iam/repository/view/model" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/static" ) const ( diff --git a/internal/admin/repository/eventsourcing/repository.go b/internal/admin/repository/eventsourcing/repository.go index 6ccfa2b5b..f76614649 100644 --- a/internal/admin/repository/eventsourcing/repository.go +++ b/internal/admin/repository/eventsourcing/repository.go @@ -4,12 +4,12 @@ import ( "context" "database/sql" - "github.com/caos/zitadel/internal/admin/repository/eventsourcing/eventstore" - "github.com/caos/zitadel/internal/admin/repository/eventsourcing/spooler" - admin_view "github.com/caos/zitadel/internal/admin/repository/eventsourcing/view" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_spol "github.com/caos/zitadel/internal/eventstore/v1/spooler" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing/eventstore" + "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing/spooler" + admin_view "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing/view" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_spol "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + "github.com/zitadel/zitadel/internal/static" ) type Config struct { diff --git a/internal/admin/repository/eventsourcing/spooler/lock.go b/internal/admin/repository/eventsourcing/spooler/lock.go index 812643a50..7da3ea937 100644 --- a/internal/admin/repository/eventsourcing/spooler/lock.go +++ b/internal/admin/repository/eventsourcing/spooler/lock.go @@ -4,7 +4,7 @@ import ( "database/sql" "time" - es_locker "github.com/caos/zitadel/internal/eventstore/v1/locker" + es_locker "github.com/zitadel/zitadel/internal/eventstore/v1/locker" ) const ( diff --git a/internal/admin/repository/eventsourcing/spooler/spooler.go b/internal/admin/repository/eventsourcing/spooler/spooler.go index 3440271dc..cee7323cc 100644 --- a/internal/admin/repository/eventsourcing/spooler/spooler.go +++ b/internal/admin/repository/eventsourcing/spooler/spooler.go @@ -3,12 +3,12 @@ package spooler import ( "database/sql" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/static" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/static" - "github.com/caos/zitadel/internal/admin/repository/eventsourcing/handler" - "github.com/caos/zitadel/internal/admin/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" + "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing/handler" + "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" ) type SpoolerConfig struct { diff --git a/internal/admin/repository/eventsourcing/view/error_event.go b/internal/admin/repository/eventsourcing/view/error_event.go index 4cc375b22..e6905b49b 100644 --- a/internal/admin/repository/eventsourcing/view/error_event.go +++ b/internal/admin/repository/eventsourcing/view/error_event.go @@ -1,7 +1,7 @@ package view import ( - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/admin/repository/eventsourcing/view/sequence.go b/internal/admin/repository/eventsourcing/view/sequence.go index 02e8519e9..413c66663 100644 --- a/internal/admin/repository/eventsourcing/view/sequence.go +++ b/internal/admin/repository/eventsourcing/view/sequence.go @@ -3,8 +3,8 @@ package view import ( "time" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/admin/repository/eventsourcing/view/styling.go b/internal/admin/repository/eventsourcing/view/styling.go index 811837bc4..98517bfb3 100644 --- a/internal/admin/repository/eventsourcing/view/styling.go +++ b/internal/admin/repository/eventsourcing/view/styling.go @@ -1,10 +1,10 @@ package view import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/iam/repository/view" - "github.com/caos/zitadel/internal/iam/repository/view/model" - global_view "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/iam/repository/view" + "github.com/zitadel/zitadel/internal/iam/repository/view/model" + global_view "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/api/api.go b/internal/api/api.go index f45eb9e35..64859dce5 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -5,20 +5,20 @@ import ( "net/http" "strings" - "github.com/caos/logging" sentryhttp "github.com/getsentry/sentry-go/http" "github.com/gorilla/mux" "github.com/improbable-eng/grpc-web/go/grpcweb" + "github.com/zitadel/logging" "google.golang.org/grpc" - internal_authz "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/server" - http_util "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/authz/repository" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/telemetry/tracing" + internal_authz "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/server" + http_util "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/authz/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) type API struct { diff --git a/internal/api/assets/asset.go b/internal/api/assets/asset.go index 98f4a191b..cf9e36842 100644 --- a/internal/api/assets/asset.go +++ b/internal/api/assets/asset.go @@ -8,17 +8,17 @@ import ( "strings" "time" - "github.com/caos/logging" sentryhttp "github.com/getsentry/sentry-go/http" "github.com/gorilla/mux" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - http_util "github.com/caos/zitadel/internal/api/http" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/api/authz" + http_util "github.com/zitadel/zitadel/internal/api/http" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/static" ) const ( diff --git a/internal/api/assets/generator/asset_generator.go b/internal/api/assets/generator/asset_generator.go index 9889e36ba..867e194bb 100644 --- a/internal/api/assets/generator/asset_generator.go +++ b/internal/api/assets/generator/asset_generator.go @@ -6,9 +6,9 @@ import ( "os" "text/template" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/config" + "github.com/zitadel/zitadel/internal/config" ) var ( @@ -132,7 +132,7 @@ func GenerateAssetHandler(configFilePath, handlerPrefix string, authz, router, d const authzTmpl = `package {{.GoPkgName}} import ( - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" ) /** @@ -167,9 +167,9 @@ const routerTmpl = `package {{.GoPkgName}} import ( "github.com/gorilla/mux" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/static" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/static" ) type {{.Name}} interface { diff --git a/internal/api/assets/login_policy.go b/internal/api/assets/login_policy.go index 8c671a3e5..a55f3d0e6 100644 --- a/internal/api/assets/login_policy.go +++ b/internal/api/assets/login_policy.go @@ -4,12 +4,12 @@ import ( "context" "strings" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/static" ) func (h *Handler) UploadDefaultLabelPolicyLogo() Uploader { diff --git a/internal/api/assets/user_avatar.go b/internal/api/assets/user_avatar.go index bffae8021..bcf84ed43 100644 --- a/internal/api/assets/user_avatar.go +++ b/internal/api/assets/user_avatar.go @@ -4,10 +4,10 @@ import ( "context" "strings" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/static" ) func (h *Handler) UploadMyUserAvatar() Uploader { diff --git a/internal/api/authz/authorization.go b/internal/api/authz/authorization.go index 58f7225fa..349522d3b 100644 --- a/internal/api/authz/authorization.go +++ b/internal/api/authz/authorization.go @@ -6,8 +6,8 @@ import ( "reflect" "strings" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) const ( diff --git a/internal/api/authz/authorization_test.go b/internal/api/authz/authorization_test.go index e9adfe725..fea2e9bc7 100644 --- a/internal/api/authz/authorization_test.go +++ b/internal/api/authz/authorization_test.go @@ -3,7 +3,7 @@ package authz import ( "testing" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type TestRequest struct { diff --git a/internal/api/authz/context.go b/internal/api/authz/context.go index 20534c3c6..84e29daf6 100644 --- a/internal/api/authz/context.go +++ b/internal/api/authz/context.go @@ -3,10 +3,10 @@ package authz import ( "context" - "github.com/caos/zitadel/internal/api/grpc" - http_util "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/api/grpc" + http_util "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) type key int diff --git a/internal/api/authz/permissions.go b/internal/api/authz/permissions.go index 64228f68b..74ffa80c7 100644 --- a/internal/api/authz/permissions.go +++ b/internal/api/authz/permissions.go @@ -3,8 +3,8 @@ package authz import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func getUserMethodPermissions(ctx context.Context, t *TokenVerifier, requiredPerm string, authConfig Config, ctxData CtxData) (requestedPermissions, allPermissions []string, err error) { diff --git a/internal/api/authz/permissions_test.go b/internal/api/authz/permissions_test.go index 2a3eeddb9..35a6615da 100644 --- a/internal/api/authz/permissions_test.go +++ b/internal/api/authz/permissions_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func getTestCtx(userID, orgID string) context.Context { diff --git a/internal/api/authz/token.go b/internal/api/authz/token.go index 93c46b7c4..915e28d9f 100644 --- a/internal/api/authz/token.go +++ b/internal/api/authz/token.go @@ -5,8 +5,8 @@ import ( "strings" "sync" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/telemetry/tracing" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) const ( diff --git a/internal/api/authz/token_test.go b/internal/api/authz/token_test.go index c6a54039a..04e104ec2 100644 --- a/internal/api/authz/token_test.go +++ b/internal/api/authz/token_test.go @@ -5,7 +5,7 @@ import ( "sync" "testing" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) func Test_VerifyAccessToken(t *testing.T) { diff --git a/internal/api/grpc/action/action.go b/internal/api/grpc/action/action.go index ebb93c83e..07b68daa1 100644 --- a/internal/api/grpc/action/action.go +++ b/internal/api/grpc/action/action.go @@ -1,10 +1,10 @@ package action import ( - object_grpc "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - action_pb "github.com/caos/zitadel/pkg/grpc/action" + object_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + action_pb "github.com/zitadel/zitadel/pkg/grpc/action" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/internal/api/grpc/admin/custom_text.go b/internal/api/grpc/admin/custom_text.go index e249f560a..13b49e5ec 100644 --- a/internal/api/grpc/admin/custom_text.go +++ b/internal/api/grpc/admin/custom_text.go @@ -5,11 +5,11 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - text_grpc "github.com/caos/zitadel/internal/api/grpc/text" - "github.com/caos/zitadel/internal/domain" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + text_grpc "github.com/zitadel/zitadel/internal/api/grpc/text" + "github.com/zitadel/zitadel/internal/domain" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetDefaultInitMessageText(ctx context.Context, req *admin_pb.GetDefaultInitMessageTextRequest) (*admin_pb.GetDefaultInitMessageTextResponse, error) { diff --git a/internal/api/grpc/admin/custom_text_converter.go b/internal/api/grpc/admin/custom_text_converter.go index 5ada84d67..ed9775f39 100644 --- a/internal/api/grpc/admin/custom_text_converter.go +++ b/internal/api/grpc/admin/custom_text_converter.go @@ -3,9 +3,9 @@ package admin import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/grpc/text" - "github.com/caos/zitadel/internal/domain" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/grpc/text" + "github.com/zitadel/zitadel/internal/domain" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func SetInitCustomTextToDomain(msg *admin_pb.SetDefaultInitMessageTextRequest) *domain.CustomMessageText { diff --git a/internal/api/grpc/admin/domain_policy.go b/internal/api/grpc/admin/domain_policy.go index 4705f624d..561e06c28 100644 --- a/internal/api/grpc/admin/domain_policy.go +++ b/internal/api/grpc/admin/domain_policy.go @@ -3,11 +3,11 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetDomainPolicy(ctx context.Context, _ *admin_pb.GetDomainPolicyRequest) (*admin_pb.GetDomainPolicyResponse, error) { diff --git a/internal/api/grpc/admin/failed_event.go b/internal/api/grpc/admin/failed_event.go index b3508b5ed..f2fa66a52 100644 --- a/internal/api/grpc/admin/failed_event.go +++ b/internal/api/grpc/admin/failed_event.go @@ -3,8 +3,8 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/query" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/query" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) ListFailedEvents(ctx context.Context, req *admin_pb.ListFailedEventsRequest) (*admin_pb.ListFailedEventsResponse, error) { diff --git a/internal/api/grpc/admin/failed_event_converter.go b/internal/api/grpc/admin/failed_event_converter.go index d9ed190e1..44ec4a358 100644 --- a/internal/api/grpc/admin/failed_event_converter.go +++ b/internal/api/grpc/admin/failed_event_converter.go @@ -1,9 +1,9 @@ package admin import ( - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/view/model" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/view/model" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func FailedEventsViewToPb(failedEvents []*model.FailedEvent) []*admin_pb.FailedEvent { diff --git a/internal/api/grpc/admin/failed_event_converter_test.go b/internal/api/grpc/admin/failed_event_converter_test.go index 2179bf238..c88f80103 100644 --- a/internal/api/grpc/admin/failed_event_converter_test.go +++ b/internal/api/grpc/admin/failed_event_converter_test.go @@ -3,9 +3,9 @@ package admin import ( "testing" - "github.com/caos/zitadel/internal/test" - "github.com/caos/zitadel/internal/view/model" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/test" + "github.com/zitadel/zitadel/internal/view/model" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func TestFailedEventsToPbFields(t *testing.T) { diff --git a/internal/api/grpc/admin/features.go b/internal/api/grpc/admin/features.go index b93927e18..7a6f0c8e5 100644 --- a/internal/api/grpc/admin/features.go +++ b/internal/api/grpc/admin/features.go @@ -3,10 +3,10 @@ package admin import ( "context" - features_grpc "github.com/caos/zitadel/internal/api/grpc/features" - object_grpc "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + features_grpc "github.com/zitadel/zitadel/internal/api/grpc/features" + object_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetDefaultFeatures(ctx context.Context, _ *admin_pb.GetDefaultFeaturesRequest) (*admin_pb.GetDefaultFeaturesResponse, error) { diff --git a/internal/api/grpc/admin/iam_member.go b/internal/api/grpc/admin/iam_member.go index 00276594d..cd53d5adb 100644 --- a/internal/api/grpc/admin/iam_member.go +++ b/internal/api/grpc/admin/iam_member.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/grpc/member" - "github.com/caos/zitadel/internal/api/grpc/object" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/grpc/member" + "github.com/zitadel/zitadel/internal/api/grpc/object" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) ListIAMMemberRoles(ctx context.Context, req *admin_pb.ListIAMMemberRolesRequest) (*admin_pb.ListIAMMemberRolesResponse, error) { diff --git a/internal/api/grpc/admin/iam_member_converter.go b/internal/api/grpc/admin/iam_member_converter.go index f2cee0ddf..07e91d21b 100644 --- a/internal/api/grpc/admin/iam_member_converter.go +++ b/internal/api/grpc/admin/iam_member_converter.go @@ -1,11 +1,11 @@ package admin import ( - member_grpc "github.com/caos/zitadel/internal/api/grpc/member" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + member_grpc "github.com/zitadel/zitadel/internal/api/grpc/member" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func AddIAMMemberToDomain(req *admin_pb.AddIAMMemberRequest) *domain.Member { diff --git a/internal/api/grpc/admin/iam_member_converter_test.go b/internal/api/grpc/admin/iam_member_converter_test.go index 0f0438fd3..74dd329ee 100644 --- a/internal/api/grpc/admin/iam_member_converter_test.go +++ b/internal/api/grpc/admin/iam_member_converter_test.go @@ -3,8 +3,8 @@ package admin import ( "testing" - "github.com/caos/zitadel/internal/test" - "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/test" + "github.com/zitadel/zitadel/pkg/grpc/admin" ) func TestAddIAMMemberToDomain(t *testing.T) { diff --git a/internal/api/grpc/admin/iam_settings.go b/internal/api/grpc/admin/iam_settings.go index 4ba9810cd..c583a7e26 100644 --- a/internal/api/grpc/admin/iam_settings.go +++ b/internal/api/grpc/admin/iam_settings.go @@ -3,9 +3,9 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) ListSecretGenerators(ctx context.Context, req *admin_pb.ListSecretGeneratorsRequest) (*admin_pb.ListSecretGeneratorsResponse, error) { diff --git a/internal/api/grpc/admin/iam_settings_converter.go b/internal/api/grpc/admin/iam_settings_converter.go index 69f2581b8..b5d6c681a 100644 --- a/internal/api/grpc/admin/iam_settings_converter.go +++ b/internal/api/grpc/admin/iam_settings_converter.go @@ -1,17 +1,17 @@ package admin import ( - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" "google.golang.org/protobuf/types/known/durationpb" - "github.com/caos/zitadel/internal/api/grpc/object" - obj_grpc "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/notification/channels/smtp" - "github.com/caos/zitadel/internal/query" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" - settings_pb "github.com/caos/zitadel/pkg/grpc/settings" + "github.com/zitadel/zitadel/internal/api/grpc/object" + obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/notification/channels/smtp" + "github.com/zitadel/zitadel/internal/query" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" + settings_pb "github.com/zitadel/zitadel/pkg/grpc/settings" ) func listSecretGeneratorToModel(req *admin_pb.ListSecretGeneratorsRequest) (*query.SecretGeneratorSearchQueries, error) { diff --git a/internal/api/grpc/admin/idp.go b/internal/api/grpc/admin/idp.go index a497c1b2f..9406e9f26 100644 --- a/internal/api/grpc/admin/idp.go +++ b/internal/api/grpc/admin/idp.go @@ -3,11 +3,11 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/authz" - idp_grpc "github.com/caos/zitadel/internal/api/grpc/idp" - object_pb "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/query" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/authz" + idp_grpc "github.com/zitadel/zitadel/internal/api/grpc/idp" + object_pb "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/query" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetIDPByID(ctx context.Context, req *admin_pb.GetIDPByIDRequest) (*admin_pb.GetIDPByIDResponse, error) { diff --git a/internal/api/grpc/admin/idp_converter.go b/internal/api/grpc/admin/idp_converter.go index 6f40b680f..dd9441091 100644 --- a/internal/api/grpc/admin/idp_converter.go +++ b/internal/api/grpc/admin/idp_converter.go @@ -1,13 +1,13 @@ package admin import ( - idp_grpc "github.com/caos/zitadel/internal/api/grpc/idp" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + idp_grpc "github.com/zitadel/zitadel/internal/api/grpc/idp" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func addOIDCIDPRequestToDomain(req *admin_pb.AddOIDCIDPRequest) *domain.IDPConfig { diff --git a/internal/api/grpc/admin/idp_converter_test.go b/internal/api/grpc/admin/idp_converter_test.go index 0ea13b89b..779913d21 100644 --- a/internal/api/grpc/admin/idp_converter_test.go +++ b/internal/api/grpc/admin/idp_converter_test.go @@ -3,9 +3,9 @@ package admin import ( "testing" - "github.com/caos/zitadel/internal/test" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" - "github.com/caos/zitadel/pkg/grpc/idp" + "github.com/zitadel/zitadel/internal/test" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/pkg/grpc/idp" ) func Test_addOIDCIDPRequestToDomain(t *testing.T) { diff --git a/internal/api/grpc/admin/information.go b/internal/api/grpc/admin/information.go index be0ccf80e..e0ada7d96 100644 --- a/internal/api/grpc/admin/information.go +++ b/internal/api/grpc/admin/information.go @@ -3,7 +3,7 @@ package admin import ( "context" - "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) Healthz(context.Context, *admin.HealthzRequest) (*admin.HealthzResponse, error) { diff --git a/internal/api/grpc/admin/instance.go b/internal/api/grpc/admin/instance.go index 6778c3f03..d7d3046f0 100644 --- a/internal/api/grpc/admin/instance.go +++ b/internal/api/grpc/admin/instance.go @@ -3,9 +3,9 @@ package admin import ( "context" - instance_grpc "github.com/caos/zitadel/internal/api/grpc/instance" - "github.com/caos/zitadel/internal/api/grpc/object" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + instance_grpc "github.com/zitadel/zitadel/internal/api/grpc/instance" + "github.com/zitadel/zitadel/internal/api/grpc/object" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetInstanceDomains(ctx context.Context, req *admin_pb.ListInstanceDomainsRequest) (*admin_pb.ListInstanceDomainsResponse, error) { diff --git a/internal/api/grpc/admin/instance_converter.go b/internal/api/grpc/admin/instance_converter.go index b83cbb90b..d91d77854 100644 --- a/internal/api/grpc/admin/instance_converter.go +++ b/internal/api/grpc/admin/instance_converter.go @@ -1,10 +1,10 @@ package admin import ( - instance_grpc "github.com/caos/zitadel/internal/api/grpc/instance" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/query" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + instance_grpc "github.com/zitadel/zitadel/internal/api/grpc/instance" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/query" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func ListInstanceDomainsRequestToModel(req *admin_pb.ListInstanceDomainsRequest) (*query.InstanceDomainSearchQueries, error) { diff --git a/internal/api/grpc/admin/label_policy.go b/internal/api/grpc/admin/label_policy.go index 77c1d5361..b5bf7d407 100644 --- a/internal/api/grpc/admin/label_policy.go +++ b/internal/api/grpc/admin/label_policy.go @@ -3,9 +3,9 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetLabelPolicy(ctx context.Context, req *admin_pb.GetLabelPolicyRequest) (*admin_pb.GetLabelPolicyResponse, error) { diff --git a/internal/api/grpc/admin/label_policy_converter.go b/internal/api/grpc/admin/label_policy_converter.go index 6d5eae59d..e99ad7c0e 100644 --- a/internal/api/grpc/admin/label_policy_converter.go +++ b/internal/api/grpc/admin/label_policy_converter.go @@ -1,8 +1,8 @@ package admin import ( - "github.com/caos/zitadel/internal/domain" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/domain" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func updateLabelPolicyToDomain(policy *admin_pb.UpdateLabelPolicyRequest) *domain.LabelPolicy { diff --git a/internal/api/grpc/admin/language.go b/internal/api/grpc/admin/language.go index 4e5c07338..6e2946399 100644 --- a/internal/api/grpc/admin/language.go +++ b/internal/api/grpc/admin/language.go @@ -5,10 +5,10 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/text" - caos_errors "github.com/caos/zitadel/internal/errors" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/text" + caos_errors "github.com/zitadel/zitadel/internal/errors" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetSupportedLanguages(ctx context.Context, req *admin_pb.GetSupportedLanguagesRequest) (*admin_pb.GetSupportedLanguagesResponse, error) { diff --git a/internal/api/grpc/admin/lockout.go b/internal/api/grpc/admin/lockout.go index f79f82374..c687f8638 100644 --- a/internal/api/grpc/admin/lockout.go +++ b/internal/api/grpc/admin/lockout.go @@ -3,9 +3,9 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetLockoutPolicy(ctx context.Context, req *admin_pb.GetLockoutPolicyRequest) (*admin_pb.GetLockoutPolicyResponse, error) { diff --git a/internal/api/grpc/admin/lockout_converter.go b/internal/api/grpc/admin/lockout_converter.go index 052e19065..555e0c2e8 100644 --- a/internal/api/grpc/admin/lockout_converter.go +++ b/internal/api/grpc/admin/lockout_converter.go @@ -1,8 +1,8 @@ package admin import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/pkg/grpc/admin" ) func UpdateLockoutPolicyToDomain(p *admin.UpdateLockoutPolicyRequest) *domain.LockoutPolicy { diff --git a/internal/api/grpc/admin/login_policy.go b/internal/api/grpc/admin/login_policy.go index 0d97454da..65fb52032 100644 --- a/internal/api/grpc/admin/login_policy.go +++ b/internal/api/grpc/admin/login_policy.go @@ -3,15 +3,15 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/query" - "github.com/caos/zitadel/internal/api/grpc/idp" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - "github.com/caos/zitadel/internal/domain" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/grpc/idp" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + "github.com/zitadel/zitadel/internal/domain" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetLoginPolicy(ctx context.Context, _ *admin_pb.GetLoginPolicyRequest) (*admin_pb.GetLoginPolicyResponse, error) { diff --git a/internal/api/grpc/admin/login_policy_converter.go b/internal/api/grpc/admin/login_policy_converter.go index 3f6c26215..202e1743d 100644 --- a/internal/api/grpc/admin/login_policy_converter.go +++ b/internal/api/grpc/admin/login_policy_converter.go @@ -1,11 +1,11 @@ package admin import ( - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func updateLoginPolicyToDomain(p *admin_pb.UpdateLoginPolicyRequest) *domain.LoginPolicy { diff --git a/internal/api/grpc/admin/notification_provider.go b/internal/api/grpc/admin/notification_provider.go index 8e0cdae9b..992f122a7 100644 --- a/internal/api/grpc/admin/notification_provider.go +++ b/internal/api/grpc/admin/notification_provider.go @@ -3,10 +3,10 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/settings" - "github.com/caos/zitadel/internal/domain" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/settings" + "github.com/zitadel/zitadel/internal/domain" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetFileSystemNotificationProvider(ctx context.Context, req *admin_pb.GetFileSystemNotificationProviderRequest) (*admin_pb.GetFileSystemNotificationProviderResponse, error) { diff --git a/internal/api/grpc/admin/oidc_settings.go b/internal/api/grpc/admin/oidc_settings.go index 5dac95a1e..5cf263f55 100644 --- a/internal/api/grpc/admin/oidc_settings.go +++ b/internal/api/grpc/admin/oidc_settings.go @@ -3,9 +3,9 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetOIDCSettings(ctx context.Context, _ *admin_pb.GetOIDCSettingsRequest) (*admin_pb.GetOIDCSettingsResponse, error) { diff --git a/internal/api/grpc/admin/oidc_settings_converter.go b/internal/api/grpc/admin/oidc_settings_converter.go index b82d7458d..fef50907a 100644 --- a/internal/api/grpc/admin/oidc_settings_converter.go +++ b/internal/api/grpc/admin/oidc_settings_converter.go @@ -1,11 +1,11 @@ package admin import ( - obj_grpc "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" - settings_pb "github.com/caos/zitadel/pkg/grpc/settings" + obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" + settings_pb "github.com/zitadel/zitadel/pkg/grpc/settings" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/internal/api/grpc/admin/org.go b/internal/api/grpc/admin/org.go index 61ab2331d..f22c0eee1 100644 --- a/internal/api/grpc/admin/org.go +++ b/internal/api/grpc/admin/org.go @@ -5,14 +5,14 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - org_grpc "github.com/caos/zitadel/internal/api/grpc/org" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" - obj_pb "github.com/caos/zitadel/pkg/grpc/object" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + org_grpc "github.com/zitadel/zitadel/internal/api/grpc/org" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" + obj_pb "github.com/zitadel/zitadel/pkg/grpc/object" ) func (s *Server) IsOrgUnique(ctx context.Context, req *admin_pb.IsOrgUniqueRequest) (*admin_pb.IsOrgUniqueResponse, error) { diff --git a/internal/api/grpc/admin/org_converter.go b/internal/api/grpc/admin/org_converter.go index a188123a2..438b42518 100644 --- a/internal/api/grpc/admin/org_converter.go +++ b/internal/api/grpc/admin/org_converter.go @@ -1,12 +1,12 @@ package admin import ( - "github.com/caos/zitadel/internal/api/grpc/object" - org_grpc "github.com/caos/zitadel/internal/api/grpc/org" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/pkg/grpc/admin" - "github.com/caos/zitadel/pkg/grpc/org" + "github.com/zitadel/zitadel/internal/api/grpc/object" + org_grpc "github.com/zitadel/zitadel/internal/api/grpc/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/pkg/grpc/org" ) func listOrgRequestToModel(req *admin.ListOrgsRequest) (*query.OrgSearchQueries, error) { diff --git a/internal/api/grpc/admin/password_age.go b/internal/api/grpc/admin/password_age.go index af7d4dbc8..b324f5e0f 100644 --- a/internal/api/grpc/admin/password_age.go +++ b/internal/api/grpc/admin/password_age.go @@ -3,9 +3,9 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetPasswordAgePolicy(ctx context.Context, req *admin_pb.GetPasswordAgePolicyRequest) (*admin_pb.GetPasswordAgePolicyResponse, error) { diff --git a/internal/api/grpc/admin/password_age_converter.go b/internal/api/grpc/admin/password_age_converter.go index ffefb8dc1..be47f1ffa 100644 --- a/internal/api/grpc/admin/password_age_converter.go +++ b/internal/api/grpc/admin/password_age_converter.go @@ -1,8 +1,8 @@ package admin import ( - "github.com/caos/zitadel/internal/domain" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/domain" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func UpdatePasswordAgePolicyToDomain(policy *admin_pb.UpdatePasswordAgePolicyRequest) *domain.PasswordAgePolicy { diff --git a/internal/api/grpc/admin/password_complexity.go b/internal/api/grpc/admin/password_complexity.go index 4bf639b68..aa4af68a3 100644 --- a/internal/api/grpc/admin/password_complexity.go +++ b/internal/api/grpc/admin/password_complexity.go @@ -3,9 +3,9 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetPasswordComplexityPolicy(ctx context.Context, _ *admin_pb.GetPasswordComplexityPolicyRequest) (*admin_pb.GetPasswordComplexityPolicyResponse, error) { diff --git a/internal/api/grpc/admin/password_complexity_converter.go b/internal/api/grpc/admin/password_complexity_converter.go index d942782cb..bb818b825 100644 --- a/internal/api/grpc/admin/password_complexity_converter.go +++ b/internal/api/grpc/admin/password_complexity_converter.go @@ -1,8 +1,8 @@ package admin import ( - "github.com/caos/zitadel/internal/domain" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/domain" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func UpdatePasswordComplexityPolicyToDomain(req *admin_pb.UpdatePasswordComplexityPolicyRequest) *domain.PasswordComplexityPolicy { diff --git a/internal/api/grpc/admin/privacy_policy.go b/internal/api/grpc/admin/privacy_policy.go index 03670ae0a..0621896a9 100644 --- a/internal/api/grpc/admin/privacy_policy.go +++ b/internal/api/grpc/admin/privacy_policy.go @@ -3,9 +3,9 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) GetPrivacyPolicy(ctx context.Context, _ *admin_pb.GetPrivacyPolicyRequest) (*admin_pb.GetPrivacyPolicyResponse, error) { diff --git a/internal/api/grpc/admin/privacy_policy_converter.go b/internal/api/grpc/admin/privacy_policy_converter.go index b21ea5451..829a3a039 100644 --- a/internal/api/grpc/admin/privacy_policy_converter.go +++ b/internal/api/grpc/admin/privacy_policy_converter.go @@ -1,8 +1,8 @@ package admin import ( - "github.com/caos/zitadel/internal/domain" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/domain" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func UpdatePrivacyPolicyToDomain(req *admin_pb.UpdatePrivacyPolicyRequest) *domain.PrivacyPolicy { diff --git a/internal/api/grpc/admin/server.go b/internal/api/grpc/admin/server.go index 618b58431..25a4e0911 100644 --- a/internal/api/grpc/admin/server.go +++ b/internal/api/grpc/admin/server.go @@ -3,14 +3,14 @@ package admin import ( "google.golang.org/grpc" - "github.com/caos/zitadel/internal/admin/repository" - "github.com/caos/zitadel/internal/admin/repository/eventsourcing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/server" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/admin/repository" + "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/server" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/pkg/grpc/admin" ) const ( diff --git a/internal/api/grpc/admin/sms.go b/internal/api/grpc/admin/sms.go index 5ab40fd08..db08aeb60 100644 --- a/internal/api/grpc/admin/sms.go +++ b/internal/api/grpc/admin/sms.go @@ -3,10 +3,10 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" - settings_pb "github.com/caos/zitadel/pkg/grpc/settings" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" + settings_pb "github.com/zitadel/zitadel/pkg/grpc/settings" ) func (s *Server) ListSMSProviders(ctx context.Context, req *admin_pb.ListSMSProvidersRequest) (*admin_pb.ListSMSProvidersResponse, error) { diff --git a/internal/api/grpc/admin/sms_converter.go b/internal/api/grpc/admin/sms_converter.go index c47ea201b..214c98caa 100644 --- a/internal/api/grpc/admin/sms_converter.go +++ b/internal/api/grpc/admin/sms_converter.go @@ -1,12 +1,12 @@ package admin import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/notification/channels/twilio" - "github.com/caos/zitadel/internal/query" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" - settings_pb "github.com/caos/zitadel/pkg/grpc/settings" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/notification/channels/twilio" + "github.com/zitadel/zitadel/internal/query" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" + settings_pb "github.com/zitadel/zitadel/pkg/grpc/settings" ) func listSMSConfigsToModel(req *admin_pb.ListSMSProvidersRequest) (*query.SMSConfigsSearchQueries, error) { diff --git a/internal/api/grpc/admin/user_converter.go b/internal/api/grpc/admin/user_converter.go index 7e34b384a..c1aafe52e 100644 --- a/internal/api/grpc/admin/user_converter.go +++ b/internal/api/grpc/admin/user_converter.go @@ -1,12 +1,12 @@ package admin import ( - "github.com/caos/logging" + "github.com/zitadel/logging" "golang.org/x/text/language" - user_grpc "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/command" - admin_grpc "github.com/caos/zitadel/pkg/grpc/admin" + user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/command" + admin_grpc "github.com/zitadel/zitadel/pkg/grpc/admin" ) func setUpOrgHumanToCommand(human *admin_grpc.SetUpOrgRequest_Human) command.AddHuman { diff --git a/internal/api/grpc/admin/view.go b/internal/api/grpc/admin/view.go index dcaf31a85..04c939bf9 100644 --- a/internal/api/grpc/admin/view.go +++ b/internal/api/grpc/admin/view.go @@ -3,8 +3,8 @@ package admin import ( "context" - "github.com/caos/zitadel/internal/query" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/query" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" ) func (s *Server) ListViews(ctx context.Context, _ *admin_pb.ListViewsRequest) (*admin_pb.ListViewsResponse, error) { diff --git a/internal/api/grpc/admin/view_converter.go b/internal/api/grpc/admin/view_converter.go index aba94cfcc..e77a511e6 100644 --- a/internal/api/grpc/admin/view_converter.go +++ b/internal/api/grpc/admin/view_converter.go @@ -1,9 +1,9 @@ package admin import ( - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/view/model" - admin_pb "github.com/caos/zitadel/pkg/grpc/admin" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/view/model" + admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/api/grpc/auth/avatar.go b/internal/api/grpc/auth/avatar.go index d49d20fe7..7e88a4a35 100644 --- a/internal/api/grpc/auth/avatar.go +++ b/internal/api/grpc/auth/avatar.go @@ -3,9 +3,9 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) RemoveMyAvatar(ctx context.Context, req *auth_pb.RemoveMyAvatarRequest) (*auth_pb.RemoveMyAvatarResponse, error) { diff --git a/internal/api/grpc/auth/email.go b/internal/api/grpc/auth/email.go index 6fa3f2ce8..3e4f636c7 100644 --- a/internal/api/grpc/auth/email.go +++ b/internal/api/grpc/auth/email.go @@ -3,11 +3,11 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/domain" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/domain" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) GetMyEmail(ctx context.Context, _ *auth_pb.GetMyEmailRequest) (*auth_pb.GetMyEmailResponse, error) { diff --git a/internal/api/grpc/auth/email_converter.go b/internal/api/grpc/auth/email_converter.go index 760bb8a78..03b2b8136 100644 --- a/internal/api/grpc/auth/email_converter.go +++ b/internal/api/grpc/auth/email_converter.go @@ -3,8 +3,8 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/pkg/grpc/auth" ) func UpdateMyEmailToDomain(ctx context.Context, email *auth.SetMyEmailRequest) *domain.Email { diff --git a/internal/api/grpc/auth/features.go b/internal/api/grpc/auth/features.go index 41e801e61..86beea81f 100644 --- a/internal/api/grpc/auth/features.go +++ b/internal/api/grpc/auth/features.go @@ -3,8 +3,8 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) ListMyZitadelFeatures(ctx context.Context, _ *auth_pb.ListMyZitadelFeaturesRequest) (*auth_pb.ListMyZitadelFeaturesResponse, error) { diff --git a/internal/api/grpc/auth/idp.go b/internal/api/grpc/auth/idp.go index cf6e1d2f0..250ac1378 100644 --- a/internal/api/grpc/auth/idp.go +++ b/internal/api/grpc/auth/idp.go @@ -3,9 +3,9 @@ package auth import ( "context" - idp_grpc "github.com/caos/zitadel/internal/api/grpc/idp" - "github.com/caos/zitadel/internal/api/grpc/object" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + idp_grpc "github.com/zitadel/zitadel/internal/api/grpc/idp" + "github.com/zitadel/zitadel/internal/api/grpc/object" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) ListMyLinkedIDPs(ctx context.Context, req *auth_pb.ListMyLinkedIDPsRequest) (*auth_pb.ListMyLinkedIDPsResponse, error) { diff --git a/internal/api/grpc/auth/idp_converter.go b/internal/api/grpc/auth/idp_converter.go index 08fe6efcd..b353f13ca 100644 --- a/internal/api/grpc/auth/idp_converter.go +++ b/internal/api/grpc/auth/idp_converter.go @@ -3,11 +3,11 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func ListMyLinkedIDPsRequestToQuery(ctx context.Context, req *auth_pb.ListMyLinkedIDPsRequest) (*query.IDPUserLinksSearchQuery, error) { diff --git a/internal/api/grpc/auth/information.go b/internal/api/grpc/auth/information.go index f1fb7c8db..4b383d174 100644 --- a/internal/api/grpc/auth/information.go +++ b/internal/api/grpc/auth/information.go @@ -3,7 +3,7 @@ package auth import ( "context" - "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) Healthz(context.Context, *auth.HealthzRequest) (*auth.HealthzResponse, error) { diff --git a/internal/api/grpc/auth/language.go b/internal/api/grpc/auth/language.go index a1c4fc179..91f78cd15 100644 --- a/internal/api/grpc/auth/language.go +++ b/internal/api/grpc/auth/language.go @@ -3,8 +3,8 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/grpc/text" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/grpc/text" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) GetSupportedLanguages(ctx context.Context, req *auth_pb.GetSupportedLanguagesRequest) (*auth_pb.GetSupportedLanguagesResponse, error) { diff --git a/internal/api/grpc/auth/metadata_converter.go b/internal/api/grpc/auth/metadata_converter.go index 363dfbe59..fa6ed41cb 100644 --- a/internal/api/grpc/auth/metadata_converter.go +++ b/internal/api/grpc/auth/metadata_converter.go @@ -1,11 +1,11 @@ package auth import ( - "github.com/caos/zitadel/internal/api/grpc/metadata" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/grpc/metadata" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/pkg/grpc/auth" ) func BulkSetMetadataToDomain(req *auth.BulkSetMyMetadataRequest) []*domain.Metadata { diff --git a/internal/api/grpc/auth/multi_factor.go b/internal/api/grpc/auth/multi_factor.go index 2e4c4ffeb..f29aa1039 100644 --- a/internal/api/grpc/auth/multi_factor.go +++ b/internal/api/grpc/auth/multi_factor.go @@ -3,13 +3,13 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - user_grpc "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" - user_pb "github.com/caos/zitadel/pkg/grpc/user" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" + user_pb "github.com/zitadel/zitadel/pkg/grpc/user" ) func (s *Server) ListMyAuthFactors(ctx context.Context, _ *auth_pb.ListMyAuthFactorsRequest) (*auth_pb.ListMyAuthFactorsResponse, error) { diff --git a/internal/api/grpc/auth/password.go b/internal/api/grpc/auth/password.go index 0d96baf44..0cbc8d4f6 100644 --- a/internal/api/grpc/auth/password.go +++ b/internal/api/grpc/auth/password.go @@ -3,10 +3,10 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/api/authz" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) UpdateMyPassword(ctx context.Context, req *auth_pb.UpdateMyPasswordRequest) (*auth_pb.UpdateMyPasswordResponse, error) { diff --git a/internal/api/grpc/auth/password_complexity.go b/internal/api/grpc/auth/password_complexity.go index f86e67c99..2ce11d6d1 100644 --- a/internal/api/grpc/auth/password_complexity.go +++ b/internal/api/grpc/auth/password_complexity.go @@ -3,9 +3,9 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) GetMyPasswordComplexityPolicy(ctx context.Context, _ *auth_pb.GetMyPasswordComplexityPolicyRequest) (*auth_pb.GetMyPasswordComplexityPolicyResponse, error) { diff --git a/internal/api/grpc/auth/passwordless.go b/internal/api/grpc/auth/passwordless.go index 8435e7a4e..e601da6e8 100644 --- a/internal/api/grpc/auth/passwordless.go +++ b/internal/api/grpc/auth/passwordless.go @@ -5,15 +5,15 @@ import ( "google.golang.org/protobuf/types/known/durationpb" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - user_grpc "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/api/ui/login" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" - user_pb "github.com/caos/zitadel/pkg/grpc/user" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/api/ui/login" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" + user_pb "github.com/zitadel/zitadel/pkg/grpc/user" ) func (s *Server) ListMyPasswordless(ctx context.Context, _ *auth_pb.ListMyPasswordlessRequest) (*auth_pb.ListMyPasswordlessResponse, error) { diff --git a/internal/api/grpc/auth/permission.go b/internal/api/grpc/auth/permission.go index 41d771e01..e32f7ef10 100644 --- a/internal/api/grpc/auth/permission.go +++ b/internal/api/grpc/auth/permission.go @@ -3,11 +3,11 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - obj_grpc "github.com/caos/zitadel/internal/api/grpc/object" - user_grpc "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/query" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/query" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) ListMyZitadelPermissions(ctx context.Context, _ *auth_pb.ListMyZitadelPermissionsRequest) (*auth_pb.ListMyZitadelPermissionsResponse, error) { diff --git a/internal/api/grpc/auth/permission_converter.go b/internal/api/grpc/auth/permission_converter.go index 793a07d32..41dc398bb 100644 --- a/internal/api/grpc/auth/permission_converter.go +++ b/internal/api/grpc/auth/permission_converter.go @@ -3,11 +3,11 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - user_grpc "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/query" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/query" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func ListMyMembershipsRequestToModel(ctx context.Context, req *auth_pb.ListMyMembershipsRequest) (*query.MembershipSearchQuery, error) { diff --git a/internal/api/grpc/auth/phone.go b/internal/api/grpc/auth/phone.go index f620d725f..3595d8510 100644 --- a/internal/api/grpc/auth/phone.go +++ b/internal/api/grpc/auth/phone.go @@ -3,11 +3,11 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/domain" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/domain" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) GetMyPhone(ctx context.Context, _ *auth_pb.GetMyPhoneRequest) (*auth_pb.GetMyPhoneResponse, error) { diff --git a/internal/api/grpc/auth/phone_converter.go b/internal/api/grpc/auth/phone_converter.go index 9660af0f8..8cf514ead 100644 --- a/internal/api/grpc/auth/phone_converter.go +++ b/internal/api/grpc/auth/phone_converter.go @@ -3,8 +3,8 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/pkg/grpc/auth" ) func UpdateMyPhoneToDomain(ctx context.Context, phone *auth.SetMyPhoneRequest) *domain.Phone { diff --git a/internal/api/grpc/auth/profile.go b/internal/api/grpc/auth/profile.go index 4cd4e5fc7..b17a0fd13 100644 --- a/internal/api/grpc/auth/profile.go +++ b/internal/api/grpc/auth/profile.go @@ -3,10 +3,10 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - object_grpc "github.com/caos/zitadel/internal/api/grpc/object" - user_grpc "github.com/caos/zitadel/internal/api/grpc/user" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + object_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) GetMyProfile(ctx context.Context, req *auth_pb.GetMyProfileRequest) (*auth_pb.GetMyProfileResponse, error) { diff --git a/internal/api/grpc/auth/profile_converter.go b/internal/api/grpc/auth/profile_converter.go index 6c81f5e64..e82ea39e7 100644 --- a/internal/api/grpc/auth/profile_converter.go +++ b/internal/api/grpc/auth/profile_converter.go @@ -3,12 +3,12 @@ package auth import ( "context" - "github.com/caos/logging" + "github.com/zitadel/logging" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/pkg/grpc/auth" ) func UpdateProfileToDomain(ctx context.Context, profile *auth.UpdateMyProfileRequest) *domain.Profile { diff --git a/internal/api/grpc/auth/refresh_token.go b/internal/api/grpc/auth/refresh_token.go index 219e65c61..234c71354 100644 --- a/internal/api/grpc/auth/refresh_token.go +++ b/internal/api/grpc/auth/refresh_token.go @@ -3,11 +3,11 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - user_grpc "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) ListMyRefreshTokens(ctx context.Context, req *auth.ListMyRefreshTokensRequest) (*auth.ListMyRefreshTokensResponse, error) { diff --git a/internal/api/grpc/auth/server.go b/internal/api/grpc/auth/server.go index 3c4ae7f37..6d7aaf6e7 100644 --- a/internal/api/grpc/auth/server.go +++ b/internal/api/grpc/auth/server.go @@ -3,15 +3,15 @@ package auth import ( "google.golang.org/grpc" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/server" - "github.com/caos/zitadel/internal/auth/repository" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/server" + "github.com/zitadel/zitadel/internal/auth/repository" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/pkg/grpc/auth" ) var _ auth.AuthServiceServer = (*Server)(nil) diff --git a/internal/api/grpc/auth/user.go b/internal/api/grpc/auth/user.go index 106e78b0b..cb343d512 100644 --- a/internal/api/grpc/auth/user.go +++ b/internal/api/grpc/auth/user.go @@ -3,16 +3,16 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/change" - "github.com/caos/zitadel/internal/api/grpc/metadata" - obj_grpc "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/api/grpc/org" - user_grpc "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/change" + "github.com/zitadel/zitadel/internal/api/grpc/metadata" + obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/api/grpc/org" + user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func (s *Server) GetMyUser(ctx context.Context, _ *auth_pb.GetMyUserRequest) (*auth_pb.GetMyUserResponse, error) { diff --git a/internal/api/grpc/auth/user_grant.go b/internal/api/grpc/auth/user_grant.go index 58fce7578..93a7ee7a4 100644 --- a/internal/api/grpc/auth/user_grant.go +++ b/internal/api/grpc/auth/user_grant.go @@ -3,10 +3,10 @@ package auth import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/query" - auth_pb "github.com/caos/zitadel/pkg/grpc/auth" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/query" + auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) func ListMyUserGrantsRequestToQuery(ctx context.Context, req *auth_pb.ListMyUserGrantsRequest) (*query.UserGrantsQueries, error) { diff --git a/internal/api/grpc/authn/converter.go b/internal/api/grpc/authn/converter.go index 385232147..e1985ed06 100644 --- a/internal/api/grpc/authn/converter.go +++ b/internal/api/grpc/authn/converter.go @@ -3,10 +3,10 @@ package authn import ( "google.golang.org/protobuf/types/known/timestamppb" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/pkg/grpc/authn" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/pkg/grpc/authn" ) func KeysToPb(keys []*query.AuthNKey) []*authn.Key { diff --git a/internal/api/grpc/change/changes.go b/internal/api/grpc/change/changes.go index 82dd061bc..a3a35bde1 100644 --- a/internal/api/grpc/change/changes.go +++ b/internal/api/grpc/change/changes.go @@ -3,11 +3,11 @@ package change import ( "google.golang.org/protobuf/types/known/timestamppb" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - change_pb "github.com/caos/zitadel/pkg/grpc/change" - "github.com/caos/zitadel/pkg/grpc/message" + "github.com/zitadel/zitadel/internal/query" + change_pb "github.com/zitadel/zitadel/pkg/grpc/change" + "github.com/zitadel/zitadel/pkg/grpc/message" ) func ChangeQueryToQuery(query *change_pb.ChangeQuery) (sequence uint64, limit uint64, asc bool) { diff --git a/internal/api/grpc/client/middleware/tracing.go b/internal/api/grpc/client/middleware/tracing.go index 0f5f471ee..0ac5a2b2b 100644 --- a/internal/api/grpc/client/middleware/tracing.go +++ b/internal/api/grpc/client/middleware/tracing.go @@ -4,7 +4,7 @@ import ( "context" "strings" - grpc_utils "github.com/caos/zitadel/internal/api/grpc" + grpc_utils "github.com/zitadel/zitadel/internal/api/grpc" grpc_trace "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" ) diff --git a/internal/api/grpc/errors/caos_errors.go b/internal/api/grpc/errors/caos_errors.go index d1337f656..2e8117c8c 100644 --- a/internal/api/grpc/errors/caos_errors.go +++ b/internal/api/grpc/errors/caos_errors.go @@ -3,9 +3,9 @@ package errors import ( "context" - "github.com/caos/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/pkg/grpc/message" + "github.com/zitadel/logging" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/pkg/grpc/message" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/api/grpc/errors/caos_errors_test.go b/internal/api/grpc/errors/caos_errors_test.go index c8d935c2d..13c6c1b73 100644 --- a/internal/api/grpc/errors/caos_errors_test.go +++ b/internal/api/grpc/errors/caos_errors_test.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestCaosToGRPCError(t *testing.T) { diff --git a/internal/api/grpc/features/features.go b/internal/api/grpc/features/features.go index 077142d86..c0fca629f 100644 --- a/internal/api/grpc/features/features.go +++ b/internal/api/grpc/features/features.go @@ -3,10 +3,10 @@ package features import ( "google.golang.org/protobuf/types/known/durationpb" - object_grpc "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - features_pb "github.com/caos/zitadel/pkg/grpc/features" + object_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + features_pb "github.com/zitadel/zitadel/pkg/grpc/features" ) func ModelFeaturesToPb(features *query.Features) *features_pb.Features { diff --git a/internal/api/grpc/header.go b/internal/api/grpc/header.go index 286724c8b..b8cc79ad0 100644 --- a/internal/api/grpc/header.go +++ b/internal/api/grpc/header.go @@ -6,7 +6,7 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/util/metautils" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/caos/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/api/http" ) func GetHeader(ctx context.Context, headername string) string { diff --git a/internal/api/grpc/idp/converter.go b/internal/api/grpc/idp/converter.go index 7d420b263..e313ac93c 100644 --- a/internal/api/grpc/idp/converter.go +++ b/internal/api/grpc/idp/converter.go @@ -1,11 +1,11 @@ package idp import ( - obj_grpc "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/query" - idp_pb "github.com/caos/zitadel/pkg/grpc/idp" + obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/query" + idp_pb "github.com/zitadel/zitadel/pkg/grpc/idp" ) func IDPViewsToPb(idps []*query.IDP) []*idp_pb.IDP { diff --git a/internal/api/grpc/instance/converter.go b/internal/api/grpc/instance/converter.go index c809706f2..d8283416e 100644 --- a/internal/api/grpc/instance/converter.go +++ b/internal/api/grpc/instance/converter.go @@ -1,10 +1,10 @@ package org import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" - instance_pb "github.com/caos/zitadel/pkg/grpc/instance" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" + instance_pb "github.com/zitadel/zitadel/pkg/grpc/instance" ) func InstancesToPb(instances []*query.Instance) []*instance_pb.Instance { diff --git a/internal/api/grpc/management/actions.go b/internal/api/grpc/management/actions.go index 6e3e6548e..9c479155c 100644 --- a/internal/api/grpc/management/actions.go +++ b/internal/api/grpc/management/actions.go @@ -3,10 +3,10 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - action_grpc "github.com/caos/zitadel/internal/api/grpc/action" - obj_grpc "github.com/caos/zitadel/internal/api/grpc/object" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + action_grpc "github.com/zitadel/zitadel/internal/api/grpc/action" + obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) ListActions(ctx context.Context, req *mgmt_pb.ListActionsRequest) (*mgmt_pb.ListActionsResponse, error) { diff --git a/internal/api/grpc/management/actions_converter.go b/internal/api/grpc/management/actions_converter.go index 9a7537efd..873a36072 100644 --- a/internal/api/grpc/management/actions_converter.go +++ b/internal/api/grpc/management/actions_converter.go @@ -1,12 +1,12 @@ package management import ( - action_grpc "github.com/caos/zitadel/internal/api/grpc/action" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + action_grpc "github.com/zitadel/zitadel/internal/api/grpc/action" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func createActionRequestToDomain(req *mgmt_pb.CreateActionRequest) *domain.Action { diff --git a/internal/api/grpc/management/auth_checks.go b/internal/api/grpc/management/auth_checks.go index 76fd84664..62e8d8c02 100644 --- a/internal/api/grpc/management/auth_checks.go +++ b/internal/api/grpc/management/auth_checks.go @@ -3,8 +3,8 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/api/authz" + caos_errors "github.com/zitadel/zitadel/internal/errors" ) func checkExplicitProjectPermission(ctx context.Context, grantID, projectID string) error { diff --git a/internal/api/grpc/management/custom_text.go b/internal/api/grpc/management/custom_text.go index f539e8ab5..b7ab8cc31 100644 --- a/internal/api/grpc/management/custom_text.go +++ b/internal/api/grpc/management/custom_text.go @@ -5,11 +5,11 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - text_grpc "github.com/caos/zitadel/internal/api/grpc/text" - "github.com/caos/zitadel/internal/domain" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + text_grpc "github.com/zitadel/zitadel/internal/api/grpc/text" + "github.com/zitadel/zitadel/internal/domain" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetCustomInitMessageText(ctx context.Context, req *mgmt_pb.GetCustomInitMessageTextRequest) (*mgmt_pb.GetCustomInitMessageTextResponse, error) { diff --git a/internal/api/grpc/management/custom_text_converter.go b/internal/api/grpc/management/custom_text_converter.go index db0e821fd..705d9007b 100644 --- a/internal/api/grpc/management/custom_text_converter.go +++ b/internal/api/grpc/management/custom_text_converter.go @@ -3,9 +3,9 @@ package management import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/grpc/text" - "github.com/caos/zitadel/internal/domain" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/grpc/text" + "github.com/zitadel/zitadel/internal/domain" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func SetInitCustomTextToDomain(msg *mgmt_pb.SetCustomInitMessageTextRequest) *domain.CustomMessageText { diff --git a/internal/api/grpc/management/features.go b/internal/api/grpc/management/features.go index 98eab8b39..57e2568de 100644 --- a/internal/api/grpc/management/features.go +++ b/internal/api/grpc/management/features.go @@ -3,9 +3,9 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - features_grpc "github.com/caos/zitadel/internal/api/grpc/features" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + features_grpc "github.com/zitadel/zitadel/internal/api/grpc/features" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetFeatures(ctx context.Context, req *mgmt_pb.GetFeaturesRequest) (*mgmt_pb.GetFeaturesResponse, error) { diff --git a/internal/api/grpc/management/flow.go b/internal/api/grpc/management/flow.go index 5d4156f3d..ee978846d 100644 --- a/internal/api/grpc/management/flow.go +++ b/internal/api/grpc/management/flow.go @@ -3,10 +3,10 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - action_grpc "github.com/caos/zitadel/internal/api/grpc/action" - obj_grpc "github.com/caos/zitadel/internal/api/grpc/object" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + action_grpc "github.com/zitadel/zitadel/internal/api/grpc/action" + obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetFlow(ctx context.Context, req *mgmt_pb.GetFlowRequest) (*mgmt_pb.GetFlowResponse, error) { diff --git a/internal/api/grpc/management/iam.go b/internal/api/grpc/management/iam.go index 9bce2508c..4ca2d518b 100644 --- a/internal/api/grpc/management/iam.go +++ b/internal/api/grpc/management/iam.go @@ -3,7 +3,7 @@ package management import ( "context" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetIAM(ctx context.Context, _ *mgmt_pb.GetIAMRequest) (*mgmt_pb.GetIAMResponse, error) { diff --git a/internal/api/grpc/management/idp.go b/internal/api/grpc/management/idp.go index ec6709f41..79b9853cd 100644 --- a/internal/api/grpc/management/idp.go +++ b/internal/api/grpc/management/idp.go @@ -3,11 +3,11 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - idp_grpc "github.com/caos/zitadel/internal/api/grpc/idp" - object_pb "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + idp_grpc "github.com/zitadel/zitadel/internal/api/grpc/idp" + object_pb "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetOrgIDPByID(ctx context.Context, req *mgmt_pb.GetOrgIDPByIDRequest) (*mgmt_pb.GetOrgIDPByIDResponse, error) { diff --git a/internal/api/grpc/management/idp_converter.go b/internal/api/grpc/management/idp_converter.go index 57b04e133..653375ed3 100644 --- a/internal/api/grpc/management/idp_converter.go +++ b/internal/api/grpc/management/idp_converter.go @@ -3,15 +3,15 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - idp_grpc "github.com/caos/zitadel/internal/api/grpc/idp" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + idp_grpc "github.com/zitadel/zitadel/internal/api/grpc/idp" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func addOIDCIDPRequestToDomain(req *mgmt_pb.AddOrgOIDCIDPRequest) *domain.IDPConfig { diff --git a/internal/api/grpc/management/idp_converter_test.go b/internal/api/grpc/management/idp_converter_test.go index 109cf7229..36368c2bf 100644 --- a/internal/api/grpc/management/idp_converter_test.go +++ b/internal/api/grpc/management/idp_converter_test.go @@ -3,9 +3,9 @@ package management import ( "testing" - "github.com/caos/zitadel/internal/test" - "github.com/caos/zitadel/pkg/grpc/idp" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/test" + "github.com/zitadel/zitadel/pkg/grpc/idp" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func Test_addOIDCIDPRequestToDomain(t *testing.T) { diff --git a/internal/api/grpc/management/information.go b/internal/api/grpc/management/information.go index 2b8882bff..e8b040de6 100644 --- a/internal/api/grpc/management/information.go +++ b/internal/api/grpc/management/information.go @@ -3,11 +3,11 @@ package management import ( "context" - "github.com/caos/oidc/v2/pkg/oidc" + "github.com/zitadel/oidc/v2/pkg/oidc" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/http" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/http" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) Healthz(context.Context, *mgmt_pb.HealthzRequest) (*mgmt_pb.HealthzResponse, error) { diff --git a/internal/api/grpc/management/language.go b/internal/api/grpc/management/language.go index 015a923bd..cab36f63e 100644 --- a/internal/api/grpc/management/language.go +++ b/internal/api/grpc/management/language.go @@ -3,8 +3,8 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/grpc/text" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/grpc/text" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetSupportedLanguages(ctx context.Context, req *mgmt_pb.GetSupportedLanguagesRequest) (*mgmt_pb.GetSupportedLanguagesResponse, error) { diff --git a/internal/api/grpc/management/org.go b/internal/api/grpc/management/org.go index 0cf3666a8..976d63f9e 100644 --- a/internal/api/grpc/management/org.go +++ b/internal/api/grpc/management/org.go @@ -3,16 +3,16 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - change_grpc "github.com/caos/zitadel/internal/api/grpc/change" - member_grpc "github.com/caos/zitadel/internal/api/grpc/member" - "github.com/caos/zitadel/internal/api/grpc/object" - org_grpc "github.com/caos/zitadel/internal/api/grpc/org" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + change_grpc "github.com/zitadel/zitadel/internal/api/grpc/change" + member_grpc "github.com/zitadel/zitadel/internal/api/grpc/member" + "github.com/zitadel/zitadel/internal/api/grpc/object" + org_grpc "github.com/zitadel/zitadel/internal/api/grpc/org" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetMyOrg(ctx context.Context, req *mgmt_pb.GetMyOrgRequest) (*mgmt_pb.GetMyOrgResponse, error) { diff --git a/internal/api/grpc/management/org_converter.go b/internal/api/grpc/management/org_converter.go index 0888ca9b7..e6dc17aef 100644 --- a/internal/api/grpc/management/org_converter.go +++ b/internal/api/grpc/management/org_converter.go @@ -3,14 +3,14 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - member_grpc "github.com/caos/zitadel/internal/api/grpc/member" - "github.com/caos/zitadel/internal/api/grpc/object" - org_grpc "github.com/caos/zitadel/internal/api/grpc/org" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + member_grpc "github.com/zitadel/zitadel/internal/api/grpc/member" + "github.com/zitadel/zitadel/internal/api/grpc/object" + org_grpc "github.com/zitadel/zitadel/internal/api/grpc/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func ListOrgDomainsRequestToModel(req *mgmt_pb.ListOrgDomainsRequest) (*query.OrgDomainSearchQueries, error) { diff --git a/internal/api/grpc/management/policy_label.go b/internal/api/grpc/management/policy_label.go index 621be7aad..c5d9333a4 100644 --- a/internal/api/grpc/management/policy_label.go +++ b/internal/api/grpc/management/policy_label.go @@ -3,10 +3,10 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetLabelPolicy(ctx context.Context, req *mgmt_pb.GetLabelPolicyRequest) (*mgmt_pb.GetLabelPolicyResponse, error) { diff --git a/internal/api/grpc/management/policy_label_converter.go b/internal/api/grpc/management/policy_label_converter.go index 4c33565a3..9918d2ea9 100644 --- a/internal/api/grpc/management/policy_label_converter.go +++ b/internal/api/grpc/management/policy_label_converter.go @@ -1,8 +1,8 @@ package management import ( - "github.com/caos/zitadel/internal/domain" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/domain" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func addLabelPolicyToDomain(p *mgmt_pb.AddCustomLabelPolicyRequest) *domain.LabelPolicy { diff --git a/internal/api/grpc/management/policy_lockout.go b/internal/api/grpc/management/policy_lockout.go index b4506b8da..1f5db06c6 100644 --- a/internal/api/grpc/management/policy_lockout.go +++ b/internal/api/grpc/management/policy_lockout.go @@ -3,10 +3,10 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetLockoutPolicy(ctx context.Context, req *mgmt_pb.GetLockoutPolicyRequest) (*mgmt_pb.GetLockoutPolicyResponse, error) { diff --git a/internal/api/grpc/management/policy_lockout_converter.go b/internal/api/grpc/management/policy_lockout_converter.go index dd804a77c..57910c4ab 100644 --- a/internal/api/grpc/management/policy_lockout_converter.go +++ b/internal/api/grpc/management/policy_lockout_converter.go @@ -1,8 +1,8 @@ package management import ( - "github.com/caos/zitadel/internal/domain" - mgmt "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/domain" + mgmt "github.com/zitadel/zitadel/pkg/grpc/management" ) func AddLockoutPolicyToDomain(p *mgmt.AddCustomLockoutPolicyRequest) *domain.LockoutPolicy { diff --git a/internal/api/grpc/management/policy_login.go b/internal/api/grpc/management/policy_login.go index 525ffe085..aaf38d38d 100644 --- a/internal/api/grpc/management/policy_login.go +++ b/internal/api/grpc/management/policy_login.go @@ -3,15 +3,15 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/idp" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/idp" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetLoginPolicy(ctx context.Context, req *mgmt_pb.GetLoginPolicyRequest) (*mgmt_pb.GetLoginPolicyResponse, error) { diff --git a/internal/api/grpc/management/policy_login_converter.go b/internal/api/grpc/management/policy_login_converter.go index 1a393cbbf..e6f63f5fb 100644 --- a/internal/api/grpc/management/policy_login_converter.go +++ b/internal/api/grpc/management/policy_login_converter.go @@ -1,11 +1,11 @@ package management import ( - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func addLoginPolicyToDomain(p *mgmt_pb.AddCustomLoginPolicyRequest) *domain.LoginPolicy { diff --git a/internal/api/grpc/management/policy_password_age.go b/internal/api/grpc/management/policy_password_age.go index b2d6ec8e5..d233927e8 100644 --- a/internal/api/grpc/management/policy_password_age.go +++ b/internal/api/grpc/management/policy_password_age.go @@ -3,10 +3,10 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetPasswordAgePolicy(ctx context.Context, req *mgmt_pb.GetPasswordAgePolicyRequest) (*mgmt_pb.GetPasswordAgePolicyResponse, error) { diff --git a/internal/api/grpc/management/policy_password_age_converter.go b/internal/api/grpc/management/policy_password_age_converter.go index 83aba7e83..c0fe79088 100644 --- a/internal/api/grpc/management/policy_password_age_converter.go +++ b/internal/api/grpc/management/policy_password_age_converter.go @@ -1,8 +1,8 @@ package management import ( - "github.com/caos/zitadel/internal/domain" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/domain" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func AddPasswordAgePolicyToDomain(policy *mgmt_pb.AddCustomPasswordAgePolicyRequest) *domain.PasswordAgePolicy { diff --git a/internal/api/grpc/management/policy_password_complexity.go b/internal/api/grpc/management/policy_password_complexity.go index 0d8af5382..36305014b 100644 --- a/internal/api/grpc/management/policy_password_complexity.go +++ b/internal/api/grpc/management/policy_password_complexity.go @@ -3,10 +3,10 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetPasswordComplexityPolicy(ctx context.Context, req *mgmt_pb.GetPasswordComplexityPolicyRequest) (*mgmt_pb.GetPasswordComplexityPolicyResponse, error) { diff --git a/internal/api/grpc/management/policy_password_complexity_converter.go b/internal/api/grpc/management/policy_password_complexity_converter.go index de78c1f9a..30fd89efd 100644 --- a/internal/api/grpc/management/policy_password_complexity_converter.go +++ b/internal/api/grpc/management/policy_password_complexity_converter.go @@ -1,8 +1,8 @@ package management import ( - "github.com/caos/zitadel/internal/domain" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/domain" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func AddPasswordComplexityPolicyToDomain(req *mgmt_pb.AddCustomPasswordComplexityPolicyRequest) *domain.PasswordComplexityPolicy { diff --git a/internal/api/grpc/management/policy_privacy.go b/internal/api/grpc/management/policy_privacy.go index 1ff36e7b6..aec14a605 100644 --- a/internal/api/grpc/management/policy_privacy.go +++ b/internal/api/grpc/management/policy_privacy.go @@ -3,10 +3,10 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + policy_grpc "github.com/zitadel/zitadel/internal/api/grpc/policy" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetPrivacyPolicy(ctx context.Context, _ *mgmt_pb.GetPrivacyPolicyRequest) (*mgmt_pb.GetPrivacyPolicyResponse, error) { diff --git a/internal/api/grpc/management/policy_privacy_converter.go b/internal/api/grpc/management/policy_privacy_converter.go index 897181562..810ecda9c 100644 --- a/internal/api/grpc/management/policy_privacy_converter.go +++ b/internal/api/grpc/management/policy_privacy_converter.go @@ -1,8 +1,8 @@ package management import ( - "github.com/caos/zitadel/internal/domain" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/domain" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func AddPrivacyPolicyToDomain(req *mgmt_pb.AddCustomPrivacyPolicyRequest) *domain.PrivacyPolicy { diff --git a/internal/api/grpc/management/project.go b/internal/api/grpc/management/project.go index 755d81c12..f214aa205 100644 --- a/internal/api/grpc/management/project.go +++ b/internal/api/grpc/management/project.go @@ -3,13 +3,13 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - change_grpc "github.com/caos/zitadel/internal/api/grpc/change" - member_grpc "github.com/caos/zitadel/internal/api/grpc/member" - object_grpc "github.com/caos/zitadel/internal/api/grpc/object" - project_grpc "github.com/caos/zitadel/internal/api/grpc/project" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + change_grpc "github.com/zitadel/zitadel/internal/api/grpc/change" + member_grpc "github.com/zitadel/zitadel/internal/api/grpc/member" + object_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + project_grpc "github.com/zitadel/zitadel/internal/api/grpc/project" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetProjectByID(ctx context.Context, req *mgmt_pb.GetProjectByIDRequest) (*mgmt_pb.GetProjectByIDResponse, error) { diff --git a/internal/api/grpc/management/project_application.go b/internal/api/grpc/management/project_application.go index c5148a6bb..28e9b96bf 100644 --- a/internal/api/grpc/management/project_application.go +++ b/internal/api/grpc/management/project_application.go @@ -3,14 +3,14 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - authn_grpc "github.com/caos/zitadel/internal/api/grpc/authn" - change_grpc "github.com/caos/zitadel/internal/api/grpc/change" - object_grpc "github.com/caos/zitadel/internal/api/grpc/object" - project_grpc "github.com/caos/zitadel/internal/api/grpc/project" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + authn_grpc "github.com/zitadel/zitadel/internal/api/grpc/authn" + change_grpc "github.com/zitadel/zitadel/internal/api/grpc/change" + object_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + project_grpc "github.com/zitadel/zitadel/internal/api/grpc/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetAppByID(ctx context.Context, req *mgmt_pb.GetAppByIDRequest) (*mgmt_pb.GetAppByIDResponse, error) { diff --git a/internal/api/grpc/management/project_application_converter.go b/internal/api/grpc/management/project_application_converter.go index 40b4ab55a..f4c03b91d 100644 --- a/internal/api/grpc/management/project_application_converter.go +++ b/internal/api/grpc/management/project_application_converter.go @@ -4,14 +4,14 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/authz" - authn_grpc "github.com/caos/zitadel/internal/api/grpc/authn" - "github.com/caos/zitadel/internal/api/grpc/object" - app_grpc "github.com/caos/zitadel/internal/api/grpc/project" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + authn_grpc "github.com/zitadel/zitadel/internal/api/grpc/authn" + "github.com/zitadel/zitadel/internal/api/grpc/object" + app_grpc "github.com/zitadel/zitadel/internal/api/grpc/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func ListAppsRequestToModel(req *mgmt_pb.ListAppsRequest) (*query.AppSearchQueries, error) { diff --git a/internal/api/grpc/management/project_converter.go b/internal/api/grpc/management/project_converter.go index 10c219919..64243ba25 100644 --- a/internal/api/grpc/management/project_converter.go +++ b/internal/api/grpc/management/project_converter.go @@ -3,15 +3,15 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - member_grpc "github.com/caos/zitadel/internal/api/grpc/member" - "github.com/caos/zitadel/internal/api/grpc/object" - proj_grpc "github.com/caos/zitadel/internal/api/grpc/project" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" - proj_pb "github.com/caos/zitadel/pkg/grpc/project" + "github.com/zitadel/zitadel/internal/api/authz" + member_grpc "github.com/zitadel/zitadel/internal/api/grpc/member" + "github.com/zitadel/zitadel/internal/api/grpc/object" + proj_grpc "github.com/zitadel/zitadel/internal/api/grpc/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" + proj_pb "github.com/zitadel/zitadel/pkg/grpc/project" ) func ProjectCreateToDomain(req *mgmt_pb.AddProjectRequest) *domain.Project { diff --git a/internal/api/grpc/management/project_grant.go b/internal/api/grpc/management/project_grant.go index 3f83577bd..48e989fab 100644 --- a/internal/api/grpc/management/project_grant.go +++ b/internal/api/grpc/management/project_grant.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/authz" - member_grpc "github.com/caos/zitadel/internal/api/grpc/member" - object_grpc "github.com/caos/zitadel/internal/api/grpc/object" - proj_grpc "github.com/caos/zitadel/internal/api/grpc/project" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + member_grpc "github.com/zitadel/zitadel/internal/api/grpc/member" + object_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + proj_grpc "github.com/zitadel/zitadel/internal/api/grpc/project" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetProjectGrantByID(ctx context.Context, req *mgmt_pb.GetProjectGrantByIDRequest) (*mgmt_pb.GetProjectGrantByIDResponse, error) { diff --git a/internal/api/grpc/management/project_grant_converter.go b/internal/api/grpc/management/project_grant_converter.go index 966412f0f..1e5d941fa 100644 --- a/internal/api/grpc/management/project_grant_converter.go +++ b/internal/api/grpc/management/project_grant_converter.go @@ -3,15 +3,15 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - member_grpc "github.com/caos/zitadel/internal/api/grpc/member" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" - proj_pb "github.com/caos/zitadel/pkg/grpc/project" + "github.com/zitadel/zitadel/internal/api/authz" + member_grpc "github.com/zitadel/zitadel/internal/api/grpc/member" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" + proj_pb "github.com/zitadel/zitadel/pkg/grpc/project" ) func listProjectGrantsRequestToModel(req *mgmt_pb.ListProjectGrantsRequest) (*query.ProjectGrantSearchQueries, error) { diff --git a/internal/api/grpc/management/server.go b/internal/api/grpc/management/server.go index 4e1271fcc..46de35795 100644 --- a/internal/api/grpc/management/server.go +++ b/internal/api/grpc/management/server.go @@ -3,13 +3,13 @@ package management import ( "google.golang.org/grpc" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/server" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/server" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/pkg/grpc/management" ) const ( diff --git a/internal/api/grpc/management/user.go b/internal/api/grpc/management/user.go index 0b5fb92b4..3b9f74f95 100644 --- a/internal/api/grpc/management/user.go +++ b/internal/api/grpc/management/user.go @@ -4,25 +4,25 @@ import ( "context" "time" - "github.com/caos/logging" - "github.com/caos/oidc/v2/pkg/oidc" + "github.com/zitadel/logging" + "github.com/zitadel/oidc/v2/pkg/oidc" "golang.org/x/text/language" "google.golang.org/protobuf/types/known/durationpb" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/authn" - change_grpc "github.com/caos/zitadel/internal/api/grpc/change" - idp_grpc "github.com/caos/zitadel/internal/api/grpc/idp" - "github.com/caos/zitadel/internal/api/grpc/metadata" - obj_grpc "github.com/caos/zitadel/internal/api/grpc/object" - user_grpc "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/api/http" - z_oidc "github.com/caos/zitadel/internal/api/oidc" - "github.com/caos/zitadel/internal/api/ui/login" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/authn" + change_grpc "github.com/zitadel/zitadel/internal/api/grpc/change" + idp_grpc "github.com/zitadel/zitadel/internal/api/grpc/idp" + "github.com/zitadel/zitadel/internal/api/grpc/metadata" + obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/api/http" + z_oidc "github.com/zitadel/zitadel/internal/api/oidc" + "github.com/zitadel/zitadel/internal/api/ui/login" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetUserByID(ctx context.Context, req *mgmt_pb.GetUserByIDRequest) (*mgmt_pb.GetUserByIDResponse, error) { diff --git a/internal/api/grpc/management/user_converter.go b/internal/api/grpc/management/user_converter.go index b75880a08..11202db21 100644 --- a/internal/api/grpc/management/user_converter.go +++ b/internal/api/grpc/management/user_converter.go @@ -4,19 +4,19 @@ import ( "context" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/authn" - "github.com/caos/zitadel/internal/api/grpc/metadata" - "github.com/caos/zitadel/internal/api/grpc/object" - user_grpc "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - user_model "github.com/caos/zitadel/internal/user/model" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/authn" + "github.com/zitadel/zitadel/internal/api/grpc/metadata" + "github.com/zitadel/zitadel/internal/api/grpc/object" + user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + user_model "github.com/zitadel/zitadel/internal/user/model" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func ListUsersRequestToModel(req *mgmt_pb.ListUsersRequest) (*query.UserSearchQueries, error) { diff --git a/internal/api/grpc/management/user_grant.go b/internal/api/grpc/management/user_grant.go index ceab3d772..6d93f8437 100644 --- a/internal/api/grpc/management/user_grant.go +++ b/internal/api/grpc/management/user_grant.go @@ -3,11 +3,11 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - obj_grpc "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/internal/api/authz" + obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) func (s *Server) GetUserGrantByID(ctx context.Context, req *mgmt_pb.GetUserGrantByIDRequest) (*mgmt_pb.GetUserGrantByIDResponse, error) { diff --git a/internal/api/grpc/management/user_grant_converter.go b/internal/api/grpc/management/user_grant_converter.go index 40ecf6771..17d992d25 100644 --- a/internal/api/grpc/management/user_grant_converter.go +++ b/internal/api/grpc/management/user_grant_converter.go @@ -3,14 +3,14 @@ package management import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - user_grpc "github.com/caos/zitadel/internal/api/grpc/user" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - mgmt_pb "github.com/caos/zitadel/pkg/grpc/management" - "github.com/caos/zitadel/pkg/grpc/user" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/pkg/grpc/user" ) func ListUserGrantsRequestToQuery(ctx context.Context, req *mgmt_pb.ListUserGrantRequest) (*query.UserGrantsQueries, error) { diff --git a/internal/api/grpc/member/converter.go b/internal/api/grpc/member/converter.go index 472860b84..df53409aa 100644 --- a/internal/api/grpc/member/converter.go +++ b/internal/api/grpc/member/converter.go @@ -1,11 +1,11 @@ package member import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" - member_pb "github.com/caos/zitadel/pkg/grpc/member" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" + member_pb "github.com/zitadel/zitadel/pkg/grpc/member" ) func MemberToDomain(member *member_pb.Member) *domain.Member { diff --git a/internal/api/grpc/metadata/metadata.go b/internal/api/grpc/metadata/metadata.go index 64dae5888..31ad5c484 100644 --- a/internal/api/grpc/metadata/metadata.go +++ b/internal/api/grpc/metadata/metadata.go @@ -1,10 +1,10 @@ package metadata import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" - meta_pb "github.com/caos/zitadel/pkg/grpc/metadata" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" + meta_pb "github.com/zitadel/zitadel/pkg/grpc/metadata" ) func MetadataListToPb(dataList []*query.UserMetadata) []*meta_pb.Metadata { diff --git a/internal/api/grpc/object/converter.go b/internal/api/grpc/object/converter.go index 05fc4453a..7590aee0b 100644 --- a/internal/api/grpc/object/converter.go +++ b/internal/api/grpc/object/converter.go @@ -5,9 +5,9 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - object_pb "github.com/caos/zitadel/pkg/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + object_pb "github.com/zitadel/zitadel/pkg/grpc/object" ) func DomainToChangeDetailsPb(objectDetail *domain.ObjectDetails) *object_pb.ObjectDetails { diff --git a/internal/api/grpc/org/converter.go b/internal/api/grpc/org/converter.go index dfd592c64..d107bde10 100644 --- a/internal/api/grpc/org/converter.go +++ b/internal/api/grpc/org/converter.go @@ -1,11 +1,11 @@ package org import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" - org_pb "github.com/caos/zitadel/pkg/grpc/org" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" + org_pb "github.com/zitadel/zitadel/pkg/grpc/org" ) func OrgQueriesToModel(queries []*org_pb.OrgQuery) (_ []query.SearchQuery, err error) { diff --git a/internal/api/grpc/policy/domain_policy.go b/internal/api/grpc/policy/domain_policy.go index d8cc9bacf..69a7693cc 100644 --- a/internal/api/grpc/policy/domain_policy.go +++ b/internal/api/grpc/policy/domain_policy.go @@ -1,9 +1,9 @@ package policy import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/query" - policy_pb "github.com/caos/zitadel/pkg/grpc/policy" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/query" + policy_pb "github.com/zitadel/zitadel/pkg/grpc/policy" ) func DomainPolicyToPb(policy *query.DomainPolicy) *policy_pb.DomainPolicy { diff --git a/internal/api/grpc/policy/label_policy.go b/internal/api/grpc/policy/label_policy.go index 565bf48c8..0b925c372 100644 --- a/internal/api/grpc/policy/label_policy.go +++ b/internal/api/grpc/policy/label_policy.go @@ -1,10 +1,10 @@ package policy import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - policy_pb "github.com/caos/zitadel/pkg/grpc/policy" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + policy_pb "github.com/zitadel/zitadel/pkg/grpc/policy" ) func ModelLabelPolicyToPb(policy *query.LabelPolicy, assetPrefix string) *policy_pb.LabelPolicy { diff --git a/internal/api/grpc/policy/login_policy.go b/internal/api/grpc/policy/login_policy.go index fb1f45660..e9eada18f 100644 --- a/internal/api/grpc/policy/login_policy.go +++ b/internal/api/grpc/policy/login_policy.go @@ -1,10 +1,10 @@ package policy import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/pkg/grpc/object" - policy_pb "github.com/caos/zitadel/pkg/grpc/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/pkg/grpc/object" + policy_pb "github.com/zitadel/zitadel/pkg/grpc/policy" "google.golang.org/protobuf/types/known/durationpb" timestamp_pb "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/api/grpc/policy/multi_factor.go b/internal/api/grpc/policy/multi_factor.go index 2ebf8bb05..3064e5c58 100644 --- a/internal/api/grpc/policy/multi_factor.go +++ b/internal/api/grpc/policy/multi_factor.go @@ -1,8 +1,8 @@ package policy import ( - "github.com/caos/zitadel/internal/domain" - policy_pb "github.com/caos/zitadel/pkg/grpc/policy" + "github.com/zitadel/zitadel/internal/domain" + policy_pb "github.com/zitadel/zitadel/pkg/grpc/policy" ) func MultiFactorTypeToDomain(multiFactorType policy_pb.MultiFactorType) domain.MultiFactorType { diff --git a/internal/api/grpc/policy/password_age_policy.go b/internal/api/grpc/policy/password_age_policy.go index c8de09b61..6c6b4293d 100644 --- a/internal/api/grpc/policy/password_age_policy.go +++ b/internal/api/grpc/policy/password_age_policy.go @@ -1,9 +1,9 @@ package policy import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/query" - policy_pb "github.com/caos/zitadel/pkg/grpc/policy" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/query" + policy_pb "github.com/zitadel/zitadel/pkg/grpc/policy" ) func ModelPasswordAgePolicyToPb(policy *query.PasswordAgePolicy) *policy_pb.PasswordAgePolicy { diff --git a/internal/api/grpc/policy/password_complexity_policy.go b/internal/api/grpc/policy/password_complexity_policy.go index c30bc5aed..c957ce0e2 100644 --- a/internal/api/grpc/policy/password_complexity_policy.go +++ b/internal/api/grpc/policy/password_complexity_policy.go @@ -1,9 +1,9 @@ package policy import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/query" - policy_pb "github.com/caos/zitadel/pkg/grpc/policy" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/query" + policy_pb "github.com/zitadel/zitadel/pkg/grpc/policy" ) func ModelPasswordComplexityPolicyToPb(policy *query.PasswordComplexityPolicy) *policy_pb.PasswordComplexityPolicy { diff --git a/internal/api/grpc/policy/password_lockout_policy.go b/internal/api/grpc/policy/password_lockout_policy.go index 7872140ff..af73f1bce 100644 --- a/internal/api/grpc/policy/password_lockout_policy.go +++ b/internal/api/grpc/policy/password_lockout_policy.go @@ -1,9 +1,9 @@ package policy import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/query" - policy_pb "github.com/caos/zitadel/pkg/grpc/policy" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/query" + policy_pb "github.com/zitadel/zitadel/pkg/grpc/policy" ) func ModelLockoutPolicyToPb(policy *query.LockoutPolicy) *policy_pb.LockoutPolicy { diff --git a/internal/api/grpc/policy/privacy_policy.go b/internal/api/grpc/policy/privacy_policy.go index 3913aa137..9f168199e 100644 --- a/internal/api/grpc/policy/privacy_policy.go +++ b/internal/api/grpc/policy/privacy_policy.go @@ -1,9 +1,9 @@ package policy import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/query" - policy_pb "github.com/caos/zitadel/pkg/grpc/policy" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/query" + policy_pb "github.com/zitadel/zitadel/pkg/grpc/policy" ) func ModelPrivacyPolicyToPb(policy *query.PrivacyPolicy) *policy_pb.PrivacyPolicy { diff --git a/internal/api/grpc/policy/second_factor.go b/internal/api/grpc/policy/second_factor.go index 0214cb2f3..84a61ea00 100644 --- a/internal/api/grpc/policy/second_factor.go +++ b/internal/api/grpc/policy/second_factor.go @@ -1,8 +1,8 @@ package policy import ( - "github.com/caos/zitadel/internal/domain" - policy_pb "github.com/caos/zitadel/pkg/grpc/policy" + "github.com/zitadel/zitadel/internal/domain" + policy_pb "github.com/zitadel/zitadel/pkg/grpc/policy" ) func SecondFactorTypeToDomain(secondFactorType policy_pb.SecondFactorType) domain.SecondFactorType { diff --git a/internal/api/grpc/project/application.go b/internal/api/grpc/project/application.go index 593c81cee..b121c88a9 100644 --- a/internal/api/grpc/project/application.go +++ b/internal/api/grpc/project/application.go @@ -3,12 +3,12 @@ package project import ( "google.golang.org/protobuf/types/known/durationpb" - object_grpc "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" - app_pb "github.com/caos/zitadel/pkg/grpc/app" - message_pb "github.com/caos/zitadel/pkg/grpc/message" + object_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" + app_pb "github.com/zitadel/zitadel/pkg/grpc/app" + message_pb "github.com/zitadel/zitadel/pkg/grpc/message" ) func AppsToPb(apps []*query.App) []*app_pb.App { diff --git a/internal/api/grpc/project/converter.go b/internal/api/grpc/project/converter.go index 92a11a44d..86dafa453 100644 --- a/internal/api/grpc/project/converter.go +++ b/internal/api/grpc/project/converter.go @@ -1,12 +1,12 @@ package project import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - proj_model "github.com/caos/zitadel/internal/project/model" - "github.com/caos/zitadel/internal/query" - proj_pb "github.com/caos/zitadel/pkg/grpc/project" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + proj_model "github.com/zitadel/zitadel/internal/project/model" + "github.com/zitadel/zitadel/internal/query" + proj_pb "github.com/zitadel/zitadel/pkg/grpc/project" ) func ProjectViewsToPb(projects []*query.Project) []*proj_pb.Project { diff --git a/internal/api/grpc/server/gateway.go b/internal/api/grpc/server/gateway.go index 2cc518e07..4310c52db 100644 --- a/internal/api/grpc/server/gateway.go +++ b/internal/api/grpc/server/gateway.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/encoding/protojson" - client_middleware "github.com/caos/zitadel/internal/api/grpc/client/middleware" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" + client_middleware "github.com/zitadel/zitadel/internal/api/grpc/client/middleware" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" ) const ( diff --git a/internal/api/grpc/server/middleware/auth_interceptor.go b/internal/api/grpc/server/middleware/auth_interceptor.go index 828631b65..44bf40a43 100644 --- a/internal/api/grpc/server/middleware/auth_interceptor.go +++ b/internal/api/grpc/server/middleware/auth_interceptor.go @@ -7,10 +7,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/caos/zitadel/internal/api/authz" - grpc_util "github.com/caos/zitadel/internal/api/grpc" - "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/api/authz" + grpc_util "github.com/zitadel/zitadel/internal/api/grpc" + "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func AuthorizationInterceptor(verifier *authz.TokenVerifier, authConfig authz.Config) grpc.UnaryServerInterceptor { diff --git a/internal/api/grpc/server/middleware/auth_interceptor_test.go b/internal/api/grpc/server/middleware/auth_interceptor_test.go index 4dcda1541..3ab740989 100644 --- a/internal/api/grpc/server/middleware/auth_interceptor_test.go +++ b/internal/api/grpc/server/middleware/auth_interceptor_test.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" ) var ( diff --git a/internal/api/grpc/server/middleware/cache_interceptor.go b/internal/api/grpc/server/middleware/cache_interceptor.go index d258bcd9d..0b2447d4d 100644 --- a/internal/api/grpc/server/middleware/cache_interceptor.go +++ b/internal/api/grpc/server/middleware/cache_interceptor.go @@ -5,12 +5,12 @@ import ( "net/http" "time" - "github.com/caos/logging" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/zitadel/logging" "google.golang.org/grpc" "google.golang.org/grpc/metadata" - _ "github.com/caos/zitadel/internal/statik" + _ "github.com/zitadel/zitadel/internal/statik" ) func NoCacheInterceptor() grpc.UnaryServerInterceptor { diff --git a/internal/api/grpc/server/middleware/error_interceptor.go b/internal/api/grpc/server/middleware/error_interceptor.go index 31a4f1d27..b06cd930f 100644 --- a/internal/api/grpc/server/middleware/error_interceptor.go +++ b/internal/api/grpc/server/middleware/error_interceptor.go @@ -2,11 +2,12 @@ package middleware import ( "context" - "github.com/caos/zitadel/internal/api/grpc/errors" + + "github.com/zitadel/zitadel/internal/api/grpc/errors" "google.golang.org/grpc" - _ "github.com/caos/zitadel/internal/statik" + _ "github.com/zitadel/zitadel/internal/statik" ) func ErrorHandler() grpc.UnaryServerInterceptor { diff --git a/internal/api/grpc/server/middleware/instance_interceptor.go b/internal/api/grpc/server/middleware/instance_interceptor.go index c2dc958a0..f497fd103 100644 --- a/internal/api/grpc/server/middleware/instance_interceptor.go +++ b/internal/api/grpc/server/middleware/instance_interceptor.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" ) type InstanceVerifier interface { diff --git a/internal/api/grpc/server/middleware/instance_interceptor_test.go b/internal/api/grpc/server/middleware/instance_interceptor_test.go index 7d0dadae8..e4a73808c 100644 --- a/internal/api/grpc/server/middleware/instance_interceptor_test.go +++ b/internal/api/grpc/server/middleware/instance_interceptor_test.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" ) func Test_hostNameFromContext(t *testing.T) { diff --git a/internal/api/grpc/server/middleware/metrics_interceptor.go b/internal/api/grpc/server/middleware/metrics_interceptor.go index e034cd83c..805494fd3 100644 --- a/internal/api/grpc/server/middleware/metrics_interceptor.go +++ b/internal/api/grpc/server/middleware/metrics_interceptor.go @@ -9,8 +9,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/status" - _ "github.com/caos/zitadel/internal/statik" - "github.com/caos/zitadel/internal/telemetry/metrics" + _ "github.com/zitadel/zitadel/internal/statik" + "github.com/zitadel/zitadel/internal/telemetry/metrics" ) const ( diff --git a/internal/api/grpc/server/middleware/mock_test.go b/internal/api/grpc/server/middleware/mock_test.go index ebd75b9d3..8670a20fb 100644 --- a/internal/api/grpc/server/middleware/mock_test.go +++ b/internal/api/grpc/server/middleware/mock_test.go @@ -5,7 +5,7 @@ import ( "google.golang.org/grpc" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) func emptyMockHandler(_ context.Context, req interface{}) (interface{}, error) { diff --git a/internal/api/grpc/server/middleware/service_interceptor.go b/internal/api/grpc/server/middleware/service_interceptor.go index 36b4e3470..99291e936 100644 --- a/internal/api/grpc/server/middleware/service_interceptor.go +++ b/internal/api/grpc/server/middleware/service_interceptor.go @@ -3,8 +3,8 @@ package middleware import ( "context" - "github.com/caos/zitadel/internal/api/service" - _ "github.com/caos/zitadel/internal/statik" + "github.com/zitadel/zitadel/internal/api/service" + _ "github.com/zitadel/zitadel/internal/statik" "google.golang.org/grpc" ) diff --git a/internal/api/grpc/server/middleware/tracing.go b/internal/api/grpc/server/middleware/tracing.go index b8c6a6909..cf369bc46 100644 --- a/internal/api/grpc/server/middleware/tracing.go +++ b/internal/api/grpc/server/middleware/tracing.go @@ -4,7 +4,7 @@ import ( "context" "strings" - grpc_utils "github.com/caos/zitadel/internal/api/grpc" + grpc_utils "github.com/zitadel/zitadel/internal/api/grpc" grpc_trace "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" ) diff --git a/internal/api/grpc/server/middleware/translation_interceptor.go b/internal/api/grpc/server/middleware/translation_interceptor.go index a23cebb3a..6380c3e38 100644 --- a/internal/api/grpc/server/middleware/translation_interceptor.go +++ b/internal/api/grpc/server/middleware/translation_interceptor.go @@ -5,9 +5,9 @@ import ( "google.golang.org/grpc" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - _ "github.com/caos/zitadel/internal/statik" + _ "github.com/zitadel/zitadel/internal/statik" ) func TranslationHandler() func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) { diff --git a/internal/api/grpc/server/middleware/translator.go b/internal/api/grpc/server/middleware/translator.go index 88ac2ccdc..6d5b1dd66 100644 --- a/internal/api/grpc/server/middleware/translator.go +++ b/internal/api/grpc/server/middleware/translator.go @@ -4,12 +4,12 @@ import ( "context" "errors" - "github.com/caos/logging" "github.com/rakyll/statik/fs" + "github.com/zitadel/logging" "golang.org/x/text/language" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/i18n" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/i18n" ) type localizers interface { diff --git a/internal/api/grpc/server/probes.go b/internal/api/grpc/server/probes.go index e794a4465..a81bceb32 100644 --- a/internal/api/grpc/server/probes.go +++ b/internal/api/grpc/server/probes.go @@ -3,13 +3,13 @@ package server import ( "context" - "github.com/caos/logging" "github.com/golang/protobuf/ptypes/empty" structpb "github.com/golang/protobuf/ptypes/struct" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/proto" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/proto" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) type ValidationFunction func(ctx context.Context) error diff --git a/internal/api/grpc/server/probes_test.go b/internal/api/grpc/server/probes_test.go index 1c1b8b277..15c889e24 100644 --- a/internal/api/grpc/server/probes_test.go +++ b/internal/api/grpc/server/probes_test.go @@ -7,7 +7,7 @@ import ( "github.com/golang/protobuf/ptypes/empty" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) func TestValidator_Healthz(t *testing.T) { diff --git a/internal/api/grpc/server/server.go b/internal/api/grpc/server/server.go index 3cad7cf8e..a6ad6edee 100644 --- a/internal/api/grpc/server/server.go +++ b/internal/api/grpc/server/server.go @@ -4,11 +4,11 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "google.golang.org/grpc" - "github.com/caos/zitadel/internal/api/authz" - grpc_api "github.com/caos/zitadel/internal/api/grpc" - "github.com/caos/zitadel/internal/api/grpc/server/middleware" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/telemetry/metrics" + "github.com/zitadel/zitadel/internal/api/authz" + grpc_api "github.com/zitadel/zitadel/internal/api/grpc" + "github.com/zitadel/zitadel/internal/api/grpc/server/middleware" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/telemetry/metrics" ) type Server interface { diff --git a/internal/api/grpc/settings/converter.go b/internal/api/grpc/settings/converter.go index 660cfd69f..ddc9642f1 100644 --- a/internal/api/grpc/settings/converter.go +++ b/internal/api/grpc/settings/converter.go @@ -1,9 +1,9 @@ package settings import ( - obj_pb "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/query" - settings_pb "github.com/caos/zitadel/pkg/grpc/settings" + obj_pb "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/query" + settings_pb "github.com/zitadel/zitadel/pkg/grpc/settings" ) func NotificationProviderToPb(provider *query.DebugNotificationProvider) *settings_pb.DebugNotificationProvider { diff --git a/internal/api/grpc/system/failed_event.go b/internal/api/grpc/system/failed_event.go index 6e3ae82a8..9e2d24829 100644 --- a/internal/api/grpc/system/failed_event.go +++ b/internal/api/grpc/system/failed_event.go @@ -3,8 +3,8 @@ package system import ( "context" - "github.com/caos/zitadel/internal/query" - system_pb "github.com/caos/zitadel/pkg/grpc/system" + "github.com/zitadel/zitadel/internal/query" + system_pb "github.com/zitadel/zitadel/pkg/grpc/system" ) func (s *Server) ListFailedEvents(ctx context.Context, req *system_pb.ListFailedEventsRequest) (*system_pb.ListFailedEventsResponse, error) { diff --git a/internal/api/grpc/system/failed_event_converter.go b/internal/api/grpc/system/failed_event_converter.go index 2b0a87af7..b73413adb 100644 --- a/internal/api/grpc/system/failed_event_converter.go +++ b/internal/api/grpc/system/failed_event_converter.go @@ -1,9 +1,9 @@ package system import ( - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/view/model" - system_pb "github.com/caos/zitadel/pkg/grpc/system" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/view/model" + system_pb "github.com/zitadel/zitadel/pkg/grpc/system" ) func FailedEventsViewToPb(failedEvents []*model.FailedEvent) []*system_pb.FailedEvent { diff --git a/internal/api/grpc/system/failed_event_converter_test.go b/internal/api/grpc/system/failed_event_converter_test.go index 7dc389752..71cb175ce 100644 --- a/internal/api/grpc/system/failed_event_converter_test.go +++ b/internal/api/grpc/system/failed_event_converter_test.go @@ -3,10 +3,10 @@ package system_test import ( "testing" - system_grpc "github.com/caos/zitadel/internal/api/grpc/system" - "github.com/caos/zitadel/internal/test" - "github.com/caos/zitadel/internal/view/model" - system_pb "github.com/caos/zitadel/pkg/grpc/system" + system_grpc "github.com/zitadel/zitadel/internal/api/grpc/system" + "github.com/zitadel/zitadel/internal/test" + "github.com/zitadel/zitadel/internal/view/model" + system_pb "github.com/zitadel/zitadel/pkg/grpc/system" ) func TestFailedEventsToPbFields(t *testing.T) { diff --git a/internal/api/grpc/system/instance.go b/internal/api/grpc/system/instance.go index d7f0335dd..365039219 100644 --- a/internal/api/grpc/system/instance.go +++ b/internal/api/grpc/system/instance.go @@ -3,11 +3,11 @@ package system import ( "context" - "github.com/caos/zitadel/internal/api/authz" - instance_grpc "github.com/caos/zitadel/internal/api/grpc/instance" - "github.com/caos/zitadel/internal/api/grpc/object" - object_pb "github.com/caos/zitadel/pkg/grpc/object" - system_pb "github.com/caos/zitadel/pkg/grpc/system" + "github.com/zitadel/zitadel/internal/api/authz" + instance_grpc "github.com/zitadel/zitadel/internal/api/grpc/instance" + "github.com/zitadel/zitadel/internal/api/grpc/object" + object_pb "github.com/zitadel/zitadel/pkg/grpc/object" + system_pb "github.com/zitadel/zitadel/pkg/grpc/system" ) func (s *Server) ListInstances(ctx context.Context, req *system_pb.ListInstancesRequest) (*system_pb.ListInstancesResponse, error) { diff --git a/internal/api/grpc/system/instance_converter.go b/internal/api/grpc/system/instance_converter.go index 958b4001c..761e5cd3f 100644 --- a/internal/api/grpc/system/instance_converter.go +++ b/internal/api/grpc/system/instance_converter.go @@ -1,12 +1,12 @@ package system import ( - instance_grpc "github.com/caos/zitadel/internal/api/grpc/instance" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/query" - instance_pb "github.com/caos/zitadel/pkg/grpc/instance" - system_pb "github.com/caos/zitadel/pkg/grpc/system" + instance_grpc "github.com/zitadel/zitadel/internal/api/grpc/instance" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/query" + instance_pb "github.com/zitadel/zitadel/pkg/grpc/instance" + system_pb "github.com/zitadel/zitadel/pkg/grpc/system" ) func AddInstancePbToSetupInstance(req *system_pb.AddInstanceRequest, defaultInstance command.InstanceSetup) *command.InstanceSetup { diff --git a/internal/api/grpc/system/server.go b/internal/api/grpc/system/server.go index fba50e3d2..d862ed19b 100644 --- a/internal/api/grpc/system/server.go +++ b/internal/api/grpc/system/server.go @@ -3,14 +3,14 @@ package system import ( "google.golang.org/grpc" - "github.com/caos/zitadel/internal/admin/repository" + "github.com/zitadel/zitadel/internal/admin/repository" - "github.com/caos/zitadel/internal/admin/repository/eventsourcing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/server" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/pkg/grpc/system" + "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/server" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/pkg/grpc/system" ) const ( diff --git a/internal/api/grpc/system/view.go b/internal/api/grpc/system/view.go index 2ae458651..9c610e071 100644 --- a/internal/api/grpc/system/view.go +++ b/internal/api/grpc/system/view.go @@ -3,8 +3,8 @@ package system import ( "context" - "github.com/caos/zitadel/internal/query" - system_pb "github.com/caos/zitadel/pkg/grpc/system" + "github.com/zitadel/zitadel/internal/query" + system_pb "github.com/zitadel/zitadel/pkg/grpc/system" ) func (s *Server) ListViews(ctx context.Context, _ *system_pb.ListViewsRequest) (*system_pb.ListViewsResponse, error) { diff --git a/internal/api/grpc/system/view_converter.go b/internal/api/grpc/system/view_converter.go index 5d2273aaf..5af11c9d7 100644 --- a/internal/api/grpc/system/view_converter.go +++ b/internal/api/grpc/system/view_converter.go @@ -1,9 +1,9 @@ package system import ( - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/view/model" - system_pb "github.com/caos/zitadel/pkg/grpc/system" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/view/model" + system_pb "github.com/zitadel/zitadel/pkg/grpc/system" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/api/grpc/text/custom_text.go b/internal/api/grpc/text/custom_text.go index 5f4a1040a..ad4d4ae97 100644 --- a/internal/api/grpc/text/custom_text.go +++ b/internal/api/grpc/text/custom_text.go @@ -1,10 +1,10 @@ package text import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - text_pb "github.com/caos/zitadel/pkg/grpc/text" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + text_pb "github.com/zitadel/zitadel/pkg/grpc/text" ) func ModelCustomMessageTextToPb(msg *query.MessageText) *text_pb.MessageCustomText { diff --git a/internal/api/grpc/user/converter.go b/internal/api/grpc/user/converter.go index 3fd62e50c..1b268498d 100644 --- a/internal/api/grpc/user/converter.go +++ b/internal/api/grpc/user/converter.go @@ -1,11 +1,11 @@ package user import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - user_pb "github.com/caos/zitadel/pkg/grpc/user" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + user_pb "github.com/zitadel/zitadel/pkg/grpc/user" ) func UsersToPb(users []*query.User, assetPrefix string) []*user_pb.User { diff --git a/internal/api/grpc/user/membership.go b/internal/api/grpc/user/membership.go index 6a61b1b36..43f17ead1 100644 --- a/internal/api/grpc/user/membership.go +++ b/internal/api/grpc/user/membership.go @@ -1,12 +1,12 @@ package user import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" - user_model "github.com/caos/zitadel/internal/user/model" - user_pb "github.com/caos/zitadel/pkg/grpc/user" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" + user_model "github.com/zitadel/zitadel/internal/user/model" + user_pb "github.com/zitadel/zitadel/pkg/grpc/user" ) func MembershipQueriesToQuery(queries []*user_pb.MembershipQuery) (_ []query.SearchQuery, err error) { diff --git a/internal/api/grpc/user/personal_access_token.go b/internal/api/grpc/user/personal_access_token.go index 2e512aa4c..a2ba3f00b 100644 --- a/internal/api/grpc/user/personal_access_token.go +++ b/internal/api/grpc/user/personal_access_token.go @@ -3,9 +3,9 @@ package user import ( "google.golang.org/protobuf/types/known/timestamppb" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/pkg/grpc/user" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/pkg/grpc/user" ) func PersonalAccessTokensToPb(tokens []*query.PersonalAccessToken) []*user.PersonalAccessToken { diff --git a/internal/api/grpc/user/query.go b/internal/api/grpc/user/query.go index d6d9e456d..190b8a815 100644 --- a/internal/api/grpc/user/query.go +++ b/internal/api/grpc/user/query.go @@ -1,10 +1,10 @@ package user import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" - user_pb "github.com/caos/zitadel/pkg/grpc/user" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" + user_pb "github.com/zitadel/zitadel/pkg/grpc/user" ) func UserQueriesToQuery(queries []*user_pb.SearchQuery) (_ []query.SearchQuery, err error) { diff --git a/internal/api/grpc/user/refresh_token.go b/internal/api/grpc/user/refresh_token.go index 315a07b63..2ace4e121 100644 --- a/internal/api/grpc/user/refresh_token.go +++ b/internal/api/grpc/user/refresh_token.go @@ -3,9 +3,9 @@ package user import ( "google.golang.org/protobuf/types/known/timestamppb" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/pkg/grpc/user" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/pkg/grpc/user" ) func RefreshTokensToPb(refreshTokens []*model.RefreshTokenView) []*user.RefreshToken { diff --git a/internal/api/grpc/user/session.go b/internal/api/grpc/user/session.go index f8c3eaa6d..a55c576e4 100644 --- a/internal/api/grpc/user/session.go +++ b/internal/api/grpc/user/session.go @@ -1,10 +1,10 @@ package user import ( - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - user_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/pkg/grpc/user" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + user_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/pkg/grpc/user" ) func UserSessionsToPb(sessions []*user_model.UserSessionView) []*user.Session { diff --git a/internal/api/grpc/user/user_grant.go b/internal/api/grpc/user/user_grant.go index 6ccf8db64..42292966b 100644 --- a/internal/api/grpc/user/user_grant.go +++ b/internal/api/grpc/user/user_grant.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/object" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" - user_pb "github.com/caos/zitadel/pkg/grpc/user" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" + user_pb "github.com/zitadel/zitadel/pkg/grpc/user" ) func UserGrantsToPb(assetPrefix string, grants []*query.UserGrant) []*user_pb.UserGrant { diff --git a/internal/api/http/cookie.go b/internal/api/http/cookie.go index 134e67bbe..4dbadcc24 100644 --- a/internal/api/http/cookie.go +++ b/internal/api/http/cookie.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/securecookie" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) const ( diff --git a/internal/api/http/domain_check.go b/internal/api/http/domain_check.go index 377a653b1..b4281c778 100644 --- a/internal/api/http/domain_check.go +++ b/internal/api/http/domain_check.go @@ -6,7 +6,7 @@ import ( "net" "net/http" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type CheckType int diff --git a/internal/api/http/marshal.go b/internal/api/http/marshal.go index 47ac18452..35fdda5f5 100644 --- a/internal/api/http/marshal.go +++ b/internal/api/http/marshal.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/caos/logging" + "github.com/zitadel/logging" ) func MarshalJSON(w http.ResponseWriter, i interface{}, err error, statusCode int) { diff --git a/internal/api/http/middleware/auth_interceptor.go b/internal/api/http/middleware/auth_interceptor.go index fed104066..d2419d837 100644 --- a/internal/api/http/middleware/auth_interceptor.go +++ b/internal/api/http/middleware/auth_interceptor.go @@ -5,9 +5,9 @@ import ( "errors" "net/http" - "github.com/caos/zitadel/internal/api/authz" - http_util "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/api/authz" + http_util "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) type AuthInterceptor struct { diff --git a/internal/api/http/middleware/cache_interceptor.go b/internal/api/http/middleware/cache_interceptor.go index a948e12c5..5a8af8b80 100644 --- a/internal/api/http/middleware/cache_interceptor.go +++ b/internal/api/http/middleware/cache_interceptor.go @@ -7,7 +7,7 @@ import ( "strings" "time" - http_utils "github.com/caos/zitadel/internal/api/http" + http_utils "github.com/zitadel/zitadel/internal/api/http" ) type Cache struct { diff --git a/internal/api/http/middleware/cors_interceptor.go b/internal/api/http/middleware/cors_interceptor.go index adf759174..2b46ccd73 100644 --- a/internal/api/http/middleware/cors_interceptor.go +++ b/internal/api/http/middleware/cors_interceptor.go @@ -5,7 +5,7 @@ import ( "github.com/rs/cors" - http_utils "github.com/caos/zitadel/internal/api/http" + http_utils "github.com/zitadel/zitadel/internal/api/http" ) var ( diff --git a/internal/api/http/middleware/instance_interceptor.go b/internal/api/http/middleware/instance_interceptor.go index 5436f4f40..e37560a53 100644 --- a/internal/api/http/middleware/instance_interceptor.go +++ b/internal/api/http/middleware/instance_interceptor.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) type instanceInterceptor struct { diff --git a/internal/api/http/middleware/instance_interceptor_test.go b/internal/api/http/middleware/instance_interceptor_test.go index 217fd6c59..039ac0a1c 100644 --- a/internal/api/http/middleware/instance_interceptor_test.go +++ b/internal/api/http/middleware/instance_interceptor_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" ) func Test_instanceInterceptor_Handler(t *testing.T) { diff --git a/internal/api/http/middleware/metrics_interceptor.go b/internal/api/http/middleware/metrics_interceptor.go index a47f5b32a..78d953ba3 100644 --- a/internal/api/http/middleware/metrics_interceptor.go +++ b/internal/api/http/middleware/metrics_interceptor.go @@ -1,10 +1,11 @@ package middleware import ( - "github.com/caos/zitadel/internal/telemetry/metrics" "net/http" - http_utils "github.com/caos/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/telemetry/metrics" + + http_utils "github.com/zitadel/zitadel/internal/api/http" ) func DefaultMetricsHandler(handler http.Handler) http.Handler { diff --git a/internal/api/http/middleware/security_headers.go b/internal/api/http/middleware/security_headers.go index c4f221fb6..e2ff49aa4 100644 --- a/internal/api/http/middleware/security_headers.go +++ b/internal/api/http/middleware/security_headers.go @@ -6,7 +6,7 @@ import ( "encoding/base64" "net/http" - http_utils "github.com/caos/zitadel/internal/api/http" + http_utils "github.com/zitadel/zitadel/internal/api/http" ) type securityKey int diff --git a/internal/api/http/middleware/telemetry_interceptor.go b/internal/api/http/middleware/telemetry_interceptor.go index bc447c0a1..ab9fccca7 100644 --- a/internal/api/http/middleware/telemetry_interceptor.go +++ b/internal/api/http/middleware/telemetry_interceptor.go @@ -1,10 +1,11 @@ package middleware import ( - "github.com/caos/zitadel/internal/telemetry" "net/http" - http_utils "github.com/caos/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/telemetry" + + http_utils "github.com/zitadel/zitadel/internal/api/http" ) func DefaultTelemetryHandler(handler http.Handler) http.Handler { diff --git a/internal/api/http/middleware/user_agent_cookie.go b/internal/api/http/middleware/user_agent_cookie.go index 2aa736fb4..e471a5b28 100644 --- a/internal/api/http/middleware/user_agent_cookie.go +++ b/internal/api/http/middleware/user_agent_cookie.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - http_utils "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/id" + http_utils "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/id" ) type cookieKey int diff --git a/internal/api/http/parser.go b/internal/api/http/parser.go index fb24460e7..f53df0340 100644 --- a/internal/api/http/parser.go +++ b/internal/api/http/parser.go @@ -5,7 +5,7 @@ import ( "github.com/gorilla/schema" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type Parser struct { diff --git a/internal/api/oidc/auth_request.go b/internal/api/oidc/auth_request.go index aff1241f9..0836bc0bc 100644 --- a/internal/api/oidc/auth_request.go +++ b/internal/api/oidc/auth_request.go @@ -5,16 +5,16 @@ import ( "strings" "time" - "github.com/caos/logging" - "github.com/caos/oidc/v2/pkg/oidc" - "github.com/caos/oidc/v2/pkg/op" + "github.com/zitadel/logging" + "github.com/zitadel/oidc/v2/pkg/oidc" + "github.com/zitadel/oidc/v2/pkg/op" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/telemetry/tracing" - "github.com/caos/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/user/model" ) func (o *OPStorage) CreateAuthRequest(ctx context.Context, req *oidc.AuthRequest, userID string) (_ op.AuthRequest, err error) { diff --git a/internal/api/oidc/auth_request_converter.go b/internal/api/oidc/auth_request_converter.go index ac19c454e..927a8c377 100644 --- a/internal/api/oidc/auth_request_converter.go +++ b/internal/api/oidc/auth_request_converter.go @@ -6,15 +6,15 @@ import ( "strings" "time" - "github.com/caos/oidc/v2/pkg/oidc" - "github.com/caos/oidc/v2/pkg/op" + "github.com/zitadel/oidc/v2/pkg/oidc" + "github.com/zitadel/oidc/v2/pkg/op" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - http_utils "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/api/authz" + http_utils "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/user/model" ) const ( diff --git a/internal/api/oidc/client.go b/internal/api/oidc/client.go index f471881f0..93fb24ce2 100644 --- a/internal/api/oidc/client.go +++ b/internal/api/oidc/client.go @@ -5,17 +5,17 @@ import ( "encoding/base64" "strings" - "github.com/caos/oidc/v2/pkg/oidc" - "github.com/caos/oidc/v2/pkg/op" + "github.com/zitadel/oidc/v2/pkg/oidc" + "github.com/zitadel/oidc/v2/pkg/op" "gopkg.in/square/go-jose.v2" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) const ( diff --git a/internal/api/oidc/client_converter.go b/internal/api/oidc/client_converter.go index eb6d67c90..90e45a8d4 100644 --- a/internal/api/oidc/client_converter.go +++ b/internal/api/oidc/client_converter.go @@ -4,12 +4,12 @@ import ( "strings" "time" - "github.com/caos/oidc/v2/pkg/oidc" - "github.com/caos/oidc/v2/pkg/op" + "github.com/zitadel/oidc/v2/pkg/oidc" + "github.com/zitadel/oidc/v2/pkg/op" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" ) type Client struct { diff --git a/internal/api/oidc/key.go b/internal/api/oidc/key.go index 2d0e175ef..220c4e059 100644 --- a/internal/api/oidc/key.go +++ b/internal/api/oidc/key.go @@ -5,17 +5,17 @@ import ( "fmt" "time" - "github.com/caos/logging" - "github.com/caos/oidc/v2/pkg/op" + "github.com/zitadel/logging" + "github.com/zitadel/oidc/v2/pkg/op" "gopkg.in/square/go-jose.v2" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/repository/keypair" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) const ( diff --git a/internal/api/oidc/op.go b/internal/api/oidc/op.go index 5e27ae319..e8e94444b 100644 --- a/internal/api/oidc/op.go +++ b/internal/api/oidc/op.go @@ -7,23 +7,23 @@ import ( "net/http" "time" - "github.com/caos/oidc/v2/pkg/op" "github.com/rakyll/statik/fs" + "github.com/zitadel/oidc/v2/pkg/op" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/assets" - http_utils "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/api/ui/login" - "github.com/caos/zitadel/internal/auth/repository" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/i18n" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/telemetry/metrics" + "github.com/zitadel/zitadel/internal/api/assets" + http_utils "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/api/ui/login" + "github.com/zitadel/zitadel/internal/auth/repository" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/telemetry/metrics" ) const ( diff --git a/internal/api/ui/console/console.go b/internal/api/ui/console/console.go index 6ff94b076..8d6729f7c 100644 --- a/internal/api/ui/console/console.go +++ b/internal/api/ui/console/console.go @@ -10,13 +10,13 @@ import ( "path" "time" - "github.com/caos/logging" - "github.com/caos/oidc/v2/pkg/op" "github.com/gorilla/mux" + "github.com/zitadel/logging" + "github.com/zitadel/oidc/v2/pkg/op" - "github.com/caos/zitadel/internal/api/authz" - http_util "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/api/authz" + http_util "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/api/http/middleware" ) type Config struct { diff --git a/internal/api/ui/login/auth_request.go b/internal/api/ui/login/auth_request.go index d7a298407..4478d129e 100644 --- a/internal/api/ui/login/auth_request.go +++ b/internal/api/ui/login/auth_request.go @@ -3,9 +3,9 @@ package login import ( "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" ) const ( diff --git a/internal/api/ui/login/change_password_handler.go b/internal/api/ui/login/change_password_handler.go index 39a9772e4..e6117c5fe 100644 --- a/internal/api/ui/login/change_password_handler.go +++ b/internal/api/ui/login/change_password_handler.go @@ -3,9 +3,9 @@ package login import ( "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" ) const ( diff --git a/internal/api/ui/login/custom_action.go b/internal/api/ui/login/custom_action.go index 93360a400..b9a171361 100644 --- a/internal/api/ui/login/custom_action.go +++ b/internal/api/ui/login/custom_action.go @@ -3,12 +3,12 @@ package login import ( "context" - "github.com/caos/oidc/v2/pkg/oidc" + "github.com/zitadel/oidc/v2/pkg/oidc" - "github.com/caos/zitadel/internal/actions" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - iam_model "github.com/caos/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/actions" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + iam_model "github.com/zitadel/zitadel/internal/iam/model" ) func (l *Login) customExternalUserMapping(ctx context.Context, user *domain.ExternalUser, tokens *oidc.Tokens, req *domain.AuthRequest, config *iam_model.IDPConfigView) (*domain.ExternalUser, error) { diff --git a/internal/api/ui/login/external_login_handler.go b/internal/api/ui/login/external_login_handler.go index 09c2b7d42..af4fc4226 100644 --- a/internal/api/ui/login/external_login_handler.go +++ b/internal/api/ui/login/external_login_handler.go @@ -8,17 +8,17 @@ import ( "strings" "time" - "github.com/caos/oidc/v2/pkg/client/rp" - "github.com/caos/oidc/v2/pkg/oidc" + "github.com/zitadel/oidc/v2/pkg/client/rp" + "github.com/zitadel/oidc/v2/pkg/oidc" "golang.org/x/oauth2" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - caos_errors "github.com/caos/zitadel/internal/errors" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/query" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + caos_errors "github.com/zitadel/zitadel/internal/errors" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/query" ) const ( diff --git a/internal/api/ui/login/external_register_handler.go b/internal/api/ui/login/external_register_handler.go index 3fdb83ef3..ca7adebe1 100644 --- a/internal/api/ui/login/external_register_handler.go +++ b/internal/api/ui/login/external_register_handler.go @@ -4,14 +4,14 @@ import ( "net/http" "strings" - "github.com/caos/oidc/v2/pkg/client/rp" - "github.com/caos/oidc/v2/pkg/oidc" + "github.com/zitadel/oidc/v2/pkg/client/rp" + "github.com/zitadel/oidc/v2/pkg/oidc" "golang.org/x/text/language" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/domain" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/query" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/query" ) const ( diff --git a/internal/api/ui/login/init_password_handler.go b/internal/api/ui/login/init_password_handler.go index d1c7445d7..f8887f79c 100644 --- a/internal/api/ui/login/init_password_handler.go +++ b/internal/api/ui/login/init_password_handler.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" ) const ( diff --git a/internal/api/ui/login/init_user_handler.go b/internal/api/ui/login/init_user_handler.go index fa91ce5ac..eceb7e43e 100644 --- a/internal/api/ui/login/init_user_handler.go +++ b/internal/api/ui/login/init_user_handler.go @@ -5,9 +5,9 @@ import ( "net/http" "strconv" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) const ( diff --git a/internal/api/ui/login/jwt_handler.go b/internal/api/ui/login/jwt_handler.go index af8677ee2..e343d62ea 100644 --- a/internal/api/ui/login/jwt_handler.go +++ b/internal/api/ui/login/jwt_handler.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/caos/logging" - "github.com/caos/oidc/v2/pkg/client/rp" - "github.com/caos/oidc/v2/pkg/oidc" + "github.com/zitadel/logging" + "github.com/zitadel/oidc/v2/pkg/client/rp" + "github.com/zitadel/oidc/v2/pkg/oidc" - http_util "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - iam_model "github.com/caos/zitadel/internal/iam/model" + http_util "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + iam_model "github.com/zitadel/zitadel/internal/iam/model" ) type jwtRequest struct { diff --git a/internal/api/ui/login/link_users_handler.go b/internal/api/ui/login/link_users_handler.go index 65f95a655..8aedc1c51 100644 --- a/internal/api/ui/login/link_users_handler.go +++ b/internal/api/ui/login/link_users_handler.go @@ -3,8 +3,8 @@ package login import ( "net/http" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/domain" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/api/ui/login/login.go b/internal/api/ui/login/login.go index cb3122b39..d2040055d 100644 --- a/internal/api/ui/login/login.go +++ b/internal/api/ui/login/login.go @@ -9,18 +9,18 @@ import ( "github.com/gorilla/mux" "github.com/rakyll/statik/fs" - "github.com/caos/zitadel/internal/api/authz" - http_utils "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/api/http/middleware" - _ "github.com/caos/zitadel/internal/api/ui/login/statik" - auth_repository "github.com/caos/zitadel/internal/auth/repository" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/form" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/api/authz" + http_utils "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/api/http/middleware" + _ "github.com/zitadel/zitadel/internal/api/ui/login/statik" + auth_repository "github.com/zitadel/zitadel/internal/auth/repository" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/form" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/static" ) type Login struct { diff --git a/internal/api/ui/login/login_handler.go b/internal/api/ui/login/login_handler.go index cc292ba69..495109566 100644 --- a/internal/api/ui/login/login_handler.go +++ b/internal/api/ui/login/login_handler.go @@ -3,9 +3,9 @@ package login import ( "net/http" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" ) const ( diff --git a/internal/api/ui/login/login_success_handler.go b/internal/api/ui/login/login_success_handler.go index cdb9fa9b7..3d9e7dabf 100644 --- a/internal/api/ui/login/login_success_handler.go +++ b/internal/api/ui/login/login_success_handler.go @@ -3,7 +3,7 @@ package login import ( "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/api/ui/login/mail_verify_handler.go b/internal/api/ui/login/mail_verify_handler.go index c00d25b72..ff694d8df 100644 --- a/internal/api/ui/login/mail_verify_handler.go +++ b/internal/api/ui/login/mail_verify_handler.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/api/ui/login/mfa_init_done_handler.go b/internal/api/ui/login/mfa_init_done_handler.go index 1b43c6ddc..c396e789a 100644 --- a/internal/api/ui/login/mfa_init_done_handler.go +++ b/internal/api/ui/login/mfa_init_done_handler.go @@ -3,7 +3,7 @@ package login import ( "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/api/ui/login/mfa_init_u2f.go b/internal/api/ui/login/mfa_init_u2f.go index 6b932cc71..372741458 100644 --- a/internal/api/ui/login/mfa_init_u2f.go +++ b/internal/api/ui/login/mfa_init_u2f.go @@ -4,8 +4,8 @@ import ( "encoding/base64" "net/http" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/domain" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/api/ui/login/mfa_init_verify_handler.go b/internal/api/ui/login/mfa_init_verify_handler.go index 9ff463571..cefe58063 100644 --- a/internal/api/ui/login/mfa_init_verify_handler.go +++ b/internal/api/ui/login/mfa_init_verify_handler.go @@ -4,13 +4,13 @@ import ( "bytes" "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" svg "github.com/ajstarks/svgo" "github.com/boombuler/barcode/qr" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/qrcode" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/qrcode" ) const ( diff --git a/internal/api/ui/login/mfa_prompt_handler.go b/internal/api/ui/login/mfa_prompt_handler.go index 228b49030..00219bdf8 100644 --- a/internal/api/ui/login/mfa_prompt_handler.go +++ b/internal/api/ui/login/mfa_prompt_handler.go @@ -3,9 +3,9 @@ package login import ( "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) const ( diff --git a/internal/api/ui/login/mfa_verify_handler.go b/internal/api/ui/login/mfa_verify_handler.go index 79dc0cfe2..4bfef5d6a 100644 --- a/internal/api/ui/login/mfa_verify_handler.go +++ b/internal/api/ui/login/mfa_verify_handler.go @@ -3,8 +3,8 @@ package login import ( "net/http" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/domain" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/api/ui/login/mfa_verify_u2f_handler.go b/internal/api/ui/login/mfa_verify_u2f_handler.go index 8fa087c79..54c3847d5 100644 --- a/internal/api/ui/login/mfa_verify_u2f_handler.go +++ b/internal/api/ui/login/mfa_verify_u2f_handler.go @@ -4,9 +4,9 @@ import ( "encoding/base64" "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" ) const ( diff --git a/internal/api/ui/login/password_complexity_policy_handler.go b/internal/api/ui/login/password_complexity_policy_handler.go index a4994f7e2..c4f8a0342 100644 --- a/internal/api/ui/login/password_complexity_policy_handler.go +++ b/internal/api/ui/login/password_complexity_policy_handler.go @@ -5,8 +5,8 @@ import ( "regexp" "strconv" - "github.com/caos/zitadel/internal/domain" - iam_model "github.com/caos/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/domain" + iam_model "github.com/zitadel/zitadel/internal/iam/model" ) const ( diff --git a/internal/api/ui/login/password_handler.go b/internal/api/ui/login/password_handler.go index 86751e830..ccf5f80b2 100644 --- a/internal/api/ui/login/password_handler.go +++ b/internal/api/ui/login/password_handler.go @@ -3,7 +3,7 @@ package login import ( "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/api/ui/login/password_reset_handler.go b/internal/api/ui/login/password_reset_handler.go index 7f4fe71a5..2c0b4a674 100644 --- a/internal/api/ui/login/password_reset_handler.go +++ b/internal/api/ui/login/password_reset_handler.go @@ -1,8 +1,8 @@ package login import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/query" "net/http" ) diff --git a/internal/api/ui/login/passwordless_login_handler.go b/internal/api/ui/login/passwordless_login_handler.go index aa0059bc0..a099e413e 100644 --- a/internal/api/ui/login/passwordless_login_handler.go +++ b/internal/api/ui/login/passwordless_login_handler.go @@ -4,7 +4,7 @@ import ( "encoding/base64" "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/api/ui/login/passwordless_prompt_handler.go b/internal/api/ui/login/passwordless_prompt_handler.go index 9b574e717..dd0408e11 100644 --- a/internal/api/ui/login/passwordless_prompt_handler.go +++ b/internal/api/ui/login/passwordless_prompt_handler.go @@ -3,7 +3,7 @@ package login import ( "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/api/ui/login/passwordless_registration_handler.go b/internal/api/ui/login/passwordless_registration_handler.go index b1b93bd6d..18be29f1c 100644 --- a/internal/api/ui/login/passwordless_registration_handler.go +++ b/internal/api/ui/login/passwordless_registration_handler.go @@ -4,12 +4,12 @@ import ( "encoding/base64" "net/http" - "github.com/caos/logging" + "github.com/zitadel/logging" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" ) const ( diff --git a/internal/api/ui/login/policy_handler.go b/internal/api/ui/login/policy_handler.go index 1b6f72cf5..54b751d3a 100644 --- a/internal/api/ui/login/policy_handler.go +++ b/internal/api/ui/login/policy_handler.go @@ -3,8 +3,8 @@ package login import ( "net/http" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/query" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/query" ) func (l *Login) getDefaultDomainPolicy(r *http.Request) (*query.DomainPolicy, error) { diff --git a/internal/api/ui/login/register_handler.go b/internal/api/ui/login/register_handler.go index cb4d90a0e..c456f98c5 100644 --- a/internal/api/ui/login/register_handler.go +++ b/internal/api/ui/login/register_handler.go @@ -5,9 +5,9 @@ import ( "golang.org/x/text/language" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) const ( diff --git a/internal/api/ui/login/register_option_handler.go b/internal/api/ui/login/register_option_handler.go index 7a0366bb3..55f9e28e8 100644 --- a/internal/api/ui/login/register_option_handler.go +++ b/internal/api/ui/login/register_option_handler.go @@ -3,7 +3,7 @@ package login import ( "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/api/ui/login/register_org_handler.go b/internal/api/ui/login/register_org_handler.go index c944dfe4c..767d09838 100644 --- a/internal/api/ui/login/register_org_handler.go +++ b/internal/api/ui/login/register_org_handler.go @@ -3,10 +3,10 @@ package login import ( "net/http" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) const ( diff --git a/internal/api/ui/login/renderer.go b/internal/api/ui/login/renderer.go index baf765c60..6f35cccd3 100644 --- a/internal/api/ui/login/renderer.go +++ b/internal/api/ui/login/renderer.go @@ -9,17 +9,17 @@ import ( "path" "strings" - "github.com/caos/logging" "github.com/gorilla/csrf" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/i18n" - "github.com/caos/zitadel/internal/notification/templates" - "github.com/caos/zitadel/internal/renderer" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/api/authz" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/notification/templates" + "github.com/zitadel/zitadel/internal/renderer" + "github.com/zitadel/zitadel/internal/static" ) const ( diff --git a/internal/api/ui/login/resources_handler.go b/internal/api/ui/login/resources_handler.go index fcfb7d4e7..6abe666e9 100644 --- a/internal/api/ui/login/resources_handler.go +++ b/internal/api/ui/login/resources_handler.go @@ -3,10 +3,10 @@ package login import ( "net/http" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/assets" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/assets" + "github.com/zitadel/zitadel/internal/api/authz" ) type dynamicResourceData struct { diff --git a/internal/api/ui/login/select_user_handler.go b/internal/api/ui/login/select_user_handler.go index 3902285f2..ee8e8fc34 100644 --- a/internal/api/ui/login/select_user_handler.go +++ b/internal/api/ui/login/select_user_handler.go @@ -3,9 +3,9 @@ package login import ( "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" - http_mw "github.com/caos/zitadel/internal/api/http/middleware" + http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" ) const ( diff --git a/internal/api/ui/login/username_change_handler.go b/internal/api/ui/login/username_change_handler.go index 947d43dea..d9b79e63a 100644 --- a/internal/api/ui/login/username_change_handler.go +++ b/internal/api/ui/login/username_change_handler.go @@ -3,7 +3,7 @@ package login import ( "net/http" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/auth/repository/auth_request.go b/internal/auth/repository/auth_request.go index 423d7f453..028feb997 100644 --- a/internal/auth/repository/auth_request.go +++ b/internal/auth/repository/auth_request.go @@ -3,7 +3,7 @@ package repository import ( "context" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) type AuthRequestRepository interface { diff --git a/internal/auth/repository/eventsourcing/eventstore/auth_request.go b/internal/auth/repository/eventsourcing/eventstore/auth_request.go index f942fd9cb..1488df474 100644 --- a/internal/auth/repository/eventsourcing/eventstore/auth_request.go +++ b/internal/auth/repository/eventsourcing/eventstore/auth_request.go @@ -4,27 +4,27 @@ import ( "context" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing/view" - cache "github.com/caos/zitadel/internal/auth_request/repository" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - iam_model "github.com/caos/zitadel/internal/iam/model" - iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model" - "github.com/caos/zitadel/internal/id" - project_view_model "github.com/caos/zitadel/internal/project/repository/view/model" - "github.com/caos/zitadel/internal/query" - user_repo "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/telemetry/tracing" - user_model "github.com/caos/zitadel/internal/user/model" - user_view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" + cache "github.com/zitadel/zitadel/internal/auth_request/repository" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + iam_view_model "github.com/zitadel/zitadel/internal/iam/repository/view/model" + "github.com/zitadel/zitadel/internal/id" + project_view_model "github.com/zitadel/zitadel/internal/project/repository/view/model" + "github.com/zitadel/zitadel/internal/query" + user_repo "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/telemetry/tracing" + user_model "github.com/zitadel/zitadel/internal/user/model" + user_view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type AuthRequestRepo struct { diff --git a/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go b/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go index 1f0db04f5..8df7c187a 100644 --- a/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go +++ b/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go @@ -8,18 +8,18 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/auth_request/repository/cache" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - proj_view_model "github.com/caos/zitadel/internal/project/repository/view/model" - "github.com/caos/zitadel/internal/query" - user_repo "github.com/caos/zitadel/internal/repository/user" - user_model "github.com/caos/zitadel/internal/user/model" - user_es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" - user_view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/auth_request/repository/cache" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + proj_view_model "github.com/zitadel/zitadel/internal/project/repository/view/model" + "github.com/zitadel/zitadel/internal/query" + user_repo "github.com/zitadel/zitadel/internal/repository/user" + user_model "github.com/zitadel/zitadel/internal/user/model" + user_es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" + user_view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type mockViewNoUserSession struct{} diff --git a/internal/auth/repository/eventsourcing/eventstore/org.go b/internal/auth/repository/eventsourcing/eventstore/org.go index 2e710d40e..e3eb2aad6 100644 --- a/internal/auth/repository/eventsourcing/eventstore/org.go +++ b/internal/auth/repository/eventsourcing/eventstore/org.go @@ -3,14 +3,14 @@ package eventstore import ( "context" - "github.com/caos/zitadel/internal/api/authz" - auth_view "github.com/caos/zitadel/internal/auth/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/domain" - eventstore "github.com/caos/zitadel/internal/eventstore/v1" - iam_model "github.com/caos/zitadel/internal/iam/model" - iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/api/authz" + auth_view "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/domain" + eventstore "github.com/zitadel/zitadel/internal/eventstore/v1" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + iam_view_model "github.com/zitadel/zitadel/internal/iam/repository/view/model" + "github.com/zitadel/zitadel/internal/query" ) type OrgRepository struct { diff --git a/internal/auth/repository/eventsourcing/eventstore/refresh_token.go b/internal/auth/repository/eventsourcing/eventstore/refresh_token.go index 57f6b6b16..b1f7a3442 100644 --- a/internal/auth/repository/eventsourcing/eventstore/refresh_token.go +++ b/internal/auth/repository/eventsourcing/eventstore/refresh_token.go @@ -4,19 +4,19 @@ import ( "context" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/telemetry/tracing" - usr_model "github.com/caos/zitadel/internal/user/model" - usr_view "github.com/caos/zitadel/internal/user/repository/view" - "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/telemetry/tracing" + usr_model "github.com/zitadel/zitadel/internal/user/model" + usr_view "github.com/zitadel/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type RefreshTokenRepo struct { diff --git a/internal/auth/repository/eventsourcing/eventstore/token.go b/internal/auth/repository/eventsourcing/eventstore/token.go index e799613e6..d5bc10ea7 100644 --- a/internal/auth/repository/eventsourcing/eventstore/token.go +++ b/internal/auth/repository/eventsourcing/eventstore/token.go @@ -4,17 +4,17 @@ import ( "context" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/errors" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/telemetry/tracing" - usr_model "github.com/caos/zitadel/internal/user/model" - usr_view "github.com/caos/zitadel/internal/user/repository/view" - "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/errors" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/telemetry/tracing" + usr_model "github.com/zitadel/zitadel/internal/user/model" + usr_view "github.com/zitadel/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type TokenRepo struct { diff --git a/internal/auth/repository/eventsourcing/eventstore/user.go b/internal/auth/repository/eventsourcing/eventstore/user.go index 3ab69f99b..39b4ba3e3 100644 --- a/internal/auth/repository/eventsourcing/eventstore/user.go +++ b/internal/auth/repository/eventsourcing/eventstore/user.go @@ -3,14 +3,14 @@ package eventstore import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/domain" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - usr_view "github.com/caos/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/domain" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + usr_view "github.com/zitadel/zitadel/internal/user/repository/view" ) type UserRepo struct { diff --git a/internal/auth/repository/eventsourcing/eventstore/user_session.go b/internal/auth/repository/eventsourcing/eventstore/user_session.go index 6384714e8..b72376e28 100644 --- a/internal/auth/repository/eventsourcing/eventstore/user_session.go +++ b/internal/auth/repository/eventsourcing/eventstore/user_session.go @@ -3,10 +3,10 @@ package eventstore import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing/view" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type UserSessionRepo struct { diff --git a/internal/auth/repository/eventsourcing/handler/handler.go b/internal/auth/repository/eventsourcing/handler/handler.go index 463d0b783..55a514867 100644 --- a/internal/auth/repository/eventsourcing/handler/handler.go +++ b/internal/auth/repository/eventsourcing/handler/handler.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing/view" - sd "github.com/caos/zitadel/internal/config/systemdefaults" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/query" - query2 "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" + sd "github.com/zitadel/zitadel/internal/config/systemdefaults" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + query2 "github.com/zitadel/zitadel/internal/query" ) type Configs map[string]*Config diff --git a/internal/auth/repository/eventsourcing/handler/idp_config.go b/internal/auth/repository/eventsourcing/handler/idp_config.go index b8e947804..387daeab2 100644 --- a/internal/auth/repository/eventsourcing/handler/idp_config.go +++ b/internal/auth/repository/eventsourcing/handler/idp_config.go @@ -1,17 +1,17 @@ package handler import ( - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - iam_model "github.com/caos/zitadel/internal/iam/model" - iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + iam_view_model "github.com/zitadel/zitadel/internal/iam/repository/view/model" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) const ( diff --git a/internal/auth/repository/eventsourcing/handler/idp_providers.go b/internal/auth/repository/eventsourcing/handler/idp_providers.go index 4c955f7b7..b35ba6752 100644 --- a/internal/auth/repository/eventsourcing/handler/idp_providers.go +++ b/internal/auth/repository/eventsourcing/handler/idp_providers.go @@ -3,21 +3,21 @@ package handler import ( "context" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - iam_model "github.com/caos/zitadel/internal/iam/model" - iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model" - query2 "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + iam_view_model "github.com/zitadel/zitadel/internal/iam/repository/view/model" + query2 "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) const ( diff --git a/internal/auth/repository/eventsourcing/handler/org_project_mapping.go b/internal/auth/repository/eventsourcing/handler/org_project_mapping.go index 7753f65ed..8bdba2d63 100644 --- a/internal/auth/repository/eventsourcing/handler/org_project_mapping.go +++ b/internal/auth/repository/eventsourcing/handler/org_project_mapping.go @@ -1,15 +1,15 @@ package handler import ( - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - view_model "github.com/caos/zitadel/internal/project/repository/view/model" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + view_model "github.com/zitadel/zitadel/internal/project/repository/view/model" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/auth/repository/eventsourcing/handler/refresh_token.go b/internal/auth/repository/eventsourcing/handler/refresh_token.go index 926a04586..4ee5508b4 100644 --- a/internal/auth/repository/eventsourcing/handler/refresh_token.go +++ b/internal/auth/repository/eventsourcing/handler/refresh_token.go @@ -3,17 +3,17 @@ package handler import ( "encoding/json" - "github.com/caos/logging" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) const ( diff --git a/internal/auth/repository/eventsourcing/handler/token.go b/internal/auth/repository/eventsourcing/handler/token.go index e2c39f4e4..109030172 100644 --- a/internal/auth/repository/eventsourcing/handler/token.go +++ b/internal/auth/repository/eventsourcing/handler/token.go @@ -4,22 +4,22 @@ import ( "context" "encoding/json" - "github.com/caos/logging" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - proj_model "github.com/caos/zitadel/internal/project/model" - project_es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model" - proj_view "github.com/caos/zitadel/internal/project/repository/view" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" - user_repo "github.com/caos/zitadel/internal/repository/user" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + es_sdk "github.com/zitadel/zitadel/internal/eventstore/v1/sdk" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + proj_model "github.com/zitadel/zitadel/internal/project/model" + project_es_model "github.com/zitadel/zitadel/internal/project/repository/eventsourcing/model" + proj_view "github.com/zitadel/zitadel/internal/project/repository/view" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" + user_repo "github.com/zitadel/zitadel/internal/repository/user" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) const ( diff --git a/internal/auth/repository/eventsourcing/handler/user.go b/internal/auth/repository/eventsourcing/handler/user.go index ae1938027..a0ce6696f 100644 --- a/internal/auth/repository/eventsourcing/handler/user.go +++ b/internal/auth/repository/eventsourcing/handler/user.go @@ -3,22 +3,22 @@ package handler import ( "context" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - org_model "github.com/caos/zitadel/internal/org/model" - org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model" - "github.com/caos/zitadel/internal/org/repository/view" - query2 "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/repository/org" - user_repo "github.com/caos/zitadel/internal/repository/user" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + es_sdk "github.com/zitadel/zitadel/internal/eventstore/v1/sdk" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + org_model "github.com/zitadel/zitadel/internal/org/model" + org_es_model "github.com/zitadel/zitadel/internal/org/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/org/repository/view" + query2 "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/repository/org" + user_repo "github.com/zitadel/zitadel/internal/repository/user" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) const ( diff --git a/internal/auth/repository/eventsourcing/handler/user_external_idps.go b/internal/auth/repository/eventsourcing/handler/user_external_idps.go index 974a9af52..d986ffa2c 100644 --- a/internal/auth/repository/eventsourcing/handler/user_external_idps.go +++ b/internal/auth/repository/eventsourcing/handler/user_external_idps.go @@ -3,22 +3,22 @@ package handler import ( "context" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/config/systemdefaults" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - iam_model "github.com/caos/zitadel/internal/iam/model" - iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model" - query2 "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" - usr_view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/config/systemdefaults" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + iam_view_model "github.com/zitadel/zitadel/internal/iam/repository/view/model" + query2 "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" + usr_view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) const ( diff --git a/internal/auth/repository/eventsourcing/handler/user_session.go b/internal/auth/repository/eventsourcing/handler/user_session.go index 04e96b66f..c12e182c8 100644 --- a/internal/auth/repository/eventsourcing/handler/user_session.go +++ b/internal/auth/repository/eventsourcing/handler/user_session.go @@ -1,17 +1,17 @@ package handler import ( - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - "github.com/caos/zitadel/internal/repository/user" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + "github.com/zitadel/zitadel/internal/repository/user" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) const ( diff --git a/internal/auth/repository/eventsourcing/repository.go b/internal/auth/repository/eventsourcing/repository.go index ebb630523..006c69337 100644 --- a/internal/auth/repository/eventsourcing/repository.go +++ b/internal/auth/repository/eventsourcing/repository.go @@ -4,17 +4,17 @@ import ( "context" "database/sql" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing/eventstore" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing/spooler" - auth_view "github.com/caos/zitadel/internal/auth/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/auth_request/repository/cache" - "github.com/caos/zitadel/internal/command" - sd "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/crypto" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_spol "github.com/caos/zitadel/internal/eventstore/v1/spooler" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/eventstore" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/spooler" + auth_view "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/auth_request/repository/cache" + "github.com/zitadel/zitadel/internal/command" + sd "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/crypto" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_spol "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/query" ) type Config struct { diff --git a/internal/auth/repository/eventsourcing/spooler/lock.go b/internal/auth/repository/eventsourcing/spooler/lock.go index b29d44535..1861eb446 100644 --- a/internal/auth/repository/eventsourcing/spooler/lock.go +++ b/internal/auth/repository/eventsourcing/spooler/lock.go @@ -4,7 +4,7 @@ import ( "database/sql" "time" - es_locker "github.com/caos/zitadel/internal/eventstore/v1/locker" + es_locker "github.com/zitadel/zitadel/internal/eventstore/v1/locker" ) const ( diff --git a/internal/auth/repository/eventsourcing/spooler/spooler.go b/internal/auth/repository/eventsourcing/spooler/spooler.go index 45b30d591..551da52bf 100644 --- a/internal/auth/repository/eventsourcing/spooler/spooler.go +++ b/internal/auth/repository/eventsourcing/spooler/spooler.go @@ -3,13 +3,13 @@ package spooler import ( "database/sql" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/query" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/query" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing/handler" - "github.com/caos/zitadel/internal/auth/repository/eventsourcing/view" - sd "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/handler" + "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" + sd "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" ) type SpoolerConfig struct { diff --git a/internal/auth/repository/eventsourcing/view/error_event.go b/internal/auth/repository/eventsourcing/view/error_event.go index 81bbcaa6b..d343d5820 100644 --- a/internal/auth/repository/eventsourcing/view/error_event.go +++ b/internal/auth/repository/eventsourcing/view/error_event.go @@ -1,7 +1,7 @@ package view import ( - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/auth/repository/eventsourcing/view/external_idps.go b/internal/auth/repository/eventsourcing/view/external_idps.go index b2dcedcf4..c5fc01dfb 100644 --- a/internal/auth/repository/eventsourcing/view/external_idps.go +++ b/internal/auth/repository/eventsourcing/view/external_idps.go @@ -1,11 +1,11 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/user/repository/view" - "github.com/caos/zitadel/internal/user/repository/view/model" - global_view "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/user/repository/view/model" + global_view "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/auth/repository/eventsourcing/view/idp_configs.go b/internal/auth/repository/eventsourcing/view/idp_configs.go index 60e1ebc3d..be10ca80e 100644 --- a/internal/auth/repository/eventsourcing/view/idp_configs.go +++ b/internal/auth/repository/eventsourcing/view/idp_configs.go @@ -1,12 +1,12 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/iam/repository/view" - iam_es_model "github.com/caos/zitadel/internal/iam/repository/view/model" - global_view "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/iam/repository/view" + iam_es_model "github.com/zitadel/zitadel/internal/iam/repository/view/model" + global_view "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/auth/repository/eventsourcing/view/idp_providers.go b/internal/auth/repository/eventsourcing/view/idp_providers.go index 4bf016248..68793c493 100644 --- a/internal/auth/repository/eventsourcing/view/idp_providers.go +++ b/internal/auth/repository/eventsourcing/view/idp_providers.go @@ -1,12 +1,12 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/iam/repository/view" - "github.com/caos/zitadel/internal/iam/repository/view/model" - global_view "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/iam/repository/view" + "github.com/zitadel/zitadel/internal/iam/repository/view/model" + global_view "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/auth/repository/eventsourcing/view/org_project_mapping.go b/internal/auth/repository/eventsourcing/view/org_project_mapping.go index ba39e37c7..5fb99b6a1 100644 --- a/internal/auth/repository/eventsourcing/view/org_project_mapping.go +++ b/internal/auth/repository/eventsourcing/view/org_project_mapping.go @@ -1,11 +1,11 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/project/repository/view" - "github.com/caos/zitadel/internal/project/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/project/repository/view" + "github.com/zitadel/zitadel/internal/project/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/auth/repository/eventsourcing/view/refresh_token.go b/internal/auth/repository/eventsourcing/view/refresh_token.go index 87534cb6a..fca9f59fc 100644 --- a/internal/auth/repository/eventsourcing/view/refresh_token.go +++ b/internal/auth/repository/eventsourcing/view/refresh_token.go @@ -1,12 +1,12 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - user_model "github.com/caos/zitadel/internal/user/model" - usr_view "github.com/caos/zitadel/internal/user/repository/view" - "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + user_model "github.com/zitadel/zitadel/internal/user/model" + usr_view "github.com/zitadel/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/auth/repository/eventsourcing/view/sequence.go b/internal/auth/repository/eventsourcing/view/sequence.go index 040171ec5..8f1c720e6 100644 --- a/internal/auth/repository/eventsourcing/view/sequence.go +++ b/internal/auth/repository/eventsourcing/view/sequence.go @@ -3,8 +3,8 @@ package view import ( "time" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/auth/repository/eventsourcing/view/token.go b/internal/auth/repository/eventsourcing/view/token.go index 573602a42..8335a0647 100644 --- a/internal/auth/repository/eventsourcing/view/token.go +++ b/internal/auth/repository/eventsourcing/view/token.go @@ -1,11 +1,11 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - usr_view "github.com/caos/zitadel/internal/user/repository/view" - "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + usr_view "github.com/zitadel/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/auth/repository/eventsourcing/view/user.go b/internal/auth/repository/eventsourcing/view/user.go index 1d81d56bb..3c232aba3 100644 --- a/internal/auth/repository/eventsourcing/view/user.go +++ b/internal/auth/repository/eventsourcing/view/user.go @@ -1,12 +1,12 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/user/repository/view" - "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/auth/repository/eventsourcing/view/user_session.go b/internal/auth/repository/eventsourcing/view/user_session.go index 8aca8f002..3aa222911 100644 --- a/internal/auth/repository/eventsourcing/view/user_session.go +++ b/internal/auth/repository/eventsourcing/view/user_session.go @@ -1,11 +1,11 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/user/repository/view" - "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/auth/repository/eventsourcing/view/view.go b/internal/auth/repository/eventsourcing/view/view.go index d02019f68..6ebec6ba9 100644 --- a/internal/auth/repository/eventsourcing/view/view.go +++ b/internal/auth/repository/eventsourcing/view/view.go @@ -5,9 +5,9 @@ import ( "github.com/jinzhu/gorm" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/query" ) type View struct { diff --git a/internal/auth/repository/org.go b/internal/auth/repository/org.go index f5daba2bf..0781ea274 100644 --- a/internal/auth/repository/org.go +++ b/internal/auth/repository/org.go @@ -3,8 +3,8 @@ package repository import ( "context" - "github.com/caos/zitadel/internal/domain" - iam_model "github.com/caos/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/domain" + iam_model "github.com/zitadel/zitadel/internal/iam/model" ) type OrgRepository interface { diff --git a/internal/auth/repository/refresh_token.go b/internal/auth/repository/refresh_token.go index ea4c7010d..8e353dc94 100644 --- a/internal/auth/repository/refresh_token.go +++ b/internal/auth/repository/refresh_token.go @@ -3,7 +3,7 @@ package repository import ( "context" - "github.com/caos/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/user/model" ) type RefreshTokenRepository interface { diff --git a/internal/auth/repository/token.go b/internal/auth/repository/token.go index 1451e06ae..0c0214a3f 100644 --- a/internal/auth/repository/token.go +++ b/internal/auth/repository/token.go @@ -2,7 +2,8 @@ package repository import ( "context" - usr_model "github.com/caos/zitadel/internal/user/model" + + usr_model "github.com/zitadel/zitadel/internal/user/model" ) type TokenRepository interface { diff --git a/internal/auth/repository/user_session.go b/internal/auth/repository/user_session.go index f6eca64de..0bfaf47e1 100644 --- a/internal/auth/repository/user_session.go +++ b/internal/auth/repository/user_session.go @@ -2,7 +2,8 @@ package repository import ( "context" - "github.com/caos/zitadel/internal/user/model" + + "github.com/zitadel/zitadel/internal/user/model" ) type UserSessionRepository interface { diff --git a/internal/auth_request/repository/cache/cache.go b/internal/auth_request/repository/cache/cache.go index 5446c3c6a..dd68b05ff 100644 --- a/internal/auth_request/repository/cache/cache.go +++ b/internal/auth_request/repository/cache/cache.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) type AuthRequestCache struct { diff --git a/internal/auth_request/repository/gen_mock.go b/internal/auth_request/repository/gen_mock.go index c904aec4d..dc352bc88 100644 --- a/internal/auth_request/repository/gen_mock.go +++ b/internal/auth_request/repository/gen_mock.go @@ -1,3 +1,3 @@ package repository -//go:generate mockgen -package mock -destination ./mock/repository.mock.go github.com/caos/zitadel/internal/auth_request/repository AuthRequestCache +//go:generate mockgen -package mock -destination ./mock/repository.mock.go github.com/zitadel/zitadel/internal/auth_request/repository AuthRequestCache diff --git a/internal/auth_request/repository/mock/repository.mock.go b/internal/auth_request/repository/mock/repository.mock.go index 8f40e3d2a..929e9aba1 100644 --- a/internal/auth_request/repository/mock/repository.mock.go +++ b/internal/auth_request/repository/mock/repository.mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/caos/zitadel/internal/auth_request/repository (interfaces: AuthRequestCache) +// Source: github.com/zitadel/zitadel/internal/auth_request/repository (interfaces: AuthRequestCache) // Package mock is a generated GoMock package. package mock @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - domain "github.com/caos/zitadel/internal/domain" + domain "github.com/zitadel/zitadel/internal/domain" gomock "github.com/golang/mock/gomock" ) diff --git a/internal/auth_request/repository/repository.go b/internal/auth_request/repository/repository.go index f089ad9bb..5c850656b 100644 --- a/internal/auth_request/repository/repository.go +++ b/internal/auth_request/repository/repository.go @@ -3,7 +3,7 @@ package repository import ( "context" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) type AuthRequestCache interface { diff --git a/internal/authz/authz.go b/internal/authz/authz.go index f9c9c3db4..3d16f0dcc 100644 --- a/internal/authz/authz.go +++ b/internal/authz/authz.go @@ -3,11 +3,11 @@ package authz import ( "database/sql" - "github.com/caos/zitadel/internal/authz/repository" - "github.com/caos/zitadel/internal/authz/repository/eventsourcing" - sd "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/authz/repository" + "github.com/zitadel/zitadel/internal/authz/repository/eventsourcing" + sd "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/query" ) type Config struct { diff --git a/internal/authz/repository/eventsourcing/eventstore/token_verifier.go b/internal/authz/repository/eventsourcing/eventstore/token_verifier.go index 986e63d33..34e99bdeb 100644 --- a/internal/authz/repository/eventsourcing/eventstore/token_verifier.go +++ b/internal/authz/repository/eventsourcing/eventstore/token_verifier.go @@ -6,20 +6,20 @@ import ( "strings" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/authz/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/telemetry/tracing" - usr_model "github.com/caos/zitadel/internal/user/model" - usr_view "github.com/caos/zitadel/internal/user/repository/view" - "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/authz/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/telemetry/tracing" + usr_model "github.com/zitadel/zitadel/internal/user/model" + usr_view "github.com/zitadel/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type TokenVerifierRepo struct { diff --git a/internal/authz/repository/eventsourcing/eventstore/user_membership.go b/internal/authz/repository/eventsourcing/eventstore/user_membership.go index 94f4aaf93..abe0be3c6 100644 --- a/internal/authz/repository/eventsourcing/eventstore/user_membership.go +++ b/internal/authz/repository/eventsourcing/eventstore/user_membership.go @@ -3,11 +3,11 @@ package eventstore import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/authz/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/domain" - user_model "github.com/caos/zitadel/internal/user/model" - user_view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/authz/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/domain" + user_model "github.com/zitadel/zitadel/internal/user/model" + user_view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type UserMembershipRepo struct { diff --git a/internal/authz/repository/eventsourcing/handler/handler.go b/internal/authz/repository/eventsourcing/handler/handler.go index ec97ad880..a680c34f6 100644 --- a/internal/authz/repository/eventsourcing/handler/handler.go +++ b/internal/authz/repository/eventsourcing/handler/handler.go @@ -3,10 +3,10 @@ package handler import ( "time" - "github.com/caos/zitadel/internal/authz/repository/eventsourcing/view" - sd "github.com/caos/zitadel/internal/config/systemdefaults" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/authz/repository/eventsourcing/view" + sd "github.com/zitadel/zitadel/internal/config/systemdefaults" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" ) type Configs map[string]*Config diff --git a/internal/authz/repository/eventsourcing/handler/user_membership.go b/internal/authz/repository/eventsourcing/handler/user_membership.go index af8591bb6..61e339d61 100644 --- a/internal/authz/repository/eventsourcing/handler/user_membership.go +++ b/internal/authz/repository/eventsourcing/handler/user_membership.go @@ -3,27 +3,27 @@ package handler import ( "context" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - org_model "github.com/caos/zitadel/internal/org/model" - org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model" - org_view "github.com/caos/zitadel/internal/org/repository/view" - proj_model "github.com/caos/zitadel/internal/project/model" - proj_es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model" - proj_view "github.com/caos/zitadel/internal/project/repository/view" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" - usr_model "github.com/caos/zitadel/internal/user/model" - usr_es_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + es_sdk "github.com/zitadel/zitadel/internal/eventstore/v1/sdk" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + org_model "github.com/zitadel/zitadel/internal/org/model" + org_es_model "github.com/zitadel/zitadel/internal/org/repository/eventsourcing/model" + org_view "github.com/zitadel/zitadel/internal/org/repository/view" + proj_model "github.com/zitadel/zitadel/internal/project/model" + proj_es_model "github.com/zitadel/zitadel/internal/project/repository/eventsourcing/model" + proj_view "github.com/zitadel/zitadel/internal/project/repository/view" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" + usr_model "github.com/zitadel/zitadel/internal/user/model" + usr_es_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) const ( diff --git a/internal/authz/repository/eventsourcing/repository.go b/internal/authz/repository/eventsourcing/repository.go index a46a3209a..b5c3113d1 100644 --- a/internal/authz/repository/eventsourcing/repository.go +++ b/internal/authz/repository/eventsourcing/repository.go @@ -4,16 +4,16 @@ import ( "context" "database/sql" - "github.com/caos/zitadel/internal/authz/repository" - "github.com/caos/zitadel/internal/authz/repository/eventsourcing/eventstore" - "github.com/caos/zitadel/internal/authz/repository/eventsourcing/spooler" - authz_view "github.com/caos/zitadel/internal/authz/repository/eventsourcing/view" - sd "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/crypto" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_spol "github.com/caos/zitadel/internal/eventstore/v1/spooler" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/authz/repository" + "github.com/zitadel/zitadel/internal/authz/repository/eventsourcing/eventstore" + "github.com/zitadel/zitadel/internal/authz/repository/eventsourcing/spooler" + authz_view "github.com/zitadel/zitadel/internal/authz/repository/eventsourcing/view" + sd "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/crypto" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_spol "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/query" ) type Config struct { diff --git a/internal/authz/repository/eventsourcing/spooler/lock.go b/internal/authz/repository/eventsourcing/spooler/lock.go index 4e60b7139..e0f0f8e6d 100644 --- a/internal/authz/repository/eventsourcing/spooler/lock.go +++ b/internal/authz/repository/eventsourcing/spooler/lock.go @@ -4,7 +4,7 @@ import ( "database/sql" "time" - es_locker "github.com/caos/zitadel/internal/eventstore/v1/locker" + es_locker "github.com/zitadel/zitadel/internal/eventstore/v1/locker" ) const ( diff --git a/internal/authz/repository/eventsourcing/spooler/spooler.go b/internal/authz/repository/eventsourcing/spooler/spooler.go index 332e222f8..592bdd1db 100644 --- a/internal/authz/repository/eventsourcing/spooler/spooler.go +++ b/internal/authz/repository/eventsourcing/spooler/spooler.go @@ -2,14 +2,15 @@ package spooler import ( "database/sql" - "github.com/caos/zitadel/internal/eventstore/v1" - sd "github.com/caos/zitadel/internal/config/systemdefaults" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/authz/repository/eventsourcing/handler" - "github.com/caos/zitadel/internal/authz/repository/eventsourcing/view" + sd "github.com/zitadel/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" + "github.com/zitadel/zitadel/internal/authz/repository/eventsourcing/handler" + "github.com/zitadel/zitadel/internal/authz/repository/eventsourcing/view" + + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" ) type SpoolerConfig struct { diff --git a/internal/authz/repository/eventsourcing/view/application.go b/internal/authz/repository/eventsourcing/view/application.go index 4cb1ea551..ef2dffdad 100644 --- a/internal/authz/repository/eventsourcing/view/application.go +++ b/internal/authz/repository/eventsourcing/view/application.go @@ -3,9 +3,9 @@ package view import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (v *View) ApplicationByOIDCClientID(ctx context.Context, clientID string) (*query.App, error) { diff --git a/internal/authz/repository/eventsourcing/view/error_event.go b/internal/authz/repository/eventsourcing/view/error_event.go index 68aae4d43..14dad9f0e 100644 --- a/internal/authz/repository/eventsourcing/view/error_event.go +++ b/internal/authz/repository/eventsourcing/view/error_event.go @@ -1,7 +1,7 @@ package view import ( - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/authz/repository/eventsourcing/view/sequence.go b/internal/authz/repository/eventsourcing/view/sequence.go index 84f751837..5d01d5dd7 100644 --- a/internal/authz/repository/eventsourcing/view/sequence.go +++ b/internal/authz/repository/eventsourcing/view/sequence.go @@ -3,8 +3,8 @@ package view import ( "time" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/authz/repository/eventsourcing/view/token.go b/internal/authz/repository/eventsourcing/view/token.go index 98e5446ea..330fb4bee 100644 --- a/internal/authz/repository/eventsourcing/view/token.go +++ b/internal/authz/repository/eventsourcing/view/token.go @@ -1,11 +1,11 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - usr_view "github.com/caos/zitadel/internal/user/repository/view" - usr_view_model "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + usr_view "github.com/zitadel/zitadel/internal/user/repository/view" + usr_view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/authz/repository/eventsourcing/view/user_membership.go b/internal/authz/repository/eventsourcing/view/user_membership.go index 9fdc1668d..645285623 100644 --- a/internal/authz/repository/eventsourcing/view/user_membership.go +++ b/internal/authz/repository/eventsourcing/view/user_membership.go @@ -1,12 +1,12 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/user/repository/view" - "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/authz/repository/eventsourcing/view/view.go b/internal/authz/repository/eventsourcing/view/view.go index 32f5c2afb..eed184979 100644 --- a/internal/authz/repository/eventsourcing/view/view.go +++ b/internal/authz/repository/eventsourcing/view/view.go @@ -3,8 +3,8 @@ package view import ( "database/sql" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/query" "github.com/jinzhu/gorm" ) diff --git a/internal/authz/repository/user_membership.go b/internal/authz/repository/user_membership.go index 05addfd89..105a51ba5 100644 --- a/internal/authz/repository/user_membership.go +++ b/internal/authz/repository/user_membership.go @@ -3,7 +3,7 @@ package repository import ( "context" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" ) type UserMembershipRepository interface { diff --git a/internal/cache/bigcache/bigcache_test.go b/internal/cache/bigcache/bigcache_test.go index f024d52ae..2c91f019c 100644 --- a/internal/cache/bigcache/bigcache_test.go +++ b/internal/cache/bigcache/bigcache_test.go @@ -1,11 +1,12 @@ package bigcache import ( - a_cache "github.com/allegro/bigcache" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" "reflect" "testing" + + a_cache "github.com/allegro/bigcache" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type TestStruct struct { diff --git a/internal/cache/bigcache/cache.go b/internal/cache/bigcache/cache.go index eeb31529d..9e7baea93 100644 --- a/internal/cache/bigcache/cache.go +++ b/internal/cache/bigcache/cache.go @@ -6,8 +6,8 @@ import ( "reflect" a_cache "github.com/allegro/bigcache" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/errors" ) type Bigcache struct { diff --git a/internal/cache/bigcache/config.go b/internal/cache/bigcache/config.go index 411104146..fa997ea59 100644 --- a/internal/cache/bigcache/config.go +++ b/internal/cache/bigcache/config.go @@ -1,8 +1,9 @@ package bigcache import ( - "github.com/caos/zitadel/internal/cache" "time" + + "github.com/zitadel/zitadel/internal/cache" ) type Config struct { diff --git a/internal/cache/config/config.go b/internal/cache/config/config.go index 2209364a1..7cabee8fc 100644 --- a/internal/cache/config/config.go +++ b/internal/cache/config/config.go @@ -3,10 +3,10 @@ package config import ( "encoding/json" - "github.com/caos/zitadel/internal/cache" - "github.com/caos/zitadel/internal/cache/bigcache" - "github.com/caos/zitadel/internal/cache/fastcache" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/cache" + "github.com/zitadel/zitadel/internal/cache/bigcache" + "github.com/zitadel/zitadel/internal/cache/fastcache" + "github.com/zitadel/zitadel/internal/errors" ) type CacheConfig struct { diff --git a/internal/cache/fastcache/config.go b/internal/cache/fastcache/config.go index bbd32861d..5e6812615 100644 --- a/internal/cache/fastcache/config.go +++ b/internal/cache/fastcache/config.go @@ -1,6 +1,6 @@ package fastcache -import "github.com/caos/zitadel/internal/cache" +import "github.com/zitadel/zitadel/internal/cache" type Config struct { MaxCacheSizeInByte int diff --git a/internal/cache/fastcache/fastcache.go b/internal/cache/fastcache/fastcache.go index 7a5b1ef30..1ff4eee14 100644 --- a/internal/cache/fastcache/fastcache.go +++ b/internal/cache/fastcache/fastcache.go @@ -3,9 +3,10 @@ package fastcache import ( "bytes" "encoding/gob" - "github.com/caos/zitadel/internal/errors" "reflect" + "github.com/zitadel/zitadel/internal/errors" + "github.com/VictoriaMetrics/fastcache" ) diff --git a/internal/cache/fastcache/fastcache_test.go b/internal/cache/fastcache/fastcache_test.go index 2e783a623..e17566e12 100644 --- a/internal/cache/fastcache/fastcache_test.go +++ b/internal/cache/fastcache/fastcache_test.go @@ -1,11 +1,12 @@ package fastcache import ( - "github.com/VictoriaMetrics/fastcache" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" "reflect" "testing" + + "github.com/VictoriaMetrics/fastcache" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type TestStruct struct { diff --git a/internal/cache/generate.go b/internal/cache/generate.go index 52bda0cba..2809d3100 100644 --- a/internal/cache/generate.go +++ b/internal/cache/generate.go @@ -1,3 +1,3 @@ package cache -//go:generate mockgen -package mock -destination ./mock/cache.mock.go github.com/caos/zitadel/internal/cache Cache +//go:generate mockgen -package mock -destination ./mock/cache.mock.go github.com/zitadel/zitadel/internal/cache Cache diff --git a/internal/cache/mock/cache.mock.go b/internal/cache/mock/cache.mock.go index 240d34da5..50c33f104 100644 --- a/internal/cache/mock/cache.mock.go +++ b/internal/cache/mock/cache.mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/caos/zitadel/internal/cache (interfaces: Cache) +// Source: github.com/zitadel/zitadel/internal/cache (interfaces: Cache) // Package mock is a generated GoMock package. package mock diff --git a/internal/command/auth_checks.go b/internal/command/auth_checks.go index bdf054051..703c2a89e 100644 --- a/internal/command/auth_checks.go +++ b/internal/command/auth_checks.go @@ -2,8 +2,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - caos_errors "github.com/caos/zitadel/internal/errors" + + "github.com/zitadel/zitadel/internal/api/authz" + caos_errors "github.com/zitadel/zitadel/internal/errors" ) func checkExplicitProjectPermission(ctx context.Context, grantID, projectID string) error { diff --git a/internal/command/command.go b/internal/command/command.go index b6749821e..58eba5ffd 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -4,23 +4,23 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/http" - authz_repo "github.com/caos/zitadel/internal/authz/repository" - sd "github.com/caos/zitadel/internal/config/systemdefaults" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/repository/action" - instance_repo "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/keypair" - "github.com/caos/zitadel/internal/repository/org" - proj_repo "github.com/caos/zitadel/internal/repository/project" - usr_repo "github.com/caos/zitadel/internal/repository/user" - usr_grant_repo "github.com/caos/zitadel/internal/repository/usergrant" - "github.com/caos/zitadel/internal/static" - webauthn_helper "github.com/caos/zitadel/internal/webauthn" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/http" + authz_repo "github.com/zitadel/zitadel/internal/authz/repository" + sd "github.com/zitadel/zitadel/internal/config/systemdefaults" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/repository/action" + instance_repo "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/repository/org" + proj_repo "github.com/zitadel/zitadel/internal/repository/project" + usr_repo "github.com/zitadel/zitadel/internal/repository/user" + usr_grant_repo "github.com/zitadel/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/static" + webauthn_helper "github.com/zitadel/zitadel/internal/webauthn" ) type Commands struct { diff --git a/internal/command/converter.go b/internal/command/converter.go index d7de10888..ad734ca40 100644 --- a/internal/command/converter.go +++ b/internal/command/converter.go @@ -1,8 +1,8 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" ) func writeModelToObjectDetails(writeModel *eventstore.WriteModel) *domain.ObjectDetails { diff --git a/internal/command/crypto.go b/internal/command/crypto.go index fafbe9612..2313e86b6 100644 --- a/internal/command/crypto.go +++ b/internal/command/crypto.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" ) func newCryptoCodeWithExpiry(ctx context.Context, filter preparation.FilterToQueryReducer, typ domain.SecretGeneratorType, alg crypto.Crypto) (value *crypto.CryptoValue, expiry time.Duration, err error) { diff --git a/internal/command/custom_login_text.go b/internal/command/custom_login_text.go index 929b211cf..b4fd4910a 100644 --- a/internal/command/custom_login_text.go +++ b/internal/command/custom_login_text.go @@ -5,10 +5,10 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) createAllLoginTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { diff --git a/internal/command/custom_login_text_model.go b/internal/command/custom_login_text_model.go index 9d50ee4b6..9f4f0b9ed 100644 --- a/internal/command/custom_login_text_model.go +++ b/internal/command/custom_login_text_model.go @@ -5,9 +5,9 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type CustomLoginTextsReadModel struct { diff --git a/internal/command/custom_message_text_model.go b/internal/command/custom_message_text_model.go index 893d4295c..50695de52 100644 --- a/internal/command/custom_message_text_model.go +++ b/internal/command/custom_message_text_model.go @@ -3,9 +3,9 @@ package command import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type CustomMessageTextReadModel struct { diff --git a/internal/command/custom_text_model.go b/internal/command/custom_text_model.go index 152e33097..8b837da1d 100644 --- a/internal/command/custom_text_model.go +++ b/internal/command/custom_text_model.go @@ -3,9 +3,9 @@ package command import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type CustomTextWriteModel struct { diff --git a/internal/command/debug_notification_model.go b/internal/command/debug_notification_model.go index 0f6746855..c6183139b 100644 --- a/internal/command/debug_notification_model.go +++ b/internal/command/debug_notification_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/settings" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/settings" ) type DebugNotificationWriteModel struct { diff --git a/internal/command/email.go b/internal/command/email.go index 970b4a606..89ca24569 100644 --- a/internal/command/email.go +++ b/internal/command/email.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" ) type Email struct { diff --git a/internal/command/existing_label_policies_model.go b/internal/command/existing_label_policies_model.go index 418819863..af4842774 100644 --- a/internal/command/existing_label_policies_model.go +++ b/internal/command/existing_label_policies_model.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) type ExistingLabelPoliciesReadModel struct { diff --git a/internal/command/features_model.go b/internal/command/features_model.go index 81a499081..1b7e6029b 100644 --- a/internal/command/features_model.go +++ b/internal/command/features_model.go @@ -3,9 +3,9 @@ package command import ( "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/features" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/features" ) type FeaturesWriteModel struct { diff --git a/internal/command/flow_model.go b/internal/command/flow_model.go index 2dab620f5..43d46dbfc 100644 --- a/internal/command/flow_model.go +++ b/internal/command/flow_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/flow" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/flow" ) type FlowWriteModel struct { diff --git a/internal/command/identity_provider_model.go b/internal/command/identity_provider_model.go index 4cc51f2e0..0d24b6360 100644 --- a/internal/command/identity_provider_model.go +++ b/internal/command/identity_provider_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type IdentityProviderWriteModel struct { diff --git a/internal/command/idp_config_model.go b/internal/command/idp_config_model.go index dea0c0e39..8d37ab275 100644 --- a/internal/command/idp_config_model.go +++ b/internal/command/idp_config_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/idpconfig" ) type IDPConfigWriteModel struct { diff --git a/internal/command/instancce_policy_password_age_model.go b/internal/command/instancce_policy_password_age_model.go index 292b20bf2..ca8801612 100644 --- a/internal/command/instancce_policy_password_age_model.go +++ b/internal/command/instancce_policy_password_age_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) type InstancePasswordAgePolicyWriteModel struct { diff --git a/internal/command/instance.go b/internal/command/instance.go index a69f11705..2c257fb77 100644 --- a/internal/command/instance.go +++ b/internal/command/instance.go @@ -4,18 +4,18 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/ui/console" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/ui/console" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" ) const ( diff --git a/internal/command/instance_converter.go b/internal/command/instance_converter.go index a548554e8..90c6e60dc 100644 --- a/internal/command/instance_converter.go +++ b/internal/command/instance_converter.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) func writeModelToObjectRoot(writeModel eventstore.WriteModel) models.ObjectRoot { diff --git a/internal/command/instance_custom_login_text.go b/internal/command/instance_custom_login_text.go index 22d5be6b0..44764b063 100644 --- a/internal/command/instance_custom_login_text.go +++ b/internal/command/instance_custom_login_text.go @@ -3,13 +3,13 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) func (c *Commands) SetCustomInstanceLoginText(ctx context.Context, loginText *domain.CustomLoginText) (*domain.ObjectDetails, error) { diff --git a/internal/command/instance_custom_login_text_model.go b/internal/command/instance_custom_login_text_model.go index 4a7e5d319..7b73e1da7 100644 --- a/internal/command/instance_custom_login_text_model.go +++ b/internal/command/instance_custom_login_text_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceCustomLoginTextReadModel struct { diff --git a/internal/command/instance_custom_login_text_test.go b/internal/command/instance_custom_login_text_test.go index 00b5c3023..d3a12c689 100644 --- a/internal/command/instance_custom_login_text_test.go +++ b/internal/command/instance_custom_login_text_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/api/authz" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/instance" ) func TestCommandSide_SetCustomIAMLoginText(t *testing.T) { diff --git a/internal/command/instance_custom_message_text.go b/internal/command/instance_custom_message_text.go index 2d2c4d64f..eef6eba58 100644 --- a/internal/command/instance_custom_message_text.go +++ b/internal/command/instance_custom_message_text.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" "golang.org/x/text/language" ) diff --git a/internal/command/instance_custom_message_text_model.go b/internal/command/instance_custom_message_text_model.go index 7e2d23a1c..4d222c0d7 100644 --- a/internal/command/instance_custom_message_text_model.go +++ b/internal/command/instance_custom_message_text_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceCustomMessageTextWriteModel struct { diff --git a/internal/command/instance_custom_message_text_test.go b/internal/command/instance_custom_message_text_test.go index 58508e874..f09773ed2 100644 --- a/internal/command/instance_custom_message_text_test.go +++ b/internal/command/instance_custom_message_text_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/instance" ) func TestCommandSide_SetDefaultMessageText(t *testing.T) { diff --git a/internal/command/instance_custom_text.go b/internal/command/instance_custom_text.go index 54d0b90c9..9e718c760 100644 --- a/internal/command/instance_custom_text.go +++ b/internal/command/instance_custom_text.go @@ -5,11 +5,11 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) SetInstanceCustomText(ctx context.Context, customText *domain.CustomText) (*domain.CustomText, error) { diff --git a/internal/command/instance_custom_text_model.go b/internal/command/instance_custom_text_model.go index 233499eb7..8cb692877 100644 --- a/internal/command/instance_custom_text_model.go +++ b/internal/command/instance_custom_text_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceCustomTextWriteModel struct { diff --git a/internal/command/instance_debug_notification_file.go b/internal/command/instance_debug_notification_file.go index 6996b4140..9f690d266 100644 --- a/internal/command/instance_debug_notification_file.go +++ b/internal/command/instance_debug_notification_file.go @@ -3,12 +3,12 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/notification/channels/fs" - iam_repo "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + iam_repo "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddDebugNotificationProviderFile(ctx context.Context, fileSystemProvider *fs.FSConfig) (*domain.ObjectDetails, error) { diff --git a/internal/command/instance_debug_notification_file_model.go b/internal/command/instance_debug_notification_file_model.go index 07aee2f1a..c07d9a79f 100644 --- a/internal/command/instance_debug_notification_file_model.go +++ b/internal/command/instance_debug_notification_file_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/settings" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/settings" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceDebugNotificationFileWriteModel struct { diff --git a/internal/command/instance_debug_notification_file_test.go b/internal/command/instance_debug_notification_file_test.go index a90d3c280..4a4d60865 100644 --- a/internal/command/instance_debug_notification_file_test.go +++ b/internal/command/instance_debug_notification_file_test.go @@ -4,14 +4,14 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/settings" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/notification/channels/fs" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/settings" "github.com/stretchr/testify/assert" ) diff --git a/internal/command/instance_debug_notification_log.go b/internal/command/instance_debug_notification_log.go index 430610bf4..3d4efbff9 100644 --- a/internal/command/instance_debug_notification_log.go +++ b/internal/command/instance_debug_notification_log.go @@ -3,12 +3,12 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddDebugNotificationProviderLog(ctx context.Context, fileSystemProvider *fs.FSConfig) (*domain.ObjectDetails, error) { diff --git a/internal/command/instance_debug_notification_log_model.go b/internal/command/instance_debug_notification_log_model.go index 0ebfb5aa2..5b65be197 100644 --- a/internal/command/instance_debug_notification_log_model.go +++ b/internal/command/instance_debug_notification_log_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/settings" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/settings" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceDebugNotificationLogWriteModel struct { diff --git a/internal/command/instance_debug_notification_log_test.go b/internal/command/instance_debug_notification_log_test.go index 8bde21466..051d3b7cd 100644 --- a/internal/command/instance_debug_notification_log_test.go +++ b/internal/command/instance_debug_notification_log_test.go @@ -4,14 +4,14 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/settings" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/notification/channels/fs" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/settings" "github.com/stretchr/testify/assert" ) diff --git a/internal/command/instance_domain.go b/internal/command/instance_domain.go index 26b31b22b..061ed1591 100644 --- a/internal/command/instance_domain.go +++ b/internal/command/instance_domain.go @@ -4,14 +4,14 @@ import ( "context" "strings" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/project" ) func (c *Commands) AddInstanceDomain(ctx context.Context, instanceDomain string) (*domain.ObjectDetails, error) { diff --git a/internal/command/instance_domain_model.go b/internal/command/instance_domain_model.go index 9bb88699c..cc8c44400 100644 --- a/internal/command/instance_domain_model.go +++ b/internal/command/instance_domain_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceDomainWriteModel struct { diff --git a/internal/command/instance_domain_policy.go b/internal/command/instance_domain_policy.go index f82cf9cf8..480d7103a 100644 --- a/internal/command/instance_domain_policy.go +++ b/internal/command/instance_domain_policy.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) func AddDefaultDomainPolicy( diff --git a/internal/command/instance_domain_test.go b/internal/command/instance_domain_test.go index e13958407..923bcf347 100644 --- a/internal/command/instance_domain_test.go +++ b/internal/command/instance_domain_test.go @@ -7,15 +7,15 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/instance" ) func TestCommandSide_AddInstanceDomain(t *testing.T) { diff --git a/internal/command/instance_email_template.go b/internal/command/instance_email_template.go index 45d950015..69e7e5d2c 100644 --- a/internal/command/instance_email_template.go +++ b/internal/command/instance_email_template.go @@ -5,10 +5,10 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) func AddEmailTemplate( diff --git a/internal/command/instance_features.go b/internal/command/instance_features.go index 215dafac8..a2ef29bca 100644 --- a/internal/command/instance_features.go +++ b/internal/command/instance_features.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) func SetDefaultFeatures( diff --git a/internal/command/instance_features_model.go b/internal/command/instance_features_model.go index f843e7ed0..d91e4b743 100644 --- a/internal/command/instance_features_model.go +++ b/internal/command/instance_features_model.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/features" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/features" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceFeaturesWriteModel struct { diff --git a/internal/command/instance_features_test.go b/internal/command/instance_features_test.go index 277ba521d..a86432583 100644 --- a/internal/command/instance_features_test.go +++ b/internal/command/instance_features_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/features" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/features" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestSetDefaultFeatures(t *testing.T) { diff --git a/internal/command/instance_idp_config.go b/internal/command/instance_idp_config.go index 56994686b..0d38deaf8 100644 --- a/internal/command/instance_idp_config.go +++ b/internal/command/instance_idp_config.go @@ -3,15 +3,15 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/telemetry/tracing" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/instance" ) func (c *Commands) AddDefaultIDPConfig(ctx context.Context, config *domain.IDPConfig) (*domain.IDPConfig, error) { diff --git a/internal/command/instance_idp_config_model.go b/internal/command/instance_idp_config_model.go index 5a99f1800..7661381f2 100644 --- a/internal/command/instance_idp_config_model.go +++ b/internal/command/instance_idp_config_model.go @@ -3,12 +3,12 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceIDPConfigWriteModel struct { diff --git a/internal/command/instance_idp_config_test.go b/internal/command/instance_idp_config_test.go index d6b04fd2a..f83a13490 100644 --- a/internal/command/instance_idp_config_test.go +++ b/internal/command/instance_idp_config_test.go @@ -7,17 +7,17 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestCommandSide_AddDefaultIDPConfig(t *testing.T) { diff --git a/internal/command/instance_idp_jwt_config.go b/internal/command/instance_idp_jwt_config.go index 2619ac0ef..e13d429cb 100644 --- a/internal/command/instance_idp_jwt_config.go +++ b/internal/command/instance_idp_jwt_config.go @@ -3,8 +3,8 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func (c *Commands) ChangeDefaultIDPJWTConfig(ctx context.Context, config *domain.JWTIDPConfig) (*domain.JWTIDPConfig, error) { diff --git a/internal/command/instance_idp_jwt_config_model.go b/internal/command/instance_idp_jwt_config_model.go index c415de5de..8b557800f 100644 --- a/internal/command/instance_idp_jwt_config_model.go +++ b/internal/command/instance_idp_jwt_config_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceIDPJWTConfigWriteModel struct { diff --git a/internal/command/instance_idp_jwt_config_test.go b/internal/command/instance_idp_jwt_config_test.go index 2d7345274..ab67124c5 100644 --- a/internal/command/instance_idp_jwt_config_test.go +++ b/internal/command/instance_idp_jwt_config_test.go @@ -7,14 +7,14 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestCommandSide_ChangeDefaultIDPJWTConfig(t *testing.T) { diff --git a/internal/command/instance_idp_oidc_config.go b/internal/command/instance_idp_oidc_config.go index 4de80fb64..f7353609c 100644 --- a/internal/command/instance_idp_oidc_config.go +++ b/internal/command/instance_idp_oidc_config.go @@ -3,8 +3,8 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func (c *Commands) ChangeDefaultIDPOIDCConfig(ctx context.Context, config *domain.OIDCIDPConfig) (*domain.OIDCIDPConfig, error) { diff --git a/internal/command/instance_idp_oidc_config_model.go b/internal/command/instance_idp_oidc_config_model.go index 57a150d3e..2bfec8832 100644 --- a/internal/command/instance_idp_oidc_config_model.go +++ b/internal/command/instance_idp_oidc_config_model.go @@ -4,13 +4,13 @@ import ( "context" "reflect" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceIDPOIDCConfigWriteModel struct { diff --git a/internal/command/instance_idp_oidc_config_test.go b/internal/command/instance_idp_oidc_config_test.go index b55547ca7..c6b074d35 100644 --- a/internal/command/instance_idp_oidc_config_test.go +++ b/internal/command/instance_idp_oidc_config_test.go @@ -7,14 +7,14 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestCommandSide_ChangeDefaultIDPOIDCConfig(t *testing.T) { diff --git a/internal/command/instance_label_policy.go b/internal/command/instance_label_policy.go index ba89429f7..891e29911 100644 --- a/internal/command/instance_label_policy.go +++ b/internal/command/instance_label_policy.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) func AddDefaultLabelPolicy( diff --git a/internal/command/instance_lockout_policy.go b/internal/command/instance_lockout_policy.go index 932b4e878..84245a1fe 100644 --- a/internal/command/instance_lockout_policy.go +++ b/internal/command/instance_lockout_policy.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) func AddDefaultLockoutPolicy( diff --git a/internal/command/instance_login_policy.go b/internal/command/instance_login_policy.go index 4fe15abb0..aac47285a 100644 --- a/internal/command/instance_login_policy.go +++ b/internal/command/instance_login_policy.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) func AddDefaultLoginPolicy( diff --git a/internal/command/instance_member.go b/internal/command/instance_member.go index f14a7df1e..700315d72 100644 --- a/internal/command/instance_member.go +++ b/internal/command/instance_member.go @@ -4,14 +4,14 @@ import ( "context" "reflect" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/api/authz" + "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/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddInstanceMemberCommand(a *instance.Aggregate, userID string, roles ...string) preparation.Validation { diff --git a/internal/command/instance_member_model.go b/internal/command/instance_member_model.go index 656d17e6c..e987a41d9 100644 --- a/internal/command/instance_member_model.go +++ b/internal/command/instance_member_model.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceMemberWriteModel struct { diff --git a/internal/command/instance_member_test.go b/internal/command/instance_member_test.go index 2df76f9e9..1aede9372 100644 --- a/internal/command/instance_member_test.go +++ b/internal/command/instance_member_test.go @@ -7,16 +7,16 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/member" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/member" ) func TestCommandSide_AddIAMMember(t *testing.T) { diff --git a/internal/command/instance_model.go b/internal/command/instance_model.go index 888aef87a..5a25a8027 100644 --- a/internal/command/instance_model.go +++ b/internal/command/instance_model.go @@ -3,9 +3,9 @@ package command import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceWriteModel struct { diff --git a/internal/command/instance_oidc_settings.go b/internal/command/instance_oidc_settings.go index a04c4328e..29ea4173f 100644 --- a/internal/command/instance_oidc_settings.go +++ b/internal/command/instance_oidc_settings.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/instance" ) func (c *Commands) AddOIDCSettings(ctx context.Context, settings *domain.OIDCSettings) (*domain.ObjectDetails, error) { diff --git a/internal/command/instance_oidc_settings_model.go b/internal/command/instance_oidc_settings_model.go index d59eab790..f27112076 100644 --- a/internal/command/instance_oidc_settings_model.go +++ b/internal/command/instance_oidc_settings_model.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceOIDCSettingsWriteModel struct { diff --git a/internal/command/instance_oidc_settings_test.go b/internal/command/instance_oidc_settings_test.go index 923254da0..50e584edb 100644 --- a/internal/command/instance_oidc_settings_test.go +++ b/internal/command/instance_oidc_settings_test.go @@ -5,14 +5,14 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/api/authz" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/instance" ) func TestCommandSide_AddOIDCConfig(t *testing.T) { diff --git a/internal/command/instance_password_age_policy.go b/internal/command/instance_password_age_policy.go index 964fd5f6c..e00dbfbfe 100644 --- a/internal/command/instance_password_age_policy.go +++ b/internal/command/instance_password_age_policy.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) func AddPasswordAgePolicy( diff --git a/internal/command/instance_password_complexity_policy.go b/internal/command/instance_password_complexity_policy.go index 78caef22d..c2f042c17 100644 --- a/internal/command/instance_password_complexity_policy.go +++ b/internal/command/instance_password_complexity_policy.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) func AddPasswordComplexityPolicy( diff --git a/internal/command/instance_policy_domain.go b/internal/command/instance_policy_domain.go index b98a41c9e..3268c9d0d 100644 --- a/internal/command/instance_policy_domain.go +++ b/internal/command/instance_policy_domain.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - iam_repo "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + iam_repo "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddDefaultDomainPolicy(ctx context.Context, policy *domain.DomainPolicy) (*domain.DomainPolicy, error) { diff --git a/internal/command/instance_policy_domain_model.go b/internal/command/instance_policy_domain_model.go index 3de13d1d0..2b01256d5 100644 --- a/internal/command/instance_policy_domain_model.go +++ b/internal/command/instance_policy_domain_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) type InstanceDomainPolicyWriteModel struct { diff --git a/internal/command/instance_policy_domain_test.go b/internal/command/instance_policy_domain_test.go index eefd792c7..0b91444c0 100644 --- a/internal/command/instance_policy_domain_test.go +++ b/internal/command/instance_policy_domain_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddDefaultDomainPolicy(t *testing.T) { diff --git a/internal/command/instance_policy_label.go b/internal/command/instance_policy_label.go index efaa44c8f..5e0e1b683 100644 --- a/internal/command/instance_policy_label.go +++ b/internal/command/instance_policy_label.go @@ -3,12 +3,12 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddDefaultLabelPolicy(ctx context.Context, policy *domain.LabelPolicy) (*domain.LabelPolicy, error) { diff --git a/internal/command/instance_policy_label_model.go b/internal/command/instance_policy_label_model.go index 2e96f1974..9dad06802 100644 --- a/internal/command/instance_policy_label_model.go +++ b/internal/command/instance_policy_label_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) type InstanceLabelPolicyWriteModel struct { diff --git a/internal/command/instance_policy_label_test.go b/internal/command/instance_policy_label_test.go index 8403084eb..b0d45221b 100644 --- a/internal/command/instance_policy_label_test.go +++ b/internal/command/instance_policy_label_test.go @@ -8,16 +8,16 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" - "github.com/caos/zitadel/internal/static" - "github.com/caos/zitadel/internal/static/mock" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/static/mock" ) func TestCommandSide_AddDefaultLabelPolicy(t *testing.T) { diff --git a/internal/command/instance_policy_login.go b/internal/command/instance_policy_login.go index 2ff845198..991a349ac 100644 --- a/internal/command/instance_policy_login.go +++ b/internal/command/instance_policy_login.go @@ -3,12 +3,12 @@ package command import ( "context" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) getDefaultLoginPolicy(ctx context.Context) (*domain.LoginPolicy, error) { diff --git a/internal/command/instance_policy_login_factors_model.go b/internal/command/instance_policy_login_factors_model.go index 44ed8b77b..139640d5e 100644 --- a/internal/command/instance_policy_login_factors_model.go +++ b/internal/command/instance_policy_login_factors_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceSecondFactorWriteModel struct { diff --git a/internal/command/instance_policy_login_identity_provider_model.go b/internal/command/instance_policy_login_identity_provider_model.go index 870d72343..019f66281 100644 --- a/internal/command/instance_policy_login_identity_provider_model.go +++ b/internal/command/instance_policy_login_identity_provider_model.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceIdentityProviderWriteModel struct { diff --git a/internal/command/instance_policy_login_model.go b/internal/command/instance_policy_login_model.go index 899da6c49..b78103914 100644 --- a/internal/command/instance_policy_login_model.go +++ b/internal/command/instance_policy_login_model.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) type InstanceLoginPolicyWriteModel struct { diff --git a/internal/command/instance_policy_login_test.go b/internal/command/instance_policy_login_test.go index 8760d3fc5..09a49bb2c 100644 --- a/internal/command/instance_policy_login_test.go +++ b/internal/command/instance_policy_login_test.go @@ -5,15 +5,15 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/user" "github.com/stretchr/testify/assert" ) diff --git a/internal/command/instance_policy_mail_template.go b/internal/command/instance_policy_mail_template.go index b01c5fefd..283c9e44a 100644 --- a/internal/command/instance_policy_mail_template.go +++ b/internal/command/instance_policy_mail_template.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddDefaultMailTemplate(ctx context.Context, policy *domain.MailTemplate) (*domain.MailTemplate, error) { diff --git a/internal/command/instance_policy_mail_template_model.go b/internal/command/instance_policy_mail_template_model.go index 0066c8d38..a7b6fcabf 100644 --- a/internal/command/instance_policy_mail_template_model.go +++ b/internal/command/instance_policy_mail_template_model.go @@ -4,11 +4,11 @@ import ( "context" "reflect" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) type InstanceMailTemplateWriteModel struct { diff --git a/internal/command/instance_policy_mail_template_test.go b/internal/command/instance_policy_mail_template_test.go index aa4d1e3ce..0ef85dabf 100644 --- a/internal/command/instance_policy_mail_template_test.go +++ b/internal/command/instance_policy_mail_template_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddDefaultMailTemplatePolicy(t *testing.T) { diff --git a/internal/command/instance_policy_password_age.go b/internal/command/instance_policy_password_age.go index be563a390..84e561ada 100644 --- a/internal/command/instance_policy_password_age.go +++ b/internal/command/instance_policy_password_age.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddDefaultPasswordAgePolicy(ctx context.Context, policy *domain.PasswordAgePolicy) (*domain.PasswordAgePolicy, error) { diff --git a/internal/command/instance_policy_password_age_test.go b/internal/command/instance_policy_password_age_test.go index 5a17ffb1e..ff3753456 100644 --- a/internal/command/instance_policy_password_age_test.go +++ b/internal/command/instance_policy_password_age_test.go @@ -6,14 +6,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddDefaultPasswordAgePolicy(t *testing.T) { diff --git a/internal/command/instance_policy_password_complexity.go b/internal/command/instance_policy_password_complexity.go index 13edd96d8..440cfb0d0 100644 --- a/internal/command/instance_policy_password_complexity.go +++ b/internal/command/instance_policy_password_complexity.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) getDefaultPasswordComplexityPolicy(ctx context.Context) (*domain.PasswordComplexityPolicy, error) { diff --git a/internal/command/instance_policy_password_complexity_model.go b/internal/command/instance_policy_password_complexity_model.go index 8e56a56c7..c4d895e79 100644 --- a/internal/command/instance_policy_password_complexity_model.go +++ b/internal/command/instance_policy_password_complexity_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) type InstancePasswordComplexityPolicyWriteModel struct { diff --git a/internal/command/instance_policy_password_complexity_test.go b/internal/command/instance_policy_password_complexity_test.go index 1dbe9b717..67bf8038e 100644 --- a/internal/command/instance_policy_password_complexity_test.go +++ b/internal/command/instance_policy_password_complexity_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddDefaultPasswordComplexityPolicy(t *testing.T) { diff --git a/internal/command/instance_policy_password_lockout.go b/internal/command/instance_policy_password_lockout.go index bcd8cfc49..671cf029e 100644 --- a/internal/command/instance_policy_password_lockout.go +++ b/internal/command/instance_policy_password_lockout.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddDefaultLockoutPolicy(ctx context.Context, policy *domain.LockoutPolicy) (*domain.LockoutPolicy, error) { diff --git a/internal/command/instance_policy_password_lockout_model.go b/internal/command/instance_policy_password_lockout_model.go index 24ec0d290..328fa29af 100644 --- a/internal/command/instance_policy_password_lockout_model.go +++ b/internal/command/instance_policy_password_lockout_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) type InstanceLockoutPolicyWriteModel struct { diff --git a/internal/command/instance_policy_password_lockout_test.go b/internal/command/instance_policy_password_lockout_test.go index 5e23b3d41..537d2a93e 100644 --- a/internal/command/instance_policy_password_lockout_test.go +++ b/internal/command/instance_policy_password_lockout_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddDefaultLockoutPolicy(t *testing.T) { diff --git a/internal/command/instance_policy_privacy.go b/internal/command/instance_policy_privacy.go index 41074758b..9c46ea007 100644 --- a/internal/command/instance_policy_privacy.go +++ b/internal/command/instance_policy_privacy.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) getDefaultPrivacyPolicy(ctx context.Context) (*domain.PrivacyPolicy, error) { diff --git a/internal/command/instance_policy_privacy_model.go b/internal/command/instance_policy_privacy_model.go index 414f66848..d83e61fd7 100644 --- a/internal/command/instance_policy_privacy_model.go +++ b/internal/command/instance_policy_privacy_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) type InstancePrivacyPolicyWriteModel struct { diff --git a/internal/command/instance_policy_privacy_test.go b/internal/command/instance_policy_privacy_test.go index 6a5965b06..38ad8e361 100644 --- a/internal/command/instance_policy_privacy_test.go +++ b/internal/command/instance_policy_privacy_test.go @@ -4,16 +4,16 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/api/authz" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddDefaultPrivacyPolicy(t *testing.T) { diff --git a/internal/command/instance_privacy_policy.go b/internal/command/instance_privacy_policy.go index c16cabd04..cd1ef0d95 100644 --- a/internal/command/instance_privacy_policy.go +++ b/internal/command/instance_privacy_policy.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) func AddPrivacyPolicy( diff --git a/internal/command/instance_secret_generator_model.go b/internal/command/instance_secret_generator_model.go index 57f529501..474841da0 100644 --- a/internal/command/instance_secret_generator_model.go +++ b/internal/command/instance_secret_generator_model.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceSecretGeneratorConfigWriteModel struct { diff --git a/internal/command/instance_settings.go b/internal/command/instance_settings.go index 74251c0c7..9389f82ba 100644 --- a/internal/command/instance_settings.go +++ b/internal/command/instance_settings.go @@ -3,14 +3,14 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "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/repository/instance" ) func (c *Commands) AddSecretGeneratorConfig(ctx context.Context, typ domain.SecretGeneratorType, config *crypto.GeneratorConfig) (*domain.ObjectDetails, error) { diff --git a/internal/command/instance_settings_test.go b/internal/command/instance_settings_test.go index 6877a8979..ad95fc061 100644 --- a/internal/command/instance_settings_test.go +++ b/internal/command/instance_settings_test.go @@ -5,15 +5,15 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/api/authz" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/instance" ) func TestCommandSide_AddSecretGenerator(t *testing.T) { diff --git a/internal/command/instance_smtp_config_model.go b/internal/command/instance_smtp_config_model.go index 44e7b4c21..71cd7b6e4 100644 --- a/internal/command/instance_smtp_config_model.go +++ b/internal/command/instance_smtp_config_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type InstanceSMTPConfigWriteModel struct { diff --git a/internal/command/jwt_config_model.go b/internal/command/jwt_config_model.go index 8ce0f9fb7..f59590c26 100644 --- a/internal/command/jwt_config_model.go +++ b/internal/command/jwt_config_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/idpconfig" ) type JWTConfigWriteModel struct { diff --git a/internal/command/key_pair.go b/internal/command/key_pair.go index d253ffe4e..6b0765998 100644 --- a/internal/command/key_pair.go +++ b/internal/command/key_pair.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/keypair" ) func (c *Commands) GenerateSigningKeyPair(ctx context.Context, algorithm string) error { diff --git a/internal/command/key_pair_model.go b/internal/command/key_pair_model.go index 766069d1e..7b3bb14f6 100644 --- a/internal/command/key_pair_model.go +++ b/internal/command/key_pair_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/keypair" ) type KeyPairWriteModel struct { diff --git a/internal/command/main_test.go b/internal/command/main_test.go index 3db45d211..aa45f1c7d 100644 --- a/internal/command/main_test.go +++ b/internal/command/main_test.go @@ -9,19 +9,19 @@ import ( "github.com/golang/mock/gomock" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/repository/mock" - action_repo "github.com/caos/zitadel/internal/repository/action" - iam_repo "github.com/caos/zitadel/internal/repository/instance" - key_repo "github.com/caos/zitadel/internal/repository/keypair" - "github.com/caos/zitadel/internal/repository/org" - proj_repo "github.com/caos/zitadel/internal/repository/project" - usr_repo "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/repository/mock" + action_repo "github.com/zitadel/zitadel/internal/repository/action" + iam_repo "github.com/zitadel/zitadel/internal/repository/instance" + key_repo "github.com/zitadel/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/repository/org" + proj_repo "github.com/zitadel/zitadel/internal/repository/project" + usr_repo "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/repository/usergrant" ) type expect func(mockRepository *mock.MockRepository) diff --git a/internal/command/member_model.go b/internal/command/member_model.go index 6709962db..b3bb25bc8 100644 --- a/internal/command/member_model.go +++ b/internal/command/member_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/member" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/member" ) type MemberWriteModel struct { diff --git a/internal/command/metadata_model.go b/internal/command/metadata_model.go index f811b6ed4..7151556cf 100644 --- a/internal/command/metadata_model.go +++ b/internal/command/metadata_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/metadata" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/metadata" ) type MetadataWriteModel struct { diff --git a/internal/command/oidc_config_model.go b/internal/command/oidc_config_model.go index 2802af55f..bd53fda04 100644 --- a/internal/command/oidc_config_model.go +++ b/internal/command/oidc_config_model.go @@ -1,10 +1,10 @@ package command import ( - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/idpconfig" ) type OIDCConfigWriteModel struct { diff --git a/internal/command/org.go b/internal/command/org.go index 1bafb253b..31aa0185f 100644 --- a/internal/command/org.go +++ b/internal/command/org.go @@ -4,16 +4,16 @@ import ( "context" "strings" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/repository/org" - user_repo "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "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/id" + "github.com/zitadel/zitadel/internal/repository/org" + user_repo "github.com/zitadel/zitadel/internal/repository/user" ) type OrgSetup struct { diff --git a/internal/command/org_action.go b/internal/command/org_action.go index bbd0e32ea..fe1971bba 100644 --- a/internal/command/org_action.go +++ b/internal/command/org_action.go @@ -4,11 +4,11 @@ import ( "context" "sort" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/action" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/action" + "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) AddAction(ctx context.Context, addAction *domain.Action, resourceOwner string) (_ string, _ *domain.ObjectDetails, err error) { diff --git a/internal/command/org_action_model.go b/internal/command/org_action_model.go index 3eb3caea9..6f66ee972 100644 --- a/internal/command/org_action_model.go +++ b/internal/command/org_action_model.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/action" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/action" ) type ActionWriteModel struct { diff --git a/internal/command/org_action_test.go b/internal/command/org_action_test.go index 6ccd6cd72..350ae0078 100644 --- a/internal/command/org_action_test.go +++ b/internal/command/org_action_test.go @@ -6,17 +6,17 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/repository/features" + "github.com/zitadel/zitadel/internal/repository/features" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/action" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/action" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestCommands_AddAction(t *testing.T) { diff --git a/internal/command/org_converter.go b/internal/command/org_converter.go index fff57ba31..f1ed76e6a 100644 --- a/internal/command/org_converter.go +++ b/internal/command/org_converter.go @@ -1,7 +1,7 @@ package command import ( - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) func orgWriteModelToOrg(wm *OrgWriteModel) *domain.Org { diff --git a/internal/command/org_custom_login_text.go b/internal/command/org_custom_login_text.go index 263cce013..9e3dbbce9 100644 --- a/internal/command/org_custom_login_text.go +++ b/internal/command/org_custom_login_text.go @@ -5,10 +5,10 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) SetOrgLoginText(ctx context.Context, resourceOwner string, loginText *domain.CustomLoginText) (*domain.ObjectDetails, error) { diff --git a/internal/command/org_custom_login_text_model.go b/internal/command/org_custom_login_text_model.go index a726a4db8..a28c2d03a 100644 --- a/internal/command/org_custom_login_text_model.go +++ b/internal/command/org_custom_login_text_model.go @@ -3,9 +3,9 @@ package command import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" ) type OrgCustomLoginTextReadModel struct { diff --git a/internal/command/org_custom_login_text_test.go b/internal/command/org_custom_login_text_test.go index bf15a4056..0d225e70c 100644 --- a/internal/command/org_custom_login_text_test.go +++ b/internal/command/org_custom_login_text_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/org" ) func TestCommandSide_SetCustomOrgLoginText(t *testing.T) { diff --git a/internal/command/org_custom_message_model.go b/internal/command/org_custom_message_model.go index fceb97771..7ff85a753 100644 --- a/internal/command/org_custom_message_model.go +++ b/internal/command/org_custom_message_model.go @@ -3,9 +3,9 @@ package command import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" ) type OrgCustomMessageTextReadModel struct { diff --git a/internal/command/org_custom_message_text.go b/internal/command/org_custom_message_text.go index 17f911c87..7aacd6a35 100644 --- a/internal/command/org_custom_message_text.go +++ b/internal/command/org_custom_message_text.go @@ -5,10 +5,10 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) SetOrgMessageText(ctx context.Context, resourceOwner string, messageText *domain.CustomMessageText) (*domain.ObjectDetails, error) { diff --git a/internal/command/org_custom_message_text_test.go b/internal/command/org_custom_message_text_test.go index 869be93ff..ecf10e069 100644 --- a/internal/command/org_custom_message_text_test.go +++ b/internal/command/org_custom_message_text_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/org" ) func TestCommandSide_SetCustomMessageText(t *testing.T) { diff --git a/internal/command/org_domain.go b/internal/command/org_domain.go index 478719fc3..12edcb5d1 100644 --- a/internal/command/org_domain.go +++ b/internal/command/org_domain.go @@ -5,16 +5,16 @@ import ( errs "errors" "strings" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - http_utils "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/api/authz" + http_utils "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" ) func AddOrgDomain(a *org.Aggregate, domain string) preparation.Validation { diff --git a/internal/command/org_domain_model.go b/internal/command/org_domain_model.go index d2b4077b3..a23d74069 100644 --- a/internal/command/org_domain_model.go +++ b/internal/command/org_domain_model.go @@ -1,10 +1,10 @@ package command import ( - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" ) type OrgDomainWriteModel struct { diff --git a/internal/command/org_domain_test.go b/internal/command/org_domain_test.go index 137d6ca8b..7770061fe 100644 --- a/internal/command/org_domain_test.go +++ b/internal/command/org_domain_test.go @@ -8,19 +8,19 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestAddDomain(t *testing.T) { diff --git a/internal/command/org_features.go b/internal/command/org_features.go index 69baab0f0..bbc4a0551 100644 --- a/internal/command/org_features.go +++ b/internal/command/org_features.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) SetOrgFeatures(ctx context.Context, resourceOwner string, features *domain.Features) (*domain.ObjectDetails, error) { diff --git a/internal/command/org_features_model.go b/internal/command/org_features_model.go index ca9224dbc..0b6e0b7db 100644 --- a/internal/command/org_features_model.go +++ b/internal/command/org_features_model.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/features" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/features" + "github.com/zitadel/zitadel/internal/repository/org" ) type OrgFeaturesWriteModel struct { diff --git a/internal/command/org_features_test.go b/internal/command/org_features_test.go index a0d74909e..4aaccf098 100644 --- a/internal/command/org_features_test.go +++ b/internal/command/org_features_test.go @@ -9,17 +9,17 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/features" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/static" - "github.com/caos/zitadel/internal/static/mock" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/features" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/static/mock" ) func TestCommandSide_SetOrgFeatures(t *testing.T) { diff --git a/internal/command/org_flow.go b/internal/command/org_flow.go index 939551567..e127517ca 100644 --- a/internal/command/org_flow.go +++ b/internal/command/org_flow.go @@ -4,9 +4,9 @@ import ( "context" "reflect" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) ClearFlow(ctx context.Context, flowType domain.FlowType, resourceOwner string) (*domain.ObjectDetails, error) { diff --git a/internal/command/org_flow_model.go b/internal/command/org_flow_model.go index f2d682c9b..20d440f37 100644 --- a/internal/command/org_flow_model.go +++ b/internal/command/org_flow_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" ) type OrgFlowWriteModel struct { diff --git a/internal/command/org_flow_test.go b/internal/command/org_flow_test.go index b0f0ff5cc..5a856015b 100644 --- a/internal/command/org_flow_test.go +++ b/internal/command/org_flow_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/action" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/action" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestCommands_ClearFlow(t *testing.T) { diff --git a/internal/command/org_idp_config.go b/internal/command/org_idp_config.go index 8d4b5261d..90bcbae4b 100644 --- a/internal/command/org_idp_config.go +++ b/internal/command/org_idp_config.go @@ -3,14 +3,14 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/telemetry/tracing" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - org_repo "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + org_repo "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) AddIDPConfig(ctx context.Context, config *domain.IDPConfig, resourceOwner string) (*domain.IDPConfig, error) { diff --git a/internal/command/org_idp_config_model.go b/internal/command/org_idp_config_model.go index 6602f7089..41b395071 100644 --- a/internal/command/org_idp_config_model.go +++ b/internal/command/org_idp_config_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/org" ) type OrgIDPConfigWriteModel struct { diff --git a/internal/command/org_idp_config_test.go b/internal/command/org_idp_config_test.go index d5ddad106..1705a620b 100644 --- a/internal/command/org_idp_config_test.go +++ b/internal/command/org_idp_config_test.go @@ -8,17 +8,17 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_AddIDPConfig(t *testing.T) { diff --git a/internal/command/org_idp_jwt_config.go b/internal/command/org_idp_jwt_config.go index 2ee0f66e1..94626420e 100644 --- a/internal/command/org_idp_jwt_config.go +++ b/internal/command/org_idp_jwt_config.go @@ -3,8 +3,8 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func (c *Commands) ChangeIDPJWTConfig(ctx context.Context, config *domain.JWTIDPConfig, resourceOwner string) (*domain.JWTIDPConfig, error) { diff --git a/internal/command/org_idp_jwt_config_model.go b/internal/command/org_idp_jwt_config_model.go index b2ecb00ba..18ef16637 100644 --- a/internal/command/org_idp_jwt_config_model.go +++ b/internal/command/org_idp_jwt_config_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/org" ) type IDPJWTConfigWriteModel struct { diff --git a/internal/command/org_idp_jwt_config_test.go b/internal/command/org_idp_jwt_config_test.go index 5d9ad8a1d..4923b8180 100644 --- a/internal/command/org_idp_jwt_config_test.go +++ b/internal/command/org_idp_jwt_config_test.go @@ -7,14 +7,14 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestCommandSide_ChangeIDPJWTConfig(t *testing.T) { diff --git a/internal/command/org_idp_oidc_config.go b/internal/command/org_idp_oidc_config.go index cafe84bb6..0b8573a2a 100644 --- a/internal/command/org_idp_oidc_config.go +++ b/internal/command/org_idp_oidc_config.go @@ -3,8 +3,8 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func (c *Commands) ChangeIDPOIDCConfig(ctx context.Context, config *domain.OIDCIDPConfig, resourceOwner string) (*domain.OIDCIDPConfig, error) { diff --git a/internal/command/org_idp_oidc_config_model.go b/internal/command/org_idp_oidc_config_model.go index 766e89109..6d19b39f2 100644 --- a/internal/command/org_idp_oidc_config_model.go +++ b/internal/command/org_idp_oidc_config_model.go @@ -4,12 +4,12 @@ import ( "context" "reflect" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/org" ) type IDPOIDCConfigWriteModel struct { diff --git a/internal/command/org_idp_oidc_config_test.go b/internal/command/org_idp_oidc_config_test.go index 361ae7d58..2fd91d701 100644 --- a/internal/command/org_idp_oidc_config_test.go +++ b/internal/command/org_idp_oidc_config_test.go @@ -7,14 +7,14 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestCommandSide_ChangeIDPOIDCConfig(t *testing.T) { diff --git a/internal/command/org_member.go b/internal/command/org_member.go index 9ddc8afbf..72222e61e 100644 --- a/internal/command/org_member.go +++ b/internal/command/org_member.go @@ -4,12 +4,12 @@ import ( "context" "reflect" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddOrgMemberCommand(a *org.Aggregate, userID string, roles ...string) preparation.Validation { diff --git a/internal/command/org_member_model.go b/internal/command/org_member_model.go index 602787ba2..92218f653 100644 --- a/internal/command/org_member_model.go +++ b/internal/command/org_member_model.go @@ -1,8 +1,8 @@ package command import ( - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" ) type OrgMemberWriteModel struct { diff --git a/internal/command/org_member_test.go b/internal/command/org_member_test.go index f0f87c868..ab9670599 100644 --- a/internal/command/org_member_test.go +++ b/internal/command/org_member_test.go @@ -7,17 +7,17 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/member" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "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" ) func TestAddMember(t *testing.T) { diff --git a/internal/command/org_model.go b/internal/command/org_model.go index 75ef94f98..a86a8732e 100644 --- a/internal/command/org_model.go +++ b/internal/command/org_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" ) type OrgWriteModel struct { diff --git a/internal/command/org_policy_domain.go b/internal/command/org_policy_domain.go index 97600f567..3e57d2498 100644 --- a/internal/command/org_policy_domain.go +++ b/internal/command/org_policy_domain.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddOrgDomainPolicy(ctx context.Context, resourceOwner string, policy *domain.DomainPolicy) (*domain.DomainPolicy, error) { diff --git a/internal/command/org_policy_domain_model.go b/internal/command/org_policy_domain_model.go index 22d51d99f..17367a760 100644 --- a/internal/command/org_policy_domain_model.go +++ b/internal/command/org_policy_domain_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) type OrgDomainPolicyWriteModel struct { diff --git a/internal/command/org_policy_domain_test.go b/internal/command/org_policy_domain_test.go index 80fe83322..479f216fc 100644 --- a/internal/command/org_policy_domain_test.go +++ b/internal/command/org_policy_domain_test.go @@ -6,13 +6,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddDomainPolicy(t *testing.T) { diff --git a/internal/command/org_policy_label.go b/internal/command/org_policy_label.go index d31b8aa82..5663eabf2 100644 --- a/internal/command/org_policy_label.go +++ b/internal/command/org_policy_label.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/static" ) func (c *Commands) AddLabelPolicy(ctx context.Context, resourceOwner string, policy *domain.LabelPolicy) (*domain.LabelPolicy, error) { diff --git a/internal/command/org_policy_label_model.go b/internal/command/org_policy_label_model.go index 5d088bfbf..83cd39d25 100644 --- a/internal/command/org_policy_label_model.go +++ b/internal/command/org_policy_label_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) type OrgLabelPolicyWriteModel struct { diff --git a/internal/command/org_policy_label_test.go b/internal/command/org_policy_label_test.go index ddb034a83..83b1baeb6 100644 --- a/internal/command/org_policy_label_test.go +++ b/internal/command/org_policy_label_test.go @@ -8,16 +8,16 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" - "github.com/caos/zitadel/internal/static" - "github.com/caos/zitadel/internal/static/mock" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/static/mock" ) func TestCommandSide_AddLabelPolicy(t *testing.T) { diff --git a/internal/command/org_policy_lockout.go b/internal/command/org_policy_lockout.go index b4ac0dd50..0aa809b4c 100644 --- a/internal/command/org_policy_lockout.go +++ b/internal/command/org_policy_lockout.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) AddLockoutPolicy(ctx context.Context, resourceOwner string, policy *domain.LockoutPolicy) (*domain.LockoutPolicy, error) { diff --git a/internal/command/org_policy_lockout_model.go b/internal/command/org_policy_lockout_model.go index bdb84a57b..1ce78055f 100644 --- a/internal/command/org_policy_lockout_model.go +++ b/internal/command/org_policy_lockout_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) type OrgLockoutPolicyWriteModel struct { diff --git a/internal/command/org_policy_lockout_test.go b/internal/command/org_policy_lockout_test.go index f505574fa..e33917963 100644 --- a/internal/command/org_policy_lockout_test.go +++ b/internal/command/org_policy_lockout_test.go @@ -6,13 +6,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddPasswordLockoutPolicy(t *testing.T) { diff --git a/internal/command/org_policy_login.go b/internal/command/org_policy_login.go index 9f2fe8834..099712bc7 100644 --- a/internal/command/org_policy_login.go +++ b/internal/command/org_policy_login.go @@ -4,13 +4,13 @@ import ( "context" "reflect" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddLoginPolicy(ctx context.Context, resourceOwner string, policy *domain.LoginPolicy) (*domain.LoginPolicy, error) { diff --git a/internal/command/org_policy_login_factors_model.go b/internal/command/org_policy_login_factors_model.go index 3b300c99a..f1f039b14 100644 --- a/internal/command/org_policy_login_factors_model.go +++ b/internal/command/org_policy_login_factors_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) type OrgSecondFactorWriteModel struct { diff --git a/internal/command/org_policy_login_identity_provider_model.go b/internal/command/org_policy_login_identity_provider_model.go index 5963342aa..15860ab8b 100644 --- a/internal/command/org_policy_login_identity_provider_model.go +++ b/internal/command/org_policy_login_identity_provider_model.go @@ -1,8 +1,8 @@ package command import ( - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" ) type OrgIdentityProviderWriteModel struct { diff --git a/internal/command/org_policy_login_model.go b/internal/command/org_policy_login_model.go index 8cfa5df15..e9799a240 100644 --- a/internal/command/org_policy_login_model.go +++ b/internal/command/org_policy_login_model.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) type OrgLoginPolicyWriteModel struct { diff --git a/internal/command/org_policy_login_test.go b/internal/command/org_policy_login_test.go index 3ff1810a2..ca7526b38 100644 --- a/internal/command/org_policy_login_test.go +++ b/internal/command/org_policy_login_test.go @@ -7,15 +7,15 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/user" ) var ( diff --git a/internal/command/org_policy_mail_template.go b/internal/command/org_policy_mail_template.go index 6cfe1d2ff..760a01b1e 100644 --- a/internal/command/org_policy_mail_template.go +++ b/internal/command/org_policy_mail_template.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) AddMailTemplate(ctx context.Context, resourceOwner string, policy *domain.MailTemplate) (*domain.MailTemplate, error) { diff --git a/internal/command/org_policy_mail_template_model.go b/internal/command/org_policy_mail_template_model.go index 3c4d45b40..3586362a6 100644 --- a/internal/command/org_policy_mail_template_model.go +++ b/internal/command/org_policy_mail_template_model.go @@ -4,10 +4,10 @@ import ( "context" "reflect" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) type OrgMailTemplateWriteModel struct { diff --git a/internal/command/org_policy_mail_template_test.go b/internal/command/org_policy_mail_template_test.go index 42874778d..f2be80df6 100644 --- a/internal/command/org_policy_mail_template_test.go +++ b/internal/command/org_policy_mail_template_test.go @@ -6,13 +6,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddMailTemplate(t *testing.T) { diff --git a/internal/command/org_policy_password_age.go b/internal/command/org_policy_password_age.go index 2406f7fbd..b390f309a 100644 --- a/internal/command/org_policy_password_age.go +++ b/internal/command/org_policy_password_age.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) AddPasswordAgePolicy(ctx context.Context, resourceOwner string, policy *domain.PasswordAgePolicy) (*domain.PasswordAgePolicy, error) { diff --git a/internal/command/org_policy_password_age_model.go b/internal/command/org_policy_password_age_model.go index 1b99c7a39..8d62a5d68 100644 --- a/internal/command/org_policy_password_age_model.go +++ b/internal/command/org_policy_password_age_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) type OrgPasswordAgePolicyWriteModel struct { diff --git a/internal/command/org_policy_password_age_test.go b/internal/command/org_policy_password_age_test.go index d0b48bbd8..17f73e228 100644 --- a/internal/command/org_policy_password_age_test.go +++ b/internal/command/org_policy_password_age_test.go @@ -6,13 +6,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddPasswordAgePolicy(t *testing.T) { diff --git a/internal/command/org_policy_password_complexity.go b/internal/command/org_policy_password_complexity.go index d61dc827c..4c7b7df3f 100644 --- a/internal/command/org_policy_password_complexity.go +++ b/internal/command/org_policy_password_complexity.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) getOrgPasswordComplexityPolicy(ctx context.Context, orgID string) (*domain.PasswordComplexityPolicy, error) { diff --git a/internal/command/org_policy_password_complexity_model.go b/internal/command/org_policy_password_complexity_model.go index 3e06cabf1..252acf32b 100644 --- a/internal/command/org_policy_password_complexity_model.go +++ b/internal/command/org_policy_password_complexity_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) type OrgPasswordComplexityPolicyWriteModel struct { diff --git a/internal/command/org_policy_password_complexity_test.go b/internal/command/org_policy_password_complexity_test.go index 655804e09..44de9259a 100644 --- a/internal/command/org_policy_password_complexity_test.go +++ b/internal/command/org_policy_password_complexity_test.go @@ -6,13 +6,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddPasswordComplexityPolicy(t *testing.T) { diff --git a/internal/command/org_policy_privacy.go b/internal/command/org_policy_privacy.go index 3dea4c36a..4385ee22e 100644 --- a/internal/command/org_policy_privacy.go +++ b/internal/command/org_policy_privacy.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/org" ) func (c *Commands) getOrgPrivacyPolicy(ctx context.Context, orgID string) (*domain.PrivacyPolicy, error) { diff --git a/internal/command/org_policy_privacy_model.go b/internal/command/org_policy_privacy_model.go index d5ff331db..acff49626 100644 --- a/internal/command/org_policy_privacy_model.go +++ b/internal/command/org_policy_privacy_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) type OrgPrivacyPolicyWriteModel struct { diff --git a/internal/command/org_policy_privacy_test.go b/internal/command/org_policy_privacy_test.go index f194825e3..ac9ba384b 100644 --- a/internal/command/org_policy_privacy_test.go +++ b/internal/command/org_policy_privacy_test.go @@ -6,13 +6,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) func TestCommandSide_AddPrivacyPolicy(t *testing.T) { diff --git a/internal/command/org_test.go b/internal/command/org_test.go index a04b41484..47b6e8a8e 100644 --- a/internal/command/org_test.go +++ b/internal/command/org_test.go @@ -7,17 +7,17 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/member" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/member" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestAddOrg(t *testing.T) { diff --git a/internal/command/phone.go b/internal/command/phone.go index efc9a7a22..ad28fa437 100644 --- a/internal/command/phone.go +++ b/internal/command/phone.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" "github.com/ttacon/libphonenumber" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" ) type Phone struct { diff --git a/internal/command/phone_test.go b/internal/command/phone_test.go index a993dd2cb..51e775d17 100644 --- a/internal/command/phone_test.go +++ b/internal/command/phone_test.go @@ -3,7 +3,7 @@ package command import ( "testing" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) func TestFormatPhoneNumber(t *testing.T) { diff --git a/internal/command/policy_label_model.go b/internal/command/policy_label_model.go index cfeec6020..a44d0e1b5 100644 --- a/internal/command/policy_label_model.go +++ b/internal/command/policy_label_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type LabelPolicyWriteModel struct { diff --git a/internal/command/policy_login_factors_model.go b/internal/command/policy_login_factors_model.go index a6d2b8525..da905f40b 100644 --- a/internal/command/policy_login_factors_model.go +++ b/internal/command/policy_login_factors_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type SecondFactorWriteModel struct { diff --git a/internal/command/policy_login_model.go b/internal/command/policy_login_model.go index ed3a2faef..cfefc7781 100644 --- a/internal/command/policy_login_model.go +++ b/internal/command/policy_login_model.go @@ -3,9 +3,9 @@ package command import ( "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type LoginPolicyWriteModel struct { diff --git a/internal/command/policy_mail_template_model.go b/internal/command/policy_mail_template_model.go index ef7e340a3..65ea6181e 100644 --- a/internal/command/policy_mail_template_model.go +++ b/internal/command/policy_mail_template_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type MailTemplateWriteModel struct { diff --git a/internal/command/policy_org_model.go b/internal/command/policy_org_model.go index 493b42d2f..d62286590 100644 --- a/internal/command/policy_org_model.go +++ b/internal/command/policy_org_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type PolicyDomainWriteModel struct { diff --git a/internal/command/policy_password_age_model.go b/internal/command/policy_password_age_model.go index 04056b498..2c98bcb2a 100644 --- a/internal/command/policy_password_age_model.go +++ b/internal/command/policy_password_age_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type PasswordAgePolicyWriteModel struct { diff --git a/internal/command/policy_password_complexity_model.go b/internal/command/policy_password_complexity_model.go index 046feaa18..197ae7ac7 100644 --- a/internal/command/policy_password_complexity_model.go +++ b/internal/command/policy_password_complexity_model.go @@ -3,10 +3,10 @@ package command import ( "regexp" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/command/policy_password_lockout_model.go b/internal/command/policy_password_lockout_model.go index 737afb4ec..a931b63b6 100644 --- a/internal/command/policy_password_lockout_model.go +++ b/internal/command/policy_password_lockout_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type LockoutPolicyWriteModel struct { diff --git a/internal/command/policy_privacy_model.go b/internal/command/policy_privacy_model.go index 9dbd6722a..2283ee0cf 100644 --- a/internal/command/policy_privacy_model.go +++ b/internal/command/policy_privacy_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/policy" ) type PrivacyPolicyWriteModel struct { diff --git a/internal/command/preparation/command.go b/internal/command/preparation/command.go index 7ec057022..3d0ac6992 100644 --- a/internal/command/preparation/command.go +++ b/internal/command/preparation/command.go @@ -3,8 +3,8 @@ package preparation import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" ) // Validation of the input values of the command and if correct returns diff --git a/internal/command/preparation/command_test.go b/internal/command/preparation/command_test.go index ef87f3ab4..7ccd59070 100644 --- a/internal/command/preparation/command_test.go +++ b/internal/command/preparation/command_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) var errTest = errors.New("test") diff --git a/internal/command/preparation_test.go b/internal/command/preparation_test.go index bc7b79a34..225cb37a9 100644 --- a/internal/command/preparation_test.go +++ b/internal/command/preparation_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/eventstore" ) //Want represents the expected values for each step diff --git a/internal/command/project.go b/internal/command/project.go index 27d186057..db58eddaf 100644 --- a/internal/command/project.go +++ b/internal/command/project.go @@ -4,13 +4,13 @@ import ( "context" "strings" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/logging" + "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/repository/project" ) func (c *Commands) AddProject(ctx context.Context, project *domain.Project, resourceOwner, ownerUserID string) (_ *domain.Project, err error) { diff --git a/internal/command/project_application.go b/internal/command/project_application.go index 3093826d4..93421f7fb 100644 --- a/internal/command/project_application.go +++ b/internal/command/project_application.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/project" ) type AddApp struct { diff --git a/internal/command/project_application_api.go b/internal/command/project_application_api.go index 8660cd3e2..2b60135df 100644 --- a/internal/command/project_application_api.go +++ b/internal/command/project_application_api.go @@ -4,16 +4,16 @@ import ( "context" "strings" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/id" - project_repo "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/id" + project_repo "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) type addAPIApp struct { diff --git a/internal/command/project_application_api_model.go b/internal/command/project_application_api_model.go index 8b227b38e..f7c1ef391 100644 --- a/internal/command/project_application_api_model.go +++ b/internal/command/project_application_api_model.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/project" ) type APIApplicationWriteModel struct { diff --git a/internal/command/project_application_api_test.go b/internal/command/project_application_api_test.go index 5383713ee..8af5e5a75 100644 --- a/internal/command/project_application_api_test.go +++ b/internal/command/project_application_api_test.go @@ -4,17 +4,17 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/project" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/project" ) func TestAddAPIConfig(t *testing.T) { diff --git a/internal/command/project_application_key.go b/internal/command/project_application_key.go index c556f0914..c56baf779 100644 --- a/internal/command/project_application_key.go +++ b/internal/command/project_application_key.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/project" ) func (c *Commands) AddApplicationKey(ctx context.Context, key *domain.ApplicationKey, resourceOwner string) (_ *domain.ApplicationKey, err error) { diff --git a/internal/command/project_application_key_model.go b/internal/command/project_application_key_model.go index 38159397c..75319e143 100644 --- a/internal/command/project_application_key_model.go +++ b/internal/command/project_application_key_model.go @@ -3,10 +3,10 @@ package command import ( "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/project" ) type ApplicationKeyWriteModel struct { diff --git a/internal/command/project_application_key_test.go b/internal/command/project_application_key_test.go index 3643e1ebf..12aab721f 100644 --- a/internal/command/project_application_key_test.go +++ b/internal/command/project_application_key_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/project" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/project" ) func TestCommandSide_AddAPIApplicationKey(t *testing.T) { diff --git a/internal/command/project_application_model.go b/internal/command/project_application_model.go index 504ebc3c5..fd6c1dde5 100644 --- a/internal/command/project_application_model.go +++ b/internal/command/project_application_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/project" ) type ApplicationWriteModel struct { diff --git a/internal/command/project_application_oidc.go b/internal/command/project_application_oidc.go index e8bb97a60..15ed08090 100644 --- a/internal/command/project_application_oidc.go +++ b/internal/command/project_application_oidc.go @@ -5,18 +5,18 @@ import ( "strings" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - http_util "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/id" - project_repo "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/telemetry/tracing" + http_util "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "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/id" + project_repo "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) type addOIDCApp struct { diff --git a/internal/command/project_application_oidc_model.go b/internal/command/project_application_oidc_model.go index f55ecc35a..d88c79a4b 100644 --- a/internal/command/project_application_oidc_model.go +++ b/internal/command/project_application_oidc_model.go @@ -5,10 +5,10 @@ import ( "reflect" "time" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/project" ) type OIDCApplicationWriteModel struct { diff --git a/internal/command/project_application_oidc_test.go b/internal/command/project_application_oidc_test.go index 5259f5c44..9e7d13ab4 100644 --- a/internal/command/project_application_oidc_test.go +++ b/internal/command/project_application_oidc_test.go @@ -7,16 +7,16 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/project" ) func TestAddOIDCApp(t *testing.T) { diff --git a/internal/command/project_application_test.go b/internal/command/project_application_test.go index 88ef37eb4..33b94f3d6 100644 --- a/internal/command/project_application_test.go +++ b/internal/command/project_application_test.go @@ -2,13 +2,14 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/project" - "github.com/stretchr/testify/assert" "testing" + + "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/project" ) func TestCommandSide_ChangeApplication(t *testing.T) { diff --git a/internal/command/project_converter.go b/internal/command/project_converter.go index aca37def6..a31b48347 100644 --- a/internal/command/project_converter.go +++ b/internal/command/project_converter.go @@ -1,7 +1,7 @@ package command import ( - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) func projectWriteModelToProject(writeModel *ProjectWriteModel) *domain.Project { diff --git a/internal/command/project_grant.go b/internal/command/project_grant.go index edabdd116..e484f33cf 100644 --- a/internal/command/project_grant.go +++ b/internal/command/project_grant.go @@ -4,12 +4,12 @@ import ( "context" "reflect" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddProjectGrant(ctx context.Context, grant *domain.ProjectGrant, resourceOwner string) (_ *domain.ProjectGrant, err error) { diff --git a/internal/command/project_grant_member.go b/internal/command/project_grant_member.go index 69eb72c02..44d47ef8f 100644 --- a/internal/command/project_grant_member.go +++ b/internal/command/project_grant_member.go @@ -4,12 +4,12 @@ import ( "context" "reflect" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/telemetry/tracing" + "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/repository/project" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddProjectGrantMember(ctx context.Context, member *domain.ProjectGrantMember) (*domain.ProjectGrantMember, error) { diff --git a/internal/command/project_grant_member_model.go b/internal/command/project_grant_member_model.go index 129495af2..6c089ba1c 100644 --- a/internal/command/project_grant_member_model.go +++ b/internal/command/project_grant_member_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/project" ) type ProjectGrantMemberWriteModel struct { diff --git a/internal/command/project_grant_member_test.go b/internal/command/project_grant_member_test.go index 79c1a638c..1282ba1a0 100644 --- a/internal/command/project_grant_member_test.go +++ b/internal/command/project_grant_member_test.go @@ -2,17 +2,18 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" - "github.com/stretchr/testify/assert" - "golang.org/x/text/language" "testing" + + "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" + "golang.org/x/text/language" ) func TestCommandSide_AddProjectGrantMember(t *testing.T) { diff --git a/internal/command/project_grant_model.go b/internal/command/project_grant_model.go index 033cca40d..791fd54fe 100644 --- a/internal/command/project_grant_model.go +++ b/internal/command/project_grant_model.go @@ -1,10 +1,10 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/project" ) type ProjectGrantWriteModel struct { diff --git a/internal/command/project_grant_test.go b/internal/command/project_grant_test.go index 398a1a07d..2ca78ce2a 100644 --- a/internal/command/project_grant_test.go +++ b/internal/command/project_grant_test.go @@ -6,16 +6,16 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/usergrant" ) func TestCommandSide_AddProjectGrant(t *testing.T) { diff --git a/internal/command/project_member.go b/internal/command/project_member.go index a19eddf0c..d69056392 100644 --- a/internal/command/project_member.go +++ b/internal/command/project_member.go @@ -4,13 +4,13 @@ import ( "context" "reflect" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/telemetry/tracing" + "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/repository/project" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddProjectMember(ctx context.Context, member *domain.Member, resourceOwner string) (*domain.Member, error) { diff --git a/internal/command/project_member_model.go b/internal/command/project_member_model.go index 975720ca7..4e78fb4f5 100644 --- a/internal/command/project_member_model.go +++ b/internal/command/project_member_model.go @@ -1,8 +1,8 @@ package command import ( - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/project" ) type ProjectMemberWriteModel struct { diff --git a/internal/command/project_member_test.go b/internal/command/project_member_test.go index 7921b9053..89ee1301f 100644 --- a/internal/command/project_member_test.go +++ b/internal/command/project_member_test.go @@ -2,18 +2,19 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/member" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" - "github.com/stretchr/testify/assert" - "golang.org/x/text/language" "testing" + + "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/member" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" + "golang.org/x/text/language" ) func TestCommandSide_AddProjectMember(t *testing.T) { diff --git a/internal/command/project_model.go b/internal/command/project_model.go index 1dbf4ecec..99b878885 100644 --- a/internal/command/project_model.go +++ b/internal/command/project_model.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/project" ) type ProjectWriteModel struct { diff --git a/internal/command/project_role.go b/internal/command/project_role.go index 4d85efc97..e67f2f251 100644 --- a/internal/command/project_role.go +++ b/internal/command/project_role.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/project" ) func (c *Commands) AddProjectRole(ctx context.Context, projectRole *domain.ProjectRole, resourceOwner string) (_ *domain.ProjectRole, err error) { diff --git a/internal/command/project_role_model.go b/internal/command/project_role_model.go index 477cedad6..641879f23 100644 --- a/internal/command/project_role_model.go +++ b/internal/command/project_role_model.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/project" ) type ProjectRoleWriteModel struct { diff --git a/internal/command/project_role_test.go b/internal/command/project_role_test.go index 7d70c9be8..2e867f801 100644 --- a/internal/command/project_role_test.go +++ b/internal/command/project_role_test.go @@ -2,15 +2,16 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/usergrant" - "github.com/stretchr/testify/assert" "testing" + + "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/usergrant" ) func TestCommandSide_AddProjectRole(t *testing.T) { diff --git a/internal/command/project_test.go b/internal/command/project_test.go index e7c4d7885..17a3043ce 100644 --- a/internal/command/project_test.go +++ b/internal/command/project_test.go @@ -4,18 +4,18 @@ import ( "context" "testing" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/member" "github.com/stretchr/testify/assert" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/member" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/repository/project" + "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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/repository/project" ) func TestCommandSide_AddProject(t *testing.T) { diff --git a/internal/command/sms_config.go b/internal/command/sms_config.go index 0b9680fc5..efdbbf608 100644 --- a/internal/command/sms_config.go +++ b/internal/command/sms_config.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/notification/channels/twilio" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/notification/channels/twilio" + "github.com/zitadel/zitadel/internal/repository/instance" ) func (c *Commands) AddSMSConfigTwilio(ctx context.Context, instanceID string, config *twilio.TwilioConfig) (string, *domain.ObjectDetails, error) { diff --git a/internal/command/sms_config_model.go b/internal/command/sms_config_model.go index c9099b167..3db99679c 100644 --- a/internal/command/sms_config_model.go +++ b/internal/command/sms_config_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" ) type IAMSMSConfigWriteModel struct { diff --git a/internal/command/sms_config_test.go b/internal/command/sms_config_test.go index 705da1f65..8ed715973 100644 --- a/internal/command/sms_config_test.go +++ b/internal/command/sms_config_test.go @@ -7,15 +7,15 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/notification/channels/twilio" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/notification/channels/twilio" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestCommandSide_AddSMSConfigTwilio(t *testing.T) { diff --git a/internal/command/smtp.go b/internal/command/smtp.go index 2d7af4b0a..d80a989f3 100644 --- a/internal/command/smtp.go +++ b/internal/command/smtp.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/notification/channels/smtp" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/notification/channels/smtp" + "github.com/zitadel/zitadel/internal/repository/instance" ) func (c *Commands) AddSMTPConfig(ctx context.Context, instanceID string, config *smtp.EmailConfig) (*domain.ObjectDetails, error) { diff --git a/internal/command/smtp_test.go b/internal/command/smtp_test.go index b2dd57725..cce72ee58 100644 --- a/internal/command/smtp_test.go +++ b/internal/command/smtp_test.go @@ -7,13 +7,13 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/notification/channels/smtp" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/notification/channels/smtp" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestCommandSide_AddSMTPConfig(t *testing.T) { diff --git a/internal/command/statics.go b/internal/command/statics.go index 84150b547..b68bebc22 100644 --- a/internal/command/statics.go +++ b/internal/command/statics.go @@ -8,8 +8,8 @@ import ( "github.com/superseriousbusiness/exifremove/pkg/exifremove" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/static" ) type AssetUpload struct { diff --git a/internal/command/unique_constraints_model.go b/internal/command/unique_constraints_model.go index 41900738c..f22a98046 100644 --- a/internal/command/unique_constraints_model.go +++ b/internal/command/unique_constraints_model.go @@ -3,17 +3,17 @@ package command import ( "context" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/member" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/repository/usergrant" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "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/policy" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/repository/usergrant" ) type UniqueConstraintReadModel struct { diff --git a/internal/command/user.go b/internal/command/user.go index 2e3a9a8b9..29fe67241 100644 --- a/internal/command/user.go +++ b/internal/command/user.go @@ -5,18 +5,18 @@ import ( "fmt" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) ChangeUsername(ctx context.Context, orgID, userID, userName string) (*domain.ObjectDetails, error) { diff --git a/internal/command/user_converter.go b/internal/command/user_converter.go index 7cf38482b..599671e1f 100644 --- a/internal/command/user_converter.go +++ b/internal/command/user_converter.go @@ -3,9 +3,9 @@ package command import ( "encoding/base64" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/user" ) func writeModelToHuman(wm *HumanWriteModel) *domain.Human { diff --git a/internal/command/user_domain_policy.go b/internal/command/user_domain_policy.go index 15281bec7..341195c33 100644 --- a/internal/command/user_domain_policy.go +++ b/internal/command/user_domain_policy.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/errors" ) func domainPolicyWriteModel(ctx context.Context, filter preparation.FilterToQueryReducer) (*PolicyDomainWriteModel, error) { diff --git a/internal/command/user_domain_policy_test.go b/internal/command/user_domain_policy_test.go index badd122bc..18c9ba9f3 100644 --- a/internal/command/user_domain_policy_test.go +++ b/internal/command/user_domain_policy_test.go @@ -5,13 +5,13 @@ import ( "reflect" "testing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func Test_customDomainPolicy(t *testing.T) { diff --git a/internal/command/user_grant.go b/internal/command/user_grant.go index 6c29b3b16..cb5665c98 100644 --- a/internal/command/user_grant.go +++ b/internal/command/user_grant.go @@ -4,12 +4,12 @@ import ( "context" "reflect" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/usergrant" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddUserGrant(ctx context.Context, usergrant *domain.UserGrant, resourceOwner string) (_ *domain.UserGrant, err error) { diff --git a/internal/command/user_grant_converter.go b/internal/command/user_grant_converter.go index 7910d9812..a7b691160 100644 --- a/internal/command/user_grant_converter.go +++ b/internal/command/user_grant_converter.go @@ -1,6 +1,6 @@ package command -import "github.com/caos/zitadel/internal/domain" +import "github.com/zitadel/zitadel/internal/domain" func userGrantWriteModelToUserGrant(writeModel *UserGrantWriteModel) *domain.UserGrant { return &domain.UserGrant{ diff --git a/internal/command/user_grant_model.go b/internal/command/user_grant_model.go index af3f847c6..5156a750d 100644 --- a/internal/command/user_grant_model.go +++ b/internal/command/user_grant_model.go @@ -1,11 +1,11 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/repository/usergrant" ) type UserGrantWriteModel struct { diff --git a/internal/command/user_grant_test.go b/internal/command/user_grant_test.go index 61f2ce385..babd79f0f 100644 --- a/internal/command/user_grant_test.go +++ b/internal/command/user_grant_test.go @@ -4,18 +4,18 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/repository/usergrant" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/repository/usergrant" "golang.org/x/text/language" ) diff --git a/internal/command/user_human.go b/internal/command/user_human.go index ca9e7e22b..a59f80f50 100644 --- a/internal/command/user_human.go +++ b/internal/command/user_human.go @@ -6,13 +6,13 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" ) func (c *Commands) getHuman(ctx context.Context, userID, resourceowner string) (*domain.Human, error) { diff --git a/internal/command/user_human_access_token_model.go b/internal/command/user_human_access_token_model.go index efa42cb81..63f0b3887 100644 --- a/internal/command/user_human_access_token_model.go +++ b/internal/command/user_human_access_token_model.go @@ -3,10 +3,10 @@ package command import ( "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/user" ) type UserAccessTokenWriteModel struct { diff --git a/internal/command/user_human_address.go b/internal/command/user_human_address.go index 9ee13b125..61c92a806 100644 --- a/internal/command/user_human_address.go +++ b/internal/command/user_human_address.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) ChangeHumanAddress(ctx context.Context, address *domain.Address) (*domain.Address, error) { diff --git a/internal/command/user_human_address_model.go b/internal/command/user_human_address_model.go index 0c7a51536..80d1faa93 100644 --- a/internal/command/user_human_address_model.go +++ b/internal/command/user_human_address_model.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/user" ) type HumanAddressWriteModel struct { diff --git a/internal/command/user_human_adress_test.go b/internal/command/user_human_adress_test.go index 5997f5eb0..db40534fc 100644 --- a/internal/command/user_human_adress_test.go +++ b/internal/command/user_human_adress_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_ChangeHumanAddress(t *testing.T) { diff --git a/internal/command/user_human_avatar.go b/internal/command/user_human_avatar.go index c6ac4acff..b70fabdd7 100644 --- a/internal/command/user_human_avatar.go +++ b/internal/command/user_human_avatar.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/user" ) func (c *Commands) AddHumanAvatar(ctx context.Context, orgID, userID string, upload *AssetUpload) (*domain.ObjectDetails, error) { diff --git a/internal/command/user_human_avatar_test.go b/internal/command/user_human_avatar_test.go index 2875ecd62..4c2a62dfb 100644 --- a/internal/command/user_human_avatar_test.go +++ b/internal/command/user_human_avatar_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/static" - "github.com/caos/zitadel/internal/static/mock" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/user" + "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/static/mock" ) func TestCommandSide_AddHumanAvatar(t *testing.T) { diff --git a/internal/command/user_human_email.go b/internal/command/user_human_email.go index a78631062..47d2fecbc 100644 --- a/internal/command/user_human_email.go +++ b/internal/command/user_human_email.go @@ -3,13 +3,13 @@ package command import ( "context" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) ChangeHumanEmail(ctx context.Context, email *domain.Email, emailCodeGenerator crypto.Generator) (*domain.Email, error) { diff --git a/internal/command/user_human_email_model.go b/internal/command/user_human_email_model.go index 2b6980312..4bba2127b 100644 --- a/internal/command/user_human_email_model.go +++ b/internal/command/user_human_email_model.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/user" ) type HumanEmailWriteModel struct { diff --git a/internal/command/user_human_email_test.go b/internal/command/user_human_email_test.go index 7d9cac2d0..45b63a3cd 100644 --- a/internal/command/user_human_email_test.go +++ b/internal/command/user_human_email_test.go @@ -8,13 +8,13 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_ChangeHumanEmail(t *testing.T) { diff --git a/internal/command/user_human_init.go b/internal/command/user_human_init.go index 49bfbb08d..234b17249 100644 --- a/internal/command/user_human_init.go +++ b/internal/command/user_human_init.go @@ -3,12 +3,12 @@ package command import ( "context" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/user" ) //ResendInitialMail resend inital mail and changes email if provided diff --git a/internal/command/user_human_init_model.go b/internal/command/user_human_init_model.go index 00d6313a9..9fd393cd4 100644 --- a/internal/command/user_human_init_model.go +++ b/internal/command/user_human_init_model.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/user" ) type HumanInitCodeWriteModel struct { diff --git a/internal/command/user_human_init_test.go b/internal/command/user_human_init_test.go index bcac84c32..d63c1b59b 100644 --- a/internal/command/user_human_init_test.go +++ b/internal/command/user_human_init_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_ResendInitialMail(t *testing.T) { diff --git a/internal/command/user_human_model.go b/internal/command/user_human_model.go index f52134aa8..561f7d3d3 100644 --- a/internal/command/user_human_model.go +++ b/internal/command/user_human_model.go @@ -3,10 +3,10 @@ package command import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/user" ) type HumanWriteModel struct { diff --git a/internal/command/user_human_otp.go b/internal/command/user_human_otp.go index c38bbad40..960c346ae 100644 --- a/internal/command/user_human_otp.go +++ b/internal/command/user_human_otp.go @@ -3,12 +3,12 @@ package command import ( "context" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddHumanOTP(ctx context.Context, userID, resourceowner string) (*domain.OTP, error) { diff --git a/internal/command/user_human_otp_model.go b/internal/command/user_human_otp_model.go index 346291f71..2e4914da5 100644 --- a/internal/command/user_human_otp_model.go +++ b/internal/command/user_human_otp_model.go @@ -1,10 +1,10 @@ package command import ( - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/user" ) type HumanOTPWriteModel struct { diff --git a/internal/command/user_human_otp_test.go b/internal/command/user_human_otp_test.go index 95d736374..047919083 100644 --- a/internal/command/user_human_otp_test.go +++ b/internal/command/user_human_otp_test.go @@ -7,13 +7,13 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_AddHumanOTP(t *testing.T) { diff --git a/internal/command/user_human_password.go b/internal/command/user_human_password.go index 0d07eae6d..9dbf49924 100644 --- a/internal/command/user_human_password.go +++ b/internal/command/user_human_password.go @@ -3,14 +3,14 @@ package command import ( "context" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) SetPassword(ctx context.Context, orgID, userID, passwordString string, oneTime bool) (objectDetails *domain.ObjectDetails, err error) { diff --git a/internal/command/user_human_password_model.go b/internal/command/user_human_password_model.go index c8343121f..68513a853 100644 --- a/internal/command/user_human_password_model.go +++ b/internal/command/user_human_password_model.go @@ -3,11 +3,11 @@ package command import ( "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/user" ) type HumanPasswordWriteModel struct { diff --git a/internal/command/user_human_password_test.go b/internal/command/user_human_password_test.go index 152923954..b8eaba434 100644 --- a/internal/command/user_human_password_test.go +++ b/internal/command/user_human_password_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_SetOneTimePassword(t *testing.T) { diff --git a/internal/command/user_human_phone.go b/internal/command/user_human_phone.go index 42c02c2de..628bf01b6 100644 --- a/internal/command/user_human_phone.go +++ b/internal/command/user_human_phone.go @@ -3,14 +3,14 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) ChangeHumanPhone(ctx context.Context, phone *domain.Phone, resourceOwner string, phoneCodeGenerator crypto.Generator) (*domain.Phone, error) { diff --git a/internal/command/user_human_phone_model.go b/internal/command/user_human_phone_model.go index fe3c58be7..5d4b52841 100644 --- a/internal/command/user_human_phone_model.go +++ b/internal/command/user_human_phone_model.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/user" ) type HumanPhoneWriteModel struct { diff --git a/internal/command/user_human_phone_test.go b/internal/command/user_human_phone_test.go index 1e743f285..4d4480803 100644 --- a/internal/command/user_human_phone_test.go +++ b/internal/command/user_human_phone_test.go @@ -8,13 +8,13 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_ChangeHumanPhone(t *testing.T) { diff --git a/internal/command/user_human_profile.go b/internal/command/user_human_profile.go index b10cb242d..a06d1a728 100644 --- a/internal/command/user_human_profile.go +++ b/internal/command/user_human_profile.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) ChangeHumanProfile(ctx context.Context, profile *domain.Profile) (*domain.Profile, error) { diff --git a/internal/command/user_human_profile_model.go b/internal/command/user_human_profile_model.go index 04028245c..de462dfdf 100644 --- a/internal/command/user_human_profile_model.go +++ b/internal/command/user_human_profile_model.go @@ -3,12 +3,12 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/user" ) type HumanProfileWriteModel struct { diff --git a/internal/command/user_human_profile_test.go b/internal/command/user_human_profile_test.go index 6542d00c3..47fd9d122 100644 --- a/internal/command/user_human_profile_test.go +++ b/internal/command/user_human_profile_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_ChangeHumanProfile(t *testing.T) { diff --git a/internal/command/user_human_refresh_token.go b/internal/command/user_human_refresh_token.go index 72df0ec0e..de7995d70 100644 --- a/internal/command/user_human_refresh_token.go +++ b/internal/command/user_human_refresh_token.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/user" ) func (c *Commands) AddAccessAndRefreshToken( diff --git a/internal/command/user_human_refresh_token_model.go b/internal/command/user_human_refresh_token_model.go index 011e744e3..32111122a 100644 --- a/internal/command/user_human_refresh_token_model.go +++ b/internal/command/user_human_refresh_token_model.go @@ -3,10 +3,10 @@ package command import ( "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/user" ) type HumanRefreshTokenWriteModel struct { diff --git a/internal/command/user_human_refresh_token_test.go b/internal/command/user_human_refresh_token_test.go index f96be731c..67031983f 100644 --- a/internal/command/user_human_refresh_token_test.go +++ b/internal/command/user_human_refresh_token_test.go @@ -6,19 +6,19 @@ import ( "testing" "time" - "github.com/caos/oidc/v2/pkg/oidc" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "github.com/zitadel/oidc/v2/pkg/oidc" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommands_AddAccessAndRefreshToken(t *testing.T) { diff --git a/internal/command/user_human_test.go b/internal/command/user_human_test.go index ea0acb836..d4810cc2e 100644 --- a/internal/command/user_human_test.go +++ b/internal/command/user_human_test.go @@ -9,18 +9,18 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_AddHuman(t *testing.T) { diff --git a/internal/command/user_human_webauthn.go b/internal/command/user_human_webauthn.go index 659df9fe9..8b2e6c97c 100644 --- a/internal/command/user_human_webauthn.go +++ b/internal/command/user_human_webauthn.go @@ -4,15 +4,15 @@ import ( "context" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - usr_repo "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + usr_repo "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) getHumanU2FTokens(ctx context.Context, userID, resourceowner string) ([]*domain.WebAuthNToken, error) { diff --git a/internal/command/user_human_webauthn_model.go b/internal/command/user_human_webauthn_model.go index 7004e2897..bbf61ee95 100644 --- a/internal/command/user_human_webauthn_model.go +++ b/internal/command/user_human_webauthn_model.go @@ -3,10 +3,10 @@ package command import ( "time" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/user" ) type HumanWebAuthNWriteModel struct { diff --git a/internal/command/user_idp_link.go b/internal/command/user_idp_link.go index 24ff5505a..266911aa2 100644 --- a/internal/command/user_idp_link.go +++ b/internal/command/user_idp_link.go @@ -3,12 +3,12 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) BulkAddedUserIDPLinks(ctx context.Context, userID, resourceOwner string, links []*domain.UserIDPLink) (err error) { diff --git a/internal/command/user_idp_link_model.go b/internal/command/user_idp_link_model.go index 6f20f9d31..0682afb31 100644 --- a/internal/command/user_idp_link_model.go +++ b/internal/command/user_idp_link_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/user" ) type UserIDPLinkWriteModel struct { diff --git a/internal/command/user_idp_link_test.go b/internal/command/user_idp_link_test.go index b623b61b4..cefd32ad3 100644 --- a/internal/command/user_idp_link_test.go +++ b/internal/command/user_idp_link_test.go @@ -7,14 +7,14 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_BulkAddUserIDPLinks(t *testing.T) { diff --git a/internal/command/user_machine.go b/internal/command/user_machine.go index d9e4d6738..c7fae09fc 100644 --- a/internal/command/user_machine.go +++ b/internal/command/user_machine.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddMachine(ctx context.Context, orgID string, machine *domain.Machine) (*domain.Machine, error) { diff --git a/internal/command/user_machine_key.go b/internal/command/user_machine_key.go index 533e5f5a5..5bb1b09e9 100644 --- a/internal/command/user_machine_key.go +++ b/internal/command/user_machine_key.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddUserMachineKey(ctx context.Context, machineKey *domain.MachineKey, resourceOwner string) (*domain.MachineKey, error) { diff --git a/internal/command/user_machine_key_model.go b/internal/command/user_machine_key_model.go index bf9db3276..9220a7f87 100644 --- a/internal/command/user_machine_key_model.go +++ b/internal/command/user_machine_key_model.go @@ -3,10 +3,10 @@ package command import ( "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/user" ) type MachineKeyWriteModel struct { diff --git a/internal/command/user_machine_model.go b/internal/command/user_machine_model.go index b73287f43..0ab2f880e 100644 --- a/internal/command/user_machine_model.go +++ b/internal/command/user_machine_model.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/user" ) type MachineWriteModel struct { diff --git a/internal/command/user_machine_test.go b/internal/command/user_machine_test.go index 7e05115f3..8df767f3e 100644 --- a/internal/command/user_machine_test.go +++ b/internal/command/user_machine_test.go @@ -6,15 +6,15 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" - id_mock "github.com/caos/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" + id_mock "github.com/zitadel/zitadel/internal/id/mock" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_AddMachine(t *testing.T) { diff --git a/internal/command/user_membership.go b/internal/command/user_membership.go index 95ce0b6c0..db1831f4e 100644 --- a/internal/command/user_membership.go +++ b/internal/command/user_membership.go @@ -3,11 +3,11 @@ package command import ( "context" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/project" ) func (c *Commands) removeUserMemberships(ctx context.Context, memberships []*query.Membership) (_ []eventstore.Command, err error) { diff --git a/internal/command/user_metadata.go b/internal/command/user_metadata.go index 92e71814a..dcc0c3cf9 100644 --- a/internal/command/user_metadata.go +++ b/internal/command/user_metadata.go @@ -3,10 +3,10 @@ package command import ( "context" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/user" ) func (c *Commands) SetUserMetadata(ctx context.Context, metadata *domain.Metadata, userID, resourceOwner string) (_ *domain.Metadata, err error) { diff --git a/internal/command/user_metadata_model.go b/internal/command/user_metadata_model.go index 527c2aeed..f99134f00 100644 --- a/internal/command/user_metadata_model.go +++ b/internal/command/user_metadata_model.go @@ -1,9 +1,9 @@ package command import ( - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/metadata" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/metadata" + "github.com/zitadel/zitadel/internal/repository/user" ) type UserMetadataWriteModel struct { diff --git a/internal/command/user_metadata_test.go b/internal/command/user_metadata_test.go index 9df1d30ad..ff0f11b4b 100644 --- a/internal/command/user_metadata_test.go +++ b/internal/command/user_metadata_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + 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/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_SetMetadata(t *testing.T) { diff --git a/internal/command/user_model.go b/internal/command/user_model.go index 14d0130df..d7b017241 100644 --- a/internal/command/user_model.go +++ b/internal/command/user_model.go @@ -3,11 +3,11 @@ package command import ( "strings" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/user" ) type UserWriteModel struct { diff --git a/internal/command/user_password_complexity_policy.go b/internal/command/user_password_complexity_policy.go index 07f2745d0..9b3d22dc6 100644 --- a/internal/command/user_password_complexity_policy.go +++ b/internal/command/user_password_complexity_policy.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/errors" ) func passwordComplexityPolicyWriteModel(ctx context.Context, filter preparation.FilterToQueryReducer) (*PasswordComplexityPolicyWriteModel, error) { diff --git a/internal/command/user_password_complexity_policy_test.go b/internal/command/user_password_complexity_policy_test.go index 096f90e9e..4dba815eb 100644 --- a/internal/command/user_password_complexity_policy_test.go +++ b/internal/command/user_password_complexity_policy_test.go @@ -5,13 +5,13 @@ import ( "reflect" "testing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/command/preparation" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func Test_customPasswordComplexityPolicy(t *testing.T) { diff --git a/internal/command/user_personal_access_token.go b/internal/command/user_personal_access_token.go index 5cf984558..56722c9c0 100644 --- a/internal/command/user_personal_access_token.go +++ b/internal/command/user_personal_access_token.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) func (c *Commands) AddPersonalAccessToken(ctx context.Context, userID, resourceOwner string, expirationDate time.Time, scopes []string, allowedUserType domain.UserType) (*domain.Token, string, error) { diff --git a/internal/command/user_personal_access_token_model.go b/internal/command/user_personal_access_token_model.go index 63ce19a03..8053965a4 100644 --- a/internal/command/user_personal_access_token_model.go +++ b/internal/command/user_personal_access_token_model.go @@ -3,10 +3,10 @@ package command import ( "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/user" ) type PersonalAccessTokenWriteModel struct { diff --git a/internal/command/user_personal_access_token_test.go b/internal/command/user_personal_access_token_test.go index f2437a074..bf5044555 100644 --- a/internal/command/user_personal_access_token_test.go +++ b/internal/command/user_personal_access_token_test.go @@ -9,20 +9,20 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" - id_mock "github.com/caos/zitadel/internal/id/mock" + id_mock "github.com/zitadel/zitadel/internal/id/mock" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/repository/user" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/id" ) func TestCommands_AddPersonalAccessToken(t *testing.T) { diff --git a/internal/command/user_test.go b/internal/command/user_test.go index 8cc6a08e1..b31974597 100644 --- a/internal/command/user_test.go +++ b/internal/command/user_test.go @@ -8,20 +8,20 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/repository/member" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/member" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/command/preparation" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/id" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/user" + "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/query" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestCommandSide_UsernameChange(t *testing.T) { diff --git a/internal/config/config.go b/internal/config/config.go index 4f060635c..0f60aa227 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -9,7 +9,7 @@ import ( "github.com/BurntSushi/toml" "sigs.k8s.io/yaml" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type ValidatableConfiguration interface { diff --git a/internal/config/systemdefaults/system_defaults.go b/internal/config/systemdefaults/system_defaults.go index 23273021c..2606f20c5 100644 --- a/internal/config/systemdefaults/system_defaults.go +++ b/internal/config/systemdefaults/system_defaults.go @@ -3,7 +3,7 @@ package systemdefaults import ( "time" - "github.com/caos/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/crypto" ) type SystemDefaults struct { diff --git a/internal/crypto/aes.go b/internal/crypto/aes.go index afdb54574..15c89e7f9 100644 --- a/internal/crypto/aes.go +++ b/internal/crypto/aes.go @@ -7,7 +7,7 @@ import ( "encoding/base64" "io" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) var _ EncryptionAlgorithm = (*AESCrypto)(nil) diff --git a/internal/crypto/code.go b/internal/crypto/code.go index b4ffe2242..9f7122f0a 100644 --- a/internal/crypto/code.go +++ b/internal/crypto/code.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "time" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/crypto/code_mocker.go b/internal/crypto/code_mocker.go index 3e163389e..181ec771d 100644 --- a/internal/crypto/code_mocker.go +++ b/internal/crypto/code_mocker.go @@ -5,7 +5,7 @@ import ( "github.com/golang/mock/gomock" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) func CreateMockEncryptionAlg(ctrl *gomock.Controller) EncryptionAlgorithm { diff --git a/internal/crypto/crypto.go b/internal/crypto/crypto.go index e82ad6d03..36de8d615 100644 --- a/internal/crypto/crypto.go +++ b/internal/crypto/crypto.go @@ -4,7 +4,7 @@ import ( "database/sql/driver" "encoding/json" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) const ( diff --git a/internal/crypto/database/database.go b/internal/crypto/database/database.go index b7f28e1e5..228a9261b 100644 --- a/internal/crypto/database/database.go +++ b/internal/crypto/database/database.go @@ -5,8 +5,8 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) type database struct { diff --git a/internal/crypto/database/database_test.go b/internal/crypto/database/database_test.go index d266a08ce..b85c5f882 100644 --- a/internal/crypto/database/database_test.go +++ b/internal/crypto/database/database_test.go @@ -11,8 +11,8 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func Test_database_ReadKeys(t *testing.T) { diff --git a/internal/crypto/file/file.go b/internal/crypto/file/file.go index 05469f657..85dcf6ac7 100644 --- a/internal/crypto/file/file.go +++ b/internal/crypto/file/file.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/caos/zitadel/internal/config" - "github.com/caos/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/config" + "github.com/zitadel/zitadel/internal/crypto" ) const ( diff --git a/internal/crypto/key.go b/internal/crypto/key.go index 61058a4e0..8730f4ed2 100644 --- a/internal/crypto/key.go +++ b/internal/crypto/key.go @@ -3,9 +3,9 @@ package crypto import ( "crypto/rand" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type KeyConfig struct { diff --git a/internal/database/config.go b/internal/database/config.go index cdef06045..56e84a041 100644 --- a/internal/database/config.go +++ b/internal/database/config.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" ) const ( diff --git a/internal/database/database.go b/internal/database/database.go index 162530a6f..fbb40a244 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -5,7 +5,7 @@ import ( //sql import _ "github.com/lib/pq" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) func Connect(config Config) (*sql.DB, error) { diff --git a/internal/domain/action.go b/internal/domain/action.go index 7e69404b3..18dd23e8c 100644 --- a/internal/domain/action.go +++ b/internal/domain/action.go @@ -3,7 +3,7 @@ package domain import ( "time" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Action struct { diff --git a/internal/domain/application_api.go b/internal/domain/application_api.go index 05af127e8..06d5dc7e6 100644 --- a/internal/domain/application_api.go +++ b/internal/domain/application_api.go @@ -1,8 +1,8 @@ package domain import ( - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type APIApp struct { diff --git a/internal/domain/application_key.go b/internal/domain/application_key.go index 081f463fb..01453cb69 100644 --- a/internal/domain/application_key.go +++ b/internal/domain/application_key.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type ApplicationKey struct { diff --git a/internal/domain/application_oauth.go b/internal/domain/application_oauth.go index c2dfdc8f3..9bcb675d1 100644 --- a/internal/domain/application_oauth.go +++ b/internal/domain/application_oauth.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/id" ) type oAuthApplication interface { diff --git a/internal/domain/application_oidc.go b/internal/domain/application_oidc.go index b617d8cd2..808052c05 100644 --- a/internal/domain/application_oidc.go +++ b/internal/domain/application_oidc.go @@ -4,9 +4,9 @@ import ( "strings" "time" - http_util "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/eventstore/v1/models" + http_util "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) const ( diff --git a/internal/domain/application_oidc_test.go b/internal/domain/application_oidc_test.go index fd2b5c117..da6c45486 100644 --- a/internal/domain/application_oidc_test.go +++ b/internal/domain/application_oidc_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) func TestApplicationValid(t *testing.T) { diff --git a/internal/domain/auth_request.go b/internal/domain/auth_request.go index c1bf56557..43a6caafd 100644 --- a/internal/domain/auth_request.go +++ b/internal/domain/auth_request.go @@ -6,7 +6,7 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type AuthRequest struct { diff --git a/internal/domain/authn_key.go b/internal/domain/authn_key.go index c62542229..213aa4c42 100644 --- a/internal/domain/authn_key.go +++ b/internal/domain/authn_key.go @@ -1,10 +1,10 @@ package domain import ( - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" ) type authNKey interface { diff --git a/internal/domain/browser_info.go b/internal/domain/browser_info.go index d6e8bd5d5..bd5b5d7d9 100644 --- a/internal/domain/browser_info.go +++ b/internal/domain/browser_info.go @@ -4,7 +4,7 @@ import ( "net" net_http "net/http" - http_util "github.com/caos/zitadel/internal/api/http" + http_util "github.com/zitadel/zitadel/internal/api/http" ) type BrowserInfo struct { diff --git a/internal/domain/custom_login_text.go b/internal/domain/custom_login_text.go index df7c2a9d7..e60cca8eb 100644 --- a/internal/domain/custom_login_text.go +++ b/internal/domain/custom_login_text.go @@ -3,7 +3,7 @@ package domain import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) const ( diff --git a/internal/domain/custom_message_text.go b/internal/domain/custom_message_text.go index d2a14b28d..ff0cf7fde 100644 --- a/internal/domain/custom_message_text.go +++ b/internal/domain/custom_message_text.go @@ -3,7 +3,7 @@ package domain import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) const ( diff --git a/internal/domain/custom_text.go b/internal/domain/custom_text.go index eb95df83e..7d79971ca 100644 --- a/internal/domain/custom_text.go +++ b/internal/domain/custom_text.go @@ -3,7 +3,7 @@ package domain import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type CustomText struct { diff --git a/internal/domain/expiration.go b/internal/domain/expiration.go index 46e3fb7e0..d62292415 100644 --- a/internal/domain/expiration.go +++ b/internal/domain/expiration.go @@ -3,7 +3,7 @@ package domain import ( "time" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/domain/features.go b/internal/domain/features.go index dabf098aa..d5bd9098c 100644 --- a/internal/domain/features.go +++ b/internal/domain/features.go @@ -3,7 +3,7 @@ package domain import ( "time" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) const ( diff --git a/internal/domain/human.go b/internal/domain/human.go index 2b15f70cb..ce3c2bf42 100644 --- a/internal/domain/human.go +++ b/internal/domain/human.go @@ -3,9 +3,9 @@ package domain import ( "time" - "github.com/caos/zitadel/internal/crypto" - caos_errors "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/crypto" + caos_errors "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type HumanDetails struct { diff --git a/internal/domain/human_address.go b/internal/domain/human_address.go index b67494a49..87a37d0be 100644 --- a/internal/domain/human_address.go +++ b/internal/domain/human_address.go @@ -1,6 +1,6 @@ package domain -import es_models "github.com/caos/zitadel/internal/eventstore/v1/models" +import es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" type Address struct { es_models.ObjectRoot diff --git a/internal/domain/human_email.go b/internal/domain/human_email.go index 718aee00f..c0197bce2 100644 --- a/internal/domain/human_email.go +++ b/internal/domain/human_email.go @@ -4,8 +4,8 @@ import ( "regexp" "time" - "github.com/caos/zitadel/internal/crypto" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/crypto" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) var ( diff --git a/internal/domain/human_otp.go b/internal/domain/human_otp.go index cf715c702..354f9b174 100644 --- a/internal/domain/human_otp.go +++ b/internal/domain/human_otp.go @@ -1,11 +1,11 @@ package domain import ( - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" "github.com/pquerna/otp" "github.com/pquerna/otp/totp" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type OTP struct { diff --git a/internal/domain/human_password.go b/internal/domain/human_password.go index 732344a5a..070d00aca 100644 --- a/internal/domain/human_password.go +++ b/internal/domain/human_password.go @@ -1,10 +1,11 @@ package domain import ( - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" "time" + + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Password struct { diff --git a/internal/domain/human_phone.go b/internal/domain/human_phone.go index d743e4ecb..81bcfd0d4 100644 --- a/internal/domain/human_phone.go +++ b/internal/domain/human_phone.go @@ -3,10 +3,10 @@ package domain import ( "time" - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" "github.com/ttacon/libphonenumber" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) const ( diff --git a/internal/domain/human_phone_test.go b/internal/domain/human_phone_test.go index d807ff689..3157dc390 100644 --- a/internal/domain/human_phone_test.go +++ b/internal/domain/human_phone_test.go @@ -3,7 +3,7 @@ package domain import ( "testing" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestFormatPhoneNumber(t *testing.T) { diff --git a/internal/domain/human_profile.go b/internal/domain/human_profile.go index b94130c94..c299e3d59 100644 --- a/internal/domain/human_profile.go +++ b/internal/domain/human_profile.go @@ -3,7 +3,7 @@ package domain import ( "golang.org/x/text/language" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Profile struct { diff --git a/internal/domain/human_web_auth_n.go b/internal/domain/human_web_auth_n.go index 1c3551d07..8b1a7134b 100644 --- a/internal/domain/human_web_auth_n.go +++ b/internal/domain/human_web_auth_n.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type WebAuthNToken struct { diff --git a/internal/domain/idp_config.go b/internal/domain/idp_config.go index e263445bf..86dde0d18 100644 --- a/internal/domain/idp_config.go +++ b/internal/domain/idp_config.go @@ -3,8 +3,8 @@ package domain import ( "time" - "github.com/caos/zitadel/internal/crypto" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/crypto" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type IDPConfig struct { diff --git a/internal/domain/key_pair.go b/internal/domain/key_pair.go index cafd2072b..ee1839bce 100644 --- a/internal/domain/key_pair.go +++ b/internal/domain/key_pair.go @@ -1,9 +1,10 @@ package domain import ( - "github.com/caos/zitadel/internal/crypto" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" "time" + + "github.com/zitadel/zitadel/internal/crypto" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type KeyPair struct { diff --git a/internal/domain/machine.go b/internal/domain/machine.go index f9a92be25..eaa84a9f2 100644 --- a/internal/domain/machine.go +++ b/internal/domain/machine.go @@ -1,6 +1,6 @@ package domain -import "github.com/caos/zitadel/internal/eventstore/v1/models" +import "github.com/zitadel/zitadel/internal/eventstore/v1/models" type Machine struct { models.ObjectRoot diff --git a/internal/domain/machine_key.go b/internal/domain/machine_key.go index c3583bc00..9f821fbe4 100644 --- a/internal/domain/machine_key.go +++ b/internal/domain/machine_key.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type MachineKey struct { diff --git a/internal/domain/member.go b/internal/domain/member.go index 8b257fb34..821e65dfe 100644 --- a/internal/domain/member.go +++ b/internal/domain/member.go @@ -1,7 +1,7 @@ package domain import ( - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Member struct { diff --git a/internal/domain/metadata.go b/internal/domain/metadata.go index 5c5032181..f0db03c88 100644 --- a/internal/domain/metadata.go +++ b/internal/domain/metadata.go @@ -3,8 +3,8 @@ package domain import ( "time" - caos_errors "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + caos_errors "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Metadata struct { diff --git a/internal/domain/mfa.go b/internal/domain/mfa.go index c60726f97..65ad9486f 100644 --- a/internal/domain/mfa.go +++ b/internal/domain/mfa.go @@ -1,6 +1,6 @@ package domain -import "github.com/caos/zitadel/internal/crypto" +import "github.com/zitadel/zitadel/internal/crypto" type MFAState int32 diff --git a/internal/domain/oidc_settings.go b/internal/domain/oidc_settings.go index acf6aab14..d47e1c842 100644 --- a/internal/domain/oidc_settings.go +++ b/internal/domain/oidc_settings.go @@ -3,7 +3,7 @@ package domain import ( "time" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type OIDCSettings struct { diff --git a/internal/domain/org.go b/internal/domain/org.go index ba4a690a6..e45143ba2 100644 --- a/internal/domain/org.go +++ b/internal/domain/org.go @@ -1,7 +1,7 @@ package domain import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Org struct { diff --git a/internal/domain/org_domain.go b/internal/domain/org_domain.go index 40da4d628..6b81a6a7b 100644 --- a/internal/domain/org_domain.go +++ b/internal/domain/org_domain.go @@ -3,9 +3,9 @@ package domain import ( "strings" - http_util "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/eventstore/v1/models" + http_util "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type OrgDomain struct { diff --git a/internal/domain/policy_domain.go b/internal/domain/policy_domain.go index 2ad2fd4b4..cba2e5051 100644 --- a/internal/domain/policy_domain.go +++ b/internal/domain/policy_domain.go @@ -1,7 +1,7 @@ package domain import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type DomainPolicy struct { diff --git a/internal/domain/policy_label.go b/internal/domain/policy_label.go index 56fe87dfd..f3d660a91 100644 --- a/internal/domain/policy_label.go +++ b/internal/domain/policy_label.go @@ -3,8 +3,8 @@ package domain import ( "regexp" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) var colorRegex = regexp.MustCompile("^$|^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$") diff --git a/internal/domain/policy_label_test.go b/internal/domain/policy_label_test.go index b60307396..9e84669e1 100644 --- a/internal/domain/policy_label_test.go +++ b/internal/domain/policy_label_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestLabelPolicyPrimaryColorValid(t *testing.T) { diff --git a/internal/domain/policy_login.go b/internal/domain/policy_login.go index db2ad78e7..06a26628a 100644 --- a/internal/domain/policy_login.go +++ b/internal/domain/policy_login.go @@ -3,7 +3,7 @@ package domain import ( "time" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type LoginPolicy struct { diff --git a/internal/domain/policy_mail_template.go b/internal/domain/policy_mail_template.go index 5d307d846..d5ebee9c2 100644 --- a/internal/domain/policy_mail_template.go +++ b/internal/domain/policy_mail_template.go @@ -1,6 +1,6 @@ package domain -import "github.com/caos/zitadel/internal/eventstore/v1/models" +import "github.com/zitadel/zitadel/internal/eventstore/v1/models" type MailTemplate struct { models.ObjectRoot diff --git a/internal/domain/policy_password_age.go b/internal/domain/policy_password_age.go index 93c839888..ee14c3b11 100644 --- a/internal/domain/policy_password_age.go +++ b/internal/domain/policy_password_age.go @@ -1,7 +1,7 @@ package domain import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type PasswordAgePolicy struct { diff --git a/internal/domain/policy_password_complexity.go b/internal/domain/policy_password_complexity.go index 3b64b3be7..99549477c 100644 --- a/internal/domain/policy_password_complexity.go +++ b/internal/domain/policy_password_complexity.go @@ -1,9 +1,10 @@ package domain import ( - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" "regexp" + + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) var ( diff --git a/internal/domain/policy_password_lockout.go b/internal/domain/policy_password_lockout.go index ec8562a6c..ddac4de42 100644 --- a/internal/domain/policy_password_lockout.go +++ b/internal/domain/policy_password_lockout.go @@ -1,7 +1,7 @@ package domain import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type LockoutPolicy struct { diff --git a/internal/domain/policy_privacy.go b/internal/domain/policy_privacy.go index eec1ff8c2..b018c73f8 100644 --- a/internal/domain/policy_privacy.go +++ b/internal/domain/policy_privacy.go @@ -1,7 +1,7 @@ package domain import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type PrivacyPolicy struct { diff --git a/internal/domain/project.go b/internal/domain/project.go index dbb43e603..bb2e5d0b8 100644 --- a/internal/domain/project.go +++ b/internal/domain/project.go @@ -1,7 +1,7 @@ package domain import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Project struct { diff --git a/internal/domain/project_grant.go b/internal/domain/project_grant.go index 8721c7d15..09604913a 100644 --- a/internal/domain/project_grant.go +++ b/internal/domain/project_grant.go @@ -1,6 +1,6 @@ package domain -import es_models "github.com/caos/zitadel/internal/eventstore/v1/models" +import es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" type ProjectGrant struct { es_models.ObjectRoot diff --git a/internal/domain/project_grant_member.go b/internal/domain/project_grant_member.go index 0a9ecef2a..8c1a84043 100644 --- a/internal/domain/project_grant_member.go +++ b/internal/domain/project_grant_member.go @@ -1,7 +1,7 @@ package domain import ( - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type ProjectGrantMember struct { diff --git a/internal/domain/project_role.go b/internal/domain/project_role.go index 574187c45..e6c782bad 100644 --- a/internal/domain/project_role.go +++ b/internal/domain/project_role.go @@ -1,7 +1,7 @@ package domain import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type ProjectRole struct { diff --git a/internal/domain/refresh_token.go b/internal/domain/refresh_token.go index 5a0d20301..84567897e 100644 --- a/internal/domain/refresh_token.go +++ b/internal/domain/refresh_token.go @@ -4,8 +4,8 @@ import ( "encoding/base64" "strings" - "github.com/caos/zitadel/internal/crypto" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/crypto" + caos_errors "github.com/zitadel/zitadel/internal/errors" ) func NewRefreshToken(userID, tokenID string, algorithm crypto.EncryptionAlgorithm) (string, error) { diff --git a/internal/domain/roles.go b/internal/domain/roles.go index adc25aaae..b6bf2ffad 100644 --- a/internal/domain/roles.go +++ b/internal/domain/roles.go @@ -3,7 +3,7 @@ package domain import ( "strings" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" ) const ( diff --git a/internal/domain/token.go b/internal/domain/token.go index e41ab106e..ee2efea48 100644 --- a/internal/domain/token.go +++ b/internal/domain/token.go @@ -4,7 +4,7 @@ import ( "strings" "time" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Token struct { diff --git a/internal/domain/user_grant.go b/internal/domain/user_grant.go index f673780e8..599b07768 100644 --- a/internal/domain/user_grant.go +++ b/internal/domain/user_grant.go @@ -1,6 +1,6 @@ package domain -import es_models "github.com/caos/zitadel/internal/eventstore/v1/models" +import es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" type UserGrant struct { es_models.ObjectRoot diff --git a/internal/domain/user_idp_link.go b/internal/domain/user_idp_link.go index 77a6bc668..39160b122 100644 --- a/internal/domain/user_idp_link.go +++ b/internal/domain/user_idp_link.go @@ -1,6 +1,6 @@ package domain -import es_models "github.com/caos/zitadel/internal/eventstore/v1/models" +import es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" type UserIDPLink struct { es_models.ObjectRoot diff --git a/internal/errors/already_exists_test.go b/internal/errors/already_exists_test.go index 9cac2badf..549d0af0a 100644 --- a/internal/errors/already_exists_test.go +++ b/internal/errors/already_exists_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestAlreadyExistsError(t *testing.T) { diff --git a/internal/errors/caos_error_test.go b/internal/errors/caos_error_test.go index 7b93fd196..4ce9fc7b3 100644 --- a/internal/errors/caos_error_test.go +++ b/internal/errors/caos_error_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestErrorMethod(t *testing.T) { diff --git a/internal/errors/deadline_exceeded_test.go b/internal/errors/deadline_exceeded_test.go index 30b9822a7..1a26e3099 100644 --- a/internal/errors/deadline_exceeded_test.go +++ b/internal/errors/deadline_exceeded_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestDeadlineExceededError(t *testing.T) { diff --git a/internal/errors/error_test.go b/internal/errors/error_test.go index 13ddd96fd..8078bca55 100644 --- a/internal/errors/error_test.go +++ b/internal/errors/error_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errors "github.com/caos/zitadel/internal/errors" + caos_errors "github.com/zitadel/zitadel/internal/errors" ) func TestContains(t *testing.T) { diff --git a/internal/errors/generate/error_test.go.tmpl b/internal/errors/generate/error_test.go.tmpl index 0de94982f..38a0eb2ca 100644 --- a/internal/errors/generate/error_test.go.tmpl +++ b/internal/errors/generate/error_test.go.tmpl @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func Test{{.ErrorName}}Error(t *testing.T) { diff --git a/internal/errors/internal_test.go b/internal/errors/internal_test.go index 1c703a4d2..d13f7def8 100644 --- a/internal/errors/internal_test.go +++ b/internal/errors/internal_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestInternalError(t *testing.T) { diff --git a/internal/errors/invalid_argument_test.go b/internal/errors/invalid_argument_test.go index e3a5797de..6de64b008 100644 --- a/internal/errors/invalid_argument_test.go +++ b/internal/errors/invalid_argument_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestInvalidArgumentError(t *testing.T) { diff --git a/internal/errors/not_found_test.go b/internal/errors/not_found_test.go index 00177112c..45f0ebb0b 100644 --- a/internal/errors/not_found_test.go +++ b/internal/errors/not_found_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestNotFoundError(t *testing.T) { diff --git a/internal/errors/permission_denied_test.go b/internal/errors/permission_denied_test.go index 05de1d15e..bf994321a 100644 --- a/internal/errors/permission_denied_test.go +++ b/internal/errors/permission_denied_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestPermissionDeniedError(t *testing.T) { diff --git a/internal/errors/precondition_failed_test.go b/internal/errors/precondition_failed_test.go index df70d9ec9..2503063b7 100644 --- a/internal/errors/precondition_failed_test.go +++ b/internal/errors/precondition_failed_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestPreconditionFailedError(t *testing.T) { diff --git a/internal/errors/unauthenticated_test.go b/internal/errors/unauthenticated_test.go index 56e469fd4..faba8bbbc 100644 --- a/internal/errors/unauthenticated_test.go +++ b/internal/errors/unauthenticated_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestUnauthenticatedError(t *testing.T) { diff --git a/internal/errors/unavailable_test.go b/internal/errors/unavailable_test.go index 11f81af14..37fd549ea 100644 --- a/internal/errors/unavailable_test.go +++ b/internal/errors/unavailable_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestUnavailableError(t *testing.T) { diff --git a/internal/errors/unimplemented_test.go b/internal/errors/unimplemented_test.go index f4c3178b0..acaba5a42 100644 --- a/internal/errors/unimplemented_test.go +++ b/internal/errors/unimplemented_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestUnimplementedError(t *testing.T) { diff --git a/internal/errors/unknown_test.go b/internal/errors/unknown_test.go index 4311289b4..2b21c0647 100644 --- a/internal/errors/unknown_test.go +++ b/internal/errors/unknown_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestUnknownError(t *testing.T) { diff --git a/internal/eventstore/aggregate.go b/internal/eventstore/aggregate.go index 4e3025cd8..15ffe8622 100644 --- a/internal/eventstore/aggregate.go +++ b/internal/eventstore/aggregate.go @@ -3,7 +3,7 @@ package eventstore import ( "context" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" ) type aggregateOpt func(*Aggregate) diff --git a/internal/eventstore/config.go b/internal/eventstore/config.go index 9b71c9049..ee26b9fdb 100644 --- a/internal/eventstore/config.go +++ b/internal/eventstore/config.go @@ -3,7 +3,7 @@ package eventstore import ( "database/sql" - z_sql "github.com/caos/zitadel/internal/eventstore/repository/sql" + z_sql "github.com/zitadel/zitadel/internal/eventstore/repository/sql" ) func Start(sqlClient *sql.DB) (*Eventstore, error) { diff --git a/internal/eventstore/event_base.go b/internal/eventstore/event_base.go index d6feb18fc..cb404feba 100644 --- a/internal/eventstore/event_base.go +++ b/internal/eventstore/event_base.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/service" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/service" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) //BaseEvent represents the minimum metadata of an event diff --git a/internal/eventstore/eventstore.go b/internal/eventstore/eventstore.go index 29d1ffa1f..8e58d9a89 100644 --- a/internal/eventstore/eventstore.go +++ b/internal/eventstore/eventstore.go @@ -7,9 +7,9 @@ import ( "reflect" "sync" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) //Eventstore abstracts all functions needed to store valid events diff --git a/internal/eventstore/eventstore_test.go b/internal/eventstore/eventstore_test.go index 44a870316..a6da55cd2 100644 --- a/internal/eventstore/eventstore_test.go +++ b/internal/eventstore/eventstore_test.go @@ -8,10 +8,10 @@ import ( "sync" "testing" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/service" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/service" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) // testEvent implements the Event interface diff --git a/internal/eventstore/example_test.go b/internal/eventstore/example_test.go index 08ac86e60..2b6b4e7c9 100644 --- a/internal/eventstore/example_test.go +++ b/internal/eventstore/example_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/eventstore/repository/sql" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/repository/sql" ) // ------------------------------------------------------------ diff --git a/internal/eventstore/handler/crdb/current_sequence.go b/internal/eventstore/handler/crdb/current_sequence.go index 0221f0d45..2b14ecccf 100644 --- a/internal/eventstore/handler/crdb/current_sequence.go +++ b/internal/eventstore/handler/crdb/current_sequence.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" ) const ( diff --git a/internal/eventstore/handler/crdb/db_mock_test.go b/internal/eventstore/handler/crdb/db_mock_test.go index 5732f135c..260a30d5d 100644 --- a/internal/eventstore/handler/crdb/db_mock_test.go +++ b/internal/eventstore/handler/crdb/db_mock_test.go @@ -9,7 +9,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) type mockExpectation func(sqlmock.Sqlmock) diff --git a/internal/eventstore/handler/crdb/failed_stmt.go b/internal/eventstore/handler/crdb/failed_stmt.go index b7a9e8bda..4124062a1 100644 --- a/internal/eventstore/handler/crdb/failed_stmt.go +++ b/internal/eventstore/handler/crdb/failed_stmt.go @@ -3,10 +3,10 @@ package crdb import ( "database/sql" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/handler" ) const ( diff --git a/internal/eventstore/handler/crdb/handler_stmt.go b/internal/eventstore/handler/crdb/handler_stmt.go index f330a1154..fd8cc5f17 100644 --- a/internal/eventstore/handler/crdb/handler_stmt.go +++ b/internal/eventstore/handler/crdb/handler_stmt.go @@ -5,11 +5,11 @@ import ( "database/sql" "fmt" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" ) var ( diff --git a/internal/eventstore/handler/crdb/handler_stmt_test.go b/internal/eventstore/handler/crdb/handler_stmt_test.go index 845746b7c..009e443af 100644 --- a/internal/eventstore/handler/crdb/handler_stmt_test.go +++ b/internal/eventstore/handler/crdb/handler_stmt_test.go @@ -11,10 +11,10 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - es_repo_mock "github.com/caos/zitadel/internal/eventstore/repository/mock" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + es_repo_mock "github.com/zitadel/zitadel/internal/eventstore/repository/mock" ) var ( diff --git a/internal/eventstore/handler/crdb/init.go b/internal/eventstore/handler/crdb/init.go index c5c1de590..175a5f24b 100644 --- a/internal/eventstore/handler/crdb/init.go +++ b/internal/eventstore/handler/crdb/init.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler" ) type Table struct { diff --git a/internal/eventstore/handler/crdb/lock.go b/internal/eventstore/handler/crdb/lock.go index 3038b4097..f2f39640d 100644 --- a/internal/eventstore/handler/crdb/lock.go +++ b/internal/eventstore/handler/crdb/lock.go @@ -7,10 +7,10 @@ import ( "os" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/id" ) const ( diff --git a/internal/eventstore/handler/crdb/lock_test.go b/internal/eventstore/handler/crdb/lock_test.go index bab920c22..3b0177ea6 100644 --- a/internal/eventstore/handler/crdb/lock_test.go +++ b/internal/eventstore/handler/crdb/lock_test.go @@ -10,7 +10,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" - z_errs "github.com/caos/zitadel/internal/errors" + z_errs "github.com/zitadel/zitadel/internal/errors" ) const ( diff --git a/internal/eventstore/handler/crdb/reduce.go b/internal/eventstore/handler/crdb/reduce.go index 1e7b2e4da..bda49c5a1 100644 --- a/internal/eventstore/handler/crdb/reduce.go +++ b/internal/eventstore/handler/crdb/reduce.go @@ -1,8 +1,8 @@ package crdb import ( - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" ) //reduce implements handler.Reduce function diff --git a/internal/eventstore/handler/crdb/statement.go b/internal/eventstore/handler/crdb/statement.go index c8538ee51..5b544c690 100644 --- a/internal/eventstore/handler/crdb/statement.go +++ b/internal/eventstore/handler/crdb/statement.go @@ -6,9 +6,9 @@ import ( "github.com/lib/pq" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" ) type execOption func(*execConfig) diff --git a/internal/eventstore/handler/crdb/statement_test.go b/internal/eventstore/handler/crdb/statement_test.go index aed750ff3..8b5e33f26 100644 --- a/internal/eventstore/handler/crdb/statement_test.go +++ b/internal/eventstore/handler/crdb/statement_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" ) type wantExecuter struct { diff --git a/internal/eventstore/handler/handler.go b/internal/eventstore/handler/handler.go index d63e6caaf..feb736751 100644 --- a/internal/eventstore/handler/handler.go +++ b/internal/eventstore/handler/handler.go @@ -1,7 +1,7 @@ package handler import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) type HandlerConfig struct { diff --git a/internal/eventstore/handler/handler_projection.go b/internal/eventstore/handler/handler_projection.go index 4cfecf2ad..7f54464b8 100644 --- a/internal/eventstore/handler/handler_projection.go +++ b/internal/eventstore/handler/handler_projection.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) const systemID = "system" diff --git a/internal/eventstore/handler/handler_projection_test.go b/internal/eventstore/handler/handler_projection_test.go index 198a915d9..86954b9ab 100644 --- a/internal/eventstore/handler/handler_projection_test.go +++ b/internal/eventstore/handler/handler_projection_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - es_repo_mock "github.com/caos/zitadel/internal/eventstore/repository/mock" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + es_repo_mock "github.com/zitadel/zitadel/internal/eventstore/repository/mock" ) var ( diff --git a/internal/eventstore/handler/reduce.go b/internal/eventstore/handler/reduce.go index ea2106b9e..329c59525 100644 --- a/internal/eventstore/handler/reduce.go +++ b/internal/eventstore/handler/reduce.go @@ -1,6 +1,6 @@ package handler -import "github.com/caos/zitadel/internal/eventstore" +import "github.com/zitadel/zitadel/internal/eventstore" //EventReducer represents the required data //to work with events diff --git a/internal/eventstore/handler/statement.go b/internal/eventstore/handler/statement.go index a565ef3ed..ae7bec92e 100644 --- a/internal/eventstore/handler/statement.go +++ b/internal/eventstore/handler/statement.go @@ -5,9 +5,9 @@ import ( "encoding/json" "errors" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) var ( diff --git a/internal/eventstore/local_crdb_test.go b/internal/eventstore/local_crdb_test.go index 64ee62f23..01c6ae19f 100644 --- a/internal/eventstore/local_crdb_test.go +++ b/internal/eventstore/local_crdb_test.go @@ -5,10 +5,10 @@ import ( "os" "testing" - "github.com/caos/logging" "github.com/cockroachdb/cockroach-go/v2/testserver" + "github.com/zitadel/logging" - "github.com/caos/zitadel/cmd/admin/initialise" + "github.com/zitadel/zitadel/cmd/admin/initialise" ) var ( diff --git a/internal/eventstore/repository/mock/gen_mock.go b/internal/eventstore/repository/mock/gen_mock.go index 3685ca779..73714228c 100644 --- a/internal/eventstore/repository/mock/gen_mock.go +++ b/internal/eventstore/repository/mock/gen_mock.go @@ -1,3 +1,3 @@ package mock -//go:generate mockgen -package mock -destination ./repository.mock.go github.com/caos/zitadel/internal/eventstore/repository Repository +//go:generate mockgen -package mock -destination ./repository.mock.go github.com/zitadel/zitadel/internal/eventstore/repository Repository diff --git a/internal/eventstore/repository/mock/repository.mock.go b/internal/eventstore/repository/mock/repository.mock.go index e0d64822a..e1cf57f79 100644 --- a/internal/eventstore/repository/mock/repository.mock.go +++ b/internal/eventstore/repository/mock/repository.mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/caos/zitadel/internal/eventstore/repository (interfaces: Repository) +// Source: github.com/zitadel/zitadel/internal/eventstore/repository (interfaces: Repository) // Package mock is a generated GoMock package. package mock @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - repository "github.com/caos/zitadel/internal/eventstore/repository" + repository "github.com/zitadel/zitadel/internal/eventstore/repository" gomock "github.com/golang/mock/gomock" ) diff --git a/internal/eventstore/repository/mock/repository.mock.impl.go b/internal/eventstore/repository/mock/repository.mock.impl.go index 9e9a3b2ca..99b09ceaf 100644 --- a/internal/eventstore/repository/mock/repository.mock.impl.go +++ b/internal/eventstore/repository/mock/repository.mock.impl.go @@ -7,7 +7,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) func NewRepo(t *testing.T) *MockRepository { diff --git a/internal/eventstore/repository/search_query.go b/internal/eventstore/repository/search_query.go index 2d8bd6734..7bd6d0960 100644 --- a/internal/eventstore/repository/search_query.go +++ b/internal/eventstore/repository/search_query.go @@ -1,6 +1,6 @@ package repository -import "github.com/caos/zitadel/internal/errors" +import "github.com/zitadel/zitadel/internal/errors" //SearchQuery defines the which and how data are queried type SearchQuery struct { diff --git a/internal/eventstore/repository/sql/crdb.go b/internal/eventstore/repository/sql/crdb.go index 17d490070..e35227253 100644 --- a/internal/eventstore/repository/sql/crdb.go +++ b/internal/eventstore/repository/sql/crdb.go @@ -8,12 +8,12 @@ import ( "strconv" "strings" - "github.com/caos/logging" "github.com/cockroachdb/cockroach-go/v2/crdb" "github.com/lib/pq" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/eventstore/repository/sql/crdb_test.go b/internal/eventstore/repository/sql/crdb_test.go index 5cc4700b2..9a0c7eb54 100644 --- a/internal/eventstore/repository/sql/crdb_test.go +++ b/internal/eventstore/repository/sql/crdb_test.go @@ -8,7 +8,7 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) func TestCRDB_placeholder(t *testing.T) { diff --git a/internal/eventstore/repository/sql/local_crdb_test.go b/internal/eventstore/repository/sql/local_crdb_test.go index 18291d572..7b790d1b5 100644 --- a/internal/eventstore/repository/sql/local_crdb_test.go +++ b/internal/eventstore/repository/sql/local_crdb_test.go @@ -5,10 +5,10 @@ import ( "os" "testing" - "github.com/caos/logging" "github.com/cockroachdb/cockroach-go/v2/testserver" + "github.com/zitadel/logging" - "github.com/caos/zitadel/cmd/admin/initialise" + "github.com/zitadel/zitadel/cmd/admin/initialise" ) var ( diff --git a/internal/eventstore/repository/sql/query.go b/internal/eventstore/repository/sql/query.go index eef4ec8a9..a9116fb4b 100644 --- a/internal/eventstore/repository/sql/query.go +++ b/internal/eventstore/repository/sql/query.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - z_errors "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + z_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) type querier interface { diff --git a/internal/eventstore/repository/sql/query_test.go b/internal/eventstore/repository/sql/query_test.go index 83a026c88..eada55b69 100644 --- a/internal/eventstore/repository/sql/query_test.go +++ b/internal/eventstore/repository/sql/query_test.go @@ -11,8 +11,8 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/lib/pq" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) func Test_getCondition(t *testing.T) { diff --git a/internal/eventstore/repository/version.go b/internal/eventstore/repository/version.go index 8a7875d98..c534f9a41 100644 --- a/internal/eventstore/repository/version.go +++ b/internal/eventstore/repository/version.go @@ -3,7 +3,7 @@ package repository import ( "regexp" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) var versionRegexp = regexp.MustCompile(`^v[0-9]+(\.[0-9]+){0,2}$`) diff --git a/internal/eventstore/search_query.go b/internal/eventstore/search_query.go index 3c2987014..e6f51fa6c 100644 --- a/internal/eventstore/search_query.go +++ b/internal/eventstore/search_query.go @@ -1,8 +1,8 @@ package eventstore import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) //SearchQueryBuilder represents the builder for your filter diff --git a/internal/eventstore/search_query_test.go b/internal/eventstore/search_query_test.go index bd44b05e9..97e05562e 100644 --- a/internal/eventstore/search_query_test.go +++ b/internal/eventstore/search_query_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) func testAddQuery(queryFuncs ...func(*SearchQuery) *SearchQuery) func(*SearchQueryBuilder) *SearchQueryBuilder { diff --git a/internal/eventstore/subscription.go b/internal/eventstore/subscription.go index 57c99607b..5348d89f2 100644 --- a/internal/eventstore/subscription.go +++ b/internal/eventstore/subscription.go @@ -3,8 +3,8 @@ package eventstore import ( "sync" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) var ( diff --git a/internal/eventstore/v1/eventstore.go b/internal/eventstore/v1/eventstore.go index e457d2fed..c7f62420f 100644 --- a/internal/eventstore/v1/eventstore.go +++ b/internal/eventstore/v1/eventstore.go @@ -4,9 +4,9 @@ import ( "context" "database/sql" - "github.com/caos/zitadel/internal/eventstore/v1/internal/repository" - z_sql "github.com/caos/zitadel/internal/eventstore/v1/internal/repository/sql" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/internal/repository" + z_sql "github.com/zitadel/zitadel/internal/eventstore/v1/internal/repository/sql" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Eventstore interface { diff --git a/internal/eventstore/v1/gen_mock.go b/internal/eventstore/v1/gen_mock.go index 0c958d6c8..7c86dd52f 100644 --- a/internal/eventstore/v1/gen_mock.go +++ b/internal/eventstore/v1/gen_mock.go @@ -1,3 +1,3 @@ package v1 -//go:generate mockgen -package mock -destination ./mock/eventstore.mock.go github.com/caos/zitadel/internal/eventstore Eventstore +//go:generate mockgen -package mock -destination ./mock/eventstore.mock.go github.com/zitadel/zitadel/internal/eventstore Eventstore diff --git a/internal/eventstore/v1/internal/repository/gen_mock.go b/internal/eventstore/v1/internal/repository/gen_mock.go index e625134d8..2500cfe8b 100644 --- a/internal/eventstore/v1/internal/repository/gen_mock.go +++ b/internal/eventstore/v1/internal/repository/gen_mock.go @@ -1,3 +1,3 @@ package repository -//go:generate mockgen -package mock -destination ./mock/repository.mock.go github.com/caos/zitadel/internal/eventstore/internal/repository Repository +//go:generate mockgen -package mock -destination ./mock/repository.mock.go github.com/zitadel/zitadel/internal/eventstore/internal/repository Repository diff --git a/internal/eventstore/v1/internal/repository/mock/repository.go b/internal/eventstore/v1/internal/repository/mock/repository.go index a07b8b8e0..8574eb300 100644 --- a/internal/eventstore/v1/internal/repository/mock/repository.go +++ b/internal/eventstore/v1/internal/repository/mock/repository.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/eventstore/v1/models" gomock "github.com/golang/mock/gomock" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) func NewMock(t *testing.T) *MockRepository { diff --git a/internal/eventstore/v1/internal/repository/mock/repository.mock.go b/internal/eventstore/v1/internal/repository/mock/repository.mock.go index 204c08892..0e5bd031c 100644 --- a/internal/eventstore/v1/internal/repository/mock/repository.mock.go +++ b/internal/eventstore/v1/internal/repository/mock/repository.mock.go @@ -1,12 +1,12 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/caos/zitadel/internal/eventstore/internal/repository (interfaces: Repository) +// Source: github.com/zitadel/zitadel/internal/eventstore/internal/repository (interfaces: Repository) // Package mock is a generated GoMock package. package mock import ( context "context" - models "github.com/caos/zitadel/internal/eventstore/v1/models" + models "github.com/zitadel/zitadel/internal/eventstore/v1/models" gomock "github.com/golang/mock/gomock" reflect "reflect" ) diff --git a/internal/eventstore/v1/internal/repository/repository.go b/internal/eventstore/v1/internal/repository/repository.go index 631a65995..31fa4a289 100644 --- a/internal/eventstore/v1/internal/repository/repository.go +++ b/internal/eventstore/v1/internal/repository/repository.go @@ -3,7 +3,7 @@ package repository import ( "context" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Repository interface { diff --git a/internal/eventstore/v1/internal/repository/sql/db_mock_test.go b/internal/eventstore/v1/internal/repository/sql/db_mock_test.go index a299ae1a5..643fd9eb4 100644 --- a/internal/eventstore/v1/internal/repository/sql/db_mock_test.go +++ b/internal/eventstore/v1/internal/repository/sql/db_mock_test.go @@ -8,7 +8,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) const ( diff --git a/internal/eventstore/v1/internal/repository/sql/filter.go b/internal/eventstore/v1/internal/repository/sql/filter.go index 993e926c7..fa9f4091d 100644 --- a/internal/eventstore/v1/internal/repository/sql/filter.go +++ b/internal/eventstore/v1/internal/repository/sql/filter.go @@ -4,10 +4,10 @@ import ( "context" "database/sql" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) type Querier interface { diff --git a/internal/eventstore/v1/internal/repository/sql/filter_test.go b/internal/eventstore/v1/internal/repository/sql/filter_test.go index e1993de2c..f5353dcc2 100644 --- a/internal/eventstore/v1/internal/repository/sql/filter_test.go +++ b/internal/eventstore/v1/internal/repository/sql/filter_test.go @@ -6,8 +6,8 @@ import ( "math" "testing" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type mockEvents struct { diff --git a/internal/eventstore/v1/internal/repository/sql/query.go b/internal/eventstore/v1/internal/repository/sql/query.go index a092f10dc..a4d36596a 100644 --- a/internal/eventstore/v1/internal/repository/sql/query.go +++ b/internal/eventstore/v1/internal/repository/sql/query.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - z_errors "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + z_errors "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) const ( diff --git a/internal/eventstore/v1/internal/repository/sql/query_test.go b/internal/eventstore/v1/internal/repository/sql/query_test.go index 6b9c99051..a8dfd671a 100644 --- a/internal/eventstore/v1/internal/repository/sql/query_test.go +++ b/internal/eventstore/v1/internal/repository/sql/query_test.go @@ -8,8 +8,8 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) func Test_numberPlaceholder(t *testing.T) { diff --git a/internal/eventstore/v1/locker/lock.go b/internal/eventstore/v1/locker/lock.go index 8ae22b110..4a24b55b0 100644 --- a/internal/eventstore/v1/locker/lock.go +++ b/internal/eventstore/v1/locker/lock.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - "github.com/caos/logging" "github.com/cockroachdb/cockroach-go/v2/crdb" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) const ( diff --git a/internal/eventstore/v1/mock/eventstore.mock.go b/internal/eventstore/v1/mock/eventstore.mock.go index 3e0d6468f..ec8ffefae 100644 --- a/internal/eventstore/v1/mock/eventstore.mock.go +++ b/internal/eventstore/v1/mock/eventstore.mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/caos/zitadel/internal/eventstore/v1 (interfaces: Eventstore) +// Source: github.com/zitadel/zitadel/internal/eventstore/v1 (interfaces: Eventstore) // Package mock is a generated GoMock package. package mock @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - models "github.com/caos/zitadel/internal/eventstore/v1/models" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + models "github.com/zitadel/zitadel/internal/eventstore/v1/models" gomock "github.com/golang/mock/gomock" ) diff --git a/internal/eventstore/v1/models/aggregate.go b/internal/eventstore/v1/models/aggregate.go index 7da47a3d1..b996e1b8a 100644 --- a/internal/eventstore/v1/models/aggregate.go +++ b/internal/eventstore/v1/models/aggregate.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type AggregateType string diff --git a/internal/eventstore/v1/models/aggregate_creator.go b/internal/eventstore/v1/models/aggregate_creator.go index 6819e5cbd..e216eaa73 100644 --- a/internal/eventstore/v1/models/aggregate_creator.go +++ b/internal/eventstore/v1/models/aggregate_creator.go @@ -3,7 +3,7 @@ package models import ( "context" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" ) type AggregateCreator struct { diff --git a/internal/eventstore/v1/models/aggregate_test.go b/internal/eventstore/v1/models/aggregate_test.go index a01cff337..5c2c74059 100644 --- a/internal/eventstore/v1/models/aggregate_test.go +++ b/internal/eventstore/v1/models/aggregate_test.go @@ -3,7 +3,7 @@ package models import ( "testing" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) func TestAggregate_AppendEvent(t *testing.T) { diff --git a/internal/eventstore/v1/models/event.go b/internal/eventstore/v1/models/event.go index de7b15c90..0f7a08a76 100644 --- a/internal/eventstore/v1/models/event.go +++ b/internal/eventstore/v1/models/event.go @@ -5,7 +5,7 @@ import ( "reflect" "time" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type EventType string diff --git a/internal/eventstore/v1/models/filter.go b/internal/eventstore/v1/models/filter.go index d59adbed5..5da8ed040 100644 --- a/internal/eventstore/v1/models/filter.go +++ b/internal/eventstore/v1/models/filter.go @@ -1,7 +1,7 @@ package models import ( - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type Filter struct { diff --git a/internal/eventstore/v1/models/search_query.go b/internal/eventstore/v1/models/search_query.go index b878f10cc..e2a8c9042 100644 --- a/internal/eventstore/v1/models/search_query.go +++ b/internal/eventstore/v1/models/search_query.go @@ -3,9 +3,9 @@ package models import ( "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type SearchQueryFactory struct { diff --git a/internal/eventstore/v1/models/search_query_old.go b/internal/eventstore/v1/models/search_query_old.go index 09754c190..08d81343a 100644 --- a/internal/eventstore/v1/models/search_query_old.go +++ b/internal/eventstore/v1/models/search_query_old.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) //SearchQuery is deprecated. Use SearchQueryFactory diff --git a/internal/eventstore/v1/models/search_query_test.go b/internal/eventstore/v1/models/search_query_test.go index 03c719c85..9abd19937 100644 --- a/internal/eventstore/v1/models/search_query_test.go +++ b/internal/eventstore/v1/models/search_query_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) func testSetColumns(columns Columns) func(factory *SearchQueryFactory) *SearchQueryFactory { diff --git a/internal/eventstore/v1/models/version.go b/internal/eventstore/v1/models/version.go index 164d672d9..3fba9a534 100644 --- a/internal/eventstore/v1/models/version.go +++ b/internal/eventstore/v1/models/version.go @@ -3,7 +3,7 @@ package models import ( "regexp" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) var versionRegexp = regexp.MustCompile(`^v[0-9]+(\.[0-9]+){0,2}$`) diff --git a/internal/eventstore/v1/query/handler.go b/internal/eventstore/v1/query/handler.go index ea8b5b657..bbc53e58f 100755 --- a/internal/eventstore/v1/query/handler.go +++ b/internal/eventstore/v1/query/handler.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/caos/logging" "github.com/getsentry/sentry-go" + "github.com/zitadel/logging" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) const ( diff --git a/internal/eventstore/v1/sdk/append_event_error.go b/internal/eventstore/v1/sdk/append_event_error.go index bb1bee3a3..f70b34e70 100644 --- a/internal/eventstore/v1/sdk/append_event_error.go +++ b/internal/eventstore/v1/sdk/append_event_error.go @@ -3,7 +3,7 @@ package sdk import ( "fmt" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/eventstore/v1/sdk/sdk.go b/internal/eventstore/v1/sdk/sdk.go index 4e23f69f4..0bca75893 100644 --- a/internal/eventstore/v1/sdk/sdk.go +++ b/internal/eventstore/v1/sdk/sdk.go @@ -3,8 +3,8 @@ package sdk import ( "context" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type filterFunc func(context.Context, *es_models.SearchQuery) ([]*es_models.Event, error) diff --git a/internal/eventstore/v1/sdk/sdk_test.go b/internal/eventstore/v1/sdk/sdk_test.go index 516cc381c..01a41e520 100644 --- a/internal/eventstore/v1/sdk/sdk_test.go +++ b/internal/eventstore/v1/sdk/sdk_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) func TestFilter(t *testing.T) { diff --git a/internal/eventstore/v1/spooler/config.go b/internal/eventstore/v1/spooler/config.go index 1d5d1f02f..a8a5d5f15 100644 --- a/internal/eventstore/v1/spooler/config.go +++ b/internal/eventstore/v1/spooler/config.go @@ -4,11 +4,11 @@ import ( "math/rand" "os" - "github.com/caos/logging" + "github.com/zitadel/logging" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/id" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/id" ) type Config struct { diff --git a/internal/eventstore/v1/spooler/spooler.go b/internal/eventstore/v1/spooler/spooler.go index 0884b11bb..5a244cc80 100644 --- a/internal/eventstore/v1/spooler/spooler.go +++ b/internal/eventstore/v1/spooler/spooler.go @@ -6,14 +6,14 @@ import ( "sync" "time" - "github.com/caos/logging" "github.com/getsentry/sentry-go" + "github.com/zitadel/logging" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/telemetry/tracing" - "github.com/caos/zitadel/internal/view/repository" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/view/repository" ) const systemID = "system" diff --git a/internal/eventstore/v1/spooler/spooler_test.go b/internal/eventstore/v1/spooler/spooler_test.go index 1549c5f4f..bca8e374d 100644 --- a/internal/eventstore/v1/spooler/spooler_test.go +++ b/internal/eventstore/v1/spooler/spooler_test.go @@ -8,13 +8,13 @@ import ( "github.com/golang/mock/gomock" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/eventstore/v1/spooler/mock" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler/mock" + "github.com/zitadel/zitadel/internal/view/repository" ) type testHandler struct { diff --git a/internal/eventstore/v1/subscription.go b/internal/eventstore/v1/subscription.go index 2cde87e8b..34280edf4 100644 --- a/internal/eventstore/v1/subscription.go +++ b/internal/eventstore/v1/subscription.go @@ -3,7 +3,7 @@ package v1 import ( "sync" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) var ( diff --git a/internal/eventstore/version.go b/internal/eventstore/version.go index cbbd6ffe9..ee1c5b6ef 100644 --- a/internal/eventstore/version.go +++ b/internal/eventstore/version.go @@ -1,7 +1,7 @@ package eventstore import ( - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) type Version repository.Version diff --git a/internal/form/parser.go b/internal/form/parser.go index f466c04f8..4cba7f9ad 100644 --- a/internal/form/parser.go +++ b/internal/form/parser.go @@ -1,9 +1,10 @@ package form import ( - "github.com/caos/zitadel/internal/errors" "net/http" + "github.com/zitadel/zitadel/internal/errors" + "github.com/gorilla/schema" ) diff --git a/internal/i18n/i18n.go b/internal/i18n/i18n.go index 6f7ebdce6..a77f3a9dd 100644 --- a/internal/i18n/i18n.go +++ b/internal/i18n/i18n.go @@ -9,15 +9,15 @@ import ( "strings" "github.com/BurntSushi/toml" - "github.com/caos/logging" "github.com/grpc-ecosystem/go-grpc-middleware/util/metautils" "github.com/nicksnyder/go-i18n/v2/i18n" + "github.com/zitadel/logging" "golang.org/x/text/language" "sigs.k8s.io/yaml" - "github.com/caos/zitadel/internal/api/authz" - http_util "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/api/authz" + http_util "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/errors" ) const ( diff --git a/internal/iam/model/iam.go b/internal/iam/model/iam.go index cc119fcf6..124f61975 100644 --- a/internal/iam/model/iam.go +++ b/internal/iam/model/iam.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/domain" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Step int diff --git a/internal/iam/model/iam_member.go b/internal/iam/model/iam_member.go index 35ca864f4..c808b0a3d 100644 --- a/internal/iam/model/iam_member.go +++ b/internal/iam/model/iam_member.go @@ -1,6 +1,6 @@ package model -import es_models "github.com/caos/zitadel/internal/eventstore/v1/models" +import es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" type IAMMember struct { es_models.ObjectRoot diff --git a/internal/iam/model/idp_config.go b/internal/iam/model/idp_config.go index 51ba1bb24..d80a039e9 100644 --- a/internal/iam/model/idp_config.go +++ b/internal/iam/model/idp_config.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/crypto" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/crypto" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type IDPConfig struct { diff --git a/internal/iam/model/idp_config_view.go b/internal/iam/model/idp_config_view.go index 42227317c..b67e5d8a2 100644 --- a/internal/iam/model/idp_config_view.go +++ b/internal/iam/model/idp_config_view.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" "time" ) diff --git a/internal/iam/model/idp_provider_view.go b/internal/iam/model/idp_provider_view.go index 4508ea3a0..0653d20fc 100644 --- a/internal/iam/model/idp_provider_view.go +++ b/internal/iam/model/idp_provider_view.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" "time" ) diff --git a/internal/iam/model/label_policy.go b/internal/iam/model/label_policy.go index b3c2cee9e..bbed48334 100644 --- a/internal/iam/model/label_policy.go +++ b/internal/iam/model/label_policy.go @@ -1,7 +1,7 @@ package model import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type LabelPolicy struct { diff --git a/internal/iam/model/label_policy_view.go b/internal/iam/model/label_policy_view.go index 1a8d26e5a..71304ea59 100644 --- a/internal/iam/model/label_policy_view.go +++ b/internal/iam/model/label_policy_view.go @@ -3,7 +3,7 @@ package model import ( "time" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) type LabelPolicyView struct { diff --git a/internal/iam/model/login_policy.go b/internal/iam/model/login_policy.go index 3d6a56ab2..09f6ec1bc 100644 --- a/internal/iam/model/login_policy.go +++ b/internal/iam/model/login_policy.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type LoginPolicy struct { diff --git a/internal/iam/model/login_policy_view.go b/internal/iam/model/login_policy_view.go index 4e4594a76..7a39818b9 100644 --- a/internal/iam/model/login_policy_view.go +++ b/internal/iam/model/login_policy_view.go @@ -3,8 +3,8 @@ package model import ( "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type LoginPolicyView struct { diff --git a/internal/iam/model/mail_template.go b/internal/iam/model/mail_template.go index 99e94bace..c1b8dc9a0 100644 --- a/internal/iam/model/mail_template.go +++ b/internal/iam/model/mail_template.go @@ -1,7 +1,7 @@ package model import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type MailTemplate struct { diff --git a/internal/iam/model/mail_text.go b/internal/iam/model/mail_text.go index 6a74587e6..1ca22c37b 100644 --- a/internal/iam/model/mail_text.go +++ b/internal/iam/model/mail_text.go @@ -1,7 +1,7 @@ package model import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type MailTexts struct { diff --git a/internal/iam/model/message_text_view.go b/internal/iam/model/message_text_view.go index 1348d0d96..496bcee21 100644 --- a/internal/iam/model/message_text_view.go +++ b/internal/iam/model/message_text_view.go @@ -5,7 +5,7 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) type MessageTextView struct { diff --git a/internal/iam/model/mfa_view.go b/internal/iam/model/mfa_view.go index e0c88e950..59f3dbc3c 100644 --- a/internal/iam/model/mfa_view.go +++ b/internal/iam/model/mfa_view.go @@ -1,7 +1,7 @@ package model import ( - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) type SecondFactorsSearchRequest struct { diff --git a/internal/iam/model/org_iam_policy.go b/internal/iam/model/org_iam_policy.go index d9a1ce55c..4a4f21ced 100644 --- a/internal/iam/model/org_iam_policy.go +++ b/internal/iam/model/org_iam_policy.go @@ -1,7 +1,7 @@ package model import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type DomainPolicy struct { diff --git a/internal/iam/model/password_age_policy.go b/internal/iam/model/password_age_policy.go index 1b1940025..70bc96e0f 100644 --- a/internal/iam/model/password_age_policy.go +++ b/internal/iam/model/password_age_policy.go @@ -1,7 +1,7 @@ package model import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type PasswordAgePolicy struct { diff --git a/internal/iam/model/password_age_policy_view.go b/internal/iam/model/password_age_policy_view.go index cbb674813..9d9b36dc8 100644 --- a/internal/iam/model/password_age_policy_view.go +++ b/internal/iam/model/password_age_policy_view.go @@ -1,8 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" "time" + + "github.com/zitadel/zitadel/internal/domain" ) type PasswordAgePolicyView struct { diff --git a/internal/iam/model/password_complexity_policy.go b/internal/iam/model/password_complexity_policy.go index 6a5b3f65a..9f270e812 100644 --- a/internal/iam/model/password_complexity_policy.go +++ b/internal/iam/model/password_complexity_policy.go @@ -1,9 +1,10 @@ package model import ( - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" "regexp" + + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) var ( diff --git a/internal/iam/model/password_complexity_policy_view.go b/internal/iam/model/password_complexity_policy_view.go index 1a0db863a..6f73bc41f 100644 --- a/internal/iam/model/password_complexity_policy_view.go +++ b/internal/iam/model/password_complexity_policy_view.go @@ -3,7 +3,7 @@ package model import ( "time" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) type PasswordComplexityPolicyView struct { diff --git a/internal/iam/model/password_lockout_policy.go b/internal/iam/model/password_lockout_policy.go index 6f4d89185..6cf8f6b27 100644 --- a/internal/iam/model/password_lockout_policy.go +++ b/internal/iam/model/password_lockout_policy.go @@ -1,7 +1,7 @@ package model import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type LockoutPolicy struct { diff --git a/internal/iam/model/password_lockout_policy_view.go b/internal/iam/model/password_lockout_policy_view.go index e1bf97dbe..fd3f94ab9 100644 --- a/internal/iam/model/password_lockout_policy_view.go +++ b/internal/iam/model/password_lockout_policy_view.go @@ -1,8 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" "time" + + "github.com/zitadel/zitadel/internal/domain" ) type LockoutPolicyView struct { diff --git a/internal/iam/model/privacy_policy_view.go b/internal/iam/model/privacy_policy_view.go index d0bcce3b1..92d5031d4 100644 --- a/internal/iam/model/privacy_policy_view.go +++ b/internal/iam/model/privacy_policy_view.go @@ -3,7 +3,7 @@ package model import ( "time" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) type PrivacyPolicyView struct { diff --git a/internal/iam/repository/eventsourcing/model/iam_member.go b/internal/iam/repository/eventsourcing/model/iam_member.go index a7c1e0bf7..2f9c66459 100644 --- a/internal/iam/repository/eventsourcing/model/iam_member.go +++ b/internal/iam/repository/eventsourcing/model/iam_member.go @@ -3,8 +3,8 @@ package model import ( "encoding/json" - "github.com/caos/logging" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/logging" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type IAMMember struct { diff --git a/internal/iam/repository/eventsourcing/model/org_iam_policy.go b/internal/iam/repository/eventsourcing/model/org_iam_policy.go index e65585552..7307de46b 100644 --- a/internal/iam/repository/eventsourcing/model/org_iam_policy.go +++ b/internal/iam/repository/eventsourcing/model/org_iam_policy.go @@ -3,9 +3,9 @@ package model import ( "encoding/json" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - iam_model "github.com/caos/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + iam_model "github.com/zitadel/zitadel/internal/iam/model" ) type DomainPolicy struct { diff --git a/internal/iam/repository/view/idp_provider_view.go b/internal/iam/repository/view/idp_provider_view.go index c600f33b2..1c0e00ad7 100644 --- a/internal/iam/repository/view/idp_provider_view.go +++ b/internal/iam/repository/view/idp_provider_view.go @@ -3,11 +3,11 @@ package view import ( "github.com/jinzhu/gorm" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/iam/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/iam/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) func GetIDPProviderByAggregateIDAndConfigID(db *gorm.DB, table, aggregateID, idpConfigID, instanceID string) (*model.IDPProviderView, error) { diff --git a/internal/iam/repository/view/idp_view.go b/internal/iam/repository/view/idp_view.go index 85f123a7e..965c64196 100644 --- a/internal/iam/repository/view/idp_view.go +++ b/internal/iam/repository/view/idp_view.go @@ -3,11 +3,11 @@ package view import ( "github.com/jinzhu/gorm" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/iam/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/iam/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) func IDPByID(db *gorm.DB, table, idpID, instanceID string) (*model.IDPConfigView, error) { diff --git a/internal/iam/repository/view/model/idp_config.go b/internal/iam/repository/view/model/idp_config.go index 2d8a6bb16..6f8629379 100644 --- a/internal/iam/repository/view/model/idp_config.go +++ b/internal/iam/repository/view/model/idp_config.go @@ -4,17 +4,17 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/iam/model" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/iam/model" ) const ( diff --git a/internal/iam/repository/view/model/idp_config_query.go b/internal/iam/repository/view/model/idp_config_query.go index 202b8048c..5a2958a0d 100644 --- a/internal/iam/repository/view/model/idp_config_query.go +++ b/internal/iam/repository/view/model/idp_config_query.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/view/repository" ) type IDPConfigSearchRequest iam_model.IDPConfigSearchRequest diff --git a/internal/iam/repository/view/model/idp_provider.go b/internal/iam/repository/view/model/idp_provider.go index 3d086263f..82d73b96c 100644 --- a/internal/iam/repository/view/model/idp_provider.go +++ b/internal/iam/repository/view/model/idp_provider.go @@ -4,14 +4,14 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) const ( diff --git a/internal/iam/repository/view/model/idp_provider_query.go b/internal/iam/repository/view/model/idp_provider_query.go index 29198849f..031b53d08 100644 --- a/internal/iam/repository/view/model/idp_provider_query.go +++ b/internal/iam/repository/view/model/idp_provider_query.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/view/repository" ) type IDPProviderSearchRequest iam_model.IDPProviderSearchRequest diff --git a/internal/iam/repository/view/model/label_policy.go b/internal/iam/repository/view/model/label_policy.go index 9c9ea26c2..207ccf10b 100644 --- a/internal/iam/repository/view/model/label_policy.go +++ b/internal/iam/repository/view/model/label_policy.go @@ -4,14 +4,14 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) const ( diff --git a/internal/iam/repository/view/model/label_policy_query.go b/internal/iam/repository/view/model/label_policy_query.go index f55101d15..555ff198a 100644 --- a/internal/iam/repository/view/model/label_policy_query.go +++ b/internal/iam/repository/view/model/label_policy_query.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/view/repository" ) type LabelPolicySearchRequest iam_model.LabelPolicySearchRequest diff --git a/internal/iam/repository/view/model/password_complexity_policy.go b/internal/iam/repository/view/model/password_complexity_policy.go index bf5fdabc1..a88603e49 100644 --- a/internal/iam/repository/view/model/password_complexity_policy.go +++ b/internal/iam/repository/view/model/password_complexity_policy.go @@ -4,15 +4,15 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) const ( diff --git a/internal/iam/repository/view/styling.go b/internal/iam/repository/view/styling.go index 146e55731..cc29b1bbc 100644 --- a/internal/iam/repository/view/styling.go +++ b/internal/iam/repository/view/styling.go @@ -1,11 +1,11 @@ package view import ( - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - iam_model "github.com/caos/zitadel/internal/iam/model" - "github.com/caos/zitadel/internal/iam/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/iam/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" "github.com/jinzhu/gorm" ) diff --git a/internal/id/gen_mock.go b/internal/id/gen_mock.go index db0189545..e83c09e95 100644 --- a/internal/id/gen_mock.go +++ b/internal/id/gen_mock.go @@ -1,3 +1,3 @@ package id -//go:generate mockgen -package mock -destination ./mock/generator.mock.go github.com/caos/zitadel/internal/id Generator +//go:generate mockgen -package mock -destination ./mock/generator.mock.go github.com/zitadel/zitadel/internal/id Generator diff --git a/internal/id/mock/generator.mock.go b/internal/id/mock/generator.mock.go index 559379eb2..4fff54338 100644 --- a/internal/id/mock/generator.mock.go +++ b/internal/id/mock/generator.mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/caos/zitadel/internal/id (interfaces: Generator) +// Source: github.com/zitadel/zitadel/internal/id (interfaces: Generator) // Package mock is a generated GoMock package. package mock diff --git a/internal/migration/command.go b/internal/migration/command.go index 4ebd85833..81c0b3b4b 100644 --- a/internal/migration/command.go +++ b/internal/migration/command.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/service" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/service" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) //SetupStep is the command pushed on the eventstore diff --git a/internal/migration/migration.go b/internal/migration/migration.go index 93d7db1d3..0dc5d1456 100644 --- a/internal/migration/migration.go +++ b/internal/migration/migration.go @@ -3,10 +3,10 @@ package migration import ( "context" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" ) const ( diff --git a/internal/notification/channels/fs/channel.go b/internal/notification/channels/fs/channel.go index c244be299..72467c070 100644 --- a/internal/notification/channels/fs/channel.go +++ b/internal/notification/channels/fs/channel.go @@ -9,14 +9,14 @@ import ( "strings" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - caos_errors "github.com/caos/zitadel/internal/errors" + caos_errors "github.com/zitadel/zitadel/internal/errors" "github.com/k3a/html2text" - "github.com/caos/zitadel/internal/notification/channels" - "github.com/caos/zitadel/internal/notification/messages" + "github.com/zitadel/zitadel/internal/notification/channels" + "github.com/zitadel/zitadel/internal/notification/messages" ) func InitFSChannel(config FSConfig) (channels.NotificationChannel, error) { diff --git a/internal/notification/channels/gen_mock.go b/internal/notification/channels/gen_mock.go index 4eb98bffc..63a6b9b65 100644 --- a/internal/notification/channels/gen_mock.go +++ b/internal/notification/channels/gen_mock.go @@ -1,4 +1,4 @@ package channels -//go:generate mockgen -package mock -destination ./mock/channel.mock.go github.com/caos/zitadel/internal/notification/channels NotificationChannel -//go:generate mockgen -package mock -destination ./mock/message.mock.go github.com/caos/zitadel/internal/notification/channels Message +//go:generate mockgen -package mock -destination ./mock/channel.mock.go github.com/zitadel/zitadel/internal/notification/channels NotificationChannel +//go:generate mockgen -package mock -destination ./mock/message.mock.go github.com/zitadel/zitadel/internal/notification/channels Message diff --git a/internal/notification/channels/log/channel.go b/internal/notification/channels/log/channel.go index 2bb1bc6de..fbe4bb7ac 100644 --- a/internal/notification/channels/log/channel.go +++ b/internal/notification/channels/log/channel.go @@ -5,8 +5,8 @@ import ( "github.com/k3a/html2text" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/notification/channels" + "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/notification/channels" ) func InitStdoutChannel(config LogConfig) channels.NotificationChannel { diff --git a/internal/notification/channels/mock/channel.mock.go b/internal/notification/channels/mock/channel.mock.go index ec564371d..47d50e08a 100644 --- a/internal/notification/channels/mock/channel.mock.go +++ b/internal/notification/channels/mock/channel.mock.go @@ -1,11 +1,11 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/caos/zitadel/internal/notification/channels (interfaces: NotificationChannel) +// Source: github.com/zitadel/zitadel/internal/notification/channels (interfaces: NotificationChannel) // Package mock is a generated GoMock package. package mock import ( - channels "github.com/caos/zitadel/internal/notification/channels" + channels "github.com/zitadel/zitadel/internal/notification/channels" gomock "github.com/golang/mock/gomock" reflect "reflect" ) diff --git a/internal/notification/channels/mock/message.mock.go b/internal/notification/channels/mock/message.mock.go index 5db3bb711..a6189fe41 100644 --- a/internal/notification/channels/mock/message.mock.go +++ b/internal/notification/channels/mock/message.mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/caos/zitadel/internal/notification/channels (interfaces: Message) +// Source: github.com/zitadel/zitadel/internal/notification/channels (interfaces: Message) // Package mock is a generated GoMock package. package mock diff --git a/internal/notification/channels/smtp/channel.go b/internal/notification/channels/smtp/channel.go index 2dc921245..3f54d2f7d 100644 --- a/internal/notification/channels/smtp/channel.go +++ b/internal/notification/channels/smtp/channel.go @@ -6,12 +6,12 @@ import ( "net" "net/smtp" - "github.com/caos/logging" "github.com/pkg/errors" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/notification/channels" - "github.com/caos/zitadel/internal/notification/messages" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/notification/channels" + "github.com/zitadel/zitadel/internal/notification/messages" ) var _ channels.NotificationChannel = (*Email)(nil) diff --git a/internal/notification/channels/twilio/channel.go b/internal/notification/channels/twilio/channel.go index 765d03205..420cf9cab 100644 --- a/internal/notification/channels/twilio/channel.go +++ b/internal/notification/channels/twilio/channel.go @@ -1,11 +1,11 @@ package twilio import ( - "github.com/caos/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/notification/channels" - "github.com/caos/zitadel/internal/notification/messages" twilio "github.com/kevinburke/twilio-go" + "github.com/zitadel/logging" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/notification/channels" + "github.com/zitadel/zitadel/internal/notification/messages" ) func InitTwilioChannel(config TwilioConfig) channels.NotificationChannel { diff --git a/internal/notification/messages/email.go b/internal/notification/messages/email.go index 5525e8fd1..3c220e7c7 100644 --- a/internal/notification/messages/email.go +++ b/internal/notification/messages/email.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/caos/zitadel/internal/notification/channels" + "github.com/zitadel/zitadel/internal/notification/channels" ) var ( diff --git a/internal/notification/messages/sms.go b/internal/notification/messages/sms.go index 128fbcf61..4623b81fc 100644 --- a/internal/notification/messages/sms.go +++ b/internal/notification/messages/sms.go @@ -1,6 +1,6 @@ package messages -import "github.com/caos/zitadel/internal/notification/channels" +import "github.com/zitadel/zitadel/internal/notification/channels" var _ channels.Message = (*SMS)(nil) diff --git a/internal/notification/notification.go b/internal/notification/notification.go index e9f39b892..548094146 100644 --- a/internal/notification/notification.go +++ b/internal/notification/notification.go @@ -3,15 +3,15 @@ package notification import ( "database/sql" - "github.com/caos/logging" "github.com/rakyll/statik/fs" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/notification/repository/eventsourcing" - _ "github.com/caos/zitadel/internal/notification/statik" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/notification/repository/eventsourcing" + _ "github.com/zitadel/zitadel/internal/notification/statik" + "github.com/zitadel/zitadel/internal/query" ) type Config struct { diff --git a/internal/notification/repository/eventsourcing/handler/handler.go b/internal/notification/repository/eventsourcing/handler/handler.go index dede5ba21..d2bb236be 100644 --- a/internal/notification/repository/eventsourcing/handler/handler.go +++ b/internal/notification/repository/eventsourcing/handler/handler.go @@ -4,12 +4,12 @@ import ( "net/http" "time" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/crypto" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - queryv1 "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/notification/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/crypto" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + queryv1 "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/notification/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/query" ) type Configs map[string]*Config diff --git a/internal/notification/repository/eventsourcing/handler/notification.go b/internal/notification/repository/eventsourcing/handler/notification.go index 6341209a9..22c2178a3 100644 --- a/internal/notification/repository/eventsourcing/handler/notification.go +++ b/internal/notification/repository/eventsourcing/handler/notification.go @@ -6,30 +6,30 @@ import ( "net/http" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - http_utils "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/models" - queryv1 "github.com/caos/zitadel/internal/eventstore/v1/query" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - "github.com/caos/zitadel/internal/i18n" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" - "github.com/caos/zitadel/internal/notification/channels/smtp" - "github.com/caos/zitadel/internal/notification/channels/twilio" - "github.com/caos/zitadel/internal/notification/types" - "github.com/caos/zitadel/internal/query" - user_repo "github.com/caos/zitadel/internal/repository/user" - es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" - "github.com/caos/zitadel/internal/user/repository/view" - "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/authz" + http_utils "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + queryv1 "github.com/zitadel/zitadel/internal/eventstore/v1/query" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels/smtp" + "github.com/zitadel/zitadel/internal/notification/channels/twilio" + "github.com/zitadel/zitadel/internal/notification/types" + "github.com/zitadel/zitadel/internal/query" + user_repo "github.com/zitadel/zitadel/internal/repository/user" + es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/user/repository/view/model" ) const ( diff --git a/internal/notification/repository/eventsourcing/handler/notify_user.go b/internal/notification/repository/eventsourcing/handler/notify_user.go index f8da09469..2a44b9c5e 100644 --- a/internal/notification/repository/eventsourcing/handler/notify_user.go +++ b/internal/notification/repository/eventsourcing/handler/notify_user.go @@ -3,23 +3,23 @@ package handler import ( "context" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/eventstore/v1/query" - es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - org_model "github.com/caos/zitadel/internal/org/model" - org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model" - org_view "github.com/caos/zitadel/internal/org/repository/view" - query2 "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/authz" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/eventstore/v1/query" + es_sdk "github.com/zitadel/zitadel/internal/eventstore/v1/sdk" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + org_model "github.com/zitadel/zitadel/internal/org/model" + org_es_model "github.com/zitadel/zitadel/internal/org/repository/eventsourcing/model" + org_view "github.com/zitadel/zitadel/internal/org/repository/view" + query2 "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) const ( diff --git a/internal/notification/repository/eventsourcing/repository.go b/internal/notification/repository/eventsourcing/repository.go index 9f0b9e702..edac6095d 100644 --- a/internal/notification/repository/eventsourcing/repository.go +++ b/internal/notification/repository/eventsourcing/repository.go @@ -4,13 +4,13 @@ import ( "database/sql" "net/http" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/crypto" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - es_spol "github.com/caos/zitadel/internal/eventstore/v1/spooler" - "github.com/caos/zitadel/internal/notification/repository/eventsourcing/spooler" - noti_view "github.com/caos/zitadel/internal/notification/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/crypto" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + es_spol "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + "github.com/zitadel/zitadel/internal/notification/repository/eventsourcing/spooler" + noti_view "github.com/zitadel/zitadel/internal/notification/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/query" ) type Config struct { diff --git a/internal/notification/repository/eventsourcing/spooler/lock.go b/internal/notification/repository/eventsourcing/spooler/lock.go index d027f106e..d773a3c39 100644 --- a/internal/notification/repository/eventsourcing/spooler/lock.go +++ b/internal/notification/repository/eventsourcing/spooler/lock.go @@ -4,7 +4,7 @@ import ( "database/sql" "time" - es_locker "github.com/caos/zitadel/internal/eventstore/v1/locker" + es_locker "github.com/zitadel/zitadel/internal/eventstore/v1/locker" ) const ( diff --git a/internal/notification/repository/eventsourcing/spooler/spooler.go b/internal/notification/repository/eventsourcing/spooler/spooler.go index 1ec23c988..f574726f7 100644 --- a/internal/notification/repository/eventsourcing/spooler/spooler.go +++ b/internal/notification/repository/eventsourcing/spooler/spooler.go @@ -4,13 +4,13 @@ import ( "database/sql" "net/http" - "github.com/caos/zitadel/internal/command" - "github.com/caos/zitadel/internal/crypto" - v1 "github.com/caos/zitadel/internal/eventstore/v1" - "github.com/caos/zitadel/internal/eventstore/v1/spooler" - "github.com/caos/zitadel/internal/notification/repository/eventsourcing/handler" - "github.com/caos/zitadel/internal/notification/repository/eventsourcing/view" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/internal/crypto" + v1 "github.com/zitadel/zitadel/internal/eventstore/v1" + "github.com/zitadel/zitadel/internal/eventstore/v1/spooler" + "github.com/zitadel/zitadel/internal/notification/repository/eventsourcing/handler" + "github.com/zitadel/zitadel/internal/notification/repository/eventsourcing/view" + "github.com/zitadel/zitadel/internal/query" ) type SpoolerConfig struct { diff --git a/internal/notification/repository/eventsourcing/view/error_event.go b/internal/notification/repository/eventsourcing/view/error_event.go index f5d44d264..73ad6678d 100644 --- a/internal/notification/repository/eventsourcing/view/error_event.go +++ b/internal/notification/repository/eventsourcing/view/error_event.go @@ -1,7 +1,7 @@ package view import ( - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/notification/repository/eventsourcing/view/notification.go b/internal/notification/repository/eventsourcing/view/notification.go index dd4a6ca30..c0810c6b4 100644 --- a/internal/notification/repository/eventsourcing/view/notification.go +++ b/internal/notification/repository/eventsourcing/view/notification.go @@ -1,8 +1,8 @@ package view import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/notification/repository/eventsourcing/view/notify_user.go b/internal/notification/repository/eventsourcing/view/notify_user.go index 58ae1bb37..d5639264f 100644 --- a/internal/notification/repository/eventsourcing/view/notify_user.go +++ b/internal/notification/repository/eventsourcing/view/notify_user.go @@ -1,11 +1,11 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/user/repository/view" - "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/user/repository/view" + "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/notification/repository/eventsourcing/view/sequence.go b/internal/notification/repository/eventsourcing/view/sequence.go index 8be8166cb..8c7307ef7 100644 --- a/internal/notification/repository/eventsourcing/view/sequence.go +++ b/internal/notification/repository/eventsourcing/view/sequence.go @@ -3,8 +3,8 @@ package view import ( "time" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/view/repository" ) const ( diff --git a/internal/notification/senders/chain.go b/internal/notification/senders/chain.go index dce46b324..8241bc052 100644 --- a/internal/notification/senders/chain.go +++ b/internal/notification/senders/chain.go @@ -1,6 +1,6 @@ package senders -import "github.com/caos/zitadel/internal/notification/channels" +import "github.com/zitadel/zitadel/internal/notification/channels" var _ channels.NotificationChannel = (*Chain)(nil) diff --git a/internal/notification/senders/debug.go b/internal/notification/senders/debug.go index 34db235e6..73f4f4d80 100644 --- a/internal/notification/senders/debug.go +++ b/internal/notification/senders/debug.go @@ -3,9 +3,9 @@ package senders import ( "context" - "github.com/caos/zitadel/internal/notification/channels" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" ) func debugChannels(ctx context.Context, getFileSystemProvider func(ctx context.Context) (*fs.FSConfig, error), getLogProvider func(ctx context.Context) (*log.LogConfig, error)) (*Chain, error) { diff --git a/internal/notification/senders/email.go b/internal/notification/senders/email.go index 81a766ffc..26e07d575 100644 --- a/internal/notification/senders/email.go +++ b/internal/notification/senders/email.go @@ -3,11 +3,11 @@ package senders import ( "context" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" - "github.com/caos/zitadel/internal/notification/channels/smtp" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels/smtp" ) func EmailChannels(ctx context.Context, emailConfig func(ctx context.Context) (*smtp.EmailConfig, error), getFileSystemProvider func(ctx context.Context) (*fs.FSConfig, error), getLogProvider func(ctx context.Context) (*log.LogConfig, error)) (chain *Chain, err error) { diff --git a/internal/notification/senders/sms.go b/internal/notification/senders/sms.go index 676d72357..2e15d054c 100644 --- a/internal/notification/senders/sms.go +++ b/internal/notification/senders/sms.go @@ -3,9 +3,9 @@ package senders import ( "context" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" - "github.com/caos/zitadel/internal/notification/channels/twilio" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels/twilio" ) func SMSChannels(ctx context.Context, twilioConfig *twilio.TwilioConfig, getFileSystemProvider func(ctx context.Context) (*fs.FSConfig, error), getLogProvider func(ctx context.Context) (*log.LogConfig, error)) (chain *Chain, err error) { diff --git a/internal/notification/templates/templateData.go b/internal/notification/templates/templateData.go index 1597c1641..a49b5864f 100644 --- a/internal/notification/templates/templateData.go +++ b/internal/notification/templates/templateData.go @@ -4,8 +4,8 @@ import ( "fmt" "html" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/i18n" ) const ( diff --git a/internal/notification/types/domain_claimed.go b/internal/notification/types/domain_claimed.go index 88d21e065..dfafe6738 100644 --- a/internal/notification/types/domain_claimed.go +++ b/internal/notification/types/domain_claimed.go @@ -4,15 +4,15 @@ import ( "context" "strings" - "github.com/caos/zitadel/internal/api/ui/login" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/i18n" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" - "github.com/caos/zitadel/internal/notification/channels/smtp" - "github.com/caos/zitadel/internal/notification/templates" - "github.com/caos/zitadel/internal/query" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/ui/login" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels/smtp" + "github.com/zitadel/zitadel/internal/notification/templates" + "github.com/zitadel/zitadel/internal/query" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type DomainClaimedData struct { diff --git a/internal/notification/types/email_verification_code.go b/internal/notification/types/email_verification_code.go index 7956813a8..58dce87e8 100644 --- a/internal/notification/types/email_verification_code.go +++ b/internal/notification/types/email_verification_code.go @@ -3,17 +3,17 @@ package types import ( "context" - "github.com/caos/zitadel/internal/api/ui/login" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/i18n" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" - "github.com/caos/zitadel/internal/notification/channels/smtp" - "github.com/caos/zitadel/internal/notification/templates" - "github.com/caos/zitadel/internal/query" - es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/ui/login" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels/smtp" + "github.com/zitadel/zitadel/internal/notification/templates" + "github.com/zitadel/zitadel/internal/query" + es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type EmailVerificationCodeData struct { diff --git a/internal/notification/types/init_code.go b/internal/notification/types/init_code.go index 876ced6c8..a05a1c375 100644 --- a/internal/notification/types/init_code.go +++ b/internal/notification/types/init_code.go @@ -3,17 +3,17 @@ package types import ( "context" - "github.com/caos/zitadel/internal/api/ui/login" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/i18n" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" - "github.com/caos/zitadel/internal/notification/channels/smtp" - "github.com/caos/zitadel/internal/notification/templates" - "github.com/caos/zitadel/internal/query" - es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/ui/login" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels/smtp" + "github.com/zitadel/zitadel/internal/notification/templates" + "github.com/zitadel/zitadel/internal/query" + es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type InitCodeEmailData struct { diff --git a/internal/notification/types/password_code.go b/internal/notification/types/password_code.go index 878022892..da7699c35 100644 --- a/internal/notification/types/password_code.go +++ b/internal/notification/types/password_code.go @@ -3,18 +3,18 @@ package types import ( "context" - "github.com/caos/zitadel/internal/api/ui/login" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/i18n" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" - "github.com/caos/zitadel/internal/notification/channels/smtp" - "github.com/caos/zitadel/internal/notification/channels/twilio" - "github.com/caos/zitadel/internal/notification/templates" - "github.com/caos/zitadel/internal/query" - es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/ui/login" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels/smtp" + "github.com/zitadel/zitadel/internal/notification/channels/twilio" + "github.com/zitadel/zitadel/internal/notification/templates" + "github.com/zitadel/zitadel/internal/query" + es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type PasswordCodeData struct { diff --git a/internal/notification/types/passwordless_registration_link.go b/internal/notification/types/passwordless_registration_link.go index 5d91b1744..88c2381ea 100644 --- a/internal/notification/types/passwordless_registration_link.go +++ b/internal/notification/types/passwordless_registration_link.go @@ -3,17 +3,17 @@ package types import ( "context" - "github.com/caos/zitadel/internal/api/ui/login" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/i18n" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" - "github.com/caos/zitadel/internal/notification/channels/smtp" - "github.com/caos/zitadel/internal/notification/templates" - "github.com/caos/zitadel/internal/query" - "github.com/caos/zitadel/internal/repository/user" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/api/ui/login" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels/smtp" + "github.com/zitadel/zitadel/internal/notification/templates" + "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/repository/user" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type PasswordlessRegistrationLinkData struct { diff --git a/internal/notification/types/phone_verification_code.go b/internal/notification/types/phone_verification_code.go index 2273bd98e..e37d39a1e 100644 --- a/internal/notification/types/phone_verification_code.go +++ b/internal/notification/types/phone_verification_code.go @@ -4,15 +4,15 @@ import ( "context" "fmt" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/i18n" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" - "github.com/caos/zitadel/internal/notification/channels/twilio" - "github.com/caos/zitadel/internal/notification/templates" - es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels/twilio" + "github.com/zitadel/zitadel/internal/notification/templates" + es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) type PhoneVerificationCodeData struct { diff --git a/internal/notification/types/templateData.go b/internal/notification/types/templateData.go index b5ca855ce..033766297 100644 --- a/internal/notification/types/templateData.go +++ b/internal/notification/types/templateData.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/caos/zitadel/internal/i18n" - "github.com/caos/zitadel/internal/notification/templates" - "github.com/caos/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/notification/templates" + "github.com/zitadel/zitadel/internal/query" ) func GetTemplateData(translator *i18n.Translator, translateArgs map[string]interface{}, assetsPrefix, href, msgType, lang string, policy *query.LabelPolicy) templates.TemplateData { diff --git a/internal/notification/types/user_email.go b/internal/notification/types/user_email.go index 84456e76a..7b4cf37ef 100644 --- a/internal/notification/types/user_email.go +++ b/internal/notification/types/user_email.go @@ -4,14 +4,14 @@ import ( "context" "html" - caos_errors "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" - "github.com/caos/zitadel/internal/notification/channels/smtp" - "github.com/caos/zitadel/internal/notification/messages" - "github.com/caos/zitadel/internal/notification/senders" + caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels/smtp" + "github.com/zitadel/zitadel/internal/notification/messages" + "github.com/zitadel/zitadel/internal/notification/senders" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) func generateEmail(ctx context.Context, user *view_model.NotifyUser, subject, content string, smtpConfig func(ctx context.Context) (*smtp.EmailConfig, error), getFileSystemProvider func(ctx context.Context) (*fs.FSConfig, error), getLogProvider func(ctx context.Context) (*log.LogConfig, error), lastEmail bool) error { diff --git a/internal/notification/types/user_phone.go b/internal/notification/types/user_phone.go index 02d7ebf54..5d7663edb 100644 --- a/internal/notification/types/user_phone.go +++ b/internal/notification/types/user_phone.go @@ -3,13 +3,13 @@ package types import ( "context" - caos_errors "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/notification/channels/fs" - "github.com/caos/zitadel/internal/notification/channels/log" - "github.com/caos/zitadel/internal/notification/channels/twilio" - "github.com/caos/zitadel/internal/notification/messages" - "github.com/caos/zitadel/internal/notification/senders" - view_model "github.com/caos/zitadel/internal/user/repository/view/model" + caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/notification/channels/fs" + "github.com/zitadel/zitadel/internal/notification/channels/log" + "github.com/zitadel/zitadel/internal/notification/channels/twilio" + "github.com/zitadel/zitadel/internal/notification/messages" + "github.com/zitadel/zitadel/internal/notification/senders" + view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" ) func generateSms(ctx context.Context, user *view_model.NotifyUser, content string, getTwilioProvider func(ctx context.Context) (*twilio.TwilioConfig, error), getFileSystemProvider func(ctx context.Context) (*fs.FSConfig, error), getLogProvider func(ctx context.Context) (*log.LogConfig, error), lastPhone bool) error { diff --git a/internal/org/model/domain.go b/internal/org/model/domain.go index 93d319bf0..c1d951b84 100644 --- a/internal/org/model/domain.go +++ b/internal/org/model/domain.go @@ -1,9 +1,9 @@ package model import ( - http_util "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/crypto" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + http_util "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/crypto" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type OrgDomain struct { diff --git a/internal/org/model/org.go b/internal/org/model/org.go index c2c4b3bf4..a944a6897 100644 --- a/internal/org/model/org.go +++ b/internal/org/model/org.go @@ -3,8 +3,8 @@ package model import ( "strings" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - iam_model "github.com/caos/zitadel/internal/iam/model" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + iam_model "github.com/zitadel/zitadel/internal/iam/model" ) type Org struct { diff --git a/internal/org/repository/eventsourcing/model/domain.go b/internal/org/repository/eventsourcing/model/domain.go index 55284611e..2f1fe880d 100644 --- a/internal/org/repository/eventsourcing/model/domain.go +++ b/internal/org/repository/eventsourcing/model/domain.go @@ -3,10 +3,10 @@ package model import ( "encoding/json" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/org/model" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/org/model" ) type OrgDomain struct { diff --git a/internal/org/repository/eventsourcing/model/domain_policy.go b/internal/org/repository/eventsourcing/model/domain_policy.go index c7f560674..445198955 100644 --- a/internal/org/repository/eventsourcing/model/domain_policy.go +++ b/internal/org/repository/eventsourcing/model/domain_policy.go @@ -1,8 +1,8 @@ package model import ( - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + iam_es_model "github.com/zitadel/zitadel/internal/iam/repository/eventsourcing/model" ) func (o *Org) appendAddDomainPolicyEvent(event *es_models.Event) error { diff --git a/internal/org/repository/eventsourcing/model/member.go b/internal/org/repository/eventsourcing/model/member.go index 2c743829b..1dad429a5 100644 --- a/internal/org/repository/eventsourcing/model/member.go +++ b/internal/org/repository/eventsourcing/model/member.go @@ -4,8 +4,8 @@ import ( "encoding/json" "reflect" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type OrgMember struct { diff --git a/internal/org/repository/eventsourcing/model/org.go b/internal/org/repository/eventsourcing/model/org.go index d74a21719..f3ebacd85 100644 --- a/internal/org/repository/eventsourcing/model/org.go +++ b/internal/org/repository/eventsourcing/model/org.go @@ -3,12 +3,12 @@ package model import ( "encoding/json" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model" - org_model "github.com/caos/zitadel/internal/org/model" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + iam_es_model "github.com/zitadel/zitadel/internal/iam/repository/eventsourcing/model" + org_model "github.com/zitadel/zitadel/internal/org/model" + "github.com/zitadel/zitadel/internal/repository/org" ) type Org struct { diff --git a/internal/org/repository/eventsourcing/model/org_test.go b/internal/org/repository/eventsourcing/model/org_test.go index ffd752636..6af1d8af0 100644 --- a/internal/org/repository/eventsourcing/model/org_test.go +++ b/internal/org/repository/eventsourcing/model/org_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "testing" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/org/model" - "github.com/caos/zitadel/internal/repository/org" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/org/model" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestOrgFromEvents(t *testing.T) { diff --git a/internal/org/repository/view/query.go b/internal/org/repository/view/query.go index 3643e2d01..02cd8dbb6 100644 --- a/internal/org/repository/view/query.go +++ b/internal/org/repository/view/query.go @@ -1,9 +1,9 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/org" ) func OrgByIDQuery(id string, latestSequence uint64) (*es_models.SearchQuery, error) { diff --git a/internal/project/model/api_config.go b/internal/project/model/api_config.go index ebe904416..2751d601d 100644 --- a/internal/project/model/api_config.go +++ b/internal/project/model/api_config.go @@ -4,12 +4,12 @@ import ( "fmt" "strings" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" ) type APIConfig struct { diff --git a/internal/project/model/application.go b/internal/project/model/application.go index dfc493373..2925b0dc4 100644 --- a/internal/project/model/application.go +++ b/internal/project/model/application.go @@ -1,7 +1,7 @@ package model import ( - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Application struct { diff --git a/internal/project/model/application_test.go b/internal/project/model/application_test.go index 527e96473..0feabf017 100644 --- a/internal/project/model/application_test.go +++ b/internal/project/model/application_test.go @@ -1,8 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/eventstore/v1/models" "testing" + + "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) func TestApplicationValid(t *testing.T) { diff --git a/internal/project/model/oidc_config.go b/internal/project/model/oidc_config.go index 7bbfbab29..c3b0739f5 100644 --- a/internal/project/model/oidc_config.go +++ b/internal/project/model/oidc_config.go @@ -5,13 +5,13 @@ import ( "strings" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/id" ) type OIDCConfig struct { diff --git a/internal/project/model/org_project_mapping_view.go b/internal/project/model/org_project_mapping_view.go index 1b45f2c17..07a4d851c 100644 --- a/internal/project/model/org_project_mapping_view.go +++ b/internal/project/model/org_project_mapping_view.go @@ -1,7 +1,7 @@ package model import ( - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" "time" ) diff --git a/internal/project/model/project.go b/internal/project/model/project.go index 875a0138f..acbef86a5 100644 --- a/internal/project/model/project.go +++ b/internal/project/model/project.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/domain" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Project struct { diff --git a/internal/project/model/project_grant.go b/internal/project/model/project_grant.go index 2c300a6b1..b90ae4059 100644 --- a/internal/project/model/project_grant.go +++ b/internal/project/model/project_grant.go @@ -1,7 +1,7 @@ package model import ( - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type ProjectGrant struct { diff --git a/internal/project/model/project_grant_member.go b/internal/project/model/project_grant_member.go index 002049231..ec56441c5 100644 --- a/internal/project/model/project_grant_member.go +++ b/internal/project/model/project_grant_member.go @@ -1,6 +1,6 @@ package model -import es_models "github.com/caos/zitadel/internal/eventstore/v1/models" +import es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" type ProjectGrantMember struct { es_models.ObjectRoot diff --git a/internal/project/model/project_grant_member_view.go b/internal/project/model/project_grant_member_view.go index 8d1b6e715..635648fe5 100644 --- a/internal/project/model/project_grant_member_view.go +++ b/internal/project/model/project_grant_member_view.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" "time" ) diff --git a/internal/project/model/project_grant_view.go b/internal/project/model/project_grant_view.go index 4ceb8b522..fb6dd26f3 100644 --- a/internal/project/model/project_grant_view.go +++ b/internal/project/model/project_grant_view.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" "time" ) diff --git a/internal/project/model/project_member.go b/internal/project/model/project_member.go index 70ef09c72..a07d939c5 100644 --- a/internal/project/model/project_member.go +++ b/internal/project/model/project_member.go @@ -1,6 +1,6 @@ package model -import es_models "github.com/caos/zitadel/internal/eventstore/v1/models" +import es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" type ProjectMember struct { es_models.ObjectRoot diff --git a/internal/project/model/project_member_view.go b/internal/project/model/project_member_view.go index 3616ba282..c208df383 100644 --- a/internal/project/model/project_member_view.go +++ b/internal/project/model/project_member_view.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" "time" ) diff --git a/internal/project/model/project_role.go b/internal/project/model/project_role.go index 6f84c4763..43d9f68ff 100644 --- a/internal/project/model/project_role.go +++ b/internal/project/model/project_role.go @@ -1,6 +1,6 @@ package model -import es_models "github.com/caos/zitadel/internal/eventstore/v1/models" +import es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" type ProjectRole struct { es_models.ObjectRoot diff --git a/internal/project/model/project_role_view.go b/internal/project/model/project_role_view.go index 620d5bfaa..10efc0bf4 100644 --- a/internal/project/model/project_role_view.go +++ b/internal/project/model/project_role_view.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" "time" ) diff --git a/internal/project/model/project_view.go b/internal/project/model/project_view.go index 9834d2643..31fa33625 100644 --- a/internal/project/model/project_view.go +++ b/internal/project/model/project_view.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" "time" ) diff --git a/internal/project/repository/eventsourcing/model/api_config.go b/internal/project/repository/eventsourcing/model/api_config.go index ca8503251..cb42ce4b2 100644 --- a/internal/project/repository/eventsourcing/model/api_config.go +++ b/internal/project/repository/eventsourcing/model/api_config.go @@ -3,10 +3,10 @@ package model import ( "encoding/json" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/crypto" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type APIConfig struct { diff --git a/internal/project/repository/eventsourcing/model/application.go b/internal/project/repository/eventsourcing/model/application.go index 42ffe5347..392ac34de 100644 --- a/internal/project/repository/eventsourcing/model/application.go +++ b/internal/project/repository/eventsourcing/model/application.go @@ -3,9 +3,9 @@ package model import ( "encoding/json" - "github.com/caos/logging" + "github.com/zitadel/logging" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Application struct { diff --git a/internal/project/repository/eventsourcing/model/oidc_config.go b/internal/project/repository/eventsourcing/model/oidc_config.go index dde46104f..f051defc5 100644 --- a/internal/project/repository/eventsourcing/model/oidc_config.go +++ b/internal/project/repository/eventsourcing/model/oidc_config.go @@ -4,13 +4,13 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/project" ) type OIDCConfig struct { diff --git a/internal/project/repository/eventsourcing/model/project.go b/internal/project/repository/eventsourcing/model/project.go index a415cbd4e..8aba9a08a 100644 --- a/internal/project/repository/eventsourcing/model/project.go +++ b/internal/project/repository/eventsourcing/model/project.go @@ -3,12 +3,12 @@ package model import ( "encoding/json" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/eventstore" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/project/model" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/eventstore" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/project/model" + "github.com/zitadel/zitadel/internal/repository/project" ) type Project struct { diff --git a/internal/project/repository/eventsourcing/model/project_grant.go b/internal/project/repository/eventsourcing/model/project_grant.go index 2bdfe731f..0f09de496 100644 --- a/internal/project/repository/eventsourcing/model/project_grant.go +++ b/internal/project/repository/eventsourcing/model/project_grant.go @@ -4,9 +4,9 @@ import ( "encoding/json" "reflect" - "github.com/caos/logging" + "github.com/zitadel/logging" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type ProjectGrant struct { diff --git a/internal/project/repository/eventsourcing/model/project_grant_member.go b/internal/project/repository/eventsourcing/model/project_grant_member.go index 1fb4a2c8b..d57b86277 100644 --- a/internal/project/repository/eventsourcing/model/project_grant_member.go +++ b/internal/project/repository/eventsourcing/model/project_grant_member.go @@ -3,9 +3,9 @@ package model import ( "encoding/json" - "github.com/caos/logging" + "github.com/zitadel/logging" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type ProjectGrantMember struct { diff --git a/internal/project/repository/eventsourcing/model/project_member.go b/internal/project/repository/eventsourcing/model/project_member.go index 2c9682269..05d1c7678 100644 --- a/internal/project/repository/eventsourcing/model/project_member.go +++ b/internal/project/repository/eventsourcing/model/project_member.go @@ -3,9 +3,9 @@ package model import ( "encoding/json" - "github.com/caos/logging" + "github.com/zitadel/logging" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type ProjectMember struct { diff --git a/internal/project/repository/eventsourcing/model/project_test.go b/internal/project/repository/eventsourcing/model/project_test.go index 640f9b87e..854509815 100644 --- a/internal/project/repository/eventsourcing/model/project_test.go +++ b/internal/project/repository/eventsourcing/model/project_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "testing" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/project/model" - "github.com/caos/zitadel/internal/repository/project" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/project/model" + "github.com/zitadel/zitadel/internal/repository/project" ) func TestProjectFromEvents(t *testing.T) { diff --git a/internal/project/repository/view/model/application.go b/internal/project/repository/view/model/application.go index 928ef7496..c0738ea93 100644 --- a/internal/project/repository/view/model/application.go +++ b/internal/project/repository/view/model/application.go @@ -4,16 +4,16 @@ import ( "encoding/json" "time" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - http_util "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/project/model" - "github.com/caos/zitadel/internal/repository/project" + http_util "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/project/model" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/project/repository/view/model/application_test.go b/internal/project/repository/view/model/application_test.go index faf51b30a..30d5a1415 100644 --- a/internal/project/repository/view/model/application_test.go +++ b/internal/project/repository/view/model/application_test.go @@ -4,10 +4,10 @@ import ( "encoding/json" "testing" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/project/model" - es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model" - "github.com/caos/zitadel/internal/repository/project" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/project/model" + es_model "github.com/zitadel/zitadel/internal/project/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/repository/project" ) func mockAppData(app *es_model.Application) []byte { diff --git a/internal/project/repository/view/model/org_project_mapping_query.go b/internal/project/repository/view/model/org_project_mapping_query.go index 94e0cbc80..90807b969 100644 --- a/internal/project/repository/view/model/org_project_mapping_query.go +++ b/internal/project/repository/view/model/org_project_mapping_query.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - proj_model "github.com/caos/zitadel/internal/project/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + proj_model "github.com/zitadel/zitadel/internal/project/model" + "github.com/zitadel/zitadel/internal/view/repository" ) type OrgProjectMappingSearchRequest proj_model.OrgProjectMappingViewSearchRequest diff --git a/internal/project/repository/view/model/project.go b/internal/project/repository/view/model/project.go index c1017f2a4..d1b4e0130 100644 --- a/internal/project/repository/view/model/project.go +++ b/internal/project/repository/view/model/project.go @@ -4,14 +4,14 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/project/model" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/project/model" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/project/repository/view/model/project_grant.go b/internal/project/repository/view/model/project_grant.go index 60bb9803c..fc6a0816a 100644 --- a/internal/project/repository/view/model/project_grant.go +++ b/internal/project/repository/view/model/project_grant.go @@ -4,14 +4,14 @@ import ( "encoding/json" "time" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/project/model" - "github.com/caos/zitadel/internal/repository/project" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/project/model" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/project/repository/view/model/project_grant_member.go b/internal/project/repository/view/model/project_grant_member.go index d63590300..95de52949 100644 --- a/internal/project/repository/view/model/project_grant_member.go +++ b/internal/project/repository/view/model/project_grant_member.go @@ -4,13 +4,13 @@ import ( "encoding/json" "time" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/project" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/project/repository/view/model/project_grant_member_test.go b/internal/project/repository/view/model/project_grant_member_test.go index 951a9c63f..c508ebb4e 100644 --- a/internal/project/repository/view/model/project_grant_member_test.go +++ b/internal/project/repository/view/model/project_grant_member_test.go @@ -7,9 +7,9 @@ import ( "github.com/lib/pq" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model" - "github.com/caos/zitadel/internal/repository/project" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + es_model "github.com/zitadel/zitadel/internal/project/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/repository/project" ) func mockProjectGrantMemberData(member *es_model.ProjectGrantMember) []byte { diff --git a/internal/project/repository/view/model/project_grant_test.go b/internal/project/repository/view/model/project_grant_test.go index eb1741276..8e50d8e06 100644 --- a/internal/project/repository/view/model/project_grant_test.go +++ b/internal/project/repository/view/model/project_grant_test.go @@ -7,10 +7,10 @@ import ( "github.com/lib/pq" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/project/model" - es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model" - "github.com/caos/zitadel/internal/repository/project" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/project/model" + es_model "github.com/zitadel/zitadel/internal/project/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/repository/project" ) func mockProjectData(project *es_model.Project) []byte { diff --git a/internal/project/repository/view/model/project_member.go b/internal/project/repository/view/model/project_member.go index 28144362a..1822d0524 100644 --- a/internal/project/repository/view/model/project_member.go +++ b/internal/project/repository/view/model/project_member.go @@ -4,13 +4,13 @@ import ( "encoding/json" "time" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/project" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/project/repository/view/model/project_member_test.go b/internal/project/repository/view/model/project_member_test.go index 8c61ee92a..f4daf31c3 100644 --- a/internal/project/repository/view/model/project_member_test.go +++ b/internal/project/repository/view/model/project_member_test.go @@ -7,9 +7,9 @@ import ( "github.com/lib/pq" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model" - "github.com/caos/zitadel/internal/repository/project" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + es_model "github.com/zitadel/zitadel/internal/project/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/repository/project" ) func mockProjectMemberData(member *es_model.ProjectMember) []byte { diff --git a/internal/project/repository/view/model/project_test.go b/internal/project/repository/view/model/project_test.go index 1cef29f57..a1c62fadc 100644 --- a/internal/project/repository/view/model/project_test.go +++ b/internal/project/repository/view/model/project_test.go @@ -3,10 +3,10 @@ package model import ( "testing" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/project/model" - es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model" - "github.com/caos/zitadel/internal/repository/project" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/project/model" + es_model "github.com/zitadel/zitadel/internal/project/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/repository/project" ) func TestProjectAppendEvent(t *testing.T) { diff --git a/internal/project/repository/view/org_project_mapping_view.go b/internal/project/repository/view/org_project_mapping_view.go index 826623ba5..f1326fd7a 100644 --- a/internal/project/repository/view/org_project_mapping_view.go +++ b/internal/project/repository/view/org_project_mapping_view.go @@ -3,11 +3,11 @@ package view import ( "github.com/jinzhu/gorm" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - proj_model "github.com/caos/zitadel/internal/project/model" - "github.com/caos/zitadel/internal/project/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + proj_model "github.com/zitadel/zitadel/internal/project/model" + "github.com/zitadel/zitadel/internal/project/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) func OrgProjectMappingByIDs(db *gorm.DB, table, orgID, projectID, instanceID string) (*model.OrgProjectMapping, error) { diff --git a/internal/project/repository/view/query.go b/internal/project/repository/view/query.go index 2b5e36a40..7deea71f2 100644 --- a/internal/project/repository/view/query.go +++ b/internal/project/repository/view/query.go @@ -1,9 +1,9 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/project" ) func ProjectByIDQuery(id, instanceID string, latestSequence uint64) (*es_models.SearchQuery, error) { diff --git a/internal/proto/struct.go b/internal/proto/struct.go index 5c7b93b43..fab78644d 100644 --- a/internal/proto/struct.go +++ b/internal/proto/struct.go @@ -7,7 +7,7 @@ import ( "github.com/golang/protobuf/jsonpb" pb_struct "github.com/golang/protobuf/ptypes/struct" - "github.com/caos/logging" + "github.com/zitadel/logging" ) var ( diff --git a/internal/protoc/protoc-gen-authoption/README.md b/internal/protoc/protoc-gen-authoption/README.md index 2f13790fb..793c57569 100644 --- a/internal/protoc/protoc-gen-authoption/README.md +++ b/internal/protoc/protoc-gen-authoption/README.md @@ -32,6 +32,6 @@ service MyService { Caos Auth Option is used for granting groups On each zitadel role is specified which auth methods are allowed to call -Get protoc-get-authoption: ``go get github.com/caos/zitadel/internal/protoc/protoc-gen-authoption`` +Get protoc-get-authoption: ``go get github.com/zitadel/zitadel/internal/protoc/protoc-gen-authoption`` Protc-Flag: ``--authoption_out=.`` \ No newline at end of file diff --git a/internal/protoc/protoc-gen-authoption/authoption/options.proto b/internal/protoc/protoc-gen-authoption/authoption/options.proto index 0e3678d3e..c62a6378e 100644 --- a/internal/protoc/protoc-gen-authoption/authoption/options.proto +++ b/internal/protoc/protoc-gen-authoption/authoption/options.proto @@ -4,7 +4,7 @@ package caos.zitadel.utils.v1; import "google/protobuf/descriptor.proto"; -option go_package = "github.com/caos/zitadel/internal/protoc/protoc-gen-authoption/authoption"; +option go_package = "github.com/zitadel/zitadel/internal/protoc/protoc-gen-authoption/authoption"; extend google.protobuf.MethodOptions { diff --git a/internal/protoc/protoc-gen-authoption/main.go b/internal/protoc/protoc-gen-authoption/main.go index 3aba24f52..5e4cbd683 100644 --- a/internal/protoc/protoc-gen-authoption/main.go +++ b/internal/protoc/protoc-gen-authoption/main.go @@ -1,8 +1,8 @@ package main import ( - base "github.com/caos/zitadel/internal/protoc/protoc-base" - "github.com/caos/zitadel/internal/protoc/protoc-gen-authoption/authoption" + base "github.com/zitadel/zitadel/internal/protoc/protoc-base" + "github.com/zitadel/zitadel/internal/protoc/protoc-gen-authoption/authoption" ) const ( diff --git a/internal/protoc/protoc-gen-authoption/templates/auth_method_mapping.go.tmpl b/internal/protoc/protoc-gen-authoption/templates/auth_method_mapping.go.tmpl index a910f8086..cfc71fb5c 100644 --- a/internal/protoc/protoc-gen-authoption/templates/auth_method_mapping.go.tmpl +++ b/internal/protoc/protoc-gen-authoption/templates/auth_method_mapping.go.tmpl @@ -6,8 +6,8 @@ package {{.File.GoPkg.Name}} import ( "google.golang.org/grpc" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/grpc/server/middleware" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/server/middleware" ) {{ range $s := .File.Services }} diff --git a/internal/query/action.go b/internal/query/action.go index 061b87ebf..910f306e8 100644 --- a/internal/query/action.go +++ b/internal/query/action.go @@ -8,11 +8,11 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) var ( diff --git a/internal/query/action_flow.go b/internal/query/action_flow.go index d0046c70b..a4716be9a 100644 --- a/internal/query/action_flow.go +++ b/internal/query/action_flow.go @@ -8,11 +8,11 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) var ( diff --git a/internal/query/action_flow_test.go b/internal/query/action_flow_test.go index fcc42d699..d8a70d83a 100644 --- a/internal/query/action_flow_test.go +++ b/internal/query/action_flow_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) func Test_FlowPrepares(t *testing.T) { diff --git a/internal/query/action_test.go b/internal/query/action_test.go index fe036b21e..673ac7c95 100644 --- a/internal/query/action_test.go +++ b/internal/query/action_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_ActionPrepares(t *testing.T) { diff --git a/internal/query/app.go b/internal/query/app.go index 6f4ccacc4..cf6c5d5b7 100644 --- a/internal/query/app.go +++ b/internal/query/app.go @@ -9,13 +9,13 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type Apps struct { diff --git a/internal/query/app_test.go b/internal/query/app_test.go index 4f78500da..b969dadb2 100644 --- a/internal/query/app_test.go +++ b/internal/query/app_test.go @@ -11,8 +11,8 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/authn_key.go b/internal/query/authn_key.go index c392ff8e4..86aac3d07 100644 --- a/internal/query/authn_key.go +++ b/internal/query/authn_key.go @@ -8,11 +8,11 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) var ( diff --git a/internal/query/authn_key_test.go b/internal/query/authn_key_test.go index ca46fc5f6..0898bf8ab 100644 --- a/internal/query/authn_key_test.go +++ b/internal/query/authn_key_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_AuthNKeyPrepares(t *testing.T) { diff --git a/internal/query/changes.go b/internal/query/changes.go index 0b80f739e..bc455e00f 100644 --- a/internal/query/changes.go +++ b/internal/query/changes.go @@ -4,17 +4,17 @@ import ( "context" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type Changes struct { diff --git a/internal/query/current_sequence.go b/internal/query/current_sequence.go index c97d44630..d0d034414 100644 --- a/internal/query/current_sequence.go +++ b/internal/query/current_sequence.go @@ -9,9 +9,9 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) const ( diff --git a/internal/query/custom_text.go b/internal/query/custom_text.go index 7406ea451..79bed936e 100644 --- a/internal/query/custom_text.go +++ b/internal/query/custom_text.go @@ -12,12 +12,12 @@ import ( "golang.org/x/text/language" "sigs.k8s.io/yaml" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/query/projection" ) type CustomTexts struct { diff --git a/internal/query/custom_text_test.go b/internal/query/custom_text_test.go index 7ec2a36ef..d189891dd 100644 --- a/internal/query/custom_text_test.go +++ b/internal/query/custom_text_test.go @@ -10,7 +10,7 @@ import ( "golang.org/x/text/language" - errs "github.com/caos/zitadel/internal/errors" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_CustomTextPrepares(t *testing.T) { diff --git a/internal/query/failed_events.go b/internal/query/failed_events.go index 056a84587..0825375db 100644 --- a/internal/query/failed_events.go +++ b/internal/query/failed_events.go @@ -7,8 +7,8 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) const ( diff --git a/internal/query/features.go b/internal/query/features.go index 9f18b06a2..6e93345af 100644 --- a/internal/query/features.go +++ b/internal/query/features.go @@ -8,11 +8,11 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type Features struct { diff --git a/internal/query/features_test.go b/internal/query/features_test.go index fabd2d20c..daa11b31e 100644 --- a/internal/query/features_test.go +++ b/internal/query/features_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_FeaturesPrepares(t *testing.T) { diff --git a/internal/query/iam_member.go b/internal/query/iam_member.go index fbb8dd42a..0454b6a95 100644 --- a/internal/query/iam_member.go +++ b/internal/query/iam_member.go @@ -7,10 +7,10 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) var ( diff --git a/internal/query/idp.go b/internal/query/idp.go index c109cf719..2bc46ca89 100644 --- a/internal/query/idp.go +++ b/internal/query/idp.go @@ -9,12 +9,12 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type IDP struct { diff --git a/internal/query/idp_login_policy_link.go b/internal/query/idp_login_policy_link.go index 1c4ab0045..0ab280d44 100644 --- a/internal/query/idp_login_policy_link.go +++ b/internal/query/idp_login_policy_link.go @@ -6,10 +6,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type IDPLoginPolicyLink struct { diff --git a/internal/query/idp_login_policy_link_test.go b/internal/query/idp_login_policy_link_test.go index 1f635d839..46ed85b8d 100644 --- a/internal/query/idp_login_policy_link_test.go +++ b/internal/query/idp_login_policy_link_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) var ( diff --git a/internal/query/idp_test.go b/internal/query/idp_test.go index 27573e093..903b442d7 100644 --- a/internal/query/idp_test.go +++ b/internal/query/idp_test.go @@ -10,9 +10,9 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_IDPPrepares(t *testing.T) { diff --git a/internal/query/idp_user_link.go b/internal/query/idp_user_link.go index fad6ba22b..b576dc15f 100644 --- a/internal/query/idp_user_link.go +++ b/internal/query/idp_user_link.go @@ -6,10 +6,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type IDPUserLink struct { diff --git a/internal/query/idp_user_link_test.go b/internal/query/idp_user_link_test.go index 42117bcc9..af1bf621e 100644 --- a/internal/query/idp_user_link_test.go +++ b/internal/query/idp_user_link_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) var ( diff --git a/internal/query/instance.go b/internal/query/instance.go index c6944ab28..e4f5a83f7 100644 --- a/internal/query/instance.go +++ b/internal/query/instance.go @@ -10,10 +10,10 @@ import ( sq "github.com/Masterminds/squirrel" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) var ( diff --git a/internal/query/instance_domain.go b/internal/query/instance_domain.go index f7e92b166..fcb4c9428 100644 --- a/internal/query/instance_domain.go +++ b/internal/query/instance_domain.go @@ -7,9 +7,9 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type InstanceDomain struct { diff --git a/internal/query/instance_test.go b/internal/query/instance_test.go index 0bf582bc3..fe2dd4b09 100644 --- a/internal/query/instance_test.go +++ b/internal/query/instance_test.go @@ -11,8 +11,8 @@ import ( sq "github.com/Masterminds/squirrel" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_InstancePrepares(t *testing.T) { diff --git a/internal/query/key.go b/internal/query/key.go index a941b4d20..28375158b 100644 --- a/internal/query/key.go +++ b/internal/query/key.go @@ -8,12 +8,12 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type Key interface { diff --git a/internal/query/key_test.go b/internal/query/key_test.go index 19ff43e7a..3dac38b6d 100644 --- a/internal/query/key_test.go +++ b/internal/query/key_test.go @@ -10,9 +10,9 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_KeyPrepares(t *testing.T) { diff --git a/internal/query/label_policy.go b/internal/query/label_policy.go index c83602397..4bfbc4055 100644 --- a/internal/query/label_policy.go +++ b/internal/query/label_policy.go @@ -8,10 +8,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type LabelPolicy struct { diff --git a/internal/query/languages.go b/internal/query/languages.go index 89441be1b..f12c29677 100644 --- a/internal/query/languages.go +++ b/internal/query/languages.go @@ -3,10 +3,10 @@ package query import ( "context" - "github.com/caos/logging" + "github.com/zitadel/logging" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/i18n" ) func (q *Queries) Languages(ctx context.Context) ([]language.Tag, error) { diff --git a/internal/query/lockout_policy.go b/internal/query/lockout_policy.go index ecc485e39..b39c718f5 100644 --- a/internal/query/lockout_policy.go +++ b/internal/query/lockout_policy.go @@ -8,11 +8,11 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type LockoutPolicy struct { diff --git a/internal/query/lockout_policy_test.go b/internal/query/lockout_policy_test.go index 72366dd74..41b1a78b0 100644 --- a/internal/query/lockout_policy_test.go +++ b/internal/query/lockout_policy_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_LockoutPolicyPrepares(t *testing.T) { diff --git a/internal/query/login_name.go b/internal/query/login_name.go index b0facabf9..6f06b181c 100644 --- a/internal/query/login_name.go +++ b/internal/query/login_name.go @@ -1,6 +1,6 @@ package query -import "github.com/caos/zitadel/internal/query/projection" +import "github.com/zitadel/zitadel/internal/query/projection" var ( loginNameTable = table{ diff --git a/internal/query/login_policy.go b/internal/query/login_policy.go index 140aa0a6f..9b072fc16 100644 --- a/internal/query/login_policy.go +++ b/internal/query/login_policy.go @@ -9,11 +9,11 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type LoginPolicy struct { diff --git a/internal/query/login_policy_test.go b/internal/query/login_policy_test.go index 9ea56add9..5546ed584 100644 --- a/internal/query/login_policy_test.go +++ b/internal/query/login_policy_test.go @@ -11,8 +11,8 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_LoginPolicyPrepares(t *testing.T) { diff --git a/internal/query/mail_template.go b/internal/query/mail_template.go index 98898c634..98f858b68 100644 --- a/internal/query/mail_template.go +++ b/internal/query/mail_template.go @@ -8,10 +8,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type MailTemplate struct { diff --git a/internal/query/member.go b/internal/query/member.go index 3a255ab99..a6ee5d409 100644 --- a/internal/query/member.go +++ b/internal/query/member.go @@ -3,7 +3,7 @@ package query import ( "time" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/query/projection" sq "github.com/Masterminds/squirrel" ) diff --git a/internal/query/member_roles.go b/internal/query/member_roles.go index f1145a5dd..e68a0240c 100644 --- a/internal/query/member_roles.go +++ b/internal/query/member_roles.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" ) func (q *Queries) GetIAMMemberRoles() []string { diff --git a/internal/query/message_text.go b/internal/query/message_text.go index 0b011bf31..c9f3fa087 100644 --- a/internal/query/message_text.go +++ b/internal/query/message_text.go @@ -15,11 +15,11 @@ import ( "golang.org/x/text/language" "sigs.k8s.io/yaml" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type MessageTexts struct { diff --git a/internal/query/message_text_test.go b/internal/query/message_text_test.go index 5a27b66cc..2208b23ee 100644 --- a/internal/query/message_text_test.go +++ b/internal/query/message_text_test.go @@ -10,8 +10,8 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_MessageTextPrepares(t *testing.T) { diff --git a/internal/query/notification_provider.go b/internal/query/notification_provider.go index f0559d41e..4b804975c 100644 --- a/internal/query/notification_provider.go +++ b/internal/query/notification_provider.go @@ -8,11 +8,11 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type DebugNotificationProvider struct { diff --git a/internal/query/notification_provider_test.go b/internal/query/notification_provider_test.go index 81493125e..a2ff0d3a6 100644 --- a/internal/query/notification_provider_test.go +++ b/internal/query/notification_provider_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_NotificationProviderPrepares(t *testing.T) { diff --git a/internal/query/oidc_settings.go b/internal/query/oidc_settings.go index 73eab0ae4..a54fac08b 100644 --- a/internal/query/oidc_settings.go +++ b/internal/query/oidc_settings.go @@ -8,9 +8,9 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) var ( diff --git a/internal/query/oidc_settings_test.go b/internal/query/oidc_settings_test.go index ca893b5ab..8b6f47cb9 100644 --- a/internal/query/oidc_settings_test.go +++ b/internal/query/oidc_settings_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - errs "github.com/caos/zitadel/internal/errors" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_OIDCConfigsPrepares(t *testing.T) { diff --git a/internal/query/org.go b/internal/query/org.go index bc5230b81..97225e86b 100644 --- a/internal/query/org.go +++ b/internal/query/org.go @@ -8,10 +8,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) var ( diff --git a/internal/query/org_domain.go b/internal/query/org_domain.go index 496b4d2d6..dc2b51602 100644 --- a/internal/query/org_domain.go +++ b/internal/query/org_domain.go @@ -7,10 +7,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type Domain struct { diff --git a/internal/query/org_domain_test.go b/internal/query/org_domain_test.go index d2b5e3880..73f18f20b 100644 --- a/internal/query/org_domain_test.go +++ b/internal/query/org_domain_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) func Test_OrgDomainPrepares(t *testing.T) { diff --git a/internal/query/org_iam_policy.go b/internal/query/org_iam_policy.go index b8ff732d3..6c9ec877e 100644 --- a/internal/query/org_iam_policy.go +++ b/internal/query/org_iam_policy.go @@ -8,11 +8,11 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type DomainPolicy struct { diff --git a/internal/query/org_iam_policy_test.go b/internal/query/org_iam_policy_test.go index e39827059..1b2a8d24d 100644 --- a/internal/query/org_iam_policy_test.go +++ b/internal/query/org_iam_policy_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_DomainPolicyPrepares(t *testing.T) { diff --git a/internal/query/org_member.go b/internal/query/org_member.go index 54387edf4..6706ba953 100644 --- a/internal/query/org_member.go +++ b/internal/query/org_member.go @@ -4,9 +4,9 @@ import ( "context" "database/sql" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" sq "github.com/Masterminds/squirrel" "github.com/lib/pq" diff --git a/internal/query/org_test.go b/internal/query/org_test.go index 51455545c..ce6f91a23 100644 --- a/internal/query/org_test.go +++ b/internal/query/org_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_OrgPrepares(t *testing.T) { diff --git a/internal/query/password_age_policy.go b/internal/query/password_age_policy.go index d7d90f255..4930b0041 100644 --- a/internal/query/password_age_policy.go +++ b/internal/query/password_age_policy.go @@ -8,10 +8,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type PasswordAgePolicy struct { diff --git a/internal/query/password_age_policy_test.go b/internal/query/password_age_policy_test.go index acfbc5fbd..6caaa685c 100644 --- a/internal/query/password_age_policy_test.go +++ b/internal/query/password_age_policy_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_PasswordAgePolicyPrepares(t *testing.T) { diff --git a/internal/query/password_complexity_policy.go b/internal/query/password_complexity_policy.go index 90ae40499..5ab06ad76 100644 --- a/internal/query/password_complexity_policy.go +++ b/internal/query/password_complexity_policy.go @@ -8,10 +8,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type PasswordComplexityPolicy struct { diff --git a/internal/query/password_complexity_policy_test.go b/internal/query/password_complexity_policy_test.go index 552e913da..50066dad3 100644 --- a/internal/query/password_complexity_policy_test.go +++ b/internal/query/password_complexity_policy_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_PasswordComplexityPolicyPrepares(t *testing.T) { diff --git a/internal/query/privacy_policy.go b/internal/query/privacy_policy.go index 3eb63b88e..8601cda0d 100644 --- a/internal/query/privacy_policy.go +++ b/internal/query/privacy_policy.go @@ -8,10 +8,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type PrivacyPolicy struct { diff --git a/internal/query/privacy_policy_test.go b/internal/query/privacy_policy_test.go index c554bbbde..cce654671 100644 --- a/internal/query/privacy_policy_test.go +++ b/internal/query/privacy_policy_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_PrivacyPolicyPrepares(t *testing.T) { diff --git a/internal/query/project.go b/internal/query/project.go index fbad437b0..9a8dcc6a8 100644 --- a/internal/query/project.go +++ b/internal/query/project.go @@ -8,11 +8,11 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/query/projection" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/project_grant.go b/internal/query/project_grant.go index 9c6a06e3a..242e1e43d 100644 --- a/internal/query/project_grant.go +++ b/internal/query/project_grant.go @@ -9,11 +9,11 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/query/projection" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" ) const ( diff --git a/internal/query/project_grant_member.go b/internal/query/project_grant_member.go index 48fac10eb..d5494b19c 100644 --- a/internal/query/project_grant_member.go +++ b/internal/query/project_grant_member.go @@ -7,10 +7,10 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) var ( diff --git a/internal/query/project_grant_test.go b/internal/query/project_grant_test.go index 22c4f35be..7415bd0f8 100644 --- a/internal/query/project_grant_test.go +++ b/internal/query/project_grant_test.go @@ -10,8 +10,8 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_ProjectGrantPrepares(t *testing.T) { diff --git a/internal/query/project_member.go b/internal/query/project_member.go index 8c6613fc6..c1a87faa4 100644 --- a/internal/query/project_member.go +++ b/internal/query/project_member.go @@ -7,10 +7,10 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) var ( diff --git a/internal/query/project_role.go b/internal/query/project_role.go index 80173084f..e0d460713 100644 --- a/internal/query/project_role.go +++ b/internal/query/project_role.go @@ -8,9 +8,9 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) var ( diff --git a/internal/query/project_role_test.go b/internal/query/project_role_test.go index 22fe0f04d..16735fedd 100644 --- a/internal/query/project_role_test.go +++ b/internal/query/project_role_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - errs "github.com/caos/zitadel/internal/errors" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_ProjectRolePrepares(t *testing.T) { diff --git a/internal/query/project_test.go b/internal/query/project_test.go index 6c3d52cac..e391bc54c 100644 --- a/internal/query/project_test.go +++ b/internal/query/project_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/projection/action.go b/internal/query/projection/action.go index 351b6b446..0184414e1 100644 --- a/internal/query/projection/action.go +++ b/internal/query/projection/action.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/action" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/action" ) const ( diff --git a/internal/query/projection/action_test.go b/internal/query/projection/action_test.go index 96160068d..187417e70 100644 --- a/internal/query/projection/action_test.go +++ b/internal/query/projection/action_test.go @@ -4,12 +4,12 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/action" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/action" ) func TestActionProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/app.go b/internal/query/projection/app.go index 61a2c4b6c..75dc7f9b6 100644 --- a/internal/query/projection/app.go +++ b/internal/query/projection/app.go @@ -5,12 +5,12 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/query/projection/app_test.go b/internal/query/projection/app_test.go index 8e88df565..d0f99d5ac 100644 --- a/internal/query/projection/app_test.go +++ b/internal/query/projection/app_test.go @@ -6,12 +6,12 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/project" ) func TestAppProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/authn_key.go b/internal/query/projection/authn_key.go index 7a32a118e..884df6513 100644 --- a/internal/query/projection/authn_key.go +++ b/internal/query/projection/authn_key.go @@ -4,13 +4,13 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" ) const ( diff --git a/internal/query/projection/authn_key_test.go b/internal/query/projection/authn_key_test.go index a3f69823b..1585bb19e 100644 --- a/internal/query/projection/authn_key_test.go +++ b/internal/query/projection/authn_key_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestAuthNKeyProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/custom_text.go b/internal/query/projection/custom_text.go index d7d9bf2c3..e526e1b78 100644 --- a/internal/query/projection/custom_text.go +++ b/internal/query/projection/custom_text.go @@ -3,13 +3,13 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/query/projection/custom_text_test.go b/internal/query/projection/custom_text_test.go index e332c41ac..96f849029 100644 --- a/internal/query/projection/custom_text_test.go +++ b/internal/query/projection/custom_text_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestCustomTextProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/debug_notification.go b/internal/query/projection/debug_notification.go index d43acfb9a..5b2b4077e 100644 --- a/internal/query/projection/debug_notification.go +++ b/internal/query/projection/debug_notification.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/repository/settings" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/repository/settings" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" ) const ( diff --git a/internal/query/projection/debug_notification_provider_test.go b/internal/query/projection/debug_notification_provider_test.go index 8395d387a..d002889f0 100644 --- a/internal/query/projection/debug_notification_provider_test.go +++ b/internal/query/projection/debug_notification_provider_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestDebugNotificationProviderProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/domain_policy.go b/internal/query/projection/domain_policy.go index 04b0e8a99..b9a693082 100644 --- a/internal/query/projection/domain_policy.go +++ b/internal/query/projection/domain_policy.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/query/projection/domain_policy_test.go b/internal/query/projection/domain_policy_test.go index ab7fcdc29..2ca4df444 100644 --- a/internal/query/projection/domain_policy_test.go +++ b/internal/query/projection/domain_policy_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestDomainPolicyProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/event_test.go b/internal/query/projection/event_test.go index 83b4db6a3..5ec2cb02b 100644 --- a/internal/query/projection/event_test.go +++ b/internal/query/projection/event_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) func testEvent( diff --git a/internal/query/projection/executer_test.go b/internal/query/projection/executer_test.go index dc4f52e19..565700b89 100644 --- a/internal/query/projection/executer_test.go +++ b/internal/query/projection/executer_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) type testExecuter struct { diff --git a/internal/query/projection/feature.go b/internal/query/projection/feature.go index 145d365df..7f8ca8638 100644 --- a/internal/query/projection/feature.go +++ b/internal/query/projection/feature.go @@ -3,15 +3,15 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/features" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/features" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) const ( diff --git a/internal/query/projection/feature_test.go b/internal/query/projection/feature_test.go index d3980ae66..af758b008 100644 --- a/internal/query/projection/feature_test.go +++ b/internal/query/projection/feature_test.go @@ -4,13 +4,13 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestFeatureProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/flow.go b/internal/query/projection/flow.go index 2e4dd699c..c0c808ff6 100644 --- a/internal/query/projection/flow.go +++ b/internal/query/projection/flow.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/org" ) const ( diff --git a/internal/query/projection/flow_test.go b/internal/query/projection/flow_test.go index 8d23f9567..bb3e977c6 100644 --- a/internal/query/projection/flow_test.go +++ b/internal/query/projection/flow_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestFlowProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/idp.go b/internal/query/projection/idp.go index fa323d6ec..1c8c3fd18 100644 --- a/internal/query/projection/idp.go +++ b/internal/query/projection/idp.go @@ -5,14 +5,14 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/idpconfig" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) const ( diff --git a/internal/query/projection/idp_login_policy_link.go b/internal/query/projection/idp_login_policy_link.go index f84535c84..b8b67fe5d 100644 --- a/internal/query/projection/idp_login_policy_link.go +++ b/internal/query/projection/idp_login_policy_link.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/query/projection/idp_login_policy_link_test.go b/internal/query/projection/idp_login_policy_link_test.go index afc9758e3..7179138b6 100644 --- a/internal/query/projection/idp_login_policy_link_test.go +++ b/internal/query/projection/idp_login_policy_link_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestIDPLoginPolicyLinkProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/idp_test.go b/internal/query/projection/idp_test.go index 0980d7539..70dedd907 100644 --- a/internal/query/projection/idp_test.go +++ b/internal/query/projection/idp_test.go @@ -5,13 +5,13 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestIDPProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/idp_user_link.go b/internal/query/projection/idp_user_link.go index 4d25584a4..041b0870b 100644 --- a/internal/query/projection/idp_user_link.go +++ b/internal/query/projection/idp_user_link.go @@ -3,13 +3,13 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) const ( diff --git a/internal/query/projection/idp_user_link_test.go b/internal/query/projection/idp_user_link_test.go index 3955360cc..aaa361d0b 100644 --- a/internal/query/projection/idp_user_link_test.go +++ b/internal/query/projection/idp_user_link_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestIDPUserLinkProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/instance.go b/internal/query/projection/instance.go index dfae71ab8..195f8c436 100644 --- a/internal/query/projection/instance.go +++ b/internal/query/projection/instance.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" ) const ( diff --git a/internal/query/projection/instance_domain.go b/internal/query/projection/instance_domain.go index 028848f6d..7997aea85 100644 --- a/internal/query/projection/instance_domain.go +++ b/internal/query/projection/instance_domain.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" ) const ( diff --git a/internal/query/projection/instance_domain_test.go b/internal/query/projection/instance_domain_test.go index 5ada417e1..727ec8e1a 100644 --- a/internal/query/projection/instance_domain_test.go +++ b/internal/query/projection/instance_domain_test.go @@ -3,11 +3,11 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestInstanceDomainProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/instance_member.go b/internal/query/projection/instance_member.go index 1eb12b0e8..d94a01529 100644 --- a/internal/query/projection/instance_member.go +++ b/internal/query/projection/instance_member.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/user" ) const ( diff --git a/internal/query/projection/instance_member_test.go b/internal/query/projection/instance_member_test.go index 9fee91d54..3f730118e 100644 --- a/internal/query/projection/instance_member_test.go +++ b/internal/query/projection/instance_member_test.go @@ -5,12 +5,12 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestInstanceMemberProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/instance_test.go b/internal/query/projection/instance_test.go index 8ec26e0ee..d0bb29882 100644 --- a/internal/query/projection/instance_test.go +++ b/internal/query/projection/instance_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestInstanceProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/key.go b/internal/query/projection/key.go index c1959ce35..4920030c0 100644 --- a/internal/query/projection/key.go +++ b/internal/query/projection/key.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/keypair" ) const ( diff --git a/internal/query/projection/key_test.go b/internal/query/projection/key_test.go index 3d215e10a..3b028e166 100644 --- a/internal/query/projection/key_test.go +++ b/internal/query/projection/key_test.go @@ -6,13 +6,13 @@ import ( "github.com/golang/mock/gomock" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/keypair" ) func TestKeyProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/label_policy.go b/internal/query/projection/label_policy.go index 3e1fd7489..5977be156 100644 --- a/internal/query/projection/label_policy.go +++ b/internal/query/projection/label_policy.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/query/projection/label_policy_test.go b/internal/query/projection/label_policy_test.go index 3c06e4d20..ac24a7811 100644 --- a/internal/query/projection/label_policy_test.go +++ b/internal/query/projection/label_policy_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestLabelPolicyProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/lockout_policy.go b/internal/query/projection/lockout_policy.go index c757eaad5..af1c58144 100644 --- a/internal/query/projection/lockout_policy.go +++ b/internal/query/projection/lockout_policy.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/query/projection/lockout_policy_test.go b/internal/query/projection/lockout_policy_test.go index 0e178bc54..583a1aa0b 100644 --- a/internal/query/projection/lockout_policy_test.go +++ b/internal/query/projection/lockout_policy_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestLockoutPolicyProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/login_name.go b/internal/query/projection/login_name.go index fc4427fab..c02e3017b 100644 --- a/internal/query/projection/login_name.go +++ b/internal/query/projection/login_name.go @@ -4,14 +4,14 @@ import ( "context" "fmt" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/repository/user" ) const ( diff --git a/internal/query/projection/login_name_test.go b/internal/query/projection/login_name_test.go index acaa2c5cd..fcc5a646d 100644 --- a/internal/query/projection/login_name_test.go +++ b/internal/query/projection/login_name_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestLoginNameProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/login_policy.go b/internal/query/projection/login_policy.go index 5a26f0b95..5ed074f47 100644 --- a/internal/query/projection/login_policy.go +++ b/internal/query/projection/login_policy.go @@ -3,13 +3,13 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/query/projection/login_policy_test.go b/internal/query/projection/login_policy_test.go index 93a459f2a..1dbd6d3c8 100644 --- a/internal/query/projection/login_policy_test.go +++ b/internal/query/projection/login_policy_test.go @@ -4,13 +4,13 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestLoginPolicyProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/mail_template.go b/internal/query/projection/mail_template.go index a55819937..5a4cf62f6 100644 --- a/internal/query/projection/mail_template.go +++ b/internal/query/projection/mail_template.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/query/projection/mail_template_test.go b/internal/query/projection/mail_template_test.go index 5a17774ed..553c3683e 100644 --- a/internal/query/projection/mail_template_test.go +++ b/internal/query/projection/mail_template_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestMailTemplateProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/member.go b/internal/query/projection/member.go index 40a69072c..d80a8d2e4 100644 --- a/internal/query/projection/member.go +++ b/internal/query/projection/member.go @@ -3,10 +3,10 @@ package projection import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/member" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/member" ) const ( diff --git a/internal/query/projection/message_text_test.go b/internal/query/projection/message_text_test.go index d612a2f94..0d1183b49 100644 --- a/internal/query/projection/message_text_test.go +++ b/internal/query/projection/message_text_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestMessageTextProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/message_texts.go b/internal/query/projection/message_texts.go index 811171f86..dc5de39ab 100644 --- a/internal/query/projection/message_texts.go +++ b/internal/query/projection/message_texts.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/query/projection/oidc_settings.go b/internal/query/projection/oidc_settings.go index 0acb491fa..5ebaac23d 100644 --- a/internal/query/projection/oidc_settings.go +++ b/internal/query/projection/oidc_settings.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/query/projection/oidc_settings_test.go b/internal/query/projection/oidc_settings_test.go index 9c3193345..d340e9438 100644 --- a/internal/query/projection/oidc_settings_test.go +++ b/internal/query/projection/oidc_settings_test.go @@ -4,11 +4,11 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestOIDCSettingsProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/org.go b/internal/query/projection/org.go index 0bc72d1fe..f13d8c9b1 100644 --- a/internal/query/projection/org.go +++ b/internal/query/projection/org.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/org" ) const ( diff --git a/internal/query/projection/org_domain.go b/internal/query/projection/org_domain.go index e8be61104..f47bcb2a2 100644 --- a/internal/query/projection/org_domain.go +++ b/internal/query/projection/org_domain.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/org" ) const ( diff --git a/internal/query/projection/org_domain_test.go b/internal/query/projection/org_domain_test.go index e50bf1046..40b2f0fba 100644 --- a/internal/query/projection/org_domain_test.go +++ b/internal/query/projection/org_domain_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestOrgDomainProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/org_member.go b/internal/query/projection/org_member.go index fbec72efd..6a33398fe 100644 --- a/internal/query/projection/org_member.go +++ b/internal/query/projection/org_member.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) const ( diff --git a/internal/query/projection/org_member_test.go b/internal/query/projection/org_member_test.go index 012bccd73..85869cfaa 100644 --- a/internal/query/projection/org_member_test.go +++ b/internal/query/projection/org_member_test.go @@ -5,12 +5,12 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestOrgMemberProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/org_test.go b/internal/query/projection/org_test.go index 054087a57..28559c8b9 100644 --- a/internal/query/projection/org_test.go +++ b/internal/query/projection/org_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestOrgProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/password_age_policy.go b/internal/query/projection/password_age_policy.go index a59243494..5a88020c7 100644 --- a/internal/query/projection/password_age_policy.go +++ b/internal/query/projection/password_age_policy.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/query/projection/password_age_policy_test.go b/internal/query/projection/password_age_policy_test.go index b647bab20..1a2e9074d 100644 --- a/internal/query/projection/password_age_policy_test.go +++ b/internal/query/projection/password_age_policy_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestPasswordAgeProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/password_complexity_policy.go b/internal/query/projection/password_complexity_policy.go index 05e94cf7f..4cd8ad393 100644 --- a/internal/query/projection/password_complexity_policy.go +++ b/internal/query/projection/password_complexity_policy.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/query/projection/password_complexity_policy_test.go b/internal/query/projection/password_complexity_policy_test.go index 413969031..317112f02 100644 --- a/internal/query/projection/password_complexity_policy_test.go +++ b/internal/query/projection/password_complexity_policy_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestPasswordComplexityProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/privacy_policy.go b/internal/query/projection/privacy_policy.go index 1809205ad..7cd3460fc 100644 --- a/internal/query/projection/privacy_policy.go +++ b/internal/query/projection/privacy_policy.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/query/projection/privacy_policy_test.go b/internal/query/projection/privacy_policy_test.go index f48e1de46..4a28e62ae 100644 --- a/internal/query/projection/privacy_policy_test.go +++ b/internal/query/projection/privacy_policy_test.go @@ -3,13 +3,13 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" ) func TestPrivacyPolicyProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/project.go b/internal/query/projection/project.go index b3d70b637..0d3af82ea 100644 --- a/internal/query/projection/project.go +++ b/internal/query/projection/project.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/query/projection/project_grant.go b/internal/query/projection/project_grant.go index 901e5670a..9468919f9 100644 --- a/internal/query/projection/project_grant.go +++ b/internal/query/projection/project_grant.go @@ -5,12 +5,12 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/query/projection/project_grant_member.go b/internal/query/projection/project_grant_member.go index 1327f612d..ea5e0501c 100644 --- a/internal/query/projection/project_grant_member.go +++ b/internal/query/projection/project_grant_member.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/member" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "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" ) const ( diff --git a/internal/query/projection/project_grant_member_test.go b/internal/query/projection/project_grant_member_test.go index 7fc34927a..cc5aa737a 100644 --- a/internal/query/projection/project_grant_member_test.go +++ b/internal/query/projection/project_grant_member_test.go @@ -5,13 +5,13 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestProjectGrantMemberProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/project_grant_test.go b/internal/query/projection/project_grant_test.go index e6d188dcf..2a7404806 100644 --- a/internal/query/projection/project_grant_test.go +++ b/internal/query/projection/project_grant_test.go @@ -5,12 +5,12 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/project" ) func TestProjectGrantProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/project_member.go b/internal/query/projection/project_member.go index c8915c07e..96319c8bb 100644 --- a/internal/query/projection/project_member.go +++ b/internal/query/projection/project_member.go @@ -3,14 +3,14 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/member" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "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" ) const ( diff --git a/internal/query/projection/project_member_test.go b/internal/query/projection/project_member_test.go index 312c6f17b..3196e337e 100644 --- a/internal/query/projection/project_member_test.go +++ b/internal/query/projection/project_member_test.go @@ -5,13 +5,13 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestProjectMemberProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/project_role.go b/internal/query/projection/project_role.go index b3dfa575d..2fbd2d78b 100644 --- a/internal/query/projection/project_role.go +++ b/internal/query/projection/project_role.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/query/projection/project_role_test.go b/internal/query/projection/project_role_test.go index 7f11231cb..2028e630d 100644 --- a/internal/query/projection/project_role_test.go +++ b/internal/query/projection/project_role_test.go @@ -3,11 +3,11 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/project" ) func TestProjectRoleProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/project_test.go b/internal/query/projection/project_test.go index 491370677..42baa2ea1 100644 --- a/internal/query/projection/project_test.go +++ b/internal/query/projection/project_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/project" ) func TestProjectProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/projection.go b/internal/query/projection/projection.go index 87e84cdb1..872a271a3 100644 --- a/internal/query/projection/projection.go +++ b/internal/query/projection/projection.go @@ -5,10 +5,10 @@ import ( "database/sql" "time" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" ) const ( diff --git a/internal/query/projection/secret_generator.go b/internal/query/projection/secret_generator.go index 74833f911..cf2b98080 100644 --- a/internal/query/projection/secret_generator.go +++ b/internal/query/projection/secret_generator.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" ) const ( diff --git a/internal/query/projection/secret_generator_test.go b/internal/query/projection/secret_generator_test.go index d8c19724d..a00a6bf40 100644 --- a/internal/query/projection/secret_generator_test.go +++ b/internal/query/projection/secret_generator_test.go @@ -4,12 +4,12 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestSecretGeneratorProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/sms.go b/internal/query/projection/sms.go index 086c20967..b4eb9e295 100644 --- a/internal/query/projection/sms.go +++ b/internal/query/projection/sms.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" ) const ( diff --git a/internal/query/projection/sms_test.go b/internal/query/projection/sms_test.go index 27341833e..0b50ced69 100644 --- a/internal/query/projection/sms_test.go +++ b/internal/query/projection/sms_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" ) var ( diff --git a/internal/query/projection/smtp.go b/internal/query/projection/smtp.go index 4b4ffddbd..4496b830d 100644 --- a/internal/query/projection/smtp.go +++ b/internal/query/projection/smtp.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/project" ) const ( diff --git a/internal/query/projection/smtp_test.go b/internal/query/projection/smtp_test.go index 23a0602fb..213bac805 100644 --- a/internal/query/projection/smtp_test.go +++ b/internal/query/projection/smtp_test.go @@ -3,11 +3,11 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/instance" ) func TestSMTPConfigProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/user.go b/internal/query/projection/user.go index 7ad568471..267285ded 100644 --- a/internal/query/projection/user.go +++ b/internal/query/projection/user.go @@ -4,12 +4,12 @@ import ( "context" "database/sql" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/user" ) type UserProjection struct { diff --git a/internal/query/projection/user_auth_method.go b/internal/query/projection/user_auth_method.go index bee4ff959..333530538 100644 --- a/internal/query/projection/user_auth_method.go +++ b/internal/query/projection/user_auth_method.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/user" ) const ( diff --git a/internal/query/projection/user_auth_method_test.go b/internal/query/projection/user_auth_method_test.go index 5532c4376..e731427c8 100644 --- a/internal/query/projection/user_auth_method_test.go +++ b/internal/query/projection/user_auth_method_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestUserAuthMethodProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/user_grant.go b/internal/query/projection/user_grant.go index 5ffa607f3..dc10d71d0 100644 --- a/internal/query/projection/user_grant.go +++ b/internal/query/projection/user_grant.go @@ -5,14 +5,14 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/repository/usergrant" ) const ( diff --git a/internal/query/projection/user_grant_test.go b/internal/query/projection/user_grant_test.go index ca97407f4..be9c5c3d4 100644 --- a/internal/query/projection/user_grant_test.go +++ b/internal/query/projection/user_grant_test.go @@ -5,14 +5,14 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/repository/usergrant" ) func TestUserGrantProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/user_metadata.go b/internal/query/projection/user_metadata.go index be750c85f..be2d01d0c 100644 --- a/internal/query/projection/user_metadata.go +++ b/internal/query/projection/user_metadata.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/user" ) const ( diff --git a/internal/query/projection/user_metadata_test.go b/internal/query/projection/user_metadata_test.go index b105aadb3..793d88816 100644 --- a/internal/query/projection/user_metadata_test.go +++ b/internal/query/projection/user_metadata_test.go @@ -3,11 +3,11 @@ package projection import ( "testing" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestUserMetadataProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/user_personal_access_token.go b/internal/query/projection/user_personal_access_token.go index 5c06b8b02..b575d4e5e 100644 --- a/internal/query/projection/user_personal_access_token.go +++ b/internal/query/projection/user_personal_access_token.go @@ -5,11 +5,11 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/handler/crdb" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" + "github.com/zitadel/zitadel/internal/repository/user" ) const ( diff --git a/internal/query/projection/user_personal_access_token_test.go b/internal/query/projection/user_personal_access_token_test.go index 89acd4e0e..ba14f7496 100644 --- a/internal/query/projection/user_personal_access_token_test.go +++ b/internal/query/projection/user_personal_access_token_test.go @@ -6,11 +6,11 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestPersonalAccessTokenProjection_reduces(t *testing.T) { diff --git a/internal/query/projection/user_test.go b/internal/query/projection/user_test.go index 3856000bc..b0c3e754a 100644 --- a/internal/query/projection/user_test.go +++ b/internal/query/projection/user_test.go @@ -4,12 +4,12 @@ import ( "database/sql" "testing" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/handler" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/user" ) func TestUserProjection_reduces(t *testing.T) { diff --git a/internal/query/query.go b/internal/query/query.go index 597a8299b..921da4be4 100644 --- a/internal/query/query.go +++ b/internal/query/query.go @@ -10,17 +10,17 @@ import ( "github.com/rakyll/statik/fs" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/query/projection" - "github.com/caos/zitadel/internal/repository/action" - iam_repo "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/keypair" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" - usr_repo "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/repository/action" + iam_repo "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/project" + usr_repo "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/repository/usergrant" ) type Queries struct { diff --git a/internal/query/search_query.go b/internal/query/search_query.go index 4a958565d..169e2c821 100644 --- a/internal/query/search_query.go +++ b/internal/query/search_query.go @@ -7,7 +7,7 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) type SearchResponse struct { diff --git a/internal/query/search_query_test.go b/internal/query/search_query_test.go index 952a2eb37..7af1c3af7 100644 --- a/internal/query/search_query_test.go +++ b/internal/query/search_query_test.go @@ -6,8 +6,8 @@ import ( "testing" sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/domain" "github.com/lib/pq" + "github.com/zitadel/zitadel/internal/domain" ) var ( diff --git a/internal/query/secret_generator_test.go b/internal/query/secret_generator_test.go index fe8d8fb37..d8b98cdd8 100644 --- a/internal/query/secret_generator_test.go +++ b/internal/query/secret_generator_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_SecretGeneratorsPrepares(t *testing.T) { diff --git a/internal/query/secret_generators.go b/internal/query/secret_generators.go index 8ce6a768f..892fc2d40 100644 --- a/internal/query/secret_generators.go +++ b/internal/query/secret_generators.go @@ -8,13 +8,13 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/query/projection" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/sms.go b/internal/query/sms.go index 94b02e9b7..e85ae57a0 100644 --- a/internal/query/sms.go +++ b/internal/query/sms.go @@ -8,11 +8,11 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type SMSConfigs struct { diff --git a/internal/query/sms_test.go b/internal/query/sms_test.go index 5b2ccaaad..2b9dac71c 100644 --- a/internal/query/sms_test.go +++ b/internal/query/sms_test.go @@ -8,9 +8,9 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/smtp.go b/internal/query/smtp.go index 030bfd4c3..32b697bd9 100644 --- a/internal/query/smtp.go +++ b/internal/query/smtp.go @@ -8,12 +8,12 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/query/projection" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/smtp_test.go b/internal/query/smtp_test.go index f7cd5c73f..37ae71620 100644 --- a/internal/query/smtp_test.go +++ b/internal/query/smtp_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/crypto" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/crypto" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_SMTPConfigsPrepares(t *testing.T) { diff --git a/internal/query/user.go b/internal/query/user.go index 7379b4b9b..9ae41aa74 100644 --- a/internal/query/user.go +++ b/internal/query/user.go @@ -10,12 +10,12 @@ import ( "github.com/lib/pq" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type Users struct { diff --git a/internal/query/user_auth_method.go b/internal/query/user_auth_method.go index fed452883..cacf174a3 100644 --- a/internal/query/user_auth_method.go +++ b/internal/query/user_auth_method.go @@ -8,12 +8,12 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/query/projection" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/user_auth_method_test.go b/internal/query/user_auth_method_test.go index ba0e32538..228dcbf4e 100644 --- a/internal/query/user_auth_method_test.go +++ b/internal/query/user_auth_method_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) func Test_UserAuthMethodPrepares(t *testing.T) { diff --git a/internal/query/user_grant.go b/internal/query/user_grant.go index 3827bbe9c..7b635fa8d 100644 --- a/internal/query/user_grant.go +++ b/internal/query/user_grant.go @@ -9,11 +9,11 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type UserGrant struct { diff --git a/internal/query/user_grant_test.go b/internal/query/user_grant_test.go index da4b30e4c..3c978c161 100644 --- a/internal/query/user_grant_test.go +++ b/internal/query/user_grant_test.go @@ -10,8 +10,8 @@ import ( "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/user_membership.go b/internal/query/user_membership.go index 711e72423..75c23902a 100644 --- a/internal/query/user_membership.go +++ b/internal/query/user_membership.go @@ -8,9 +8,9 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type Memberships struct { diff --git a/internal/query/user_metadata.go b/internal/query/user_metadata.go index 9daf0a289..dca74db48 100644 --- a/internal/query/user_metadata.go +++ b/internal/query/user_metadata.go @@ -8,10 +8,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/query/projection" ) type UserMetadataList struct { diff --git a/internal/query/user_metadata_test.go b/internal/query/user_metadata_test.go index ad2e5cf0e..0f083a335 100644 --- a/internal/query/user_metadata_test.go +++ b/internal/query/user_metadata_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - errs "github.com/caos/zitadel/internal/errors" + errs "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/user_personal_access_token.go b/internal/query/user_personal_access_token.go index 047666764..d1e610d79 100644 --- a/internal/query/user_personal_access_token.go +++ b/internal/query/user_personal_access_token.go @@ -9,11 +9,11 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/lib/pq" - "github.com/caos/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/query/projection" - "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/user_personal_access_token_test.go b/internal/query/user_personal_access_token_test.go index 831762bae..584c9be60 100644 --- a/internal/query/user_personal_access_token_test.go +++ b/internal/query/user_personal_access_token_test.go @@ -11,7 +11,7 @@ import ( "github.com/lib/pq" - errs "github.com/caos/zitadel/internal/errors" + errs "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/user_test.go b/internal/query/user_test.go index 1169bec37..3a9b0998f 100644 --- a/internal/query/user_test.go +++ b/internal/query/user_test.go @@ -12,8 +12,8 @@ import ( "github.com/lib/pq" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + errs "github.com/zitadel/zitadel/internal/errors" ) var ( diff --git a/internal/query/zitadel_permission.go b/internal/query/zitadel_permission.go index 39488da93..c24ecd659 100644 --- a/internal/query/zitadel_permission.go +++ b/internal/query/zitadel_permission.go @@ -3,8 +3,8 @@ package query import ( "context" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/domain" ) func (q *Queries) MyZitadelPermissions(ctx context.Context, orgID, userID string) (*domain.Permissions, error) { diff --git a/internal/renderer/renderer.go b/internal/renderer/renderer.go index accb5bae2..ceeacc03c 100644 --- a/internal/renderer/renderer.go +++ b/internal/renderer/renderer.go @@ -7,12 +7,12 @@ import ( "os" "text/template" - "github.com/caos/logging" + "github.com/zitadel/logging" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/i18n" ) const ( diff --git a/internal/repository/action/action.go b/internal/repository/action/action.go index 92716a332..38eaf29e3 100644 --- a/internal/repository/action/action.go +++ b/internal/repository/action/action.go @@ -5,9 +5,9 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/action/aggregate.go b/internal/repository/action/aggregate.go index 909295a2c..d63082a62 100644 --- a/internal/repository/action/aggregate.go +++ b/internal/repository/action/aggregate.go @@ -1,6 +1,6 @@ package action -import "github.com/caos/zitadel/internal/eventstore" +import "github.com/zitadel/zitadel/internal/eventstore" const ( AggregateType = "action" diff --git a/internal/repository/action/eventstore.go b/internal/repository/action/eventstore.go index 98733a244..dc49e7e17 100644 --- a/internal/repository/action/eventstore.go +++ b/internal/repository/action/eventstore.go @@ -1,6 +1,6 @@ package action -import "github.com/caos/zitadel/internal/eventstore" +import "github.com/zitadel/zitadel/internal/eventstore" func RegisterEventMappers(es *eventstore.Eventstore) { es.RegisterFilterEventMapper(AddedEventType, AddedEventMapper). diff --git a/internal/repository/asset/asset.go b/internal/repository/asset/asset.go index f312418e6..344585fb3 100644 --- a/internal/repository/asset/asset.go +++ b/internal/repository/asset/asset.go @@ -3,9 +3,9 @@ package asset import ( "encoding/json" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/features/features.go b/internal/repository/features/features.go index fc045ab15..0d67cf8a2 100644 --- a/internal/repository/features/features.go +++ b/internal/repository/features/features.go @@ -4,10 +4,10 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/flow/flow.go b/internal/repository/flow/flow.go index 1293f7500..649cab70f 100644 --- a/internal/repository/flow/flow.go +++ b/internal/repository/flow/flow.go @@ -3,10 +3,10 @@ package flow import ( "encoding/json" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/idpconfig/idp_config.go b/internal/repository/idpconfig/idp_config.go index 6ee874c85..1578ed828 100644 --- a/internal/repository/idpconfig/idp_config.go +++ b/internal/repository/idpconfig/idp_config.go @@ -3,10 +3,10 @@ package idpconfig import ( "encoding/json" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/idpconfig/jwt_config.go b/internal/repository/idpconfig/jwt_config.go index 85e4df96b..e329ff391 100644 --- a/internal/repository/idpconfig/jwt_config.go +++ b/internal/repository/idpconfig/jwt_config.go @@ -3,10 +3,10 @@ package idpconfig import ( "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/idpconfig/oidc_config.go b/internal/repository/idpconfig/oidc_config.go index 51cd813e2..096c55c9d 100644 --- a/internal/repository/idpconfig/oidc_config.go +++ b/internal/repository/idpconfig/oidc_config.go @@ -3,12 +3,12 @@ package idpconfig import ( "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/aggregate.go b/internal/repository/instance/aggregate.go index d171b7600..4b7dcd377 100644 --- a/internal/repository/instance/aggregate.go +++ b/internal/repository/instance/aggregate.go @@ -1,7 +1,7 @@ package instance import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) const ( diff --git a/internal/repository/instance/custom_text.go b/internal/repository/instance/custom_text.go index ca0bb9b2f..e6fef42bb 100644 --- a/internal/repository/instance/custom_text.go +++ b/internal/repository/instance/custom_text.go @@ -5,9 +5,9 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/instance/debug_notification_file.go b/internal/repository/instance/debug_notification_file.go index 29fc3c7c8..d886947a2 100644 --- a/internal/repository/instance/debug_notification_file.go +++ b/internal/repository/instance/debug_notification_file.go @@ -3,10 +3,10 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/settings" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/settings" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/debug_notification_log.go b/internal/repository/instance/debug_notification_log.go index 5fa8ffc1b..b9e090af0 100644 --- a/internal/repository/instance/debug_notification_log.go +++ b/internal/repository/instance/debug_notification_log.go @@ -3,10 +3,10 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/repository/settings" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/repository/settings" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/domain.go b/internal/repository/instance/domain.go index 78c4a35f0..0e227abfd 100644 --- a/internal/repository/instance/domain.go +++ b/internal/repository/instance/domain.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/event_default_language.go b/internal/repository/instance/event_default_language.go index a6369f40f..74ef81ee1 100644 --- a/internal/repository/instance/event_default_language.go +++ b/internal/repository/instance/event_default_language.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" "golang.org/x/text/language" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/event_iam_project_set.go b/internal/repository/instance/event_iam_project_set.go index 75bce840f..b1aac6985 100644 --- a/internal/repository/instance/event_iam_project_set.go +++ b/internal/repository/instance/event_iam_project_set.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/event_org_set.go b/internal/repository/instance/event_org_set.go index 2163e5f7f..505e56f94 100644 --- a/internal/repository/instance/event_org_set.go +++ b/internal/repository/instance/event_org_set.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/events_step.go b/internal/repository/instance/events_step.go index 40fd20f22..4e430b282 100644 --- a/internal/repository/instance/events_step.go +++ b/internal/repository/instance/events_step.go @@ -5,11 +5,11 @@ import ( "encoding/json" "strconv" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/eventstore.go b/internal/repository/instance/eventstore.go index a6b235367..97a1cb27c 100644 --- a/internal/repository/instance/eventstore.go +++ b/internal/repository/instance/eventstore.go @@ -1,7 +1,7 @@ package instance import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) func RegisterEventMappers(es *eventstore.Eventstore) { diff --git a/internal/repository/instance/features.go b/internal/repository/instance/features.go index a811505fb..6bd6637c2 100644 --- a/internal/repository/instance/features.go +++ b/internal/repository/instance/features.go @@ -3,9 +3,9 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/features" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/features" ) var ( diff --git a/internal/repository/instance/idp_config.go b/internal/repository/instance/idp_config.go index 10782bf8a..ce3aad857 100644 --- a/internal/repository/instance/idp_config.go +++ b/internal/repository/instance/idp_config.go @@ -3,11 +3,11 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/idpconfig" ) const ( diff --git a/internal/repository/instance/idp_jwt_config.go b/internal/repository/instance/idp_jwt_config.go index 0122a336e..bc21f78d0 100644 --- a/internal/repository/instance/idp_jwt_config.go +++ b/internal/repository/instance/idp_jwt_config.go @@ -3,10 +3,10 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/idpconfig" ) const ( diff --git a/internal/repository/instance/idp_oidc_config.go b/internal/repository/instance/idp_oidc_config.go index e32ae9299..0b1bd0567 100644 --- a/internal/repository/instance/idp_oidc_config.go +++ b/internal/repository/instance/idp_oidc_config.go @@ -3,12 +3,12 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/idpconfig" ) const ( diff --git a/internal/repository/instance/instance.go b/internal/repository/instance/instance.go index 69fb974f4..8e11b0215 100644 --- a/internal/repository/instance/instance.go +++ b/internal/repository/instance/instance.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/member.go b/internal/repository/instance/member.go index 1f4e3dbf5..baf6b7fde 100644 --- a/internal/repository/instance/member.go +++ b/internal/repository/instance/member.go @@ -3,10 +3,10 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/member" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/member" ) var ( diff --git a/internal/repository/instance/migrate_unique_constraints.go b/internal/repository/instance/migrate_unique_constraints.go index 3cc090287..93a58b1ed 100644 --- a/internal/repository/instance/migrate_unique_constraints.go +++ b/internal/repository/instance/migrate_unique_constraints.go @@ -3,10 +3,10 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/oidc_settings.go b/internal/repository/instance/oidc_settings.go index 9fc0930d9..f7d2a1e40 100644 --- a/internal/repository/instance/oidc_settings.go +++ b/internal/repository/instance/oidc_settings.go @@ -5,9 +5,9 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/policy_domain.go b/internal/repository/instance/policy_domain.go index b085bec2c..861c84012 100644 --- a/internal/repository/instance/policy_domain.go +++ b/internal/repository/instance/policy_domain.go @@ -3,10 +3,10 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/instance/policy_label.go b/internal/repository/instance/policy_label.go index 426c688ce..97949935d 100644 --- a/internal/repository/instance/policy_label.go +++ b/internal/repository/instance/policy_label.go @@ -3,10 +3,10 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/instance/policy_login.go b/internal/repository/instance/policy_login.go index f9570385c..3c2941fb7 100644 --- a/internal/repository/instance/policy_login.go +++ b/internal/repository/instance/policy_login.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/instance/policy_login_factors.go b/internal/repository/instance/policy_login_factors.go index 47c4382e3..2697ac5d8 100644 --- a/internal/repository/instance/policy_login_factors.go +++ b/internal/repository/instance/policy_login_factors.go @@ -3,11 +3,11 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/instance/policy_login_identity_provider.go b/internal/repository/instance/policy_login_identity_provider.go index 5e7e065e5..b7471e4c5 100644 --- a/internal/repository/instance/policy_login_identity_provider.go +++ b/internal/repository/instance/policy_login_identity_provider.go @@ -3,11 +3,11 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/instance/policy_mail_template.go b/internal/repository/instance/policy_mail_template.go index c9e5ea22d..b159066be 100644 --- a/internal/repository/instance/policy_mail_template.go +++ b/internal/repository/instance/policy_mail_template.go @@ -3,9 +3,9 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/instance/policy_mail_text.go b/internal/repository/instance/policy_mail_text.go index b13668bc1..5feb94311 100644 --- a/internal/repository/instance/policy_mail_text.go +++ b/internal/repository/instance/policy_mail_text.go @@ -3,9 +3,9 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/instance/policy_password_age.go b/internal/repository/instance/policy_password_age.go index 01c9b0b87..a805af4f7 100644 --- a/internal/repository/instance/policy_password_age.go +++ b/internal/repository/instance/policy_password_age.go @@ -3,10 +3,10 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/instance/policy_password_complexity.go b/internal/repository/instance/policy_password_complexity.go index 536660c6e..5cac8c842 100644 --- a/internal/repository/instance/policy_password_complexity.go +++ b/internal/repository/instance/policy_password_complexity.go @@ -3,10 +3,10 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/repository/instance/policy_password_lockout.go b/internal/repository/instance/policy_password_lockout.go index a8376cb89..ab6a34084 100644 --- a/internal/repository/instance/policy_password_lockout.go +++ b/internal/repository/instance/policy_password_lockout.go @@ -3,10 +3,10 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/instance/policy_privacy.go b/internal/repository/instance/policy_privacy.go index 7a9dd7f4c..c629894ee 100644 --- a/internal/repository/instance/policy_privacy.go +++ b/internal/repository/instance/policy_privacy.go @@ -3,10 +3,10 @@ package instance import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) const ( diff --git a/internal/repository/instance/secret_generator.go b/internal/repository/instance/secret_generator.go index 33d6a92f6..013bd53d9 100644 --- a/internal/repository/instance/secret_generator.go +++ b/internal/repository/instance/secret_generator.go @@ -5,10 +5,10 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/sms.go b/internal/repository/instance/sms.go index 9a33ef4ad..61bbe1d33 100644 --- a/internal/repository/instance/sms.go +++ b/internal/repository/instance/sms.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/instance/smtp_config.go b/internal/repository/instance/smtp_config.go index c95d22ba8..9b722adba 100644 --- a/internal/repository/instance/smtp_config.go +++ b/internal/repository/instance/smtp_config.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/keypair/aggregate.go b/internal/repository/keypair/aggregate.go index 1fb1f1cfb..b5c9e2785 100644 --- a/internal/repository/keypair/aggregate.go +++ b/internal/repository/keypair/aggregate.go @@ -1,7 +1,7 @@ package keypair import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) const ( diff --git a/internal/repository/keypair/eventstore.go b/internal/repository/keypair/eventstore.go index fa222da93..dc0509c29 100644 --- a/internal/repository/keypair/eventstore.go +++ b/internal/repository/keypair/eventstore.go @@ -1,7 +1,7 @@ package keypair import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) func RegisterEventMappers(es *eventstore.Eventstore) { diff --git a/internal/repository/keypair/key_pair.go b/internal/repository/keypair/key_pair.go index a7dfdc861..35b58e5d7 100644 --- a/internal/repository/keypair/key_pair.go +++ b/internal/repository/keypair/key_pair.go @@ -5,11 +5,11 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/member/events.go b/internal/repository/member/events.go index 30ce6002d..e19f99f6a 100644 --- a/internal/repository/member/events.go +++ b/internal/repository/member/events.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/metadata/metadata.go b/internal/repository/metadata/metadata.go index 53392ea92..20b150c4c 100644 --- a/internal/repository/metadata/metadata.go +++ b/internal/repository/metadata/metadata.go @@ -3,9 +3,9 @@ package metadata import ( "encoding/json" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/org/aggregate.go b/internal/repository/org/aggregate.go index 731851545..58121afbc 100644 --- a/internal/repository/org/aggregate.go +++ b/internal/repository/org/aggregate.go @@ -1,7 +1,7 @@ package org import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) const ( diff --git a/internal/repository/org/custom_text.go b/internal/repository/org/custom_text.go index 6d9ac57d8..2e12d5aac 100644 --- a/internal/repository/org/custom_text.go +++ b/internal/repository/org/custom_text.go @@ -5,10 +5,10 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/org/domain.go b/internal/repository/org/domain.go index e26d025ac..56515dc79 100644 --- a/internal/repository/org/domain.go +++ b/internal/repository/org/domain.go @@ -4,12 +4,12 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/org/eventstore.go b/internal/repository/org/eventstore.go index 7aa9b43d4..e0b479e3c 100644 --- a/internal/repository/org/eventstore.go +++ b/internal/repository/org/eventstore.go @@ -1,7 +1,7 @@ package org import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) func RegisterEventMappers(es *eventstore.Eventstore) { diff --git a/internal/repository/org/features.go b/internal/repository/org/features.go index 59ac570a7..7fbb0c33c 100644 --- a/internal/repository/org/features.go +++ b/internal/repository/org/features.go @@ -3,9 +3,9 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/features" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/features" ) var ( diff --git a/internal/repository/org/flow.go b/internal/repository/org/flow.go index cc448b221..48a8c360b 100644 --- a/internal/repository/org/flow.go +++ b/internal/repository/org/flow.go @@ -3,10 +3,10 @@ package org import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/flow" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/flow" ) var ( diff --git a/internal/repository/org/idp_config.go b/internal/repository/org/idp_config.go index ca8374aac..2596cd941 100644 --- a/internal/repository/org/idp_config.go +++ b/internal/repository/org/idp_config.go @@ -3,11 +3,11 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/idpconfig" ) const ( diff --git a/internal/repository/org/idp_jwt_config.go b/internal/repository/org/idp_jwt_config.go index b97c99ba3..866feacc5 100644 --- a/internal/repository/org/idp_jwt_config.go +++ b/internal/repository/org/idp_jwt_config.go @@ -3,10 +3,10 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/idpconfig" ) const ( diff --git a/internal/repository/org/idp_oidc_config.go b/internal/repository/org/idp_oidc_config.go index 56ca0e12b..45a21332e 100644 --- a/internal/repository/org/idp_oidc_config.go +++ b/internal/repository/org/idp_oidc_config.go @@ -3,12 +3,12 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/idpconfig" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/idpconfig" ) const ( diff --git a/internal/repository/org/member.go b/internal/repository/org/member.go index c2803a8d6..20d909bf9 100644 --- a/internal/repository/org/member.go +++ b/internal/repository/org/member.go @@ -3,10 +3,10 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/member" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/member" ) var ( diff --git a/internal/repository/org/org.go b/internal/repository/org/org.go index d713cc239..6666f04ad 100644 --- a/internal/repository/org/org.go +++ b/internal/repository/org/org.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/org/policy_domain.go b/internal/repository/org/policy_domain.go index 9550b4d2a..b560b97c3 100644 --- a/internal/repository/org/policy_domain.go +++ b/internal/repository/org/policy_domain.go @@ -3,10 +3,10 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/org/policy_label.go b/internal/repository/org/policy_label.go index 5517a7222..5a17de6ed 100644 --- a/internal/repository/org/policy_label.go +++ b/internal/repository/org/policy_label.go @@ -3,9 +3,9 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/org/policy_login.go b/internal/repository/org/policy_login.go index dd915fd1b..87ccb7bd4 100644 --- a/internal/repository/org/policy_login.go +++ b/internal/repository/org/policy_login.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/org/policy_login_factors.go b/internal/repository/org/policy_login_factors.go index b76588aee..568c3ed8c 100644 --- a/internal/repository/org/policy_login_factors.go +++ b/internal/repository/org/policy_login_factors.go @@ -3,11 +3,11 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/org/policy_login_identity_provider.go b/internal/repository/org/policy_login_identity_provider.go index 5f1b1b466..ea963a99f 100644 --- a/internal/repository/org/policy_login_identity_provider.go +++ b/internal/repository/org/policy_login_identity_provider.go @@ -3,11 +3,11 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/org/policy_mail_template.go b/internal/repository/org/policy_mail_template.go index c41f287d6..7c4270205 100644 --- a/internal/repository/org/policy_mail_template.go +++ b/internal/repository/org/policy_mail_template.go @@ -3,10 +3,10 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/org/policy_mail_text.go b/internal/repository/org/policy_mail_text.go index acc45f0c8..826dae46c 100644 --- a/internal/repository/org/policy_mail_text.go +++ b/internal/repository/org/policy_mail_text.go @@ -3,10 +3,10 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/org/policy_password_age.go b/internal/repository/org/policy_password_age.go index 98d648dae..8268fe50b 100644 --- a/internal/repository/org/policy_password_age.go +++ b/internal/repository/org/policy_password_age.go @@ -3,10 +3,10 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/org/policy_password_complexity.go b/internal/repository/org/policy_password_complexity.go index 6a42e7a82..624062566 100644 --- a/internal/repository/org/policy_password_complexity.go +++ b/internal/repository/org/policy_password_complexity.go @@ -3,10 +3,10 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/org/policy_password_lockout.go b/internal/repository/org/policy_password_lockout.go index 09c906ac4..8536a924c 100644 --- a/internal/repository/org/policy_password_lockout.go +++ b/internal/repository/org/policy_password_lockout.go @@ -3,10 +3,10 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/org/policy_privacy.go b/internal/repository/org/policy_privacy.go index e28f9d28e..78cb7beaa 100644 --- a/internal/repository/org/policy_privacy.go +++ b/internal/repository/org/policy_privacy.go @@ -3,10 +3,10 @@ package org import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/policy" ) var ( diff --git a/internal/repository/policy/custom_text.go b/internal/repository/policy/custom_text.go index 7bfa19f8a..f227bcb90 100644 --- a/internal/repository/policy/custom_text.go +++ b/internal/repository/policy/custom_text.go @@ -5,9 +5,9 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/policy/label.go b/internal/repository/policy/label.go index e3a1b084a..754a65e0b 100644 --- a/internal/repository/policy/label.go +++ b/internal/repository/policy/label.go @@ -3,10 +3,10 @@ package policy import ( "encoding/json" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/asset" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/asset" ) const ( diff --git a/internal/repository/policy/login.go b/internal/repository/policy/login.go index 4161c7ad9..12a082d28 100644 --- a/internal/repository/policy/login.go +++ b/internal/repository/policy/login.go @@ -4,10 +4,10 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/policy/mail_template.go b/internal/repository/policy/mail_template.go index 19ab9c907..777157bad 100644 --- a/internal/repository/policy/mail_template.go +++ b/internal/repository/policy/mail_template.go @@ -3,9 +3,9 @@ package policy import ( "encoding/json" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/policy/mail_text.go b/internal/repository/policy/mail_text.go index 7c2b186c4..ab6c6d269 100644 --- a/internal/repository/policy/mail_text.go +++ b/internal/repository/policy/mail_text.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/policy/policy_domain.go b/internal/repository/policy/policy_domain.go index 82cb7801a..b855bfdc1 100644 --- a/internal/repository/policy/policy_domain.go +++ b/internal/repository/policy/policy_domain.go @@ -3,10 +3,10 @@ package policy import ( "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/policy/policy_login_factors.go b/internal/repository/policy/policy_login_factors.go index 61a549809..5f45725cb 100644 --- a/internal/repository/policy/policy_login_factors.go +++ b/internal/repository/policy/policy_login_factors.go @@ -3,10 +3,10 @@ package policy import ( "encoding/json" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/policy/policy_login_identity_provider.go b/internal/repository/policy/policy_login_identity_provider.go index e74113087..f3ff719c2 100644 --- a/internal/repository/policy/policy_login_identity_provider.go +++ b/internal/repository/policy/policy_login_identity_provider.go @@ -3,10 +3,10 @@ package policy import ( "encoding/json" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/policy/policy_password_age.go b/internal/repository/policy/policy_password_age.go index 25d692516..f994e08ab 100644 --- a/internal/repository/policy/policy_password_age.go +++ b/internal/repository/policy/policy_password_age.go @@ -3,9 +3,9 @@ package policy import ( "encoding/json" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/policy/policy_password_complexity.go b/internal/repository/policy/policy_password_complexity.go index 5337be184..a7bf665c0 100644 --- a/internal/repository/policy/policy_password_complexity.go +++ b/internal/repository/policy/policy_password_complexity.go @@ -3,10 +3,10 @@ package policy import ( "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/policy/policy_password_lockout.go b/internal/repository/policy/policy_password_lockout.go index 0fdee370d..cc257dc80 100644 --- a/internal/repository/policy/policy_password_lockout.go +++ b/internal/repository/policy/policy_password_lockout.go @@ -3,10 +3,10 @@ package policy import ( "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/policy/policy_privacy.go b/internal/repository/policy/policy_privacy.go index 36b3b2501..faccca092 100644 --- a/internal/repository/policy/policy_privacy.go +++ b/internal/repository/policy/policy_privacy.go @@ -3,10 +3,10 @@ package policy import ( "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/project/aggregate.go b/internal/repository/project/aggregate.go index 964070635..539171881 100644 --- a/internal/repository/project/aggregate.go +++ b/internal/repository/project/aggregate.go @@ -1,7 +1,7 @@ package project import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) const ( diff --git a/internal/repository/project/api_config.go b/internal/repository/project/api_config.go index 6df8aafaf..a5be49df2 100644 --- a/internal/repository/project/api_config.go +++ b/internal/repository/project/api_config.go @@ -4,12 +4,12 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/project/application.go b/internal/repository/project/application.go index a9565dc01..3834add6e 100644 --- a/internal/repository/project/application.go +++ b/internal/repository/project/application.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/project/eventstore.go b/internal/repository/project/eventstore.go index 5876a535c..ed2d12adb 100644 --- a/internal/repository/project/eventstore.go +++ b/internal/repository/project/eventstore.go @@ -1,7 +1,7 @@ package project import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) func RegisterEventMappers(es *eventstore.Eventstore) { diff --git a/internal/repository/project/grant.go b/internal/repository/project/grant.go index 36b4d7ac1..b1248ea12 100644 --- a/internal/repository/project/grant.go +++ b/internal/repository/project/grant.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) var ( diff --git a/internal/repository/project/grant_member.go b/internal/repository/project/grant_member.go index 7cd4fbbc4..709067981 100644 --- a/internal/repository/project/grant_member.go +++ b/internal/repository/project/grant_member.go @@ -5,11 +5,11 @@ import ( "encoding/json" "fmt" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/member" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/member" ) var ( diff --git a/internal/repository/project/key.go b/internal/repository/project/key.go index fcb64c94b..0f2eb11a5 100644 --- a/internal/repository/project/key.go +++ b/internal/repository/project/key.go @@ -5,11 +5,11 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/project/member.go b/internal/repository/project/member.go index 93ff49fb5..f32062d27 100644 --- a/internal/repository/project/member.go +++ b/internal/repository/project/member.go @@ -3,10 +3,10 @@ package project import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/member" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/member" ) var ( diff --git a/internal/repository/project/oidc_config.go b/internal/repository/project/oidc_config.go index b3e1c61e7..4878d241f 100644 --- a/internal/repository/project/oidc_config.go +++ b/internal/repository/project/oidc_config.go @@ -5,11 +5,11 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/project/project.go b/internal/repository/project/project.go index 90e173f4a..a05d06d81 100644 --- a/internal/repository/project/project.go +++ b/internal/repository/project/project.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/project/role.go b/internal/repository/project/role.go index 3ec97dd4a..bc04ee549 100644 --- a/internal/repository/project/role.go +++ b/internal/repository/project/role.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) var ( diff --git a/internal/repository/settings/debug_notification.go b/internal/repository/settings/debug_notification.go index 1034abdd3..30ceb49c3 100644 --- a/internal/repository/settings/debug_notification.go +++ b/internal/repository/settings/debug_notification.go @@ -3,9 +3,9 @@ package settings import ( "encoding/json" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/aggregate.go b/internal/repository/user/aggregate.go index f19d6807f..a4d080f93 100644 --- a/internal/repository/user/aggregate.go +++ b/internal/repository/user/aggregate.go @@ -1,7 +1,7 @@ package user import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) const ( diff --git a/internal/repository/user/eventstore.go b/internal/repository/user/eventstore.go index 9f387ed7c..424b67db8 100644 --- a/internal/repository/user/eventstore.go +++ b/internal/repository/user/eventstore.go @@ -1,7 +1,7 @@ package user import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) func RegisterEventMappers(es *eventstore.Eventstore) { diff --git a/internal/repository/user/human.go b/internal/repository/user/human.go index 4fc426ee8..f537837f4 100644 --- a/internal/repository/user/human.go +++ b/internal/repository/user/human.go @@ -5,12 +5,12 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" "golang.org/x/text/language" ) diff --git a/internal/repository/user/human_address.go b/internal/repository/user/human_address.go index 32f75dd15..70d888917 100644 --- a/internal/repository/user/human_address.go +++ b/internal/repository/user/human_address.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/human_avatar.go b/internal/repository/user/human_avatar.go index 3caf651bc..6b88b524a 100644 --- a/internal/repository/user/human_avatar.go +++ b/internal/repository/user/human_avatar.go @@ -3,9 +3,9 @@ package user import ( "context" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/asset" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/asset" ) const ( diff --git a/internal/repository/user/human_email.go b/internal/repository/user/human_email.go index 22aaf6d5e..bf42c2193 100644 --- a/internal/repository/user/human_email.go +++ b/internal/repository/user/human_email.go @@ -5,11 +5,11 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/human_external_idp.go b/internal/repository/user/human_external_idp.go index 884caf0bf..6a279951a 100644 --- a/internal/repository/user/human_external_idp.go +++ b/internal/repository/user/human_external_idp.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/human_mfa_events.go b/internal/repository/user/human_mfa_events.go index bb902c266..f0cc13877 100644 --- a/internal/repository/user/human_mfa_events.go +++ b/internal/repository/user/human_mfa_events.go @@ -3,9 +3,9 @@ package user import ( "context" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/human_mfa_otp.go b/internal/repository/user/human_mfa_otp.go index 45f718767..e28ece9c8 100644 --- a/internal/repository/user/human_mfa_otp.go +++ b/internal/repository/user/human_mfa_otp.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/human_mfa_passwordless.go b/internal/repository/user/human_mfa_passwordless.go index f5295faa0..13889277f 100644 --- a/internal/repository/user/human_mfa_passwordless.go +++ b/internal/repository/user/human_mfa_passwordless.go @@ -5,11 +5,11 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/human_mfa_u2f.go b/internal/repository/user/human_mfa_u2f.go index e42798e85..27fe6be3f 100644 --- a/internal/repository/user/human_mfa_u2f.go +++ b/internal/repository/user/human_mfa_u2f.go @@ -3,9 +3,9 @@ package user import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/human_mfa_web_auth_n.go b/internal/repository/user/human_mfa_web_auth_n.go index e6dc9b058..faeb3124c 100644 --- a/internal/repository/user/human_mfa_web_auth_n.go +++ b/internal/repository/user/human_mfa_web_auth_n.go @@ -3,10 +3,10 @@ package user import ( "encoding/json" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) type HumanWebAuthNAddedEvent struct { diff --git a/internal/repository/user/human_password.go b/internal/repository/user/human_password.go index 99691c334..6e315ce22 100644 --- a/internal/repository/user/human_password.go +++ b/internal/repository/user/human_password.go @@ -5,12 +5,12 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/human_phone.go b/internal/repository/user/human_phone.go index dcd44c2d9..b38342be8 100644 --- a/internal/repository/user/human_phone.go +++ b/internal/repository/user/human_phone.go @@ -5,10 +5,10 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/crypto" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/human_profile.go b/internal/repository/user/human_profile.go index 5f2ba0be4..24aeeab72 100644 --- a/internal/repository/user/human_profile.go +++ b/internal/repository/user/human_profile.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" "golang.org/x/text/language" ) diff --git a/internal/repository/user/human_refresh_token.go b/internal/repository/user/human_refresh_token.go index 4e59d8db1..e2e9bd463 100644 --- a/internal/repository/user/human_refresh_token.go +++ b/internal/repository/user/human_refresh_token.go @@ -5,10 +5,10 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/machine.go b/internal/repository/user/machine.go index 315741a67..470346e9b 100644 --- a/internal/repository/user/machine.go +++ b/internal/repository/user/machine.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/machine_key.go b/internal/repository/user/machine_key.go index 73327b4cf..8c85f04c4 100644 --- a/internal/repository/user/machine_key.go +++ b/internal/repository/user/machine_key.go @@ -5,10 +5,10 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/metadata.go b/internal/repository/user/metadata.go index 9160f7385..64e621f54 100644 --- a/internal/repository/user/metadata.go +++ b/internal/repository/user/metadata.go @@ -3,9 +3,9 @@ package user import ( "context" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" - "github.com/caos/zitadel/internal/repository/metadata" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/repository/metadata" ) const ( diff --git a/internal/repository/user/personal_access_token.go b/internal/repository/user/personal_access_token.go index fa8609e30..3e7cfa570 100644 --- a/internal/repository/user/personal_access_token.go +++ b/internal/repository/user/personal_access_token.go @@ -5,9 +5,9 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/user/user.go b/internal/repository/user/user.go index a2549cd0b..97235d70a 100644 --- a/internal/repository/user/user.go +++ b/internal/repository/user/user.go @@ -5,11 +5,11 @@ import ( "encoding/json" "time" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/repository/usergrant/aggregate.go b/internal/repository/usergrant/aggregate.go index d28a3a9e9..93900a2e5 100644 --- a/internal/repository/usergrant/aggregate.go +++ b/internal/repository/usergrant/aggregate.go @@ -1,7 +1,7 @@ package usergrant import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) const ( diff --git a/internal/repository/usergrant/eventstore.go b/internal/repository/usergrant/eventstore.go index 647db86a0..7731115b0 100644 --- a/internal/repository/usergrant/eventstore.go +++ b/internal/repository/usergrant/eventstore.go @@ -1,7 +1,7 @@ package usergrant import ( - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" ) func RegisterEventMappers(es *eventstore.Eventstore) { diff --git a/internal/repository/usergrant/user_grant.go b/internal/repository/usergrant/user_grant.go index 5866976a1..fc887d2a3 100644 --- a/internal/repository/usergrant/user_grant.go +++ b/internal/repository/usergrant/user_grant.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "github.com/caos/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/repository" ) const ( diff --git a/internal/static/config/config.go b/internal/static/config/config.go index 0e4a069e6..334c3b6fb 100644 --- a/internal/static/config/config.go +++ b/internal/static/config/config.go @@ -3,10 +3,10 @@ package config import ( "database/sql" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/static" - "github.com/caos/zitadel/internal/static/database" - "github.com/caos/zitadel/internal/static/s3" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/static/database" + "github.com/zitadel/zitadel/internal/static/s3" ) type AssetStorageConfig struct { diff --git a/internal/static/database/crdb.go b/internal/static/database/crdb.go index 811a29aab..4fde9781f 100644 --- a/internal/static/database/crdb.go +++ b/internal/static/database/crdb.go @@ -10,8 +10,8 @@ import ( "github.com/Masterminds/squirrel" - caos_errors "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/static" + caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/static" ) var _ static.Storage = (*crdbStorage)(nil) diff --git a/internal/static/database/crdb_test.go b/internal/static/database/crdb_test.go index e9f001b82..2a5735e1e 100644 --- a/internal/static/database/crdb_test.go +++ b/internal/static/database/crdb_test.go @@ -13,7 +13,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/static" ) var ( diff --git a/internal/static/mock/storage_mock.go b/internal/static/mock/storage_mock.go index c844c4554..c6d35d259 100644 --- a/internal/static/mock/storage_mock.go +++ b/internal/static/mock/storage_mock.go @@ -9,7 +9,7 @@ import ( io "io" reflect "reflect" - static "github.com/caos/zitadel/internal/static" + static "github.com/zitadel/zitadel/internal/static" gomock "github.com/golang/mock/gomock" ) diff --git a/internal/static/mock/storage_mock.impl.go b/internal/static/mock/storage_mock.impl.go index 302276374..3187eaa47 100644 --- a/internal/static/mock/storage_mock.impl.go +++ b/internal/static/mock/storage_mock.impl.go @@ -8,8 +8,8 @@ import ( "github.com/golang/mock/gomock" - caos_errors "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/static" + caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/static" ) func NewStorage(t *testing.T) *MockStorage { diff --git a/internal/static/s3/config.go b/internal/static/s3/config.go index e2556e8c8..9a00cb97b 100644 --- a/internal/static/s3/config.go +++ b/internal/static/s3/config.go @@ -7,9 +7,9 @@ import ( "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "github.com/caos/zitadel/internal/errors" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/static" ) type Config struct { diff --git a/internal/static/s3/minio.go b/internal/static/s3/minio.go index b8ffd5960..dbc211185 100644 --- a/internal/static/s3/minio.go +++ b/internal/static/s3/minio.go @@ -7,13 +7,13 @@ import ( "net/http" "strings" - "github.com/caos/logging" "github.com/minio/minio-go/v7" + "github.com/zitadel/logging" "golang.org/x/sync/errgroup" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/static" ) var _ static.Storage = (*Minio)(nil) diff --git a/internal/telemetry/http_handler.go b/internal/telemetry/http_handler.go index 698579195..adb8bb076 100644 --- a/internal/telemetry/http_handler.go +++ b/internal/telemetry/http_handler.go @@ -1,10 +1,11 @@ package telemetry import ( - "github.com/caos/zitadel/internal/telemetry/metrics" "net/http" "strings" + "github.com/zitadel/zitadel/internal/telemetry/metrics" + "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" ) diff --git a/internal/telemetry/metrics/config/config.go b/internal/telemetry/metrics/config/config.go index 50bfe3df4..000763249 100644 --- a/internal/telemetry/metrics/config/config.go +++ b/internal/telemetry/metrics/config/config.go @@ -3,9 +3,9 @@ package config import ( "encoding/json" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/telemetry/metrics" - "github.com/caos/zitadel/internal/telemetry/metrics/otel" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/telemetry/metrics" + "github.com/zitadel/zitadel/internal/telemetry/metrics/otel" ) type MetricsConfig struct { diff --git a/internal/telemetry/metrics/otel/config.go b/internal/telemetry/metrics/otel/config.go index 8d6718d31..c26e78a1f 100644 --- a/internal/telemetry/metrics/otel/config.go +++ b/internal/telemetry/metrics/otel/config.go @@ -1,7 +1,7 @@ package otel import ( - "github.com/caos/zitadel/internal/telemetry/metrics" + "github.com/zitadel/zitadel/internal/telemetry/metrics" ) type Config struct { diff --git a/internal/telemetry/metrics/otel/open_telemetry.go b/internal/telemetry/metrics/otel/open_telemetry.go index f58262b3f..696e9d529 100644 --- a/internal/telemetry/metrics/otel/open_telemetry.go +++ b/internal/telemetry/metrics/otel/open_telemetry.go @@ -13,8 +13,8 @@ import ( processor "go.opentelemetry.io/otel/sdk/metric/processor/basic" selector "go.opentelemetry.io/otel/sdk/metric/selector/simple" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/telemetry/metrics" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/telemetry/metrics" ) type Metrics struct { diff --git a/internal/telemetry/tracing/caller.go b/internal/telemetry/tracing/caller.go index c8ab9071b..da9cc2940 100644 --- a/internal/telemetry/tracing/caller.go +++ b/internal/telemetry/tracing/caller.go @@ -3,7 +3,7 @@ package tracing import ( "runtime" - "github.com/caos/logging" + "github.com/zitadel/logging" ) func GetCaller() string { diff --git a/internal/telemetry/tracing/config/config.go b/internal/telemetry/tracing/config/config.go index 70a08be42..28921a1ae 100644 --- a/internal/telemetry/tracing/config/config.go +++ b/internal/telemetry/tracing/config/config.go @@ -3,11 +3,11 @@ package config import ( "encoding/json" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/telemetry/tracing" - "github.com/caos/zitadel/internal/telemetry/tracing/google" - "github.com/caos/zitadel/internal/telemetry/tracing/log" - "github.com/caos/zitadel/internal/telemetry/tracing/otel" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/telemetry/tracing/google" + "github.com/zitadel/zitadel/internal/telemetry/tracing/log" + "github.com/zitadel/zitadel/internal/telemetry/tracing/otel" ) type TracingConfig struct { diff --git a/internal/telemetry/tracing/google/google_tracer.go b/internal/telemetry/tracing/google/google_tracer.go index f7c0858d1..0643d2fe9 100644 --- a/internal/telemetry/tracing/google/google_tracer.go +++ b/internal/telemetry/tracing/google/google_tracer.go @@ -7,9 +7,9 @@ import ( texporter "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace" sdk_trace "go.opentelemetry.io/otel/sdk/trace" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/telemetry/tracing" - "github.com/caos/zitadel/internal/telemetry/tracing/otel" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/telemetry/tracing/otel" ) type Config struct { diff --git a/internal/telemetry/tracing/log/config.go b/internal/telemetry/tracing/log/config.go index d169cc217..e83b2ceb8 100644 --- a/internal/telemetry/tracing/log/config.go +++ b/internal/telemetry/tracing/log/config.go @@ -1,8 +1,8 @@ package log import ( - "github.com/caos/zitadel/internal/telemetry/tracing" - "github.com/caos/zitadel/internal/telemetry/tracing/otel" + "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/telemetry/tracing/otel" stdout "go.opentelemetry.io/otel/exporters/stdout/stdouttrace" sdk_trace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/internal/telemetry/tracing/otel/config.go b/internal/telemetry/tracing/otel/config.go index 676bdc153..fa3599821 100644 --- a/internal/telemetry/tracing/otel/config.go +++ b/internal/telemetry/tracing/otel/config.go @@ -3,7 +3,7 @@ package otel import ( "context" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/telemetry/tracing" otlpgrpc "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" sdk_trace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/internal/telemetry/tracing/otel/open_telemetry.go b/internal/telemetry/tracing/otel/open_telemetry.go index 9c4ef0d4a..5ce60b4de 100644 --- a/internal/telemetry/tracing/otel/open_telemetry.go +++ b/internal/telemetry/tracing/otel/open_telemetry.go @@ -9,7 +9,7 @@ import ( sdk_trace "go.opentelemetry.io/otel/sdk/trace" api_trace "go.opentelemetry.io/otel/trace" - "github.com/caos/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/telemetry/tracing" ) type Tracer struct { diff --git a/internal/telemetry/tracing/span.go b/internal/telemetry/tracing/span.go index 2121f27ed..d49090f34 100644 --- a/internal/telemetry/tracing/span.go +++ b/internal/telemetry/tracing/span.go @@ -1,7 +1,7 @@ package tracing import ( - grpc_errs "github.com/caos/zitadel/internal/api/grpc/errors" + grpc_errs "github.com/zitadel/zitadel/internal/api/grpc/errors" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/internal/user/model/address.go b/internal/user/model/address.go index 2bec01a4d..bbfdb5fce 100644 --- a/internal/user/model/address.go +++ b/internal/user/model/address.go @@ -1,6 +1,6 @@ package model -import es_models "github.com/caos/zitadel/internal/eventstore/v1/models" +import es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" type Address struct { es_models.ObjectRoot diff --git a/internal/user/model/email.go b/internal/user/model/email.go index 80f65a33f..1745f7ecc 100644 --- a/internal/user/model/email.go +++ b/internal/user/model/email.go @@ -1,9 +1,10 @@ package model import ( - "github.com/caos/zitadel/internal/crypto" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" "time" + + "github.com/zitadel/zitadel/internal/crypto" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Email struct { diff --git a/internal/user/model/external_idp.go b/internal/user/model/external_idp.go index d30b505cf..d556baf8f 100644 --- a/internal/user/model/external_idp.go +++ b/internal/user/model/external_idp.go @@ -1,7 +1,7 @@ package model import ( - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type ExternalIDP struct { diff --git a/internal/user/model/external_idp_view.go b/internal/user/model/external_idp_view.go index d6b7fc02d..a0968cf64 100644 --- a/internal/user/model/external_idp_view.go +++ b/internal/user/model/external_idp_view.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" "time" ) diff --git a/internal/user/model/notify_user.go b/internal/user/model/notify_user.go index 102c4592a..c2a0818b5 100644 --- a/internal/user/model/notify_user.go +++ b/internal/user/model/notify_user.go @@ -3,7 +3,7 @@ package model import ( "time" - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) type NotifyUser struct { diff --git a/internal/user/model/password.go b/internal/user/model/password.go index 2ec8f789b..6eba0ac0f 100644 --- a/internal/user/model/password.go +++ b/internal/user/model/password.go @@ -3,8 +3,8 @@ package model import ( "time" - "github.com/caos/zitadel/internal/crypto" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/crypto" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Password struct { diff --git a/internal/user/model/phone.go b/internal/user/model/phone.go index 77dd0a502..61d386598 100644 --- a/internal/user/model/phone.go +++ b/internal/user/model/phone.go @@ -1,11 +1,12 @@ package model import ( - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/ttacon/libphonenumber" "time" + + "github.com/ttacon/libphonenumber" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) const ( diff --git a/internal/user/model/phone_test.go b/internal/user/model/phone_test.go index 642387c98..0df607cd5 100644 --- a/internal/user/model/phone_test.go +++ b/internal/user/model/phone_test.go @@ -1,8 +1,9 @@ package model import ( - caos_errs "github.com/caos/zitadel/internal/errors" "testing" + + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestFormatPhoneNumber(t *testing.T) { diff --git a/internal/user/model/profile.go b/internal/user/model/profile.go index 4be072cb6..30f9d5236 100644 --- a/internal/user/model/profile.go +++ b/internal/user/model/profile.go @@ -3,7 +3,7 @@ package model import ( "golang.org/x/text/language" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Profile struct { diff --git a/internal/user/model/refresh_token.go b/internal/user/model/refresh_token.go index f7277049f..21c049f3c 100644 --- a/internal/user/model/refresh_token.go +++ b/internal/user/model/refresh_token.go @@ -1,8 +1,9 @@ package model import ( - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" "time" + + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type RefreshToken struct { diff --git a/internal/user/model/refresh_token_view.go b/internal/user/model/refresh_token_view.go index 9fbd6b01a..d3437a22c 100644 --- a/internal/user/model/refresh_token_view.go +++ b/internal/user/model/refresh_token_view.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" "time" ) diff --git a/internal/user/model/token.go b/internal/user/model/token.go index 1d5ca69c5..ebcbaef1f 100644 --- a/internal/user/model/token.go +++ b/internal/user/model/token.go @@ -1,8 +1,9 @@ package model import ( - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" "time" + + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Token struct { diff --git a/internal/user/model/token_view.go b/internal/user/model/token_view.go index 3dac7ff35..de9b387b4 100644 --- a/internal/user/model/token_view.go +++ b/internal/user/model/token_view.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" "time" ) diff --git a/internal/user/model/user_membership_view.go b/internal/user/model/user_membership_view.go index 50bdac731..08bc87f61 100644 --- a/internal/user/model/user_membership_view.go +++ b/internal/user/model/user_membership_view.go @@ -1,8 +1,8 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" "time" ) diff --git a/internal/user/model/user_session_view.go b/internal/user/model/user_session_view.go index b2bbf968c..e328865d8 100644 --- a/internal/user/model/user_session_view.go +++ b/internal/user/model/user_session_view.go @@ -3,8 +3,8 @@ package model import ( "time" - "github.com/caos/zitadel/internal/domain" - caos_errors "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errors "github.com/zitadel/zitadel/internal/errors" ) type UserSessionView struct { diff --git a/internal/user/model/user_view.go b/internal/user/model/user_view.go index d6b36475e..297b24a80 100644 --- a/internal/user/model/user_view.go +++ b/internal/user/model/user_view.go @@ -5,10 +5,10 @@ import ( "golang.org/x/text/language" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore/v1/models" - iam_model "github.com/caos/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + iam_model "github.com/zitadel/zitadel/internal/iam/model" ) type UserView struct { diff --git a/internal/user/repository/eventsourcing/model/address.go b/internal/user/repository/eventsourcing/model/address.go index 855573c24..d3fa65f4e 100644 --- a/internal/user/repository/eventsourcing/model/address.go +++ b/internal/user/repository/eventsourcing/model/address.go @@ -3,10 +3,10 @@ package model import ( "encoding/json" - "github.com/caos/logging" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Address struct { diff --git a/internal/user/repository/eventsourcing/model/address_test.go b/internal/user/repository/eventsourcing/model/address_test.go index bd693c5a2..e7ff262c8 100644 --- a/internal/user/repository/eventsourcing/model/address_test.go +++ b/internal/user/repository/eventsourcing/model/address_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) func TestAddressChanges(t *testing.T) { diff --git a/internal/user/repository/eventsourcing/model/auth_request.go b/internal/user/repository/eventsourcing/model/auth_request.go index 8880b2d82..f41aaf843 100644 --- a/internal/user/repository/eventsourcing/model/auth_request.go +++ b/internal/user/repository/eventsourcing/model/auth_request.go @@ -4,10 +4,10 @@ import ( "encoding/json" "net" - "github.com/caos/logging" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type AuthRequest struct { diff --git a/internal/user/repository/eventsourcing/model/email.go b/internal/user/repository/eventsourcing/model/email.go index 541659f01..f4abf69ed 100644 --- a/internal/user/repository/eventsourcing/model/email.go +++ b/internal/user/repository/eventsourcing/model/email.go @@ -4,11 +4,11 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Email struct { diff --git a/internal/user/repository/eventsourcing/model/email_test.go b/internal/user/repository/eventsourcing/model/email_test.go index a4ae8221d..7aeef578b 100644 --- a/internal/user/repository/eventsourcing/model/email_test.go +++ b/internal/user/repository/eventsourcing/model/email_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) func TestEmailChanges(t *testing.T) { diff --git a/internal/user/repository/eventsourcing/model/external_idp.go b/internal/user/repository/eventsourcing/model/external_idp.go index e2a3556be..df3038ea5 100644 --- a/internal/user/repository/eventsourcing/model/external_idp.go +++ b/internal/user/repository/eventsourcing/model/external_idp.go @@ -3,10 +3,10 @@ package model import ( "encoding/json" - "github.com/caos/logging" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type ExternalIDP struct { diff --git a/internal/user/repository/eventsourcing/model/external_idp_test.go b/internal/user/repository/eventsourcing/model/external_idp_test.go index 434d8a3a5..4a779d4e1 100644 --- a/internal/user/repository/eventsourcing/model/external_idp_test.go +++ b/internal/user/repository/eventsourcing/model/external_idp_test.go @@ -2,8 +2,9 @@ package model import ( "encoding/json" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" "testing" + + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) func TestAppendExternalIDPAddedEvent(t *testing.T) { diff --git a/internal/user/repository/eventsourcing/model/otp.go b/internal/user/repository/eventsourcing/model/otp.go index 7c4509fc5..5057ffaaa 100644 --- a/internal/user/repository/eventsourcing/model/otp.go +++ b/internal/user/repository/eventsourcing/model/otp.go @@ -3,12 +3,12 @@ package model import ( "encoding/json" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/user/model" ) type OTP struct { diff --git a/internal/user/repository/eventsourcing/model/otp_test.go b/internal/user/repository/eventsourcing/model/otp_test.go index 392846e5d..89d027a2e 100644 --- a/internal/user/repository/eventsourcing/model/otp_test.go +++ b/internal/user/repository/eventsourcing/model/otp_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "testing" - "github.com/caos/zitadel/internal/crypto" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/crypto" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/user/model" ) func TestAppendMFAOTPAddedEvent(t *testing.T) { diff --git a/internal/user/repository/eventsourcing/model/password.go b/internal/user/repository/eventsourcing/model/password.go index 1d1a54681..1699c8c99 100644 --- a/internal/user/repository/eventsourcing/model/password.go +++ b/internal/user/repository/eventsourcing/model/password.go @@ -4,11 +4,11 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Password struct { diff --git a/internal/user/repository/eventsourcing/model/password_test.go b/internal/user/repository/eventsourcing/model/password_test.go index c9ddc513d..92e046bc8 100644 --- a/internal/user/repository/eventsourcing/model/password_test.go +++ b/internal/user/repository/eventsourcing/model/password_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) func TestAppendUserPasswordChangedEvent(t *testing.T) { diff --git a/internal/user/repository/eventsourcing/model/phone.go b/internal/user/repository/eventsourcing/model/phone.go index ef02556a9..80e08fc16 100644 --- a/internal/user/repository/eventsourcing/model/phone.go +++ b/internal/user/repository/eventsourcing/model/phone.go @@ -4,11 +4,11 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Phone struct { diff --git a/internal/user/repository/eventsourcing/model/phone_test.go b/internal/user/repository/eventsourcing/model/phone_test.go index dd13191b0..205b4102f 100644 --- a/internal/user/repository/eventsourcing/model/phone_test.go +++ b/internal/user/repository/eventsourcing/model/phone_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) func TestPhoneChanges(t *testing.T) { diff --git a/internal/user/repository/eventsourcing/model/profile.go b/internal/user/repository/eventsourcing/model/profile.go index 73d625ff1..a68b5b456 100644 --- a/internal/user/repository/eventsourcing/model/profile.go +++ b/internal/user/repository/eventsourcing/model/profile.go @@ -5,7 +5,7 @@ import ( "golang.org/x/text/language" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" ) type Profile struct { diff --git a/internal/user/repository/eventsourcing/model/profile_test.go b/internal/user/repository/eventsourcing/model/profile_test.go index cf0d76eab..958659482 100644 --- a/internal/user/repository/eventsourcing/model/profile_test.go +++ b/internal/user/repository/eventsourcing/model/profile_test.go @@ -3,7 +3,7 @@ package model import ( "testing" - user_model "github.com/caos/zitadel/internal/user/model" + user_model "github.com/zitadel/zitadel/internal/user/model" "golang.org/x/text/language" ) diff --git a/internal/user/repository/eventsourcing/model/token.go b/internal/user/repository/eventsourcing/model/token.go index 5836e8920..df99ff256 100644 --- a/internal/user/repository/eventsourcing/model/token.go +++ b/internal/user/repository/eventsourcing/model/token.go @@ -4,12 +4,12 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - user_repo "github.com/caos/zitadel/internal/repository/user" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + user_repo "github.com/zitadel/zitadel/internal/repository/user" ) type Token struct { diff --git a/internal/user/repository/eventsourcing/model/user.go b/internal/user/repository/eventsourcing/model/user.go index 738e2ae90..ec5a33e2a 100644 --- a/internal/user/repository/eventsourcing/model/user.go +++ b/internal/user/repository/eventsourcing/model/user.go @@ -4,14 +4,14 @@ import ( "encoding/json" "strings" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/errors" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/user/model" ) const ( diff --git a/internal/user/repository/eventsourcing/model/user_human.go b/internal/user/repository/eventsourcing/model/user_human.go index 07367a7be..068e1af97 100644 --- a/internal/user/repository/eventsourcing/model/user_human.go +++ b/internal/user/repository/eventsourcing/model/user_human.go @@ -4,14 +4,14 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/crypto" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/crypto" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/user/model" ) type Human struct { diff --git a/internal/user/repository/eventsourcing/model/user_machine.go b/internal/user/repository/eventsourcing/model/user_machine.go index 9c184ba1a..01decb939 100644 --- a/internal/user/repository/eventsourcing/model/user_machine.go +++ b/internal/user/repository/eventsourcing/model/user_machine.go @@ -4,12 +4,12 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - user_repo "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + user_repo "github.com/zitadel/zitadel/internal/repository/user" ) type Machine struct { diff --git a/internal/user/repository/eventsourcing/model/web_auth_n.go b/internal/user/repository/eventsourcing/model/web_auth_n.go index 9d788043f..3bde19030 100644 --- a/internal/user/repository/eventsourcing/model/web_auth_n.go +++ b/internal/user/repository/eventsourcing/model/web_auth_n.go @@ -3,11 +3,11 @@ package model import ( "encoding/json" - "github.com/caos/logging" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/user/model" + caos_errs "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/user/model" ) type WebAuthNToken struct { diff --git a/internal/user/repository/eventsourcing/model/web_auth_n_test.go b/internal/user/repository/eventsourcing/model/web_auth_n_test.go index 05752efb9..dcd7d7e97 100644 --- a/internal/user/repository/eventsourcing/model/web_auth_n_test.go +++ b/internal/user/repository/eventsourcing/model/web_auth_n_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/pkg/grpc/user" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/pkg/grpc/user" ) func TestAppendMFAU2FAddedEvent(t *testing.T) { diff --git a/internal/user/repository/view/external_idp_view.go b/internal/user/repository/view/external_idp_view.go index 64e7c9081..269b23537 100644 --- a/internal/user/repository/view/external_idp_view.go +++ b/internal/user/repository/view/external_idp_view.go @@ -1,14 +1,14 @@ package view import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/view/repository" "github.com/jinzhu/gorm" - caos_errs "github.com/caos/zitadel/internal/errors" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/user/repository/view/model" + caos_errs "github.com/zitadel/zitadel/internal/errors" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/user/repository/view/model" ) func ExternalIDPByExternalUserIDAndIDPConfigID(db *gorm.DB, table, externalUserID, idpConfigID, instanceID string) (*model.ExternalIDPView, error) { diff --git a/internal/user/repository/view/model/external_idp_query.go b/internal/user/repository/view/model/external_idp_query.go index 7c9a774f1..2f2d30436 100644 --- a/internal/user/repository/view/model/external_idp_query.go +++ b/internal/user/repository/view/model/external_idp_query.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/view/repository" ) type ExternalIDPSearchRequest usr_model.ExternalIDPSearchRequest diff --git a/internal/user/repository/view/model/external_idps.go b/internal/user/repository/view/model/external_idps.go index b2508dfc6..79e2a572c 100644 --- a/internal/user/repository/view/model/external_idps.go +++ b/internal/user/repository/view/model/external_idps.go @@ -4,12 +4,12 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - user_repo "github.com/caos/zitadel/internal/repository/user" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + user_repo "github.com/zitadel/zitadel/internal/repository/user" ) const ( diff --git a/internal/user/repository/view/model/notify_user.go b/internal/user/repository/view/model/notify_user.go index bde6a81c6..0f6efefed 100644 --- a/internal/user/repository/view/model/notify_user.go +++ b/internal/user/repository/view/model/notify_user.go @@ -4,15 +4,15 @@ import ( "encoding/json" "time" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - org_model "github.com/caos/zitadel/internal/org/model" - "github.com/caos/zitadel/internal/repository/user" - es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + org_model "github.com/zitadel/zitadel/internal/org/model" + "github.com/zitadel/zitadel/internal/repository/user" + es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" ) const ( diff --git a/internal/user/repository/view/model/notify_user_query.go b/internal/user/repository/view/model/notify_user_query.go index 3141f77f2..e91299f38 100644 --- a/internal/user/repository/view/model/notify_user_query.go +++ b/internal/user/repository/view/model/notify_user_query.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/view/repository" ) type NotifyUserSearchRequest usr_model.NotifyUserSearchRequest diff --git a/internal/user/repository/view/model/notify_user_test.go b/internal/user/repository/view/model/notify_user_test.go index 149fa4b9b..e1726c0fa 100644 --- a/internal/user/repository/view/model/notify_user_test.go +++ b/internal/user/repository/view/model/notify_user_test.go @@ -3,9 +3,9 @@ package model import ( "testing" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" - es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" + es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" ) func TestNotifyUserAppendEvent(t *testing.T) { diff --git a/internal/user/repository/view/model/refresh_token.go b/internal/user/repository/view/model/refresh_token.go index 33b6210a5..c9ef998e0 100644 --- a/internal/user/repository/view/model/refresh_token.go +++ b/internal/user/repository/view/model/refresh_token.go @@ -4,14 +4,14 @@ import ( "encoding/json" "time" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - user_repo "github.com/caos/zitadel/internal/repository/user" - usr_model "github.com/caos/zitadel/internal/user/model" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + user_repo "github.com/zitadel/zitadel/internal/repository/user" + usr_model "github.com/zitadel/zitadel/internal/user/model" ) const ( diff --git a/internal/user/repository/view/model/refresh_token_query.go b/internal/user/repository/view/model/refresh_token_query.go index a36339442..339c4c5ac 100644 --- a/internal/user/repository/view/model/refresh_token_query.go +++ b/internal/user/repository/view/model/refresh_token_query.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/view/repository" ) type RefreshTokenSearchRequest model.RefreshTokenSearchRequest diff --git a/internal/user/repository/view/model/token.go b/internal/user/repository/view/model/token.go index ec592c512..38125cf2a 100644 --- a/internal/user/repository/view/model/token.go +++ b/internal/user/repository/view/model/token.go @@ -4,14 +4,14 @@ import ( "encoding/json" "time" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - user_repo "github.com/caos/zitadel/internal/repository/user" - usr_model "github.com/caos/zitadel/internal/user/model" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + user_repo "github.com/zitadel/zitadel/internal/repository/user" + usr_model "github.com/zitadel/zitadel/internal/user/model" ) const ( diff --git a/internal/user/repository/view/model/token_query.go b/internal/user/repository/view/model/token_query.go index d7b574761..a551ce355 100644 --- a/internal/user/repository/view/model/token_query.go +++ b/internal/user/repository/view/model/token_query.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/view/repository" ) type TokenSearchRequest model.TokenSearchRequest diff --git a/internal/user/repository/view/model/user.go b/internal/user/repository/view/model/user.go index a9bc9ec8a..be424453f 100644 --- a/internal/user/repository/view/model/user.go +++ b/internal/user/repository/view/model/user.go @@ -5,17 +5,17 @@ import ( "encoding/json" "time" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - org_model "github.com/caos/zitadel/internal/org/model" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/user/model" - es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + org_model "github.com/zitadel/zitadel/internal/org/model" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/user/model" + es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" ) const ( diff --git a/internal/user/repository/view/model/user_membership.go b/internal/user/repository/view/model/user_membership.go index d6a03d36a..fa2a67f61 100644 --- a/internal/user/repository/view/model/user_membership.go +++ b/internal/user/repository/view/model/user_membership.go @@ -4,19 +4,19 @@ import ( "encoding/json" "time" - "github.com/caos/logging" "github.com/lib/pq" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model" - org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model" - proj_es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model" - "github.com/caos/zitadel/internal/repository/instance" - "github.com/caos/zitadel/internal/repository/org" - "github.com/caos/zitadel/internal/repository/project" - "github.com/caos/zitadel/internal/user/model" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + iam_es_model "github.com/zitadel/zitadel/internal/iam/repository/eventsourcing/model" + org_es_model "github.com/zitadel/zitadel/internal/org/repository/eventsourcing/model" + proj_es_model "github.com/zitadel/zitadel/internal/project/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/user/model" ) const ( diff --git a/internal/user/repository/view/model/user_membership_query.go b/internal/user/repository/view/model/user_membership_query.go index 0df478448..37d68792b 100644 --- a/internal/user/repository/view/model/user_membership_query.go +++ b/internal/user/repository/view/model/user_membership_query.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/view/repository" ) type UserMembershipSearchRequest usr_model.UserMembershipSearchRequest diff --git a/internal/user/repository/view/model/user_query.go b/internal/user/repository/view/model/user_query.go index e46dd8986..7f8f5fbb7 100644 --- a/internal/user/repository/view/model/user_query.go +++ b/internal/user/repository/view/model/user_query.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/view/repository" ) type UserSearchRequest usr_model.UserSearchRequest diff --git a/internal/user/repository/view/model/user_session.go b/internal/user/repository/view/model/user_session.go index 6394def79..f5bbf83a6 100644 --- a/internal/user/repository/view/model/user_session.go +++ b/internal/user/repository/view/model/user_session.go @@ -4,15 +4,15 @@ import ( "encoding/json" "time" - "github.com/caos/logging" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/eventstore" - "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/user/model" - es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/user/model" + es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" ) const ( diff --git a/internal/user/repository/view/model/user_session_query.go b/internal/user/repository/view/model/user_session_query.go index 3ba32fbf8..4e1d91daf 100644 --- a/internal/user/repository/view/model/user_session_query.go +++ b/internal/user/repository/view/model/user_session_query.go @@ -1,9 +1,9 @@ package model import ( - "github.com/caos/zitadel/internal/domain" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/view/repository" ) type UserSessionSearchRequest usr_model.UserSessionSearchRequest diff --git a/internal/user/repository/view/model/user_session_test.go b/internal/user/repository/view/model/user_session_test.go index 204f601a8..3ba7ab5e6 100644 --- a/internal/user/repository/view/model/user_session_test.go +++ b/internal/user/repository/view/model/user_session_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/caos/zitadel/internal/crypto" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" - es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/crypto" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" + es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" ) func now() time.Time { diff --git a/internal/user/repository/view/model/user_test.go b/internal/user/repository/view/model/user_test.go index 06e747e4a..6fa5261cc 100644 --- a/internal/user/repository/view/model/user_test.go +++ b/internal/user/repository/view/model/user_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/caos/zitadel/internal/crypto" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" - "github.com/caos/zitadel/internal/user/model" - es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/crypto" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/user/model" + es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" ) func mockUserData(user *es_model.User) []byte { diff --git a/internal/user/repository/view/notify_user.go b/internal/user/repository/view/notify_user.go index aa03f037c..031ca3209 100644 --- a/internal/user/repository/view/notify_user.go +++ b/internal/user/repository/view/notify_user.go @@ -3,11 +3,11 @@ package view import ( "github.com/jinzhu/gorm" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) func NotifyUserByID(db *gorm.DB, table, userID, instanceID string) (*model.NotifyUser, error) { diff --git a/internal/user/repository/view/query.go b/internal/user/repository/view/query.go index bb5971f2c..594c99925 100644 --- a/internal/user/repository/view/query.go +++ b/internal/user/repository/view/query.go @@ -1,9 +1,9 @@ package view import ( - "github.com/caos/zitadel/internal/errors" - es_models "github.com/caos/zitadel/internal/eventstore/v1/models" - "github.com/caos/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/repository/user" ) func UserByIDQuery(id, instanceID string, latestSequence uint64) (*es_models.SearchQuery, error) { diff --git a/internal/user/repository/view/refresh_token_view.go b/internal/user/repository/view/refresh_token_view.go index eee15bbe3..4cf38bd35 100644 --- a/internal/user/repository/view/refresh_token_view.go +++ b/internal/user/repository/view/refresh_token_view.go @@ -4,11 +4,11 @@ import ( "github.com/jinzhu/gorm" "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/user/model" - usr_model "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/user/model" + usr_model "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) func RefreshTokenByID(db *gorm.DB, table, tokenID, instanceID string) (*usr_model.RefreshTokenView, error) { diff --git a/internal/user/repository/view/token_view.go b/internal/user/repository/view/token_view.go index 981582829..f9c67a46d 100644 --- a/internal/user/repository/view/token_view.go +++ b/internal/user/repository/view/token_view.go @@ -4,11 +4,11 @@ import ( "github.com/jinzhu/gorm" "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/user/model" - usr_model "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/user/model" + usr_model "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) func TokenByID(db *gorm.DB, table, tokenID, instanceID string) (*usr_model.TokenView, error) { diff --git a/internal/user/repository/view/user_session_view.go b/internal/user/repository/view/user_session_view.go index 32a72263e..1d5d8efda 100644 --- a/internal/user/repository/view/user_session_view.go +++ b/internal/user/repository/view/user_session_view.go @@ -3,11 +3,11 @@ package view import ( "github.com/jinzhu/gorm" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) func UserSessionByIDs(db *gorm.DB, table, agentID, userID, instanceID string) (*model.UserSessionView, error) { diff --git a/internal/user/repository/view/user_view.go b/internal/user/repository/view/user_view.go index 0f3c4a2a6..8484f8a9e 100644 --- a/internal/user/repository/view/user_view.go +++ b/internal/user/repository/view/user_view.go @@ -1,14 +1,14 @@ package view import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/view/repository" "github.com/jinzhu/gorm" - caos_errs "github.com/caos/zitadel/internal/errors" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/user/repository/view/model" + caos_errs "github.com/zitadel/zitadel/internal/errors" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/user/repository/view/model" ) func UserByID(db *gorm.DB, table, userID, instanceID string) (*model.UserView, error) { diff --git a/internal/user/repository/view/usermembership_view.go b/internal/user/repository/view/usermembership_view.go index a6c69b520..c388877a1 100644 --- a/internal/user/repository/view/usermembership_view.go +++ b/internal/user/repository/view/usermembership_view.go @@ -3,11 +3,11 @@ package view import ( "github.com/jinzhu/gorm" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - usr_model "github.com/caos/zitadel/internal/user/model" - "github.com/caos/zitadel/internal/user/repository/view/model" - "github.com/caos/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" ) func UserMembershipByIDs(db *gorm.DB, table, userID, aggregateID, objectID, instanceID string, membertype usr_model.MemberType) (*model.UserMembershipView, error) { diff --git a/internal/view/model/general_query.go b/internal/view/model/general_query.go index 5e0134a7a..c528f1dda 100644 --- a/internal/view/model/general_query.go +++ b/internal/view/model/general_query.go @@ -1,7 +1,7 @@ package model import ( - "github.com/caos/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/domain" ) type GeneralSearchRequest struct { diff --git a/internal/view/repository/db_mock_test.go b/internal/view/repository/db_mock_test.go index 0a3729592..5fc8e6677 100644 --- a/internal/view/repository/db_mock_test.go +++ b/internal/view/repository/db_mock_test.go @@ -3,10 +3,11 @@ package repository import ( "database/sql/driver" "fmt" - "github.com/caos/zitadel/internal/domain" "strconv" "testing" + "github.com/zitadel/zitadel/internal/domain" + "github.com/DATA-DOG/go-sqlmock" "github.com/jinzhu/gorm" ) diff --git a/internal/view/repository/failed_events.go b/internal/view/repository/failed_events.go index bad4abc54..31e2cc08f 100644 --- a/internal/view/repository/failed_events.go +++ b/internal/view/repository/failed_events.go @@ -5,9 +5,9 @@ import ( "github.com/jinzhu/gorm" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/errors" - view_model "github.com/caos/zitadel/internal/view/model" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/errors" + view_model "github.com/zitadel/zitadel/internal/view/model" ) type FailedEvent struct { diff --git a/internal/view/repository/general_query.go b/internal/view/repository/general_query.go index 8cd264d1d..6b27d3d79 100644 --- a/internal/view/repository/general_query.go +++ b/internal/view/repository/general_query.go @@ -1,8 +1,8 @@ package repository import ( - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/view/model" + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/view/model" ) type GeneralSearchRequest model.GeneralSearchRequest diff --git a/internal/view/repository/query.go b/internal/view/repository/query.go index 65fa3ebb9..94d438148 100644 --- a/internal/view/repository/query.go +++ b/internal/view/repository/query.go @@ -6,8 +6,8 @@ import ( "github.com/jinzhu/gorm" "github.com/lib/pq" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) type SearchRequest interface { diff --git a/internal/view/repository/query_test.go b/internal/view/repository/query_test.go index 79c369229..c85660e99 100644 --- a/internal/view/repository/query_test.go +++ b/internal/view/repository/query_test.go @@ -1,10 +1,11 @@ package repository import ( - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/jinzhu/gorm" "testing" + + "github.com/jinzhu/gorm" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestPrepareSearchQuery(t *testing.T) { diff --git a/internal/view/repository/requests.go b/internal/view/repository/requests.go index c8193cc04..29f28b25a 100644 --- a/internal/view/repository/requests.go +++ b/internal/view/repository/requests.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/caos/logging" "github.com/jinzhu/gorm" + "github.com/zitadel/logging" - caos_errs "github.com/caos/zitadel/internal/errors" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func PrepareGetByKey(table string, key ColumnKey, id string) func(db *gorm.DB, res interface{}) error { diff --git a/internal/view/repository/requests_test.go b/internal/view/repository/requests_test.go index 20e61555f..a933c77bd 100644 --- a/internal/view/repository/requests_test.go +++ b/internal/view/repository/requests_test.go @@ -1,10 +1,11 @@ package repository import ( - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/jinzhu/gorm" "testing" + + "github.com/jinzhu/gorm" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) func TestPrepareGetByKey(t *testing.T) { diff --git a/internal/view/repository/sequence.go b/internal/view/repository/sequence.go index 99102ff49..6e1b85e5a 100644 --- a/internal/view/repository/sequence.go +++ b/internal/view/repository/sequence.go @@ -6,9 +6,9 @@ import ( "github.com/jinzhu/gorm" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" - "github.com/caos/zitadel/internal/view/model" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/view/model" ) type CurrentSequence struct { diff --git a/internal/webauthn/converter.go b/internal/webauthn/converter.go index 05d04cace..431980c82 100644 --- a/internal/webauthn/converter.go +++ b/internal/webauthn/converter.go @@ -1,9 +1,9 @@ package webauthn import ( - "github.com/caos/zitadel/internal/domain" "github.com/duo-labs/webauthn/protocol" "github.com/duo-labs/webauthn/webauthn" + "github.com/zitadel/zitadel/internal/domain" ) func WebAuthNsToCredentials(webAuthNs []*domain.WebAuthNToken) []webauthn.Credential { diff --git a/internal/webauthn/webauthn.go b/internal/webauthn/webauthn.go index 3d2810978..eb1d52128 100644 --- a/internal/webauthn/webauthn.go +++ b/internal/webauthn/webauthn.go @@ -5,14 +5,14 @@ import ( "context" "encoding/json" - "github.com/caos/logging" "github.com/duo-labs/webauthn/protocol" "github.com/duo-labs/webauthn/webauthn" + "github.com/zitadel/logging" - "github.com/caos/zitadel/internal/api/authz" - "github.com/caos/zitadel/internal/api/http" - "github.com/caos/zitadel/internal/domain" - caos_errs "github.com/caos/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/domain" + caos_errs "github.com/zitadel/zitadel/internal/errors" ) type Config struct { diff --git a/main.go b/main.go index 38447d7c4..0d769bb6a 100644 --- a/main.go +++ b/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/caos/zitadel/cmd" "github.com/spf13/cobra" + "github.com/zitadel/zitadel/cmd" ) func main() { diff --git a/openapi/handler.go b/openapi/handler.go index c7b712416..db827128b 100644 --- a/openapi/handler.go +++ b/openapi/handler.go @@ -6,7 +6,7 @@ import ( "github.com/rakyll/statik/fs" "github.com/rs/cors" - _ "github.com/caos/zitadel/openapi/statik" + _ "github.com/zitadel/zitadel/openapi/statik" ) const ( diff --git a/pkg/grpc/app/application.go b/pkg/grpc/app/application.go index 272100ad0..7d8b42788 100644 --- a/pkg/grpc/app/application.go +++ b/pkg/grpc/app/application.go @@ -1,7 +1,7 @@ package app import ( - "github.com/caos/zitadel/internal/api/grpc/server/middleware" + "github.com/zitadel/zitadel/internal/api/grpc/server/middleware" ) func (a *App) Localizers() []middleware.Localizer { diff --git a/pkg/grpc/auth/changes.go b/pkg/grpc/auth/changes.go index 884c044fb..24b0009d6 100644 --- a/pkg/grpc/auth/changes.go +++ b/pkg/grpc/auth/changes.go @@ -1,6 +1,6 @@ package auth -import "github.com/caos/zitadel/internal/api/grpc/server/middleware" +import "github.com/zitadel/zitadel/internal/api/grpc/server/middleware" func (c *ListMyUserChangesResponse) Localizers() []middleware.Localizer { if c == nil { diff --git a/pkg/grpc/management/app.go b/pkg/grpc/management/app.go index 6b5f85113..c95a146d7 100644 --- a/pkg/grpc/management/app.go +++ b/pkg/grpc/management/app.go @@ -1,7 +1,7 @@ package management import ( - "github.com/caos/zitadel/internal/api/grpc/server/middleware" + "github.com/zitadel/zitadel/internal/api/grpc/server/middleware" ) func (a *ListAppsResponse) Localizers() []middleware.Localizer { diff --git a/pkg/grpc/management/changes.go b/pkg/grpc/management/changes.go index 172d2de0d..403d4ee30 100644 --- a/pkg/grpc/management/changes.go +++ b/pkg/grpc/management/changes.go @@ -1,7 +1,7 @@ package management import ( - "github.com/caos/zitadel/internal/api/grpc/server/middleware" + "github.com/zitadel/zitadel/internal/api/grpc/server/middleware" ) func (c *ListUserChangesResponse) Localizers() []middleware.Localizer { diff --git a/proto/zitadel/action.proto b/proto/zitadel/action.proto index 94498af0b..29f276110 100644 --- a/proto/zitadel/action.proto +++ b/proto/zitadel/action.proto @@ -7,7 +7,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.action.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/action"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/action"; message Action { string id = 1 [ diff --git a/proto/zitadel/admin.proto b/proto/zitadel/admin.proto index 59c3a7e69..37e8466e2 100644 --- a/proto/zitadel/admin.proto +++ b/proto/zitadel/admin.proto @@ -22,7 +22,7 @@ import "validate/validate.proto"; package zitadel.admin.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/admin"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/admin"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { @@ -36,7 +36,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { } license: { name: "Apache 2.0", - url: "https://github.com/caos/zitadel/blob/main/LICENSE"; + url: "https://github.com/zitadel/zitadel/blob/main/LICENSE"; }; }; diff --git a/proto/zitadel/app.proto b/proto/zitadel/app.proto index 312d3adbd..a966de4c6 100644 --- a/proto/zitadel/app.proto +++ b/proto/zitadel/app.proto @@ -8,7 +8,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.app.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/app"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/app"; message App { string id = 1 [ diff --git a/proto/zitadel/auth.proto b/proto/zitadel/auth.proto index 03903d298..152da0df8 100644 --- a/proto/zitadel/auth.proto +++ b/proto/zitadel/auth.proto @@ -16,7 +16,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.auth.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/auth"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/auth"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { @@ -30,7 +30,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { } license: { name: "Apache License 2.0", - url: "https://github.com/caos/zitadel/blob/main/LICENSE" + url: "https://github.com/zitadel/zitadel/blob/main/LICENSE" }; }; diff --git a/proto/zitadel/auth_n_key.proto b/proto/zitadel/auth_n_key.proto index 8577da7b0..887ab664f 100644 --- a/proto/zitadel/auth_n_key.proto +++ b/proto/zitadel/auth_n_key.proto @@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.authn.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/authn"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/authn"; message Key { string id = 1 [ diff --git a/proto/zitadel/change.proto b/proto/zitadel/change.proto index dd79501ed..c88e79178 100644 --- a/proto/zitadel/change.proto +++ b/proto/zitadel/change.proto @@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.change.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/change"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/change"; message Change { google.protobuf.Timestamp change_date = 1 [ @@ -63,7 +63,7 @@ message ChangeQuery { uint32 limit = 2 [ (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { example: "20"; - description: "Maximum amount of events returned. Default is set to 1000 in https://github.com/caos/zitadel/blob/new-eventstore/cmd/zitadel/startup.yaml. If no limit is set or the limit exeeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken."; + description: "Maximum amount of events returned. Default is set to 1000 in https://github.com/zitadel/zitadel/blob/new-eventstore/cmd/zitadel/startup.yaml. If no limit is set or the limit exeeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken."; } ]; bool asc = 3 [ diff --git a/proto/zitadel/features.proto b/proto/zitadel/features.proto index cc84241bd..3de7eb80f 100644 --- a/proto/zitadel/features.proto +++ b/proto/zitadel/features.proto @@ -5,7 +5,7 @@ import "google/protobuf/duration.proto"; package zitadel.features.v1; -option go_package = "github.com/caos/zitadel/pkg/grpc/features"; +option go_package = "github.com/zitadel/zitadel/pkg/grpc/features"; message Features { zitadel.v1.ObjectDetails details = 1; diff --git a/proto/zitadel/idp.proto b/proto/zitadel/idp.proto index 76f119c18..1b7f9aac1 100644 --- a/proto/zitadel/idp.proto +++ b/proto/zitadel/idp.proto @@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.idp.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/idp"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/idp"; message IDP { string id = 1 [ diff --git a/proto/zitadel/instance.proto b/proto/zitadel/instance.proto index 075a601f0..e27c0c84b 100644 --- a/proto/zitadel/instance.proto +++ b/proto/zitadel/instance.proto @@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.instance.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/instance"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/instance"; message Instance { string id = 1 [ diff --git a/proto/zitadel/management.proto b/proto/zitadel/management.proto index 22ea2b1f4..b07ccfb4b 100644 --- a/proto/zitadel/management.proto +++ b/proto/zitadel/management.proto @@ -26,7 +26,7 @@ import "validate/validate.proto"; package zitadel.management.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/management"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/management"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { @@ -40,7 +40,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { } license: { name: "Apache License 2.0", - url: "https://github.com/caos/zitadel/blob/main/LICENSE" + url: "https://github.com/zitadel/zitadel/blob/main/LICENSE" }; }; diff --git a/proto/zitadel/member.proto b/proto/zitadel/member.proto index dbd9b3c38..65dc52cb2 100644 --- a/proto/zitadel/member.proto +++ b/proto/zitadel/member.proto @@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.member.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/member"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/member"; message Member { string user_id = 1 [ diff --git a/proto/zitadel/message.proto b/proto/zitadel/message.proto index 245ce8e1e..ede9ab529 100644 --- a/proto/zitadel/message.proto +++ b/proto/zitadel/message.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package zitadel.v1; -option go_package = "github.com/caos/zitadel/pkg/grpc/message"; +option go_package = "github.com/zitadel/zitadel/pkg/grpc/message"; message ErrorDetail { string id = 1; diff --git a/proto/zitadel/metadata.proto b/proto/zitadel/metadata.proto index f3459220c..9139c3aad 100644 --- a/proto/zitadel/metadata.proto +++ b/proto/zitadel/metadata.proto @@ -6,7 +6,7 @@ import "validate/validate.proto"; package zitadel.metadata.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/metadata"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/metadata"; message Metadata { zitadel.v1.ObjectDetails details = 1; diff --git a/proto/zitadel/object.proto b/proto/zitadel/object.proto index 0a883bee3..aa1580a00 100644 --- a/proto/zitadel/object.proto +++ b/proto/zitadel/object.proto @@ -5,7 +5,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/object"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/object"; message ObjectDetails { //sequence represents the order of events. It's always upcounting @@ -47,7 +47,7 @@ message ListQuery { uint32 limit = 2 [ (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { example: "20"; - description: "Maximum amount of events returned. Default is set to 1000 in https://github.com/caos/zitadel/blob/new-eventstore/cmd/zitadel/startup.yaml. If limit exeeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken."; + description: "Maximum amount of events returned. Default is set to 1000 in https://github.com/zitadel/zitadel/blob/new-eventstore/cmd/zitadel/startup.yaml. If limit exeeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken."; } ]; bool asc = 3 [ diff --git a/proto/zitadel/options.proto b/proto/zitadel/options.proto index 84e4f333d..b30904e12 100644 --- a/proto/zitadel/options.proto +++ b/proto/zitadel/options.proto @@ -4,7 +4,7 @@ package zitadel.v1; import "google/protobuf/descriptor.proto"; -option go_package = "github.com/caos/zitadel/internal/protoc/protoc-gen-authoption/authoption"; +option go_package = "github.com/zitadel/zitadel/internal/protoc/protoc-gen-authoption/authoption"; extend google.protobuf.MethodOptions { diff --git a/proto/zitadel/org.proto b/proto/zitadel/org.proto index cbfad44e7..88c4e42c4 100644 --- a/proto/zitadel/org.proto +++ b/proto/zitadel/org.proto @@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.org.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/org"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/org"; message Org { string id = 1 [ diff --git a/proto/zitadel/policy.proto b/proto/zitadel/policy.proto index 2e1bcf5d7..1d7598255 100644 --- a/proto/zitadel/policy.proto +++ b/proto/zitadel/policy.proto @@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.policy.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/policy"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/policy"; //deprecated: please use DomainPolicy instead message OrgIAMPolicy { diff --git a/proto/zitadel/project.proto b/proto/zitadel/project.proto index f5d357f39..f1e4113b5 100644 --- a/proto/zitadel/project.proto +++ b/proto/zitadel/project.proto @@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.project.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/project"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/project"; message Project { string id = 1 [ diff --git a/proto/zitadel/settings.proto b/proto/zitadel/settings.proto index 8d4f8abee..b22e1ce8f 100644 --- a/proto/zitadel/settings.proto +++ b/proto/zitadel/settings.proto @@ -7,7 +7,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.settings.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/settings"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/settings"; message SecretGenerator { SecretGeneratorType generator_type = 1; diff --git a/proto/zitadel/system.proto b/proto/zitadel/system.proto index 94b8582ef..229d81e8d 100644 --- a/proto/zitadel/system.proto +++ b/proto/zitadel/system.proto @@ -15,7 +15,7 @@ import "validate/validate.proto"; package zitadel.system.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/system"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/system"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { @@ -29,7 +29,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { } license: { name: "Apache 2.0", - url: "https://github.com/caos/zitadel/blob/main/LICENSE"; + url: "https://github.com/zitadel/zitadel/blob/main/LICENSE"; }; }; diff --git a/proto/zitadel/text.proto b/proto/zitadel/text.proto index 03c29f658..52464422a 100644 --- a/proto/zitadel/text.proto +++ b/proto/zitadel/text.proto @@ -6,7 +6,7 @@ import "validate/validate.proto"; package zitadel.text.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/text"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/text"; message MessageCustomText { zitadel.v1.ObjectDetails details = 1; diff --git a/proto/zitadel/user.proto b/proto/zitadel/user.proto index 82ebaed89..be10315e5 100644 --- a/proto/zitadel/user.proto +++ b/proto/zitadel/user.proto @@ -8,7 +8,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; package zitadel.user.v1; -option go_package ="github.com/caos/zitadel/pkg/grpc/user"; +option go_package ="github.com/zitadel/zitadel/pkg/grpc/user"; message User { string id = 1 [ diff --git a/tools/go.mod b/tools/go.mod index 260ef613e..604ee5704 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/caos/zitadel/tools +module github.com/zitadel/zitadel/tools go 1.15 diff --git a/tools/install.sh b/tools/install.sh index 4f29afa13..1a113086c 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -2,7 +2,7 @@ set -eux -cd $GOPATH/src/github.com/caos/zitadel/tools +cd $GOPATH/src/github.com/zitadel/zitadel/tools for imp in `cat tools.go | grep "_" | sed -E "s/_ \"(.*.+)\"/\1/g"`; do echo "installing $imp" go install $imp