TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-11 22:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove alias

Browse Source
This commit is contained in:
Yordis Prieto
2024-08-27 23:18:02 -04:00
parent 4bd9c60a89
commit 39196a5fbd
10 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/login/src/app/(login)/signedin/page.tsx
View File

@@ -1,7 +1,7 @@
import { createCallback, getBrandingSettings, getSession } from "@/lib/zitadel";
import DynamicTheme from "@/ui/DynamicTheme";
import UserAvatar from "@/ui/UserAvatar";
import { createMessage } from "@zitadel/client";
import { create } from "@zitadel/client";
import { getMostRecentCookieWithLoginname } from "@zitadel/next";
import { redirect } from "next/navigation";
import {
@@ -14,11 +14,11 @@ async function loadSession(loginName: string, authRequestId?: string) {
if (authRequestId) {
return createCallback(
createMessage(CreateCallbackRequestSchema, {
create(CreateCallbackRequestSchema, {
authRequestId,
callbackKind: {
case: "session",
value: createMessage(SessionSchema, {
value: create(SessionSchema, {
sessionId: recent.id,
sessionToken: recent.token,
}),

10
apps/login/src/app/api/otp/set/route.ts
View File

@@ -10,7 +10,7 @@ import {
ChecksSchema,
CheckTOTPSchema,
} from "@zitadel/proto/zitadel/session/v2/session_service_pb";
import { createMessage } from "@zitadel/client";
import { create } from "@zitadel/client";
export async function POST(request: NextRequest) {
const body = await request.json();
@@ -35,18 +35,18 @@ export async function POST(request: NextRequest) {
return recentPromise
.then((recent) => {
const checks = createMessage(ChecksSchema, {});
const checks = create(ChecksSchema, {});
if (method === "time-based") {
checks.totp = createMessage(CheckTOTPSchema, {
checks.totp = create(CheckTOTPSchema, {
code,
});
} else if (method === "sms") {
checks.otpSms = createMessage(CheckOTPSchema, {
checks.otpSms = create(CheckOTPSchema, {
code,
});
} else if (method === "email") {
checks.otpEmail = createMessage(CheckOTPSchema, {
checks.otpEmail = create(CheckOTPSchema, {
code,
});
}

4
apps/login/src/app/api/passkeys/verify/route.ts
View File

@@ -1,7 +1,7 @@
import { getSession, verifyPasskeyRegistration } from "@/lib/zitadel";
import { getSessionCookieById } from "@zitadel/next";
import { NextRequest, NextResponse, userAgent } from "next/server";
import { createMessage } from "@zitadel/client";
import { create } from "@zitadel/client";
import { VerifyPasskeyRegistrationRequestSchema } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
export async function POST(request: NextRequest) {
@@ -28,7 +28,7 @@ export async function POST(request: NextRequest) {
});
if (userId) {
return verifyPasskeyRegistration(
createMessage(VerifyPasskeyRegistrationRequestSchema, {
create(VerifyPasskeyRegistrationRequestSchema, {
passkeyId,
passkeyName,
publicKeyCredential,

4
apps/login/src/app/api/u2f/verify/route.ts
View File

@@ -5,7 +5,7 @@ import {
VerifyU2FRegistrationRequestSchema,
VerifyU2FRegistrationResponseSchema,
} from "@zitadel/proto/zitadel/user/v2/user_service_pb";
import { createMessage, toJson } from "@zitadel/client";
import { create, toJson } from "@zitadel/client";
export async function POST(request: NextRequest) {
const body = await request.json();
@@ -34,7 +34,7 @@ export async function POST(request: NextRequest) {
// tokenName: passkeyName,
// };
const req = createMessage(
const req = create(
VerifyU2FRegistrationRequestSchema,
// TODO: why did we passed the request instead of body here?
body,

14
apps/login/src/app/login/route.ts
View File

@@ -24,7 +24,7 @@ import {
} from "@zitadel/proto/zitadel/oidc/v2/authorization_pb";
import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
import { idpTypeToSlug } from "@/lib/idp";
import { createMessage } from "@zitadel/client";
import { create } from "@zitadel/client";
async function loadSessions(ids: string[]): Promise<Session[]> {
const response = await listSessions(
@@ -105,11 +105,11 @@ export async function GET(request: NextRequest) {
// works not with _rsc request
try {
const { callbackUrl } = await createCallback(
createMessage(CreateCallbackRequestSchema, {
create(CreateCallbackRequestSchema, {
authRequestId,
callbackKind: {
case: "session",
value: createMessage(SessionSchema, session),
value: create(SessionSchema, session),
},
}),
);
@@ -269,11 +269,11 @@ export async function GET(request: NextRequest) {
sessionToken: cookie?.token,
};
const { callbackUrl } = await createCallback(
createMessage(CreateCallbackRequestSchema, {
create(CreateCallbackRequestSchema, {
authRequestId,
callbackKind: {
case: "session",
value: createMessage(SessionSchema, session),
value: create(SessionSchema, session),
},
}),
);
@@ -306,11 +306,11 @@ export async function GET(request: NextRequest) {
};
try {
const { callbackUrl } = await createCallback(
createMessage(CreateCallbackRequestSchema, {
create(CreateCallbackRequestSchema, {
authRequestId,
callbackKind: {
case: "session",
value: createMessage(SessionSchema, session),
value: create(SessionSchema, session),
},
}),
);

8
apps/login/src/lib/idp.ts
View File

@@ -4,7 +4,7 @@ import {
} from "@zitadel/proto/zitadel/user/v2/user_service_pb";
import { IDPInformation } from "@zitadel/proto/zitadel/user/v2/idp_pb";
import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
import { createMessage } from "@zitadel/client";
import { create } from "@zitadel/client";
// This maps the IdentityProviderType to a slug which is used in the /success and /failure routes
export function idpTypeToSlug(idpType: IdentityProviderType) {
@@ -42,7 +42,7 @@ export const PROVIDER_MAPPING: {
const rawInfo = idp.rawInformation as OIDC_USER;
console.log(rawInfo);
return createMessage(AddHumanUserRequestSchema, {
return create(AddHumanUserRequestSchema, {
username: idp.userName,
email: {
email: rawInfo.User?.email,
@@ -78,7 +78,7 @@ export const PROVIDER_MAPPING: {
console.log(rawInfo, rawInfo.userPrincipalName);
return createMessage(AddHumanUserRequestSchema, {
return create(AddHumanUserRequestSchema, {
username: idp.userName,
email: {
email: rawInfo.mail || rawInfo.userPrincipalName || "",
@@ -104,7 +104,7 @@ export const PROVIDER_MAPPING: {
name: string;
};
return createMessage(AddHumanUserRequestSchema, {
return create(AddHumanUserRequestSchema, {
username: idp.userName,
email: {
email: rawInfo.email,

8
apps/login/src/lib/zitadel.ts
View File

@@ -24,7 +24,7 @@ import {
SearchQuerySchema,
} from "@zitadel/proto/zitadel/user/v2/query_pb";
import { PROVIDER_MAPPING } from "./idp";
import { createMessage } from "@zitadel/client";
import { create } from "@zitadel/client";
import { TextQueryMethod } from "@zitadel/proto/zitadel/object/v2/object_pb";
const SESSION_LIFETIME_S = 3000;
@@ -254,7 +254,7 @@ export async function listUsers({
if (userName) {
queries.push(
createMessage(SearchQuerySchema, {
create(SearchQuerySchema, {
query: {
case: "userNameQuery",
value: {
@@ -268,7 +268,7 @@ export async function listUsers({
if (organizationId) {
queries.push(
createMessage(SearchQuerySchema, {
create(SearchQuerySchema, {
query: {
case: "organizationIdQuery",
value: {
@@ -281,7 +281,7 @@ export async function listUsers({
if (email) {
queries.push(
createMessage(SearchQuerySchema, {
create(SearchQuerySchema, {
query: {
case: "emailQuery",
value: {

9
apps/login/src/ui/DynamicTheme.tsx
View File

@@ -13,15 +13,8 @@ export default function DynamicTheme({
children: React.ReactNode;
branding?: BrandingSettings;
}) {
let partial: Partial<BrandingSettings> | undefined;
if (branding) {
partial = {
lightTheme: branding?.lightTheme,
darkTheme: branding?.darkTheme,
};
}
return (
<ThemeWrapper branding={partial}>
<ThemeWrapper branding={branding}>
{/* <ThemeProvider> */}
<LayoutProviders>
<div className="rounded-lg bg-vc-border-gradient dark:bg-dark-vc-border-gradient p-px shadow-lg shadow-black/5 dark:shadow-black/20 mb-10">

6
apps/login/src/utils/session.ts
View File

@@ -17,7 +17,7 @@ import {
ChecksSchema,
} from "@zitadel/proto/zitadel/session/v2/session_service_pb";
import { toDate } from "@zitadel/client";
import { createMessage } from "@zitadel/client";
import { create } from "@zitadel/client";
type CustomCookieData = {
id: string;
@@ -37,7 +37,7 @@ export async function createSessionAndUpdateCookie(
organization?: string,
authRequestId?: string,
) {
const checks = createMessage(
const checks = create(
ChecksSchema,
password
? {
@@ -91,7 +91,7 @@ export async function createSessionForUserIdAndUpdateCookie(
challenges: RequestChallenges | undefined,
authRequestId: string | undefined,
): Promise<Session> {
const checks = createMessage(
const checks = create(
ChecksSchema,
password
? {

2
packages/zitadel-client/src/index.ts
View File

@@ -2,6 +2,6 @@ export { toDate } from "./helpers";
export { NewAuthorizationBearerInterceptor } from "./interceptors";
// TODO: Move this to `./protobuf.ts` and export it from there
export { create as createMessage, fromJson, toJson } from "@bufbuild/protobuf";
export { create, fromJson, toJson } from "@bufbuild/protobuf";
export { TimestampSchema, timestampDate } from "@bufbuild/protobuf/wkt";
export type { Timestamp } from "@bufbuild/protobuf/wkt";