feat: add v2 beta clients from gRPC (#918)

* add new clients

* please the upgraded linter

* update renove file

renovate.json

@@ -1,4 +1,4 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
- "extends": ["github>smartive/renovate-config", "github>smartive/renovate-config:with-submodules", ":disableMajorUpdates"]
+ "extends": ["github>smartive/renovate-config", ":disableMajorUpdates"]
 }

src/Directory.Build.props

@@ -37,15 +37,15 @@
  <ItemGroup>
  <PackageReference
  Include="StyleCop.Analyzers"
- Version="1.2.0-beta.507"
+ Version="1.2.0-beta.556"
  PrivateAssets="all"
  Condition="$(MSBuildProjectExtension) == '.csproj'" />
  <PackageReference
  Include="SonarAnalyzer.CSharp"
  Version="9.17.0.82934"
  PrivateAssets="all"
  Condition="$(MSBuildProjectExtension) == '.csproj'" />
- <PackageReference Include="Roslynator.Analyzers" Version="4.9.0" PrivateAssets="All" />
+ <PackageReference Include="Roslynator.Analyzers" Version="4.10.0" PrivateAssets="All" />
  </ItemGroup>
 
  <ItemGroup>

src/Zitadel/Api/Clients.cs

@@ -5,6 +5,12 @@
 using Zitadel.Auth.V1;
 using Zitadel.Authentication;
 using Zitadel.Management.V1;
+using Zitadel.Oidc.V2beta;
+using Zitadel.Org.V2beta;
+using Zitadel.Session.V2beta;
+using Zitadel.Settings.V2beta;
+using Zitadel.System.V1;
+using Zitadel.User.V2beta;
 
 namespace Zitadel.Api;
 
