Skip to content

Commit

Permalink
v2alpha to v2beta
Browse files Browse the repository at this point in the history
  • Loading branch information
peintnermax committed Sep 20, 2023
1 parent e364274 commit 363abd2
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 27 deletions.
6 changes: 3 additions & 3 deletions apps/login/mock/mocked-services.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
zitadel/user/v2alpha/user_service.proto
zitadel/session/v2alpha/session_service.proto
zitadel/settings/v2alpha/settings_service.proto
zitadel/user/v2beta/user_service.proto
zitadel/session/v2beta/session_service.proto
zitadel/settings/v2beta/settings_service.proto
zitadel/management.proto
zitadel/auth.proto
zitadel/admin.proto
2 changes: 1 addition & 1 deletion apps/login/ui/SignInWithIDP.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface SignInWithIDPProps {
}

const START_IDP_FLOW_PATH = (idpId: string) =>
`/v2alpha/users/idps/${idpId}/start`;
`/v2beta/users/idps/${idpId}/start`;

export function SignInWithIDP({
host,
Expand Down
32 changes: 16 additions & 16 deletions packages/zitadel-server/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,55 +4,55 @@ import * as user from "./v2/user";
import * as oidc from "./v2/oidc";
import * as management from "./management";

import * as login from "./proto/server/zitadel/settings/v2alpha/login_settings";
import * as password from "./proto/server/zitadel/settings/v2alpha/password_settings";
import * as legal from "./proto/server/zitadel/settings/v2alpha/legal_settings";
import * as login from "./proto/server/zitadel/settings/v2beta/login_settings";
import * as password from "./proto/server/zitadel/settings/v2beta/password_settings";
import * as legal from "./proto/server/zitadel/settings/v2beta/legal_settings";

export {
BrandingSettings,
Theme,
} from "./proto/server/zitadel/settings/v2alpha/branding_settings";
} from "./proto/server/zitadel/settings/v2beta/branding_settings";

export {
LoginSettings,
IdentityProvider,
IdentityProviderType,
} from "./proto/server/zitadel/settings/v2alpha/login_settings";
} from "./proto/server/zitadel/settings/v2beta/login_settings";

export {
RequestChallenges,
Challenges,
Challenges_WebAuthN,
} from "./proto/server/zitadel/session/v2alpha/challenge";
} from "./proto/server/zitadel/session/v2beta/challenge";

export {
GetAuthRequestRequest,
GetAuthRequestResponse,
CreateCallbackRequest,
CreateCallbackResponse,
} from "./proto/server/zitadel/oidc/v2alpha/oidc_service";
} from "./proto/server/zitadel/oidc/v2beta/oidc_service";

export {
AuthRequest,
Prompt,
} from "./proto/server/zitadel/oidc/v2alpha/authorization";
} from "./proto/server/zitadel/oidc/v2beta/authorization";

export {
Session,
Factors,
} from "./proto/server/zitadel/session/v2alpha/session";
} from "./proto/server/zitadel/session/v2beta/session";
export {
IDPInformation,
IDPLink,
} from "./proto/server/zitadel/user/v2alpha/idp";
} from "./proto/server/zitadel/user/v2beta/idp";
export {
ListSessionsResponse,
GetSessionResponse,
CreateSessionResponse,
SetSessionResponse,
SetSessionRequest,
DeleteSessionResponse,
} from "./proto/server/zitadel/session/v2alpha/session_service";
} from "./proto/server/zitadel/session/v2beta/session_service";
export {
GetPasswordComplexitySettingsResponse,
GetBrandingSettingsResponse,
Expand All @@ -62,7 +62,7 @@ export {
GetLoginSettingsRequest,
GetActiveIdentityProvidersResponse,
GetActiveIdentityProvidersRequest,
} from "./proto/server/zitadel/settings/v2alpha/settings_service";
} from "./proto/server/zitadel/settings/v2beta/settings_service";
export {
AddHumanUserResponse,
AddHumanUserRequest,
Expand All @@ -80,15 +80,15 @@ export {
StartIdentityProviderIntentResponse,
RetrieveIdentityProviderIntentRequest,
RetrieveIdentityProviderIntentResponse,
} from "./proto/server/zitadel/user/v2alpha/user_service";
} from "./proto/server/zitadel/user/v2beta/user_service";
export {
SetHumanPasswordResponse,
SetHumanPasswordRequest,
} from "./proto/server/zitadel/management";
export * from "./proto/server/zitadel/idp";
export { type LegalAndSupportSettings } from "./proto/server/zitadel/settings/v2alpha/legal_settings";
export { type PasswordComplexitySettings } from "./proto/server/zitadel/settings/v2alpha/password_settings";
export { type ResourceOwnerType } from "./proto/server/zitadel/settings/v2alpha/settings";
export { type LegalAndSupportSettings } from "./proto/server/zitadel/settings/v2beta/legal_settings";
export { type PasswordComplexitySettings } from "./proto/server/zitadel/settings/v2beta/password_settings";
export { type ResourceOwnerType } from "./proto/server/zitadel/settings/v2beta/settings";

import {
getServers,
Expand Down
2 changes: 1 addition & 1 deletion packages/zitadel-server/src/v2/oidc/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from "./oidc";
export * from "../../proto/server/zitadel/oidc/v2alpha/oidc_service";
export * from "../../proto/server/zitadel/oidc/v2beta/oidc_service";
2 changes: 1 addition & 1 deletion packages/zitadel-server/src/v2/session/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from "./session";
export * from "../../proto/server/zitadel/session/v2alpha/session";
export * from "../../proto/server/zitadel/session/v2beta/session";
2 changes: 1 addition & 1 deletion packages/zitadel-server/src/v2/session/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { CompatServiceDefinition } from "nice-grpc/lib/service-definitions";
import {
SessionServiceClient,
SessionServiceDefinition,
} from "../../proto/server/zitadel/session/v2alpha/session_service";
} from "../../proto/server/zitadel/session/v2beta/session_service";

import { ZitadelServer, createClient, getServers } from "../../server";

Expand Down
2 changes: 1 addition & 1 deletion packages/zitadel-server/src/v2/settings/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from "./settings";
export * from "../../proto/server/zitadel/settings/v2alpha/settings";
export * from "../../proto/server/zitadel/settings/v2beta/settings";
2 changes: 1 addition & 1 deletion packages/zitadel-server/src/v2/settings/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { CompatServiceDefinition } from "nice-grpc/lib/service-definitions";
import {
SettingsServiceClient,
SettingsServiceDefinition,
} from "../../proto/server/zitadel/settings/v2alpha/settings_service";
} from "../../proto/server/zitadel/settings/v2beta/settings_service";

import { ZitadelServer, createClient, getServers } from "../../server";

Expand Down
2 changes: 1 addition & 1 deletion packages/zitadel-server/src/v2/user/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from "./user";
export * from "../../proto/server/zitadel/user/v2alpha/user";
export * from "../../proto/server/zitadel/user/v2beta/user";
2 changes: 1 addition & 1 deletion packages/zitadel-server/src/v2/user/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { CompatServiceDefinition } from "nice-grpc/lib/service-definitions";
import {
UserServiceClient,
UserServiceDefinition,
} from "../../proto/server/zitadel/user/v2alpha/user_service";
} from "../../proto/server/zitadel/user/v2beta/user_service";

import { ZitadelServer, createClient, getServers } from "../../server";

Expand Down

0 comments on commit 363abd2

Please sign in to comment.