TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 07:47:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use default redirect uri when not passed on end_session endpoint (#4054)

Browse Source 
* fix: use default redirect uri when not passed on end_session endpoint

* instance state
This commit is contained in:
Livio Spring
2022-07-27 09:49:16 +02:00
committed by GitHub
parent 8e94d2377b
commit c15577c1f9
6 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/grpc/instance/converter.go
View File

@@ -28,6 +28,7 @@ func InstanceToPb(instance *query.Instance) *instance_pb.Instance {
Name: instance.Name,
Domains: DomainsToPb(instance.Domains),
Version: build.Version(),
State: instance_pb.State_STATE_RUNNING, //TODO: change when delete is implemented
}
}
@@ -43,6 +44,7 @@ func InstanceDetailToPb(instance *query.Instance) *instance_pb.InstanceDetail {
Name: instance.Name,
Domains: DomainsToPb(instance.Domains),
Version: build.Version(),
State: instance_pb.State_STATE_RUNNING, //TODO: change when delete is implemented
}
}

6
internal/api/oidc/auth_request.go
View File

@@ -143,12 +143,12 @@ func (o *OPStorage) TerminateSession(ctx context.Context, userID, clientID strin
defer func() { span.EndWithError(err) }()
userAgentID, ok := middleware.UserAgentIDFromCtx(ctx)
if !ok {
logging.Log("OIDC-aGh4q").Error("no user agent id")
logging.Error("no user agent id")
return errors.ThrowPreconditionFailed(nil, "OIDC-fso7F", "no user agent id")
}
userIDs, err := o.repo.UserSessionUserIDsByAgentID(ctx, userAgentID)
if err != nil {
logging.Log("OIDC-Ghgr3").WithError(err).Error("error retrieving user sessions")
logging.WithError(err).Error("error retrieving user sessions")
return err
}
if len(userIDs) == 0 {
@@ -158,7 +158,7 @@ func (o *OPStorage) TerminateSession(ctx context.Context, userID, clientID strin
UserID: userID,
}
err = o.command.HumansSignOut(authz.SetCtxData(ctx, data), userAgentID, userIDs)
logging.Log("OIDC-Dggt2").OnError(err).Error("error signing out")
logging.OnError(err).Error("error signing out")
return err
}

4
internal/api/ui/login/static/templates/logout_done.html
View File

@@ -10,9 +10,9 @@
<div class="lgn-actions">
<span class="fill-space"></span>
<button class="primary right" type="submit">{{t "LogoutDone.LoginButtonText"}}</button>
<button class="lgn-raised-button lgn-primary right" type="submit">{{t "LogoutDone.LoginButtonText"}}</button>
</div>
</form>
{{template "main-bottom" .}}
{{template "main-bottom" .}}