mirror of
https://github.com/zitadel/zitadel.git
synced 2025-04-07 19:34:31 +00:00

* feat(command): remove org * refactor: imports, unused code, error handling * reduce org removed in action * add org deletion to projections * add org removal to projections * add org removal to projections * org removed projection * lint import * projections * fix: table names in tests * fix: table names in tests * logging * add org state * fix(domain): add Owner removed to object details * feat(ListQuery): add with owner removed * fix(org-delete): add bool to functions to select with owner removed * fix(org-delete): add bools to user grants with events to determine if dependencies lost owner * fix(org-delete): add unit tests for owner removed and org removed events * fix(org-delete): add handling of org remove for grants and members * fix(org-delete): correction of unit tests for owner removed * fix(org-delete): update projections, unit tests and get functions * fix(org-delete): add change date to authnkeys and owner removed to org metadata * fix(org-delete): include owner removed for login names * fix(org-delete): some column fixes in projections and build for queries with owner removed * indexes * fix(org-delete): include review changes * fix(org-delete): change user projection name after merge * fix(org-delete): include review changes for project grant where no project owner is necessary * fix(org-delete): include auth and adminapi tables with owner removed information * fix(org-delete): cleanup username and orgdomain uniqueconstraints when org is removed * fix(org-delete): add permissions for org.remove * remove unnecessary unique constraints * fix column order in primary keys * fix(org-delete): include review changes * fix(org-delete): add owner removed indexes and chang setup step to create tables * fix(org-delete): move PK order of instance_id and change added user_grant from review * fix(org-delete): no params for prepareUserQuery * change to step 6 * merge main * fix(org-delete): OldUserName rename to private * fix linting * cleanup * fix: remove org test * create prerelease * chore: delete org-delete as prerelease Co-authored-by: Stefan Benz <stefan@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
159 lines
4.2 KiB
Go
159 lines
4.2 KiB
Go
package login
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/command"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
caos_errs "github.com/zitadel/zitadel/internal/errors"
|
|
)
|
|
|
|
const (
|
|
tmplRegisterOrg = "registerorg"
|
|
)
|
|
|
|
type registerOrgFormData struct {
|
|
RegisterOrgName string `schema:"orgname"`
|
|
Email string `schema:"email"`
|
|
Username string `schema:"username"`
|
|
Firstname string `schema:"firstname"`
|
|
Lastname string `schema:"lastname"`
|
|
Password string `schema:"register-password"`
|
|
Password2 string `schema:"register-password-confirmation"`
|
|
TermsConfirm bool `schema:"terms-confirm"`
|
|
}
|
|
|
|
type registerOrgData struct {
|
|
baseData
|
|
registerOrgFormData
|
|
PasswordPolicyDescription string
|
|
MinLength uint64
|
|
HasUppercase string
|
|
HasLowercase string
|
|
HasNumber string
|
|
HasSymbol string
|
|
UserLoginMustBeDomain bool
|
|
IamDomain string
|
|
}
|
|
|
|
func (l *Login) handleRegisterOrg(w http.ResponseWriter, r *http.Request) {
|
|
data := new(registerOrgFormData)
|
|
authRequest, err := l.getAuthRequestAndParseData(r, data)
|
|
if err != nil {
|
|
l.renderError(w, r, authRequest, err)
|
|
return
|
|
}
|
|
l.renderRegisterOrg(w, r, authRequest, data, nil)
|
|
}
|
|
|
|
func (l *Login) handleRegisterOrgCheck(w http.ResponseWriter, r *http.Request) {
|
|
data := new(registerOrgFormData)
|
|
authRequest, err := l.getAuthRequestAndParseData(r, data)
|
|
if err != nil {
|
|
l.renderError(w, r, authRequest, err)
|
|
return
|
|
}
|
|
if data.Password != data.Password2 {
|
|
err := caos_errs.ThrowInvalidArgument(nil, "VIEW-KaGue", "Errors.User.Password.ConfirmationWrong")
|
|
l.renderRegisterOrg(w, r, authRequest, data, err)
|
|
return
|
|
}
|
|
|
|
ctx := setContext(r.Context(), "")
|
|
userIDs, err := l.getClaimedUserIDsOfOrgDomain(ctx, data.RegisterOrgName)
|
|
if err != nil {
|
|
l.renderRegisterOrg(w, r, authRequest, data, err)
|
|
return
|
|
}
|
|
_, _, err = l.command.SetUpOrg(ctx, data.toCommandOrg(), userIDs...)
|
|
if err != nil {
|
|
l.renderRegisterOrg(w, r, authRequest, data, err)
|
|
return
|
|
}
|
|
if authRequest == nil {
|
|
l.defaultRedirect(w, r)
|
|
return
|
|
}
|
|
l.renderNextStep(w, r, authRequest)
|
|
}
|
|
|
|
func (l *Login) renderRegisterOrg(w http.ResponseWriter, r *http.Request, authRequest *domain.AuthRequest, formData *registerOrgFormData, err error) {
|
|
var errID, errMessage string
|
|
if err != nil {
|
|
errID, errMessage = l.getErrorMessage(r, err)
|
|
}
|
|
if formData == nil {
|
|
formData = new(registerOrgFormData)
|
|
}
|
|
translator := l.getTranslator(r.Context(), authRequest)
|
|
data := registerOrgData{
|
|
baseData: l.getBaseData(r, authRequest, "RegistrationOrg.Title", "RegistrationOrg.Description", errID, errMessage),
|
|
registerOrgFormData: *formData,
|
|
}
|
|
pwPolicy := l.getPasswordComplexityPolicy(r, "0")
|
|
if pwPolicy != nil {
|
|
data.MinLength = pwPolicy.MinLength
|
|
if pwPolicy.HasUppercase {
|
|
data.HasUppercase = UpperCaseRegex
|
|
}
|
|
if pwPolicy.HasLowercase {
|
|
data.HasLowercase = LowerCaseRegex
|
|
}
|
|
if pwPolicy.HasSymbol {
|
|
data.HasSymbol = SymbolRegex
|
|
}
|
|
if pwPolicy.HasNumber {
|
|
data.HasNumber = NumberRegex
|
|
}
|
|
}
|
|
orgPolicy, _ := l.getDefaultDomainPolicy(r)
|
|
if orgPolicy != nil {
|
|
data.UserLoginMustBeDomain = orgPolicy.UserLoginMustBeDomain
|
|
data.IamDomain = authz.GetInstance(r.Context()).RequestedDomain()
|
|
}
|
|
|
|
if authRequest == nil {
|
|
l.customTexts(r.Context(), translator, "")
|
|
}
|
|
l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplRegisterOrg], data, nil)
|
|
}
|
|
|
|
func (d registerOrgFormData) toUserDomain() *domain.Human {
|
|
if d.Username == "" {
|
|
d.Username = d.Email
|
|
}
|
|
return &domain.Human{
|
|
Username: d.Username,
|
|
Profile: &domain.Profile{
|
|
FirstName: d.Firstname,
|
|
LastName: d.Lastname,
|
|
},
|
|
Password: &domain.Password{
|
|
SecretString: d.Password,
|
|
},
|
|
Email: &domain.Email{
|
|
EmailAddress: d.Email,
|
|
},
|
|
}
|
|
}
|
|
|
|
func (d registerOrgFormData) toCommandOrg() *command.OrgSetup {
|
|
if d.Username == "" {
|
|
d.Username = d.Email
|
|
}
|
|
return &command.OrgSetup{
|
|
Name: d.RegisterOrgName,
|
|
Human: command.AddHuman{
|
|
Username: d.Username,
|
|
FirstName: d.Firstname,
|
|
LastName: d.Lastname,
|
|
Email: command.Email{
|
|
Address: d.Email,
|
|
},
|
|
Password: d.Password,
|
|
Register: true,
|
|
},
|
|
}
|
|
}
|