mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-17 21:37:35 +00:00
c0f8f4e5f2
* privatelabeling refresh, org context color * chore(deps): bump @grpc/grpc-js from 1.6.10 to 1.7.0 in /console (#4358) Bumps [@grpc/grpc-js](https://github.com/grpc/grpc-node) from 1.6.10 to 1.7.0. - [Release notes](https://github.com/grpc/grpc-node/releases) - [Commits](https://github.com/grpc/grpc-node/compare/@grpc/grpc-js@1.6.10...@grpc/grpc-js@1.7.0) --- updated-dependencies: - dependency-name: "@grpc/grpc-js" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump ngx-color from 8.0.2 to 8.0.3 in /console (#4357) Bumps [ngx-color](https://github.com/scttcper/ngx-color) from 8.0.2 to 8.0.3. - [Release notes](https://github.com/scttcper/ngx-color/releases) - [Commits](https://github.com/scttcper/ngx-color/compare/v8.0.2...v8.0.3) --- updated-dependencies: - dependency-name: ngx-color dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @types/node from 17.0.45 to 18.7.16 in /console (#4341) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.45 to 18.7.16. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump jasmine-core from 4.2.0 to 4.4.0 in /console (#4317) Bumps [jasmine-core](https://github.com/jasmine/jasmine) from 4.2.0 to 4.4.0. - [Release notes](https://github.com/jasmine/jasmine/releases) - [Changelog](https://github.com/jasmine/jasmine/blob/main/RELEASE.md) - [Commits](https://github.com/jasmine/jasmine/compare/v4.2.0...v4.4.0) --- updated-dependencies: - dependency-name: jasmine-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @types/jasmine from 4.0.3 to 4.3.0 in /console (#4279) Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 4.0.3 to 4.3.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine) --- updated-dependencies: - dependency-name: "@types/jasmine" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * quicklink * cli core * material cdk * eslint * add grantid * show oidc config error * use prettier config, linter * rm stylelint, fix lint * prettier - ignore proto output * labelling * update contribution guide Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Elio Bischof <eliobischof@gmail.com>
298 lines
15 KiB
Markdown
298 lines
15 KiB
Markdown
# Contributing to ZITADEL
|
|
|
|
## Introduction
|
|
|
|
Thank you for your interest about how to contribute! As you might know there is more than code to contribute. You can find all information needed to start contributing here.
|
|
|
|
Please give us and our community the chance to get rid of security vulnerabilities by responsibly disclose this kind of issues by contacting [security@zitadel.com](mailto:security@zitadel.com).
|
|
|
|
The strongest part of a community is the possibility to share thoughts. That's why we try to react as soon as possible to your ideas, thoughts and feedback. We love to discuss as much as possible in an open space like in the [issues](https://github.com/zitadel/zitadel/issues) and [discussions](https://github.com/zitadel/zitadel/discussions) section here or in our [chat](https://zitadel.com/chat), but we understand your doubts and provide further contact options [here](https://zitadel.com/contact).
|
|
|
|
If you want to give an answer or be part of discussions please be kind. Treat others like you want to be treated. Read more about our code of conduct [here](CODE_OF_CONDUCT.md).
|
|
|
|
## What can I contribute?
|
|
|
|
For people who are new to ZITADEL: We flag issues which are a good starting point to start contributing. You find them [here](https://github.com/zitadel/zitadel/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
|
|
|
|
Make ZITADEL more popular and give it a ⭐
|
|
|
|
Help shaping the future of ZITADEL:
|
|
|
|
- Join our [chat](https://zitadel.com/chat) and discuss with us or others.
|
|
- Ask or answer questions in the [issues section](https://github.com/zitadel/zitadel/issues)
|
|
- Share your thoughts and ideas in the [discussions section](https://github.com/zitadel/zitadel/discussions)
|
|
|
|
[Contribute](#how-to-contribute)
|
|
|
|
- [Contribute code](#contribute)
|
|
- If you found a mistake on our [docs page](https://docs.zitadel.com) or something is missing please read [the docs section](#contribute-docs)
|
|
- [Translate](#contribute-internationalization) and improve texts
|
|
|
|
Follow [@zitadel](https://twitter.com/zitadel) on twitter
|
|
|
|
## How to contribute
|
|
|
|
We strongly recommend to [talk to us](https://zitadel.com/contact) before you start contributing to streamline our and your work.
|
|
|
|
We accept contributions through pull requests. You need a github account for that. If you are unfamiliar with git have a look at Github's documentation on [creating forks](https://help.github.com/articles/fork-a-repo) and [creating pull requests](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork). Please draft the pull request as soon as possible. Go through the following checklist before you submit the final pull request:
|
|
|
|
### Submit a Pull Request (PR)
|
|
|
|
1. [Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) the [zitadel/zitadel](https://github.com/zitadel/zitadel) repository on GitHub
|
|
2. On your fork, commit your changes to a new branch
|
|
|
|
`git checkout -b my-fix-branch main`
|
|
|
|
3. Make your changes following the [guidelines](#contribute) in this guide. Make sure that all tests pass.
|
|
|
|
4. Commit the changes on the new branch
|
|
|
|
`git commit --all`
|
|
|
|
5. [Merge](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging) the latest commit of the `main`-branch
|
|
|
|
6. Push the changes to your branch on Github
|
|
|
|
`git push origin my-fix-branch`
|
|
|
|
7. Use [Semantic Release commit messages](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#type) to simplify creation of release notes. In the title of the pull request [correct tagging](#commit-messages) is required and will be requested by the reviewers.
|
|
|
|
8. On GitHub, [send a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review) to `zitadel:main`. Request review from one of the maintainers.
|
|
|
|
### Reviewing a Pull Request
|
|
|
|
The reviewers will provide you feedback and approve your changes as soon as they are satisfied. If we ask you for changes in the code, you can follow the [GitHub Guide](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request) to incorporate feedback in your pull request.
|
|
|
|
<!-- TODO: how to do this via git -->
|
|
<!-- TODO: change commit message via git -->
|
|
|
|
### Commit Messages
|
|
|
|
Make sure you use [semantic release messages format](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#type).
|
|
|
|
`<type>(<scope>): <short summary>`
|
|
|
|
#### Type
|
|
|
|
Must be one of the following:
|
|
|
|
- **feat**: New Feature
|
|
- **fix**: Bug Fix
|
|
- **docs**: Documentation
|
|
|
|
#### Scope
|
|
|
|
This is optional to indicate which component is affected. In doubt, leave blank (`<type>: <short summary>`)
|
|
|
|
#### Short Summary
|
|
|
|
Provide a brief description of the change.
|
|
|
|
## Contribute
|
|
|
|
The code consists of the following parts:
|
|
|
|
| name | description | language | where to find |
|
|
| --------------- | ------------------------------------------------------------------ | --------------------------------------------------------------------------- | -------------------------------------------------- |
|
|
| backend | Service that serves the grpc(-web) and RESTful API | [go](https://go.dev) | [API implementation](./internal/api/grpc) |
|
|
| console | Frontend the user interacts with after he is logged in | [Angular](https://angular.io), [Typescript](https://www.typescriptlang.org) | [./console](./console) |
|
|
| login | Server side rendered frontend the user interacts with during login | [go](https://go.dev), [go templates](https://pkg.go.dev/html/template) | [./internal/api/ui/login](./internal/api/ui/login) |
|
|
| API definitions | Specifications of the API | [Protobuf](https://developers.google.com/protocol-buffers) | [./proto/zitadel](./proto/zitadel) |
|
|
| docs | Project documentation made with docusaurus | [Docusaurus](https://docusaurus.io/) | [./docs](./docs) |
|
|
|
|
Please validate and test the code before you contribute.
|
|
|
|
We add the label "good first issue" for problems we think are a good starting point to contribute to ZITADEL.
|
|
|
|
- [Issues for first time contributors](https://github.com/zitadel/zitadel/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
|
|
- [All issues](https://github.com/zitadel/zitadel/issues)
|
|
|
|
### Backend / Login
|
|
|
|
By executing the commands from this section, you run everything you need to develop the ZITADEL backend locally.
|
|
Using [Docker Compose](https://docs.docker.com/compose/), you run a [CockroachDB](https://www.cockroachlabs.com/docs/v22.1/start-a-local-cluster-in-docker-mac.html) on your local machine.
|
|
With [goreleaser](https://opencollective.com/goreleaser), you build a debuggable ZITADEL binary and run it using [delve](https://github.com/go-delve/delve).
|
|
Then, you test your changes via the console your binary is serving at http://<span because="breaks the link"></span>localhost:8080 and by verifying the database.
|
|
Once you are happy with your changes, you run end-to-end tests and tear everything down.
|
|
|
|
The commands in this section are tested against the following software versions:
|
|
|
|
- [Docker version 20.10.17](https://docs.docker.com/engine/install/)
|
|
- [Goreleaser version v1.8.3](https://goreleaser.com/install/)
|
|
- [Go version 1.19](https://go.dev/doc/install)
|
|
- [Delve 1.9.1](https://github.com/go-delve/delve/tree/v1.9.1/Documentation/installation)
|
|
|
|
<!-- TODO: Describe linting (@adlerhurst) -->
|
|
|
|
Make some changes to the source code, then run the database locally.
|
|
|
|
```bash
|
|
# You just need the db service to develop the backend against.
|
|
docker compose --file ./e2e/docker-compose.yaml up --detach db
|
|
```
|
|
|
|
Build the binary. This takes some minutes, but you can speed up rebuilds.
|
|
|
|
```bash
|
|
# You just need goreleasers build part (--snapshot) and you just need to target your current platform (--single-target)
|
|
goreleaser build --id dev --snapshot --single-target --rm-dist --output .artifacts/zitadel/zitadel
|
|
```
|
|
|
|
> Note: With this command, several steps are executed.
|
|
> For speeding up rebuilds, you can reexecute only specific steps you think are necessary based on your changes.
|
|
> Generating gRPC stubs: `DOCKER_BUILDKIT=1 docker build -f build/zitadel/Dockerfile . --target go-copy -o .`
|
|
> Running unit tests: `DOCKER_BUILDKIT=1 docker build -f build/zitadel/Dockerfile . --target go-codecov`
|
|
> Generating the console: `DOCKER_BUILDKIT=1 docker build -f build/console/Dockerfile . -t zitadel-npm-console --target angular-export -o internal/api/ui/console/static/`
|
|
> Build the binary: `goreleaser build --id dev --snapshot --single-target --rm-dist --output .artifacts/zitadel/zitadel --skip-before`
|
|
|
|
You can now run and debug the binary in .artifacts/zitadel/zitadel using your favourite IDE, for example GoLand.
|
|
You can test if ZITADEL does what you expect by using the UI at http://localhost:8080/ui/console.
|
|
Also, you can verify the data by running `cockroach sql --database zitadel --insecure` and running SQL queries.
|
|
|
|
As soon as you are ready to battle test your changes, run the end-to-end tests.
|
|
|
|
```bash
|
|
# Build the production binary (unit tests are executed, too)
|
|
goreleaser build --id prod --snapshot --single-target --rm-dist --output .artifacts/zitadel/zitadel
|
|
|
|
# Pack the binary into a docker image
|
|
DOCKER_BUILDKIT=1 docker build --file build/Dockerfile .artifacts/zitadel -t zitadel:local
|
|
|
|
# Run the tests
|
|
ZITADEL_IMAGE=zitadel:local docker compose --file ./e2e/docker-compose.yaml run e2e
|
|
```
|
|
|
|
When you are happy with your changes, you can cleanup your environment.
|
|
|
|
```bash
|
|
# Stop and remove the docker containers for zitadel and the database
|
|
docker compose --file ./e2e/docker-compose.yaml down
|
|
```
|
|
|
|
### Console
|
|
|
|
By executing the commands from this section, you run everything you need to develop the console locally.
|
|
Using [Docker Compose](https://docs.docker.com/compose/), you run [CockroachDB](https://www.cockroachlabs.com/docs/v22.1/start-a-local-cluster-in-docker-mac.html) and the [latest release of ZITADEL](https://github.com/zitadel/zitadel/releases/latest) on your local machine.
|
|
You use the ZITADEL container as backend for your console.
|
|
The console is run in your [Node](https://nodejs.org/en/about/) environment using [a local development server for Angular](https://angular.io/cli/serve#ng-serve), so you have fast feedback about your changes.
|
|
|
|
We use angular-eslint/Prettier for linting/formatting, so please run `npm run lint:fix` before committing. (VSCode users, check out [this ESLint extension](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) and [this Prettier extension](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) to fix lint and formatting issues in development)
|
|
|
|
Once you are happy with your changes, you run end-to-end tests and tear everything down.
|
|
|
|
The commands in this section are tested against the following software versions:
|
|
|
|
- [Docker version 20.10.17](https://docs.docker.com/engine/install/)
|
|
- [Node version v16.17.0](https://nodejs.org/en/download/)
|
|
- [npm version 8.18.0](https://docs.npmjs.com/try-the-latest-stable-version-of-npm)
|
|
- [Cypress runtime dependencies](https://docs.cypress.io/guides/continuous-integration/introduction#Dependencies)
|
|
- [curl version 7.58.0](https://curl.se/download.html)
|
|
|
|
<details>
|
|
<summary>Note for WSL2 on Windows 10</summary>
|
|
Following the suggestions <a href="https://stackoverflow.com/questions/62641553/setup-cypress-on-wsl-ubuntu-for-windows-10">here </a> subsequently <a href="https://github.com/microsoft/WSL/issues/4106">here </a> may need to XLaunch and configure your DISPLAY variable. Use at your own risk.
|
|
|
|
1. Install `VcXsrv Windows X Server`
|
|
2. Set the target of your shortcut to `"C:\Program Files\VcXsrv\xlaunch.exe" -ac`
|
|
3. In WSL2 run `export DISPLAY=$(cat /etc/resolv.conf | grep nameserver | awk '{print $2}'):0` to set your DISPLAY variable
|
|
4. When starting XLaunch, make sure to disable access control
|
|
</details>
|
|
|
|
Run the database and the latest backend locally.
|
|
|
|
```bash
|
|
# Change to the console directory
|
|
cd ./console
|
|
|
|
# You just need the db and the zitadel services to develop the console against.
|
|
docker compose --file ../e2e/docker-compose.yaml up --detach db zitadel
|
|
```
|
|
|
|
When the backend is ready, you have the latest zitadel exposed at http://localhost:8080.
|
|
You can now run a local development server with live code reloading at http://localhost:4200.
|
|
To allow console access via http://localhost:4200, you have to configure the ZITADEL backend.
|
|
|
|
1. Navigate to http://localhost:8080/ui/console/projects.
|
|
2. When prompted, login with _zitadel-admin@<span because="breaks the mailto"></span>zitadel.localhost_ and _Password1!_
|
|
3. Select the _ZITADEL_ project.
|
|
4. Select the _Console_ application.
|
|
5. Select _Redirect Settings_
|
|
6. Add _http://<span because="breaks the link"></span>localhost:4200/auth/callback_ to the _Redirect URIs_
|
|
7. Add _http://<span because="breaks the link"></span>localhost:4200/signedout_ to the _Post Logout URIs_
|
|
8. Select the _Save_ button
|
|
|
|
You can run the local console development server now.
|
|
|
|
```bash
|
|
# Console loads its target environment from the file console/src/assets/environment.json.
|
|
# Load it from the backend.
|
|
curl http://localhost:8080/ui/console/assets/environment.json > ./src/assets/environment.json
|
|
|
|
# Generate source files from Protos
|
|
npm run generate
|
|
|
|
# Install npm dependencies
|
|
npm install
|
|
|
|
# Start the server
|
|
npm start
|
|
```
|
|
|
|
Navigate to http://localhost:4200/.
|
|
Make some changes to the source code and see how the browser is automatically updated.
|
|
After making changes to the code, you should run the end-to-end-tests.
|
|
Open another shell.
|
|
|
|
```bash
|
|
# Change to the e2e directory
|
|
cd .. && cd e2e/
|
|
|
|
# Install npm dependencies
|
|
npm install
|
|
|
|
# Run all tests in a headless browser
|
|
npm run e2e:dev
|
|
```
|
|
|
|
You can also open the test suite interactively for fast success feedback on specific tests.
|
|
|
|
```bash
|
|
# Run all tests in a headless browser
|
|
npm run open:dev
|
|
```
|
|
|
|
When you are happy with your changes, you can cleanup your environment
|
|
|
|
```bash
|
|
# Stop and remove the docker containers for zitadel and the database
|
|
docker compose down
|
|
```
|
|
|
|
## Contribute Docs
|
|
|
|
Project documentation is made with docusaurus and is located under [./docs](./docs).
|
|
Please refer to the [README](./docs/README.md) for more information and local testing.
|
|
|
|
When making a pull request use `docs(<scope>): <short summary>` as title for the semantic release.
|
|
Scope can be left empty (omit the brackets) or refer to the top navigation sections.
|
|
|
|
## Contribute Internationalization
|
|
|
|
ZITADEL loads translations from four files:
|
|
|
|
- [Console texts](./console/src/assets/i18n)
|
|
- [Login interface](./internal/api/ui/login/static/i18n)
|
|
- [Email notification](./internal/notification/static/i18n)
|
|
- [Common texts](./internal/static/i18n) for success or error toasts
|
|
|
|
You may edit the texts in these files or create a new file for additional language support. Make sure you set the locale (ISO 639-1 code) as the name of the new language file.
|
|
|
|
## Want to start ZITADEL?
|
|
|
|
You can find an installation guide for all the different environments here:
|
|
[https://docs.zitadel.com/docs/guides/installation](https://docs.zitadel.com/docs/guides/installation)
|
|
|
|
## **Did you find a security flaw?**
|
|
|
|
- Please read [Security Policy](./SECURITY.md).
|