Skip to content

Commit

Permalink
feat: upgrade protos and use UTC in service account auth (#54)
Browse files Browse the repository at this point in the history
  • Loading branch information
buehler authored May 7, 2021
1 parent 8dcded7 commit 05616b8
Show file tree
Hide file tree
Showing 9 changed files with 386 additions and 31 deletions.
2 changes: 1 addition & 1 deletion src/Zitadel.Api/google/api/annotations.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2015, Google Inc.
// Copyright 2015 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/Zitadel.Api/google/api/http.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020 Google LLC
// Copyright 2015 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
38 changes: 28 additions & 10 deletions src/Zitadel.Api/zitadel/admin.proto
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ option go_package ="github.com/caos/zitadel/pkg/grpc/admin";

option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
info: {
title: "Administrator API for ZITADEL";
description: "This API provides all functions to administrate ZITADEL.";
title: "Administration API aka Admin";
version: "1.0";
contact: {
name: "file an issue",
url: "https://github.com/caos/zitadel";
};
description: "This API is intended to configure and manage the IAM itself.";
contact:{
name: "CAOS developers of ZITADEL"
url: "https://zitadel.ch"
email: "[email protected]"
}
license: {
name: "Apache 2.0",
url: "https://github.com/caos/zitadel/blob/main/LICENSE";
Expand Down Expand Up @@ -172,6 +173,7 @@ service AdminService {
};
}

// Returns an organisation by id
rpc GetOrgByID(GetOrgByIDRequest) returns (GetOrgByIDResponse) {
option (google.api.http) = {
get: "/orgs/{id}";
Expand All @@ -198,7 +200,7 @@ service AdminService {
}

//Returns all organisations matching the request
// all queries need to match (ANDed)
// all queries need to match (AND)
rpc ListOrgs(ListOrgsRequest) returns (ListOrgsResponse) {
option (google.api.http) = {
post: "/orgs/_search";
Expand Down Expand Up @@ -275,6 +277,7 @@ service AdminService {
};
}

// Returns a identity provider configuration of the IAM
rpc GetIDPByID(GetIDPByIDRequest) returns (GetIDPByIDResponse) {
option (google.api.http) = {
get: "/idps/{id}";
Expand Down Expand Up @@ -310,6 +313,7 @@ service AdminService {
};
}

// Returns all identity provider configurations of the IAM
rpc ListIDPs(ListIDPsRequest) returns (ListIDPsResponse) {
option (google.api.http) = {
post: "/idps/_search";
Expand Down Expand Up @@ -346,6 +350,7 @@ service AdminService {
};
}

// Adds a new oidc identity provider configuration the IAM
rpc AddOIDCIDP(AddOIDCIDPRequest) returns (AddOIDCIDPResponse) {
option (google.api.http) = {
post: "/idps/oidc";
Expand Down Expand Up @@ -1675,8 +1680,11 @@ service AdminService {
}
}


//This is an empty request
message HealthzRequest {}

//This is an empty response
message HealthzResponse {}

// if name or domain is already in use, org is not unique
Expand Down Expand Up @@ -1883,11 +1891,8 @@ message SetUpOrgRequest {
Email email = 3 [(validate.rules).message.required = true];
Phone phone = 4;
string password = 5 [
(validate.rules).string = {min_len: 1, max_len: 72},
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
description: "the initial password of the user";
min_length: 1;
max_length: 72;
example: "\"my_53cr3t-P4$$w0rd\"";
}
];
Expand Down Expand Up @@ -2188,6 +2193,7 @@ message SetDefaultFeaturesRequest {
bool login_policy_passwordless = 10;
bool password_complexity_policy = 11;
bool label_policy = 12;
bool custom_domain = 13;
}

message SetDefaultFeaturesResponse {
Expand Down Expand Up @@ -2217,6 +2223,7 @@ message SetOrgFeaturesRequest {
bool login_policy_passwordless = 11;
bool password_complexity_policy = 12;
bool label_policy = 13;
bool custom_domain = 14;
}

message SetOrgFeaturesResponse {
Expand Down Expand Up @@ -2338,6 +2345,7 @@ message ResetCustomOrgIAMPolicyToDefaultResponse {
zitadel.v1.ObjectDetails details = 1;
}

//This is an empty request
message GetLabelPolicyRequest {}

message GetLabelPolicyResponse {
Expand Down Expand Up @@ -2380,6 +2388,7 @@ message UpdateLabelPolicyResponse {
zitadel.v1.ObjectDetails details = 1;
}

//This is an empty request
message GetLoginPolicyRequest {}

message GetLoginPolicyResponse {
Expand Down Expand Up @@ -2470,6 +2479,7 @@ message RemoveIDPFromLoginPolicyResponse {
zitadel.v1.ObjectDetails details = 1;
}

//This is an empty request
message ListLoginPolicySecondFactorsRequest {}

message ListLoginPolicySecondFactorsResponse {
Expand Down Expand Up @@ -2505,6 +2515,7 @@ message RemoveSecondFactorFromLoginPolicyResponse {
zitadel.v1.ObjectDetails details = 1;
}

//This is an empty request
message ListLoginPolicyMultiFactorsRequest {}

message ListLoginPolicyMultiFactorsResponse {
Expand Down Expand Up @@ -2578,6 +2589,7 @@ message UpdatePasswordComplexityPolicyResponse {
zitadel.v1.ObjectDetails details = 1;
}

//This is an empty request
message GetPasswordAgePolicyRequest {}

message GetPasswordAgePolicyResponse {
Expand All @@ -2603,6 +2615,7 @@ message UpdatePasswordAgePolicyResponse {
zitadel.v1.ObjectDetails details = 1;
}

//This is an empty request
message GetPasswordLockoutPolicyRequest {}

message GetPasswordLockoutPolicyResponse {
Expand Down Expand Up @@ -2692,6 +2705,7 @@ message RemoveIAMMemberResponse {
zitadel.v1.ObjectDetails details = 1;
}

//This is an empty request
message ListIAMMemberRolesRequest {}

message ListIAMMemberRolesResponse {
Expand All @@ -2711,6 +2725,7 @@ message ListIAMMembersResponse {
repeated zitadel.member.v1.Member result = 2;
}

//This is an empty request
message ListViewsRequest {}

message ListViewsResponse {
Expand Down Expand Up @@ -2743,8 +2758,10 @@ message ClearViewRequest {
];
}

//This is an empty response
message ClearViewResponse {}

//This is an empty request
message ListFailedEventsRequest {}

message ListFailedEventsResponse {
Expand Down Expand Up @@ -2782,6 +2799,7 @@ message RemoveFailedEventRequest {
];
}

//This is an empty response
message RemoveFailedEventResponse {}

message View {
Expand Down
Loading

0 comments on commit 05616b8

Please sign in to comment.