TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-06-01 07:18:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(API): remove deprecated organisation_id from user factor in session service (#7631)

Browse Source
This commit is contained in:
Livio Spring 2024-03-26 12:25:40 +01:00 committed by GitHub
parent 2021bad0ad
commit a83829b5ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/api/grpc/session/v2/session.go
View File

@ -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,
}
}

4
internal/api/grpc/session/v2/session_test.go
View File

@ -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{

10
proto/zitadel/session/v2beta/session.proto
View File

@ -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;
}
}