mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-11 22:22:31 +00:00
chore: remove alias
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
import { createCallback, getBrandingSettings, getSession } from "@/lib/zitadel";
|
import { createCallback, getBrandingSettings, getSession } from "@/lib/zitadel";
|
||||||
import DynamicTheme from "@/ui/DynamicTheme";
|
import DynamicTheme from "@/ui/DynamicTheme";
|
||||||
import UserAvatar from "@/ui/UserAvatar";
|
import UserAvatar from "@/ui/UserAvatar";
|
||||||
import { createMessage } from "@zitadel/client";
|
import { create } from "@zitadel/client";
|
||||||
import { getMostRecentCookieWithLoginname } from "@zitadel/next";
|
import { getMostRecentCookieWithLoginname } from "@zitadel/next";
|
||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
import {
|
import {
|
||||||
@@ -14,11 +14,11 @@ async function loadSession(loginName: string, authRequestId?: string) {
|
|||||||
|
|
||||||
if (authRequestId) {
|
if (authRequestId) {
|
||||||
return createCallback(
|
return createCallback(
|
||||||
createMessage(CreateCallbackRequestSchema, {
|
create(CreateCallbackRequestSchema, {
|
||||||
authRequestId,
|
authRequestId,
|
||||||
callbackKind: {
|
callbackKind: {
|
||||||
case: "session",
|
case: "session",
|
||||||
value: createMessage(SessionSchema, {
|
value: create(SessionSchema, {
|
||||||
sessionId: recent.id,
|
sessionId: recent.id,
|
||||||
sessionToken: recent.token,
|
sessionToken: recent.token,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import {
|
|||||||
ChecksSchema,
|
ChecksSchema,
|
||||||
CheckTOTPSchema,
|
CheckTOTPSchema,
|
||||||
} from "@zitadel/proto/zitadel/session/v2/session_service_pb";
|
} 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) {
|
export async function POST(request: NextRequest) {
|
||||||
const body = await request.json();
|
const body = await request.json();
|
||||||
@@ -35,18 +35,18 @@ export async function POST(request: NextRequest) {
|
|||||||
|
|
||||||
return recentPromise
|
return recentPromise
|
||||||
.then((recent) => {
|
.then((recent) => {
|
||||||
const checks = createMessage(ChecksSchema, {});
|
const checks = create(ChecksSchema, {});
|
||||||
|
|
||||||
if (method === "time-based") {
|
if (method === "time-based") {
|
||||||
checks.totp = createMessage(CheckTOTPSchema, {
|
checks.totp = create(CheckTOTPSchema, {
|
||||||
code,
|
code,
|
||||||
});
|
});
|
||||||
} else if (method === "sms") {
|
} else if (method === "sms") {
|
||||||
checks.otpSms = createMessage(CheckOTPSchema, {
|
checks.otpSms = create(CheckOTPSchema, {
|
||||||
code,
|
code,
|
||||||
});
|
});
|
||||||
} else if (method === "email") {
|
} else if (method === "email") {
|
||||||
checks.otpEmail = createMessage(CheckOTPSchema, {
|
checks.otpEmail = create(CheckOTPSchema, {
|
||||||
code,
|
code,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { getSession, verifyPasskeyRegistration } from "@/lib/zitadel";
|
import { getSession, verifyPasskeyRegistration } from "@/lib/zitadel";
|
||||||
import { getSessionCookieById } from "@zitadel/next";
|
import { getSessionCookieById } from "@zitadel/next";
|
||||||
import { NextRequest, NextResponse, userAgent } from "next/server";
|
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";
|
import { VerifyPasskeyRegistrationRequestSchema } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
|
||||||
|
|
||||||
export async function POST(request: NextRequest) {
|
export async function POST(request: NextRequest) {
|
||||||
@@ -28,7 +28,7 @@ export async function POST(request: NextRequest) {
|
|||||||
});
|
});
|
||||||
if (userId) {
|
if (userId) {
|
||||||
return verifyPasskeyRegistration(
|
return verifyPasskeyRegistration(
|
||||||
createMessage(VerifyPasskeyRegistrationRequestSchema, {
|
create(VerifyPasskeyRegistrationRequestSchema, {
|
||||||
passkeyId,
|
passkeyId,
|
||||||
passkeyName,
|
passkeyName,
|
||||||
publicKeyCredential,
|
publicKeyCredential,
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import {
|
|||||||
VerifyU2FRegistrationRequestSchema,
|
VerifyU2FRegistrationRequestSchema,
|
||||||
VerifyU2FRegistrationResponseSchema,
|
VerifyU2FRegistrationResponseSchema,
|
||||||
} from "@zitadel/proto/zitadel/user/v2/user_service_pb";
|
} 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) {
|
export async function POST(request: NextRequest) {
|
||||||
const body = await request.json();
|
const body = await request.json();
|
||||||
@@ -34,7 +34,7 @@ export async function POST(request: NextRequest) {
|
|||||||
// tokenName: passkeyName,
|
// tokenName: passkeyName,
|
||||||
// };
|
// };
|
||||||
|
|
||||||
const req = createMessage(
|
const req = create(
|
||||||
VerifyU2FRegistrationRequestSchema,
|
VerifyU2FRegistrationRequestSchema,
|
||||||
// TODO: why did we passed the request instead of body here?
|
// TODO: why did we passed the request instead of body here?
|
||||||
body,
|
body,
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import {
|
|||||||
} from "@zitadel/proto/zitadel/oidc/v2/authorization_pb";
|
} from "@zitadel/proto/zitadel/oidc/v2/authorization_pb";
|
||||||
import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
|
import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
|
||||||
import { idpTypeToSlug } from "@/lib/idp";
|
import { idpTypeToSlug } from "@/lib/idp";
|
||||||
import { createMessage } from "@zitadel/client";
|
import { create } from "@zitadel/client";
|
||||||
|
|
||||||
async function loadSessions(ids: string[]): Promise<Session[]> {
|
async function loadSessions(ids: string[]): Promise<Session[]> {
|
||||||
const response = await listSessions(
|
const response = await listSessions(
|
||||||
@@ -105,11 +105,11 @@ export async function GET(request: NextRequest) {
|
|||||||
// works not with _rsc request
|
// works not with _rsc request
|
||||||
try {
|
try {
|
||||||
const { callbackUrl } = await createCallback(
|
const { callbackUrl } = await createCallback(
|
||||||
createMessage(CreateCallbackRequestSchema, {
|
create(CreateCallbackRequestSchema, {
|
||||||
authRequestId,
|
authRequestId,
|
||||||
callbackKind: {
|
callbackKind: {
|
||||||
case: "session",
|
case: "session",
|
||||||
value: createMessage(SessionSchema, session),
|
value: create(SessionSchema, session),
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@@ -269,11 +269,11 @@ export async function GET(request: NextRequest) {
|
|||||||
sessionToken: cookie?.token,
|
sessionToken: cookie?.token,
|
||||||
};
|
};
|
||||||
const { callbackUrl } = await createCallback(
|
const { callbackUrl } = await createCallback(
|
||||||
createMessage(CreateCallbackRequestSchema, {
|
create(CreateCallbackRequestSchema, {
|
||||||
authRequestId,
|
authRequestId,
|
||||||
callbackKind: {
|
callbackKind: {
|
||||||
case: "session",
|
case: "session",
|
||||||
value: createMessage(SessionSchema, session),
|
value: create(SessionSchema, session),
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@@ -306,11 +306,11 @@ export async function GET(request: NextRequest) {
|
|||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
const { callbackUrl } = await createCallback(
|
const { callbackUrl } = await createCallback(
|
||||||
createMessage(CreateCallbackRequestSchema, {
|
create(CreateCallbackRequestSchema, {
|
||||||
authRequestId,
|
authRequestId,
|
||||||
callbackKind: {
|
callbackKind: {
|
||||||
case: "session",
|
case: "session",
|
||||||
value: createMessage(SessionSchema, session),
|
value: create(SessionSchema, session),
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import {
|
|||||||
} from "@zitadel/proto/zitadel/user/v2/user_service_pb";
|
} from "@zitadel/proto/zitadel/user/v2/user_service_pb";
|
||||||
import { IDPInformation } from "@zitadel/proto/zitadel/user/v2/idp_pb";
|
import { IDPInformation } from "@zitadel/proto/zitadel/user/v2/idp_pb";
|
||||||
import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_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
|
// This maps the IdentityProviderType to a slug which is used in the /success and /failure routes
|
||||||
export function idpTypeToSlug(idpType: IdentityProviderType) {
|
export function idpTypeToSlug(idpType: IdentityProviderType) {
|
||||||
@@ -42,7 +42,7 @@ export const PROVIDER_MAPPING: {
|
|||||||
const rawInfo = idp.rawInformation as OIDC_USER;
|
const rawInfo = idp.rawInformation as OIDC_USER;
|
||||||
console.log(rawInfo);
|
console.log(rawInfo);
|
||||||
|
|
||||||
return createMessage(AddHumanUserRequestSchema, {
|
return create(AddHumanUserRequestSchema, {
|
||||||
username: idp.userName,
|
username: idp.userName,
|
||||||
email: {
|
email: {
|
||||||
email: rawInfo.User?.email,
|
email: rawInfo.User?.email,
|
||||||
@@ -78,7 +78,7 @@ export const PROVIDER_MAPPING: {
|
|||||||
|
|
||||||
console.log(rawInfo, rawInfo.userPrincipalName);
|
console.log(rawInfo, rawInfo.userPrincipalName);
|
||||||
|
|
||||||
return createMessage(AddHumanUserRequestSchema, {
|
return create(AddHumanUserRequestSchema, {
|
||||||
username: idp.userName,
|
username: idp.userName,
|
||||||
email: {
|
email: {
|
||||||
email: rawInfo.mail || rawInfo.userPrincipalName || "",
|
email: rawInfo.mail || rawInfo.userPrincipalName || "",
|
||||||
@@ -104,7 +104,7 @@ export const PROVIDER_MAPPING: {
|
|||||||
name: string;
|
name: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
return createMessage(AddHumanUserRequestSchema, {
|
return create(AddHumanUserRequestSchema, {
|
||||||
username: idp.userName,
|
username: idp.userName,
|
||||||
email: {
|
email: {
|
||||||
email: rawInfo.email,
|
email: rawInfo.email,
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import {
|
|||||||
SearchQuerySchema,
|
SearchQuerySchema,
|
||||||
} from "@zitadel/proto/zitadel/user/v2/query_pb";
|
} from "@zitadel/proto/zitadel/user/v2/query_pb";
|
||||||
import { PROVIDER_MAPPING } from "./idp";
|
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";
|
import { TextQueryMethod } from "@zitadel/proto/zitadel/object/v2/object_pb";
|
||||||
|
|
||||||
const SESSION_LIFETIME_S = 3000;
|
const SESSION_LIFETIME_S = 3000;
|
||||||
@@ -254,7 +254,7 @@ export async function listUsers({
|
|||||||
|
|
||||||
if (userName) {
|
if (userName) {
|
||||||
queries.push(
|
queries.push(
|
||||||
createMessage(SearchQuerySchema, {
|
create(SearchQuerySchema, {
|
||||||
query: {
|
query: {
|
||||||
case: "userNameQuery",
|
case: "userNameQuery",
|
||||||
value: {
|
value: {
|
||||||
@@ -268,7 +268,7 @@ export async function listUsers({
|
|||||||
|
|
||||||
if (organizationId) {
|
if (organizationId) {
|
||||||
queries.push(
|
queries.push(
|
||||||
createMessage(SearchQuerySchema, {
|
create(SearchQuerySchema, {
|
||||||
query: {
|
query: {
|
||||||
case: "organizationIdQuery",
|
case: "organizationIdQuery",
|
||||||
value: {
|
value: {
|
||||||
@@ -281,7 +281,7 @@ export async function listUsers({
|
|||||||
|
|
||||||
if (email) {
|
if (email) {
|
||||||
queries.push(
|
queries.push(
|
||||||
createMessage(SearchQuerySchema, {
|
create(SearchQuerySchema, {
|
||||||
query: {
|
query: {
|
||||||
case: "emailQuery",
|
case: "emailQuery",
|
||||||
value: {
|
value: {
|
||||||
|
|||||||
@@ -13,15 +13,8 @@ export default function DynamicTheme({
|
|||||||
children: React.ReactNode;
|
children: React.ReactNode;
|
||||||
branding?: BrandingSettings;
|
branding?: BrandingSettings;
|
||||||
}) {
|
}) {
|
||||||
let partial: Partial<BrandingSettings> | undefined;
|
|
||||||
if (branding) {
|
|
||||||
partial = {
|
|
||||||
lightTheme: branding?.lightTheme,
|
|
||||||
darkTheme: branding?.darkTheme,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return (
|
return (
|
||||||
<ThemeWrapper branding={partial}>
|
<ThemeWrapper branding={branding}>
|
||||||
{/* <ThemeProvider> */}
|
{/* <ThemeProvider> */}
|
||||||
<LayoutProviders>
|
<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">
|
<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">
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import {
|
|||||||
ChecksSchema,
|
ChecksSchema,
|
||||||
} from "@zitadel/proto/zitadel/session/v2/session_service_pb";
|
} from "@zitadel/proto/zitadel/session/v2/session_service_pb";
|
||||||
import { toDate } from "@zitadel/client";
|
import { toDate } from "@zitadel/client";
|
||||||
import { createMessage } from "@zitadel/client";
|
import { create } from "@zitadel/client";
|
||||||
|
|
||||||
type CustomCookieData = {
|
type CustomCookieData = {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -37,7 +37,7 @@ export async function createSessionAndUpdateCookie(
|
|||||||
organization?: string,
|
organization?: string,
|
||||||
authRequestId?: string,
|
authRequestId?: string,
|
||||||
) {
|
) {
|
||||||
const checks = createMessage(
|
const checks = create(
|
||||||
ChecksSchema,
|
ChecksSchema,
|
||||||
password
|
password
|
||||||
? {
|
? {
|
||||||
@@ -91,7 +91,7 @@ export async function createSessionForUserIdAndUpdateCookie(
|
|||||||
challenges: RequestChallenges | undefined,
|
challenges: RequestChallenges | undefined,
|
||||||
authRequestId: string | undefined,
|
authRequestId: string | undefined,
|
||||||
): Promise<Session> {
|
): Promise<Session> {
|
||||||
const checks = createMessage(
|
const checks = create(
|
||||||
ChecksSchema,
|
ChecksSchema,
|
||||||
password
|
password
|
||||||
? {
|
? {
|
||||||
|
|||||||
@@ -2,6 +2,6 @@ export { toDate } from "./helpers";
|
|||||||
export { NewAuthorizationBearerInterceptor } from "./interceptors";
|
export { NewAuthorizationBearerInterceptor } from "./interceptors";
|
||||||
|
|
||||||
// TODO: Move this to `./protobuf.ts` and export it from there
|
// 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 { TimestampSchema, timestampDate } from "@bufbuild/protobuf/wkt";
|
||||||
export type { Timestamp } from "@bufbuild/protobuf/wkt";
|
export type { Timestamp } from "@bufbuild/protobuf/wkt";
|
||||||
|
|||||||
Reference in New Issue
Block a user