mirror of
https://github.com/zitadel/zitadel.git
synced 2025-04-16 17:01:28 +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>
125 lines
4.0 KiB
Go
125 lines
4.0 KiB
Go
package login
|
|
|
|
import (
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/zitadel/logging"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
)
|
|
|
|
const (
|
|
tmplRegisterOption = "registeroption"
|
|
)
|
|
|
|
type registerOptionFormData struct {
|
|
UsernamePassword bool `schema:"usernamepassword"`
|
|
}
|
|
|
|
type registerOptionData struct {
|
|
baseData
|
|
}
|
|
|
|
func (l *Login) handleRegisterOption(w http.ResponseWriter, r *http.Request) {
|
|
data := new(registerOptionFormData)
|
|
authRequest, err := l.getAuthRequestAndParseData(r, data)
|
|
if err != nil {
|
|
l.renderError(w, r, authRequest, err)
|
|
return
|
|
}
|
|
l.renderRegisterOption(w, r, authRequest, nil)
|
|
}
|
|
|
|
func (l *Login) renderRegisterOption(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, err error) {
|
|
var errID, errMessage string
|
|
if err != nil {
|
|
errID, errMessage = l.getErrorMessage(r, err)
|
|
}
|
|
allowed := registrationAllowed(authReq)
|
|
externalAllowed := externalRegistrationAllowed(authReq)
|
|
if err == nil {
|
|
// if only external allowed with a single idp then use that
|
|
if !allowed && externalAllowed && len(authReq.AllowedExternalIDPs) == 1 {
|
|
l.handleExternalRegisterByConfigID(w, r, authReq, authReq.AllowedExternalIDPs[0].IDPConfigID)
|
|
return
|
|
}
|
|
// if only direct registration is allowed, show the form
|
|
if allowed && !externalAllowed {
|
|
data := l.passLoginHintToRegistration(r, authReq)
|
|
l.renderRegister(w, r, authReq, data, nil)
|
|
return
|
|
}
|
|
}
|
|
translator := l.getTranslator(r.Context(), authReq)
|
|
data := registerOptionData{
|
|
baseData: l.getBaseData(r, authReq, "RegisterOption.Title", "RegisterOption.Description", errID, errMessage),
|
|
}
|
|
funcs := map[string]interface{}{
|
|
"hasRegistration": func() bool {
|
|
return allowed
|
|
},
|
|
"hasExternalLogin": func() bool {
|
|
return externalAllowed
|
|
},
|
|
}
|
|
l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplRegisterOption], data, funcs)
|
|
}
|
|
|
|
func (l *Login) handleRegisterOptionCheck(w http.ResponseWriter, r *http.Request) {
|
|
data := new(registerOptionFormData)
|
|
authReq, err := l.getAuthRequestAndParseData(r, data)
|
|
if err != nil {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
if data.UsernamePassword {
|
|
l.handleRegister(w, r)
|
|
return
|
|
}
|
|
l.handleRegisterOption(w, r)
|
|
}
|
|
|
|
func registrationAllowed(authReq *domain.AuthRequest) bool {
|
|
return authReq != nil && authReq.LoginPolicy != nil && authReq.LoginPolicy.AllowRegister && authReq.LoginPolicy.AllowUsernamePassword
|
|
}
|
|
|
|
func externalRegistrationAllowed(authReq *domain.AuthRequest) bool {
|
|
return authReq != nil && authReq.LoginPolicy != nil && authReq.LoginPolicy.AllowExternalIDP && authReq.AllowedExternalIDPs != nil && len(authReq.AllowedExternalIDPs) > 0
|
|
}
|
|
|
|
func (l *Login) passLoginHintToRegistration(r *http.Request, authReq *domain.AuthRequest) *registerFormData {
|
|
data := ®isterFormData{}
|
|
if authReq == nil {
|
|
return data
|
|
}
|
|
data.Email = authReq.LoginHint
|
|
domainPolicy, err := l.getOrgDomainPolicy(r, authReq.RequestedOrgID)
|
|
if err != nil {
|
|
logging.WithFields("authRequest", authReq.ID, "org", authReq.RequestedOrgID).Error("unable to load domain policy for registration loginHint")
|
|
return data
|
|
}
|
|
data.Username = authReq.LoginHint
|
|
if !domainPolicy.UserLoginMustBeDomain {
|
|
return data
|
|
}
|
|
searchQuery, err := query.NewOrgDomainOrgIDSearchQuery(authReq.RequestedOrgID)
|
|
if err != nil {
|
|
logging.WithFields("authRequest", authReq.ID, "org", authReq.RequestedOrgID).Error("unable to search query for registration loginHint")
|
|
return data
|
|
}
|
|
domains, err := l.query.SearchOrgDomains(r.Context(), &query.OrgDomainSearchQueries{Queries: []query.SearchQuery{searchQuery}}, false)
|
|
if err != nil {
|
|
logging.WithFields("authRequest", authReq.ID, "org", authReq.RequestedOrgID).Error("unable to load domains for registration loginHint")
|
|
return data
|
|
}
|
|
for _, orgDomain := range domains.Domains {
|
|
if orgDomain.IsVerified && strings.HasSuffix(authReq.LoginHint, "@"+orgDomain.Domain) {
|
|
data.Username = strings.TrimSuffix(authReq.LoginHint, "@"+orgDomain.Domain)
|
|
return data
|
|
}
|
|
}
|
|
return data
|
|
}
|