mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-21 20:38:47 +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
173 lines
5.5 KiB
TypeScript
173 lines
5.5 KiB
TypeScript
import { stub } from "../support/e2e";
|
|
|
|
describe("login", () => {
|
|
beforeEach(() => {
|
|
stub("zitadel.org.v2.OrganizationService", "ListOrganizations", {
|
|
data: {
|
|
details: {
|
|
totalResult: 1,
|
|
},
|
|
result: [{ id: "256088834543534543" }],
|
|
},
|
|
});
|
|
stub("zitadel.session.v2.SessionService", "CreateSession", {
|
|
data: {
|
|
details: {
|
|
sequence: 859,
|
|
changeDate: new Date("2024-04-04T09:40:55.577Z"),
|
|
resourceOwner: "220516472055706145",
|
|
},
|
|
sessionId: "221394658884845598",
|
|
sessionToken: "SDMc7DlYXPgwRJ-Tb5NlLqynysHjEae3csWsKzoZWLplRji0AYY3HgAkrUEBqtLCvOayLJPMd0ax4Q",
|
|
challenges: undefined,
|
|
},
|
|
});
|
|
|
|
stub("zitadel.session.v2.SessionService", "GetSession", {
|
|
data: {
|
|
session: {
|
|
id: "221394658884845598",
|
|
creationDate: new Date("2024-04-04T09:40:55.577Z"),
|
|
changeDate: new Date("2024-04-04T09:40:55.577Z"),
|
|
sequence: 859,
|
|
factors: {
|
|
user: {
|
|
id: "221394658884845598",
|
|
loginName: "[email protected]",
|
|
},
|
|
password: undefined,
|
|
webAuthN: undefined,
|
|
intent: undefined,
|
|
},
|
|
metadata: {},
|
|
},
|
|
},
|
|
});
|
|
|
|
stub("zitadel.settings.v2.SettingsService", "GetLoginSettings", {
|
|
data: {
|
|
settings: {
|
|
passkeysType: 1,
|
|
allowUsernamePassword: true,
|
|
},
|
|
},
|
|
});
|
|
});
|
|
describe("password login", () => {
|
|
beforeEach(() => {
|
|
stub("zitadel.user.v2.UserService", "ListUsers", {
|
|
data: {
|
|
details: {
|
|
totalResult: 1,
|
|
},
|
|
result: [
|
|
{
|
|
userId: "221394658884845598",
|
|
state: 1,
|
|
username: "[email protected]",
|
|
loginNames: ["[email protected]"],
|
|
preferredLoginName: "[email protected]",
|
|
human: {
|
|
userId: "221394658884845598",
|
|
state: 1,
|
|
username: "[email protected]",
|
|
loginNames: ["[email protected]"],
|
|
preferredLoginName: "[email protected]",
|
|
profile: {
|
|
givenName: "John",
|
|
familyName: "Doe",
|
|
avatarUrl: "https://zitadel.com/avatar.jpg",
|
|
},
|
|
email: {
|
|
email: "[email protected]",
|
|
isVerified: true,
|
|
},
|
|
},
|
|
},
|
|
],
|
|
},
|
|
});
|
|
stub("zitadel.user.v2.UserService", "ListAuthenticationMethodTypes", {
|
|
data: {
|
|
authMethodTypes: [1], // 1 for password authentication
|
|
},
|
|
});
|
|
});
|
|
it("should redirect a user with password authentication to /password", () => {
|
|
cy.visit("/loginname?loginName=john%40zitadel.com&submit=true");
|
|
cy.url({ timeout: 10_000 }).should("include", Cypress.config().baseUrl + "/password");
|
|
});
|
|
describe("with passkey prompt", () => {
|
|
beforeEach(() => {
|
|
stub("zitadel.session.v2.SessionService", "SetSession", {
|
|
data: {
|
|
details: {
|
|
sequence: 859,
|
|
changeDate: "2023-07-04T07:58:20.126Z",
|
|
resourceOwner: "220516472055706145",
|
|
},
|
|
sessionToken: "SDMc7DlYXPgwRJ-Tb5NlLqynysHjEae3csWsKzoZWLplRji0AYY3HgAkrUEBqtLCvOayLJPMd0ax4Q",
|
|
challenges: undefined,
|
|
},
|
|
});
|
|
});
|
|
// it("should prompt a user to setup passwordless authentication if passkey is allowed in the login settings", () => {
|
|
// cy.visit("/loginname?loginName=john%40zitadel.com&submit=true");
|
|
// cy.location("pathname", { timeout: 10_000 }).should("eq", "/password");
|
|
// cy.get('input[type="password"]').focus().type("MyStrongPassword!1");
|
|
// cy.get('button[type="submit"]').click();
|
|
// cy.location("pathname", { timeout: 10_000 }).should(
|
|
// "eq",
|
|
// "/passkey/set",
|
|
// );
|
|
// });
|
|
});
|
|
});
|
|
describe("passkey login", () => {
|
|
beforeEach(() => {
|
|
stub("zitadel.user.v2.UserService", "ListUsers", {
|
|
data: {
|
|
details: {
|
|
totalResult: 1,
|
|
},
|
|
result: [
|
|
{
|
|
userId: "221394658884845598",
|
|
state: 1,
|
|
username: "[email protected]",
|
|
loginNames: ["[email protected]"],
|
|
preferredLoginName: "[email protected]",
|
|
human: {
|
|
userId: "221394658884845598",
|
|
state: 1,
|
|
username: "[email protected]",
|
|
loginNames: ["[email protected]"],
|
|
preferredLoginName: "[email protected]",
|
|
profile: {
|
|
givenName: "John",
|
|
familyName: "Doe",
|
|
avatarUrl: "https://zitadel.com/avatar.jpg",
|
|
},
|
|
email: {
|
|
email: "[email protected]",
|
|
isVerified: true,
|
|
},
|
|
},
|
|
},
|
|
],
|
|
},
|
|
});
|
|
stub("zitadel.user.v2.UserService", "ListAuthenticationMethodTypes", {
|
|
data: {
|
|
authMethodTypes: [2], // 2 for passwordless authentication
|
|
},
|
|
});
|
|
});
|
|
|
|
it("should redirect a user with passwordless authentication to /passkey", () => {
|
|
cy.visit("/loginname?loginName=john%40zitadel.com&submit=true");
|
|
cy.url({ timeout: 10_000 }).should("include", Cypress.config().baseUrl + "/passkey");
|
|
});
|
|
});
|
|
});
|