Skip to content

Commit

Permalink
Merge branch 'main' into next-rc
Browse files Browse the repository at this point in the history
  • Loading branch information
livio-a committed May 7, 2024
2 parents d5e40d9 + 72c5b05 commit 01e41c2
Show file tree
Hide file tree
Showing 120 changed files with 5,611 additions and 1,944 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ <h3>{{ 'DESCRIPTIONS.SETTINGS.LOGIN.FORM.TITLE' | translate }}</h3>
class="login-policy-toggle"
color="primary"
ngDefaultControl
matTooltip="{{ 'DESCRIPTIONS.SETTINGS.LOGIN.FORM.PASSWORD_RESET_ALLOWED.DESCRIPTION' | translate }}"
matTooltip="{{ 'DESCRIPTIONS.SETTINGS.LOGIN.FORM.HIDE_PASSWORD_RESET.DESCRIPTION' | translate }}"
[(ngModel)]="loginData.hidePasswordReset"
[disabled]="
([
Expand All @@ -311,7 +311,7 @@ <h3>{{ 'DESCRIPTIONS.SETTINGS.LOGIN.FORM.TITLE' | translate }}</h3>
| async) === false
"
>
{{ 'DESCRIPTIONS.SETTINGS.LOGIN.FORM.PASSWORD_RESET_ALLOWED.TITLE' | translate }}
{{ 'DESCRIPTIONS.SETTINGS.LOGIN.FORM.HIDE_PASSWORD_RESET.TITLE' | translate }}
</mat-checkbox>

<!-- <ng-template #passwordResetInfo>
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "Разрешен е външен вход",
"DESCRIPTION": "Позволете на вашите потребители да влизат с външен доставчик на идентичност вместо да използват ZITADEL потребител за вход."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Разрешено е възстановяване на парола",
"DESCRIPTION": "Позволете на вашите потребители да възстановяват своята парола."
"HIDE_PASSWORD_RESET": {
"TITLE": "Скрито възстановяване на паролата",
"DESCRIPTION": "Не позволявайте на потребителите ви да нулират паролата си."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Разрешено е откриването на домейни",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "Povoleno externí přihlášení",
"DESCRIPTION": "Umožni svým uživatelům přihlásit se pomocí externího poskytovatele identity namísto použití ZITADEL uživatele pro přihlášení."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Povoleno resetování hesla",
"DESCRIPTION": "Umožni svým uživatelům resetovat jejich heslo."
"HIDE_PASSWORD_RESET": {
"TITLE": "Obnovení hesla skryté",
"DESCRIPTION": "Neumožněte uživatelům resetovat heslo."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Povoleno objevování domén",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "Externer Login erlaubt",
"DESCRIPTION": "Erlaube deinen Benutzern, sich mit einem externen Identitätsanbieter einzuloggen, anstatt den ZITADEL-Benutzer zum Einloggen zu verwenden."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Passwort-Reset erlaubt",
"DESCRIPTION": "Erlaube deinen Benutzern, ihr Passwort zurückzusetzen."
"HIDE_PASSWORD_RESET": {
"TITLE": "Passwort-Reset ausgeblendet",
"DESCRIPTION": "Erlauben Sie Ihren Benutzern nicht, ihr Passwort zurückzusetzen."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Domänenentdeckung erlaubt",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "External Login allowed",
"DESCRIPTION": "Allow your users to log in with an external identity provider instead of using the ZITADEL user to log in."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Password Reset allowed",
"DESCRIPTION": "Allow your users to reset their password."
"HIDE_PASSWORD_RESET": {
"TITLE": "Password Reset hidden",
"DESCRIPTION": "Do not allow your users to reset their password."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Domain Discovery allowed",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "Permitido Inicio de Sesión Externo",
"DESCRIPTION": "Permite a tus usuarios iniciar sesión con un proveedor de identidad externo en lugar de usar el usuario de ZITADEL para iniciar sesión."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Permitido Restablecimiento de Contraseña",
"DESCRIPTION": "Permite a tus usuarios restablecer su contraseña."
"HIDE_PASSWORD_RESET": {
"TITLE": "Restablecimiento de contraseña oculto",
"DESCRIPTION": "No permita que sus usuarios restablezcan su contraseña."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Permitido Descubrimiento de Dominio",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "External Login allowed",
"DESCRIPTION": "Allow your users to log in with an external identity provider instead of using the ZITADEL user to log in."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Password Reset allowed",
"DESCRIPTION": "Allow your users to reset their password."
"HIDE_PASSWORD_RESET": {
"TITLE": "Réinitialisation du mot de passe masquée",
"DESCRIPTION": "Ne permettez pas à vos utilisateurs de réinitialiser leur mot de passe."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Domain Discovery allowed",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "Login Esterno consentito",
"DESCRIPTION": "Permetti ai tuoi utenti di accedere con un provider di identità esterno invece di utilizzare l'utente ZITADEL per accedere."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Reset Password consentito",
"DESCRIPTION": "Permetti ai tuoi utenti di reimpostare la loro password."
"HIDE_PASSWORD_RESET": {
"TITLE": "Ripristino password nascosto",
"DESCRIPTION": "Non consentire agli utenti di reimpostare la password."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Scoperta Dominio consentita",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "外部ログインが許可",
"DESCRIPTION": "ユーザーがZITADELユーザーを使用する代わりに外部IDプロバイダーでログインできるようにします。"
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "パスワードリセットが許可",
"DESCRIPTION": "ユーザーがパスワードをリセットできるようにします"
"HIDE_PASSWORD_RESET": {
"TITLE": "パスワードリセットは非表示です",
"DESCRIPTION": "ユーザーがパスワードをリセットできないようにしてください"
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "ドメインディスカバリーが許可",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/mk.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "Дозволена надворешна најава",
"DESCRIPTION": "Овозможете на вашите корисници да се најават со надворешен провајдер на идентитет наместо да користат ZITADEL корисник за најава."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Дозволено ресетирање на лозинка",
"DESCRIPTION": "Овозможете на вашите корисници да ја ресетираат својата лозинка."
"HIDE_PASSWORD_RESET": {
"TITLE": "Скриено ресетирање на лозинка",
"DESCRIPTION": "Не дозволувајте им на вашите корисници да ја ресетираат лозинката."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Дозволено откривање на домени",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "Extern inloggen toegestaan",
"DESCRIPTION": "Sta je gebruikers toe om in te loggen met een externe identiteitsprovider in plaats van het gebruik van de ZITADEL gebruiker om in te loggen."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Wachtwoord resetten toegestaan",
"DESCRIPTION": "Sta je gebruikers toe om hun wachtwoord te resetten."
"HIDE_PASSWORD_RESET": {
"TITLE": "Wachtwoord reset verborgen",
"DESCRIPTION": "Sta uw gebruikers niet toe hun wachtwoord opnieuw in te stellen."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Domeinontdekking toegestaan",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "Dozwolone logowanie zewnętrzne",
"DESCRIPTION": "Pozwól swoim użytkownikom logować się za pomocą zewnętrznego dostawcy tożsamości zamiast używać użytkownika ZITADEL do logowania."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Dozwolone resetowanie hasła",
"DESCRIPTION": "Pozwól swoim użytkownikom na resetowanie ich hasła."
"HIDE_PASSWORD_RESET": {
"TITLE": "Ukryte resetowanie hasła",
"DESCRIPTION": "Nie zezwalaj użytkownikom na resetowanie hasła."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Dozwolone odkrywanie domen",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "Login Externo permitido",
"DESCRIPTION": "Permite que seus usuários façam login com um provedor de identidade externo em vez de usar o usuário ZITADEL para fazer login."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Redefinição de Senha permitida",
"DESCRIPTION": "Permite que seus usuários redefinam sua senha."
"HIDE_PASSWORD_RESET": {
"TITLE": "Redefinição de senha oculta",
"DESCRIPTION": "Não permita que seus usuários redefinam a senha."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Descoberta de Domínio permitida",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "Разрешен внешний вход",
"DESCRIPTION": "Разрешить пользователям входить с использованием внешнего поставщика идентификации вместо использования пользователя ZITADEL для входа."
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "Разрешено сбросить пароль",
"DESCRIPTION": "Разрешить пользователям сбрасывать свой пароль."
"HIDE_PASSWORD_RESET": {
"TITLE": "Скрытый сброс пароля",
"DESCRIPTION": "Не разрешайте пользователям сбрасывать пароль."
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "Разрешено обнаружение домена",
Expand Down
6 changes: 3 additions & 3 deletions console/src/assets/i18n/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@
"TITLE": "允许外部登录",
"DESCRIPTION": "允许用户使用外部身份提供者登录,而不是使用ZITADEL用户登录。"
},
"PASSWORD_RESET_ALLOWED": {
"TITLE": "允许密码重置",
"DESCRIPTION": "允许用户重置他们的密码"
"HIDE_PASSWORD_RESET": {
"TITLE": "隐藏密码重置",
"DESCRIPTION": "不允许用户重置密码"
},
"DOMAIN_DISCOVERY_ALLOWED": {
"TITLE": "允许域名发现",
Expand Down
139 changes: 139 additions & 0 deletions docs/docs/apis/actionsv2/execution-local.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
---
title: Actions v2 example execution locally
---

In this guide, you will create a ZITADEL execution and target. After a user is created through the API, the target is called.

## Prerequisites

Before you start, make sure you have everything set up correctly.

- You need to be at least a ZITADEL [_IAM_OWNER_](/guides/manage/console/managers)
- Your ZITADEL instance needs to have the actions feature enabled.

## Start example target

To start a simple HTTP server locally, which receives the webhook call, the following code example can be used:

```go
package main

import (
"fmt"
"io"
"net/http"
)

// webhook HandleFunc to read the request body and then print out the contents
func webhook(w http.ResponseWriter, req *http.Request) {
// read the body content
sentBody, err := io.ReadAll(req.Body)
if err != nil {
// if there was an error while reading the body return an error
http.Error(w, "error", http.StatusInternalServerError)
return
}
// print out the read content
fmt.Println(string(sentBody))
}

func main() {
// handle the HTTP call under "/webhook"
http.HandleFunc("/webhook", webhook)

// start an HTTP server with the before defined function to handle the endpoint under "http://localhost:8090"
http.ListenAndServe(":8090", nil)
}
```

What happens here is only a target which prints out the received request, which could also be handled with a different logic.

## Create target

As you see in the example above the target is created with HTTP and port '8090' and if we want to use it as webhook, the target can be created as follows:

[Create a target](/apis/resources/action_service_v3/action-service-create-target)

```shell
curl -L -X POST 'https://$CUSTOM-DOMAIN/v3alpha/targets' \
-H 'Content-Type: application/json' \
-H 'Accept: application/json' \
-H 'Authorization: Bearer <TOKEN>' \
--data-raw '{
"name": "local webhook",
"restWebhook": {
"interruptOnError": true
},
"endpoint": "http://localhost:8090/webhook",
"timeout": "10s"
}'
```

Save the returned ID to set in the execution.

## Set execution

To call the target just created before, with the intention to print the request used for user creation by the user V2 API, we define an execution with a method condition.

[Set an execution](/apis/resources/action_service_v3/action-service-set-execution)

```shell
curl -L -X PUT 'https://$CUSTOM-DOMAIN/v3alpha/executions' \
-H 'Content-Type: application/json' \
-H 'Accept: application/json' \
-H 'Authorization: Bearer <TOKEN>' \
--data-raw '{
"condition": {
"request": {
"method": "/zitadel.user.v2beta.UserService/AddHumanUser"
}
},
"targets": [
{
"target": "<TargetID returned>"
}
]
}'
```

## Example call

Now on every call on `/zitadel.user.v2beta.UserService/AddHumanUser` the local server prints out the received body of the request:

```shell
curl -L -X PUT 'https://$CUSTOM-DOMAIN/v2beta/users/human' \
-H 'Content-Type: application/json' \
-H 'Accept: application/json' \
-H 'Authorization: Bearer <TOKEN>' \
--data-raw '{
"profile": {
"givenName": "Example_given",
"familyName": "Example_family"
},
"email": {
"email": "example@example.com"
}
}'
```

Should print out something like, also described under [Sent information Request](./introduction#sent-information-request):
```shell
{
"fullMethod": "/zitadel.user.v2beta.UserService/AddHumanUser",
"instanceID": "262851882718855632",
"orgID": "262851882718921168",
"projectID": "262851882719052240",
"userID": "262851882718986704",
"request": {
"profile": {
"given_name": "Example_given",
"family_name": "Example_family"
},
"email": {
"email": "example@example.com"
}
}
}
```


0 comments on commit 01e41c2

Please sign in to comment.