mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-07 07:16:54 +00:00
# Which Problems Are Solved - The previous monorepo in monorepo structure for the login app and its related packages was fragmented, complicated and buggy. - The process for building and testing the login container was inconsistent between local development and CI. - Lack of clear documentation as well as easy and reliable ways for non-frontend developers to reproduce and fix failing PR checks locally. # How the Problems Are Solved - Consolidated the login app and its related npm packages by moving the main package to `apps/login/apps/login` and merging `apps/login/packages/integration` and `apps/login/packages/acceptance` into the main `apps/login` package. - Migrated from Docker Compose-based test setups to dev container-based setups, adding support for multiple dev container configurations: - `.devcontainer/base` - `.devcontainer/turbo-lint-unit` - `.devcontainer/turbo-lint-unit-debug` - `.devcontainer/login-integration` - `.devcontainer/login-integration-debug` - Added npm scripts to run the new dev container setups, enabling exact reproduction of GitHub PR checks locally, and updated the pipeline to use these containers. - Cleaned up Dockerfiles and docker-bake.hcl files to only build the production image for the login app. - Cleaned up compose files to focus on dev environments in dev containers. - Updated `CONTRIBUTING.md` with guidance on running and debugging PR checks locally using the new dev container approach. - Introduced separate Dockerfiles for the login app to distinguish between using published client packages and building clients from local protos. - Ensured the login container is always built in the pipeline for use in integration and acceptance tests. - Updated Makefile and GitHub Actions workflows to use `--frozen-lockfile` for installing pnpm packages, ensuring reproducible installs. - Disabled GitHub release creation by the changeset action. - Refactored the `/build` directory structure for clarity and maintainability. - Added a `clean` command to `docks/package.json`. - Experimentally added `knip` to the `zitadel-client` package for improved linting of dependencies and exports. # Additional Changes - Fixed Makefile commands for consistency and reliability. - Improved the structure and clarity of the `/build` directory to support seamless integration of the login build. - Enhanced documentation and developer experience for running and debugging CI checks locally. # Additional Context - See updated `CONTRIBUTING.md` for new local development and debugging instructions. - These changes are a prerequisite for further improvements to the CI pipeline and local development workflow. - Closes #10276
72 lines
2.7 KiB
TypeScript
72 lines
2.7 KiB
TypeScript
import { faker } from "@faker-js/faker";
|
|
import { test as base } from "@playwright/test";
|
|
import dotenv from "dotenv";
|
|
import path from "path";
|
|
import { code } from "./code";
|
|
import { codeScreenExpect } from "./code-screen";
|
|
import { loginScreenExpect, loginWithPassword, loginWithPasswordAndTOTP } from "./login";
|
|
import { PasswordUserWithTOTP } from "./user";
|
|
|
|
// Read from ".env" file.
|
|
dotenv.config({ path: path.resolve(__dirname, "../../login/.env.test.local") });
|
|
|
|
const test = base.extend<{ user: PasswordUserWithTOTP; sink: any }>({
|
|
user: async ({ page }, use) => {
|
|
const user = new PasswordUserWithTOTP({
|
|
email: faker.internet.email(),
|
|
isEmailVerified: true,
|
|
firstName: faker.person.firstName(),
|
|
lastName: faker.person.lastName(),
|
|
organization: "",
|
|
phone: faker.phone.number({ style: "international" }),
|
|
isPhoneVerified: true,
|
|
password: "Password1!",
|
|
passwordChangeRequired: false,
|
|
});
|
|
|
|
await user.ensure(page);
|
|
await use(user);
|
|
await user.cleanup();
|
|
},
|
|
});
|
|
|
|
test("username, password and totp login", async ({ user, page }) => {
|
|
// Given totp is enabled on the organization of the user
|
|
// Given the user has only totp configured as second factor
|
|
// User enters username
|
|
// User enters password
|
|
// Screen for entering the code is shown directly
|
|
// User enters the code into the ui
|
|
// User is redirected to the app (default redirect url)
|
|
await loginWithPasswordAndTOTP(page, user.getUsername(), user.getPassword(), user.getSecret());
|
|
await loginScreenExpect(page, user.getFullName());
|
|
});
|
|
|
|
test("username, password and totp otp login, wrong code", async ({ user, page }) => {
|
|
// Given totp is enabled on the organization of the user
|
|
// Given the user has only totp configured as second factor
|
|
// User enters username
|
|
// User enters password
|
|
// Screen for entering the code is shown directly
|
|
// User enters a wrond code
|
|
// Error message - "Invalid code" is shown
|
|
const c = "wrongcode";
|
|
await loginWithPassword(page, user.getUsername(), user.getPassword());
|
|
await code(page, c);
|
|
await codeScreenExpect(page, c);
|
|
});
|
|
|
|
test("username, password and totp login, multiple mfa options", async ({ page }) => {
|
|
test.skip();
|
|
// Given totp and email otp is enabled on the organization of the user
|
|
// Given the user has totp and email otp configured as second factor
|
|
// User enters username
|
|
// User enters password
|
|
// Screen for entering the code is shown directly
|
|
// Button to switch to email otp is shown
|
|
// User clicks button to use email otp instead
|
|
// User receives an email with a verification code
|
|
// User enters code in ui
|
|
// User is redirected to the app (default redirect url)
|
|
});
|