TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-13 03:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: panics (#2993)

Browse Source 
* add missing return

Signed-off-by: Livio Amstutz <livio.a@gmail.com>

* add nil pointer check

Signed-off-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Livio Amstutz 2022-01-12 15:31:11 +01:00 committed by GitHub
parent 6240dffc42
commit 3d14653a08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/ui/login/handler/login_success_handler.go
View File

@ -23,6 +23,7 @@ func (l *Login) handleLoginSuccess(w http.ResponseWriter, r *http.Request) {
authRequest, _ := l.getAuthRequest(r) authRequest, _ := l.getAuthRequest(r)
if authRequest == nil { if authRequest == nil {
l.renderSuccessAndCallback(w, r, nil, nil) l.renderSuccessAndCallback(w, r, nil, nil)
return
} }
for _, step := range authRequest.PossibleSteps { for _, step := range authRequest.PossibleSteps {
if step.Type() != domain.NextStepLoginSucceeded && step.Type() != domain.NextStepRedirectToCallback { if step.Type() != domain.NextStepLoginSucceeded && step.Type() != domain.NextStepRedirectToCallback {

2
internal/ui/login/handler/register_handler.go
View File

@ -70,7 +70,7 @@ func (l *Login) handleRegisterCheck(w http.ResponseWriter, r *http.Request) {
resourceOwner := iam.GlobalOrgID resourceOwner := iam.GlobalOrgID
memberRoles := []string{domain.RoleSelfManagementGlobal} memberRoles := []string{domain.RoleSelfManagementGlobal}
if authRequest.RequestedOrgID != "" && authRequest.RequestedOrgID != iam.GlobalOrgID { if authRequest != nil && authRequest.RequestedOrgID != "" && authRequest.RequestedOrgID != iam.GlobalOrgID {
memberRoles = nil memberRoles = nil
resourceOwner = authRequest.RequestedOrgID resourceOwner = authRequest.RequestedOrgID
} }