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

sessions with ts

Browse Source
This commit is contained in:
peintnermax
2024-04-03 14:12:05 +02:00
parent d8611ab070
commit 836df9ea6b
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/login/cypress/integration/login.cy.ts
View File

@@ -6,7 +6,7 @@ describe("login", () => {
data: { data: {
details: { details: {
sequence: 859, sequence: 859,
changeDate: "2023-07-04T07:58:20.126Z", changeDate: "1519211810362",
resourceOwner: "220516472055706145", resourceOwner: "220516472055706145",
}, },
sessionId: "221394658884845598", sessionId: "221394658884845598",
@@ -20,8 +20,8 @@ describe("login", () => {
data: { data: {
session: { session: {
id: "221394658884845598", id: "221394658884845598",
creationDate: "2023-07-04T07:58:20.026Z", creationDate: "1519211810362",
changeDate: "2023-07-04T07:58:20.126Z", changeDate: "1519211810999",
sequence: 859, sequence: 859,
factors: { factors: {
user: { user: {

2
apps/login/ui/Button.tsx
View File

@@ -40,7 +40,7 @@ export const getButtonClasses = (
clsx({ clsx({
"box-border font-normal leading-36px text-14px inline-flex items-center rounded-md focus:outline-none transition-colors transition-shadow duration-300": "box-border font-normal leading-36px text-14px inline-flex items-center rounded-md focus:outline-none transition-colors transition-shadow duration-300":
true, true,
"shadow hover:shadow-xl active:shadow-xl disabled:border-none disabled:bg-gray-300 disabled:text-gray-600 disabled:cursor-not-allowed disabled:dark:bg-gray-800 disabled:dark:text-gray-900": "shadow hover:shadow-xl active:shadow-xl disabled:border-none disabled:bg-gray-300 disabled:text-gray-600 disabled:shadow-none disabled:cursor-not-allowed disabled:dark:bg-gray-800 disabled:dark:text-gray-900":
variant === ButtonVariants.Primary, variant === ButtonVariants.Primary,
"bg-primary-light-500 dark:bg-primary-dark-500 hover:bg-primary-light-400 hover:dark:bg-primary-dark-400 text-primary-light-contrast-500 dark:text-primary-dark-contrast-500": "bg-primary-light-500 dark:bg-primary-dark-500 hover:bg-primary-light-400 hover:dark:bg-primary-dark-400 text-primary-light-contrast-500 dark:text-primary-dark-contrast-500":
variant === ButtonVariants.Primary && color !== ButtonColors.Warn, variant === ButtonVariants.Primary && color !== ButtonColors.Warn,

1
apps/login/utils/cookies.ts
View File

@@ -1,6 +1,5 @@
"use server"; "use server";
import { login } from "@zitadel/server";
import { cookies } from "next/headers"; import { cookies } from "next/headers";
export type SessionCookie = { export type SessionCookie = {

22
apps/login/utils/session.ts
View File

@@ -39,9 +39,9 @@ export async function createSessionAndUpdateCookie(
const sessionCookie: SessionCookie = { const sessionCookie: SessionCookie = {
id: createdSession.sessionId, id: createdSession.sessionId,
token: createdSession.sessionToken, token: createdSession.sessionToken,
creationDate: response.session.creationDate?.toString() ?? "", creationDate: `${response.session.creationDate?.getTime() ?? ""}`,
expirationDate: (response.session.expirationDate ?? "")?.toString(), expirationDate: `${response.session.expirationDate?.getTime() ?? ""}`,
changeDate: response.session.changeDate?.toString() ?? "", changeDate: `${response.session.changeDate?.getTime() ?? ""}`,
loginName: response.session.factors.user.loginName ?? "", loginName: response.session.factors.user.loginName ?? "",
organization: response.session.factors.user.organizationId ?? "", organization: response.session.factors.user.organizationId ?? "",
}; };
@@ -89,9 +89,9 @@ export async function createSessionForUserIdAndUpdateCookie(
const sessionCookie: SessionCookie = { const sessionCookie: SessionCookie = {
id: createdSession.sessionId, id: createdSession.sessionId,
token: createdSession.sessionToken, token: createdSession.sessionToken,
creationDate: response.session.creationDate?.toString() ?? "", creationDate: `${response.session.creationDate?.getTime() ?? ""}`,
expirationDate: (response.session.expirationDate ?? "")?.toString(), expirationDate: `${response.session.expirationDate?.getTime() ?? ""}`,
changeDate: response.session.changeDate?.toString() ?? "", changeDate: `${response.session.changeDate?.getTime() ?? ""}`,
loginName: response.session.factors.user.loginName ?? "", loginName: response.session.factors.user.loginName ?? "",
}; };
@@ -141,9 +141,9 @@ export async function createSessionForIdpAndUpdateCookie(
const sessionCookie: SessionCookie = { const sessionCookie: SessionCookie = {
id: createdSession.sessionId, id: createdSession.sessionId,
token: createdSession.sessionToken, token: createdSession.sessionToken,
creationDate: response.session.creationDate?.toString() ?? "", creationDate: `${response.session.creationDate?.getTime() ?? ""}`,
expirationDate: (response.session.expirationDate ?? "")?.toString(), expirationDate: `${response.session.expirationDate?.getTime() ?? ""}`,
changeDate: response.session.changeDate?.toString() ?? "", changeDate: `${response.session.changeDate?.getTime() ?? ""}`,
loginName: response.session.factors.user.loginName ?? "", loginName: response.session.factors.user.loginName ?? "",
organization: response.session.factors.user.organizationId ?? "", organization: response.session.factors.user.organizationId ?? "",
}; };
@@ -193,7 +193,7 @@ export async function setSessionAndUpdateCookie(
token: updatedSession.sessionToken, token: updatedSession.sessionToken,
creationDate: recentCookie.creationDate, creationDate: recentCookie.creationDate,
expirationDate: recentCookie.expirationDate, expirationDate: recentCookie.expirationDate,
changeDate: updatedSession.details?.changeDate?.toString() ?? "", changeDate: `${updatedSession.details?.changeDate?.getTime() ?? ""}`,
loginName: recentCookie.loginName, loginName: recentCookie.loginName,
organization: recentCookie.organization, organization: recentCookie.organization,
}; };
@@ -216,7 +216,7 @@ export async function setSessionAndUpdateCookie(
token: updatedSession.sessionToken, token: updatedSession.sessionToken,
creationDate: sessionCookie.creationDate, creationDate: sessionCookie.creationDate,
expirationDate: sessionCookie.expirationDate, expirationDate: sessionCookie.expirationDate,
changeDate: session.changeDate?.toString() ?? "", changeDate: `${session.changeDate?.getTime() ?? ""}`,
loginName: session.factors?.user?.loginName ?? "", loginName: session.factors?.user?.loginName ?? "",
organization: session.factors?.user?.organizationId ?? "", organization: session.factors?.user?.organizationId ?? "",
}; };