@@ -13,14 +19,6 @@ namespace Zitadel.Api;
 /// </summary>
 public static class Clients
 {
- /// <summary>
- /// Create a service client for the auth service.
- /// </summary>
- /// <param name="options">Options for the client like authorization method.</param>
- /// <returns>The <see cref="Auth.V1.AuthService.AuthServiceClient"/>.</returns>
- public static AuthService.AuthServiceClient AuthService(Options options) =>
- GetClient<AuthService.AuthServiceClient>(options);
-
  /// <summary>
  /// Create a service client for the admin service.
  /// </summary>
@@ -29,6 +27,14 @@ public static AuthService.AuthServiceClient AuthService(Options options) =>
  public static AdminService.AdminServiceClient AdminService(Options options) =>
  GetClient<AdminService.AdminServiceClient>(options);
 
+ /// <summary>
+ /// Create a service client for the auth service.
+ /// </summary>
+ /// <param name="options">Options for the client like authorization method.</param>
+ /// <returns>The <see cref="Auth.V1.AuthService.AuthServiceClient"/>.</returns>
+ public static AuthService.AuthServiceClient AuthService(Options options) =>
+ GetClient<AuthService.AuthServiceClient>(options);
+
  /// <summary>
  /// Create a service client for the management service.
  /// </summary>
@@ -37,6 +43,54 @@ public static AdminService.AdminServiceClient AdminService(Options options) =>
  public static ManagementService.ManagementServiceClient ManagementService(Options options) =>
  GetClient<ManagementService.ManagementServiceClient>(options);
 
+ /// <summary>
+ /// Create a service client for the oidc service.
+ /// </summary>
+ /// <param name="options">Options for the client like authorization method.</param>
+ /// <returns>The <see cref="OIDCService.OIDCServiceClient"/>.</returns>
+ public static OIDCService.OIDCServiceClient OidcService(Options options) =>
+ GetClient<OIDCService.OIDCServiceClient>(options);
+
+ /// <summary>
+ /// Create a service client for the organization service.
+ /// </summary>
+ /// <param name="options">Options for the client like authorization method.</param>
+ /// <returns>The <see cref="OrganizationService.OrganizationServiceClient"/>.</returns>
+ public static OrganizationService.OrganizationServiceClient OrganizationService(Options options) =>
+ GetClient<OrganizationService.OrganizationServiceClient>(options);
+
+ /// <summary>
+ /// Create a service client for the session service.
+ /// </summary>
+ /// <param name="options">Options for the client like authorization method.</param>
+ /// <returns>The <see cref="SessionService.SessionServiceClient"/>.</returns>
+ public static SessionService.SessionServiceClient SessionService(Options options) =>
+ GetClient<SessionService.SessionServiceClient>(options);
+
+ /// <summary>
+ /// Create a service client for the settings service.
+ /// </summary>
+ /// <param name="options">Options for the client like authorization method.</param>
+ /// <returns>The <see cref="SettingsService.SettingsServiceClient"/>.</returns>
+ public static SettingsService.SettingsServiceClient SettingsService(Options options) =>
+ GetClient<SettingsService.SettingsServiceClient>(options);
+
+ /// <summary>
+ /// Create a service client for the system service.
+ /// </summary>
+ /// <param name="options">Options for the client like authorization method.</param>
+ /// <returns>The <see cref="SystemService.SystemServiceClient"/>.</returns>
+ public static SystemService.SystemServiceClient SystemService(Options options) =>
+ GetClient<SystemService.SystemServiceClient>(options);
+
+ /// <summary>
+ /// Create a service client for the user service.
+ /// </summary>
+ /// <param name="options">Options for the client like authorization method.</param>
+ /// <returns>The <see cref="UserService.UserServiceClient"/>.</returns>
+ public static UserService.UserServiceClient UserService(Options options) =>
+ GetClient<UserService.UserServiceClient>(options);
+
  private static TClient GetClient<TClient>(Options options)
  where TClient : ClientBase<TClient>
  {

src/Zitadel/Credentials/ServiceAccount.cs

@@ -33,13 +33,13 @@ namespace Zitadel.Credentials
  /// </summary>
  public record ServiceAccount
  {
- private static readonly HttpClient HttpClient = new();
-
  /// <summary>
  /// The key type.
  /// </summary>
  public const string Type = "serviceaccount";
 
+ private static readonly HttpClient HttpClient = new();
+
  /// <summary>
  /// The user id associated with this service account.
  /// </summary>
@@ -204,10 +204,7 @@ private async Task<string> GetSignedJwtAsync(string audience)
  },
  rsa,
  JwsAlgorithm.RS256,
- new Dictionary<string, object>
- {
- { "kid", KeyId },
- });
+ new Dictionary<string, object> { { "kid", KeyId }, });
  }
 
  private async Task<RSAParameters> GetRsaParametersAsync()
@@ -225,12 +222,6 @@ private async Task<RSAParameters> GetRsaParametersAsync()
  return DotNetUtilities.ToRSAParameters(keyPair.Private as RsaPrivateCrtKeyParameters);
  }
 
- private sealed record AccessTokenResponse
- {
- [JsonPropertyName("access_token")]
- public string AccessToken { get; init; } = string.Empty;
- }
-
  /// <summary>
  /// Options for the authentication with a <see cref="ServiceAccount"/>.
  /// </summary>
@@ -283,8 +274,7 @@ internal string CreateOidcScopes() =>
  ' ',
  new[]
  {
- "openid",
- ApiAccess
+ "openid", ApiAccess
  ? ApiAccessScope
  : string.Empty,
  }
@@ -293,5 +283,11 @@ internal string CreateOidcScopes() =>
  .Union(RequiredRoles.Select(r => $"urn:zitadel:iam:org:project:role:{r}"))
  .Where(s => !string.IsNullOrWhiteSpace(s)));
  }
+
+ private sealed record AccessTokenResponse
+ {
+ [JsonPropertyName("access_token")]
+ public string AccessToken { get; init; } = string.Empty;
+ }
  }
 }