From a83829b5ffefae3311f24af5d0a546687e9e552b Mon Sep 17 00:00:00 2001 From: Livio Spring Date: Tue, 26 Mar 2024 12:25:40 +0100 Subject: [PATCH] fix(API): remove deprecated organisation_id from user factor in session service (#7631) --- internal/api/grpc/session/v2/session.go | 1 - internal/api/grpc/session/v2/session_test.go | 4 ---- proto/zitadel/session/v2beta/session.proto | 10 +++------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/internal/api/grpc/session/v2/session.go b/internal/api/grpc/session/v2/session.go index 428cd94517..29c897948b 100644 --- a/internal/api/grpc/session/v2/session.go +++ b/internal/api/grpc/session/v2/session.go @@ -237,7 +237,6 @@ func userFactorToPb(factor query.SessionUserFactor) *session.UserFactor { Id: factor.UserID, LoginName: factor.LoginName, DisplayName: factor.DisplayName, - OrganisationId: factor.ResourceOwner, OrganizationId: factor.ResourceOwner, } } diff --git a/internal/api/grpc/session/v2/session_test.go b/internal/api/grpc/session/v2/session_test.go index a268a9c889..c088b5b886 100644 --- a/internal/api/grpc/session/v2/session_test.go +++ b/internal/api/grpc/session/v2/session_test.go @@ -157,7 +157,6 @@ func Test_sessionsToPb(t *testing.T) { Id: "345", LoginName: "donald", DisplayName: "donald duck", - OrganisationId: "org1", OrganizationId: "org1", }, }, @@ -174,7 +173,6 @@ func Test_sessionsToPb(t *testing.T) { Id: "345", LoginName: "donald", DisplayName: "donald duck", - OrganisationId: "org1", OrganizationId: "org1", }, Password: &session.PasswordFactor{ @@ -194,7 +192,6 @@ func Test_sessionsToPb(t *testing.T) { Id: "345", LoginName: "donald", DisplayName: "donald duck", - OrganisationId: "org1", OrganizationId: "org1", }, WebAuthN: &session.WebAuthNFactor{ @@ -215,7 +212,6 @@ func Test_sessionsToPb(t *testing.T) { Id: "345", LoginName: "donald", DisplayName: "donald duck", - OrganisationId: "org1", OrganizationId: "org1", }, Totp: &session.TOTPFactor{ diff --git a/proto/zitadel/session/v2beta/session.proto b/proto/zitadel/session/v2beta/session.proto index 09f3c6852c..f1d894f671 100644 --- a/proto/zitadel/session/v2beta/session.proto +++ b/proto/zitadel/session/v2beta/session.proto @@ -59,6 +59,8 @@ message Factors { } message UserFactor { + reserved 5; + reserved "organisation_id"; google.protobuf.Timestamp verified_at = 1 [ (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { description: "\"time when the user was last checked\""; @@ -79,12 +81,6 @@ message UserFactor { description: "\"display name of the checked user\""; } ]; - // deprecated: use organization_id, will be remove before GA (https://github.com/zitadel/zitadel/issues/6718) - string organisation_id = 5 [ - (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { - description: "\"organization id of the checked user; deprecated: use organization_id\""; - } - ]; string organization_id = 6 [ (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { description: "\"organization id of the checked user\""; @@ -179,4 +175,4 @@ message UserAgent { enum SessionFieldName { SESSION_FIELD_NAME_UNSPECIFIED = 0; SESSION_FIELD_NAME_CREATION_DATE = 1; -} \ No newline at end of file +}