mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-19 06:02:52 +00:00
# Which Problems Are Solved Replaces Turbo by Nx and lays the foundation for the next CI improvements. It enables using Nx Cloud to speed the up the pipelines that affect any node package. It streamlines the dev experience for frontend and backend developers by providing the following commands: | Task | Command | Notes | |------|---------|--------| | **Production** | `nx run PROJECT:prod` | Production server | | **Develop** | `nx run PROJECT:dev` | Hot reloading development server | | **Test** | `nx run PROJECT:test` | Run all tests | | **Lint** | `nx run PROJECT:lint` | Check code style | | **Lint Fix** | `nx run PROJECT:lint-fix` | Auto-fix style issues | The following values can be used for PROJECT: - @zitadel/zitadel (root commands) - @zitadel/api, - @zitadel/login, - @zitadel/console, - @zitadel/docs, - @zitadel/client - @zitadel/proto The project names and folders are streamlined: | Old Folder | New Folder | | --- | --- | | ./e2e | ./tests/functional-ui | | ./load-test | ./benchmark | | ./build/zitadel | ./apps/api | | ./console | ./apps/console (postponed so the PR is reviewable) | Also, all references to the TypeScript repo are removed so we can archive it. # How the Problems Are Solved - Ran `npx nx@latest init` - Replaced all turbo.json by project.json and fixed the target configs - Removed Turbo dependency - All JavaScript related code affected by a PRs changes is quality-checked using the `nx affected` command - We move PR checks that are runnable using Nx into the `check` workflow. For workflows where we don't use Nx, yet, we restore previously built dependency artifacts from Nx. - We only use a single and easy to understand dev container - The CONTRIBUTING.md is streamlined - The setup with a generated client pat is orchestrated with Nx - Everything related to the TypeScript repo is updated or removed. A **Deploy with Vercel** button is added to the docs and the CONTRIBUTING.md. # Additional Changes - NPM package names have a consistent pattern. - Docker bake is removed. The login container is built and released like the core container. - The integration tests build the login container before running, so they don't rely on the login container action anymore. This fixes consistently failing checks on PRs from forks. - The docs build in GitHub actions is removed, as we already build on Vercel. # Additional Context - Internal discussion: https://zitadel.slack.com/archives/C087ADF8LRX/p1756277884928169 - Workflow dispatch test: https://github.com/zitadel/zitadel/actions/runs/17760122959 --------- Co-authored-by: Florian Forster <[email protected]> Co-authored-by: Tim Möhlmann <[email protected]> Co-authored-by: Copilot <[email protected]>
283 lines
10 KiB
TypeScript
283 lines
10 KiB
TypeScript
import { ensureProjectGrantExists } from 'support/api/grants';
|
|
import {
|
|
ensureHumanIsOrgMember,
|
|
ensureHumanIsNotOrgMember,
|
|
ensureHumanIsNotProjectMember,
|
|
ensureHumanIsProjectMember,
|
|
} from 'support/api/members';
|
|
import { ensureOrgExists } from 'support/api/orgs';
|
|
import { ensureDomainPolicy } from 'support/api/policies';
|
|
import { ensureHumanUserExists, ensureUserDoesntExist } from 'support/api/users';
|
|
import { Context } from 'support/commands';
|
|
import { ensureProjectExists, ensureProjectResourceDoesntExist, Roles } from '../../support/api/projects';
|
|
|
|
describe('permissions', () => {
|
|
beforeEach(() => {
|
|
cy.context()
|
|
.as('ctx')
|
|
.then((ctx) => {
|
|
ensureDomainPolicy(ctx.api, false, true, false);
|
|
});
|
|
});
|
|
|
|
describe('management', () => {
|
|
const testManagerUsername = 'e2ehumanmanager';
|
|
function testAuthorizations(
|
|
roles: string[],
|
|
beforeCreate: (ctx: Context) => void,
|
|
beforeMutate: (ctx: Context) => void,
|
|
navigate: () => void,
|
|
) {
|
|
beforeEach(() => {
|
|
cy.get<Context>('@ctx').then((ctx) => {
|
|
ensureUserDoesntExist(ctx.api, testManagerUsername);
|
|
ensureHumanUserExists(ctx.api, testManagerUsername);
|
|
});
|
|
});
|
|
|
|
describe('create authorization', () => {
|
|
beforeEach(() => {
|
|
cy.get<Context>('@ctx').then((ctx) => {
|
|
beforeCreate(ctx);
|
|
navigate();
|
|
});
|
|
});
|
|
|
|
it('should add a manager', () => {
|
|
cy.get('[data-e2e="add-member-button"]').click();
|
|
cy.get('[data-e2e="add-member-input"]').should('be.enabled').type(testManagerUsername);
|
|
cy.get('[data-e2e="user-option"]').first().click();
|
|
cy.contains('[data-e2e="role-checkbox"]', roles[0]).click();
|
|
cy.get('[data-e2e="confirm-add-member-button"]').click();
|
|
cy.shouldConfirmSuccess();
|
|
cy.contains('[data-e2e="member-avatar"]', 'ee');
|
|
});
|
|
});
|
|
|
|
describe('mutate authorization', () => {
|
|
const rowSelector = `tr:contains(${testManagerUsername})`;
|
|
|
|
beforeEach(() => {
|
|
cy.get<Context>('@ctx').then((ctx) => {
|
|
beforeMutate(ctx);
|
|
navigate();
|
|
cy.contains('[data-e2e="member-avatar"]', 'ee').click();
|
|
cy.get(rowSelector).as('managerRow');
|
|
});
|
|
});
|
|
|
|
it('should remove a manager', () => {
|
|
cy.get('@managerRow').find('[data-e2e="remove-member-button"]').click({ force: true });
|
|
cy.get('[data-e2e="confirm-dialog-button"]').click();
|
|
cy.shouldConfirmSuccess();
|
|
cy.shouldNotExist({
|
|
selector: rowSelector,
|
|
timeout: { ms: 2000, errMessage: 'timed out before manager disappeared from the table' },
|
|
});
|
|
});
|
|
|
|
it('should remove a managers authorization', () => {
|
|
cy.get('@managerRow').find('[data-e2e="role"]').should('have.length', roles.length);
|
|
cy.get('@managerRow')
|
|
.contains('[data-e2e="role"]', roles[0])
|
|
.find('[data-e2e="remove-role-button"]')
|
|
.click({ force: true }); // TODO: Is this a bug?
|
|
cy.get('[data-e2e="confirm-dialog-button"]').click();
|
|
cy.shouldConfirmSuccess();
|
|
cy.get('@managerRow')
|
|
.find('[data-e2e="remove-role-button"]')
|
|
.should('have.length', roles.length - 1);
|
|
});
|
|
});
|
|
}
|
|
|
|
describe('organizations', () => {
|
|
const roles = [
|
|
{ internal: 'ORG_OWNER', display: 'Org Owner' },
|
|
{ internal: 'ORG_OWNER_VIEWER', display: 'Org Owner Viewer' },
|
|
];
|
|
|
|
testAuthorizations(
|
|
roles.map((role) => role.display),
|
|
function (ctx: Context) {
|
|
ensureHumanIsNotOrgMember(ctx.api, testManagerUsername);
|
|
},
|
|
function (ctx: Context) {
|
|
ensureHumanIsNotOrgMember(ctx.api, testManagerUsername);
|
|
ensureHumanIsOrgMember(
|
|
ctx.api,
|
|
testManagerUsername,
|
|
roles.map((role) => role.internal),
|
|
);
|
|
},
|
|
() => {
|
|
cy.visit('/orgs');
|
|
cy.contains('tr', Cypress.env('ORGANIZATION')).click();
|
|
},
|
|
);
|
|
});
|
|
|
|
describe('projects', () => {
|
|
describe('owned projects', () => {
|
|
beforeEach(() => {
|
|
cy.get<Context>('@ctx').then((ctx) => {
|
|
ensureProjectExists(ctx.api, 'e2eprojectpermission').as('projectId');
|
|
});
|
|
});
|
|
|
|
const visitOwnedProject = () => {
|
|
cy.get<number>('@projectId').then((projectId) => {
|
|
cy.visit(`/projects/${projectId}`);
|
|
});
|
|
};
|
|
|
|
describe('authorizations', () => {
|
|
const roles = [
|
|
{ internal: 'PROJECT_OWNER_GLOBAL', display: 'Project Owner Global' },
|
|
{ internal: 'PROJECT_OWNER_VIEWER_GLOBAL', display: 'Project Owner Viewer Global' },
|
|
];
|
|
|
|
testAuthorizations(
|
|
roles.map((role) => role.display),
|
|
function (ctx) {
|
|
cy.get<string>('@projectId').then((projectId) => {
|
|
ensureHumanIsNotProjectMember(ctx.api, projectId, testManagerUsername);
|
|
});
|
|
},
|
|
function (ctx) {
|
|
cy.get<string>('@projectId').then((projectId) => {
|
|
ensureHumanIsNotProjectMember(ctx.api, projectId, testManagerUsername);
|
|
ensureHumanIsProjectMember(
|
|
ctx.api,
|
|
projectId,
|
|
testManagerUsername,
|
|
roles.map((role) => role.internal),
|
|
);
|
|
});
|
|
},
|
|
visitOwnedProject,
|
|
);
|
|
});
|
|
|
|
describe('roles', () => {
|
|
const testRoleName = 'e2eroleundertestname';
|
|
|
|
beforeEach(() => {
|
|
cy.get<Context>('@ctx').then((ctx) => {
|
|
cy.get<string>('@projectId').then((projectId) => {
|
|
ensureProjectResourceDoesntExist(ctx.api, projectId, Roles, testRoleName);
|
|
visitOwnedProject();
|
|
});
|
|
});
|
|
});
|
|
|
|
it('should add a role', () => {
|
|
cy.get('[data-e2e="sidenav-element-roles"]').click();
|
|
cy.get('[data-e2e="add-new-role"]').click();
|
|
cy.get('[formcontrolname="key"]').should('be.enabled').type(testRoleName);
|
|
cy.get('[formcontrolname="displayName"]').should('be.enabled').type('e2eroleundertestdisplay');
|
|
cy.get('[formcontrolname="group"]').should('be.enabled').type('e2eroleundertestgroup');
|
|
cy.get('[data-e2e="save-button"]').click();
|
|
cy.shouldConfirmSuccess();
|
|
cy.contains('tr', testRoleName);
|
|
});
|
|
it('should remove a role');
|
|
});
|
|
});
|
|
|
|
describe('granted projects', () => {
|
|
beforeEach(() => {
|
|
cy.get<Context>('@ctx').then((ctx) => {
|
|
ensureOrgExists(ctx, 'e2eforeignorg').then((foreignOrgId) => {
|
|
ensureProjectExists(ctx.api, 'e2eprojectgrants', foreignOrgId)
|
|
.as('foreignProjectId')
|
|
.then((foreignProjectId) => {
|
|
ensureProjectGrantExists(ctx, foreignOrgId, foreignProjectId).as('grantId');
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
function visitGrantedProject() {
|
|
cy.get<string>('@foreignProjectId').then((foreignProjectId) => {
|
|
cy.get<string>('@grantId').then((grantId) => {
|
|
cy.visit(`/granted-projects/${foreignProjectId}/grant/${grantId}`);
|
|
});
|
|
});
|
|
}
|
|
|
|
describe('authorizations', () => {
|
|
const roles = [
|
|
{ internal: 'PROJECT_GRANT_OWNER', display: 'Project Grant Owner' },
|
|
{ internal: 'PROJECT_GRANT_OWNER_VIEWER', display: 'Project Grant Owner Viewer' },
|
|
];
|
|
|
|
testAuthorizations(
|
|
roles.map((role) => role.display),
|
|
function (ctx: Context) {
|
|
cy.get<string>('@foreignProjectId').then((foreignProjectId) => {
|
|
cy.get<string>('@grantId').then((grantId) => {
|
|
ensureHumanIsNotProjectMember(ctx.api, foreignProjectId, testManagerUsername, grantId);
|
|
});
|
|
});
|
|
},
|
|
function (ctx: Context) {
|
|
cy.get<string>('@foreignProjectId').then((foreignProjectId) => {
|
|
cy.get<string>('@grantId').then((grantId) => {
|
|
ensureHumanIsNotProjectMember(ctx.api, foreignProjectId, testManagerUsername, grantId);
|
|
ensureHumanIsProjectMember(
|
|
ctx.api,
|
|
foreignProjectId,
|
|
testManagerUsername,
|
|
roles.map((role) => role.internal),
|
|
grantId,
|
|
);
|
|
});
|
|
});
|
|
},
|
|
visitGrantedProject,
|
|
);
|
|
});
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('validations', () => {
|
|
describe('owned projects', () => {
|
|
describe('no ownership', () => {
|
|
it('a user without project global ownership can ...');
|
|
it('a user without project global ownership can not ...');
|
|
});
|
|
describe('project owner viewer global', () => {
|
|
it('a project owner viewer global additionally can ...');
|
|
it('a project owner viewer global still can not ...');
|
|
});
|
|
describe('project owner global', () => {
|
|
it('a project owner global additionally can ...');
|
|
it('a project owner global still can not ...');
|
|
});
|
|
});
|
|
|
|
describe('granted projects', () => {
|
|
describe('no ownership', () => {
|
|
it('a user without project grant ownership can ...');
|
|
it('a user without project grant ownership can not ...');
|
|
});
|
|
describe('project grant owner viewer', () => {
|
|
it('a project grant owner viewer additionally can ...');
|
|
it('a project grant owner viewer still can not ...');
|
|
});
|
|
describe('project grant owner', () => {
|
|
it('a project grant owner additionally can ...');
|
|
it('a project grant owner still can not ...');
|
|
});
|
|
});
|
|
describe('organization', () => {
|
|
describe('org owner', () => {
|
|
it('a project owner global can ...');
|
|
it('a project owner global can not ...');
|
|
});
|
|
});
|
|
});
|