3pp-mirror/pushbits
1
0
Fork 0
mirror of https://github.com/pushbits/server.git synced 2025-07-25 12:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity

Kick user when deleting an application

Browse source
This commit is contained in:
eikendev 2020-08-06 17:56:58 +02:00
parent b89deeac3d
commit 3bdadd6029
No known key found for this signature in database
GPG key ID: A1BDB1B28C8EF694
4 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/application.go
View file

@ -25,7 +25,7 @@ func (h *ApplicationHandler) applicationExists(token string) bool {
func (h *ApplicationHandler) registerApplication(ctx *gin.Context, a *model.Application, u *model.User) error {
log.Printf("Registering application %s.\n", a.Name)
channelID, err := h.DP.RegisterApplication(a.Name, u.MatrixID)
channelID, err := h.DP.RegisterApplication(a.ID, a.Name, a.Token, u.MatrixID)
if success := successOrAbort(ctx, http.StatusInternalServerError, err); !success {
return err
}
@ -55,10 +55,10 @@ func (h *ApplicationHandler) createApplication(ctx *gin.Context, name string, u
return &application, nil
}
func (h *ApplicationHandler) deleteApplication(ctx *gin.Context, a *model.Application) error {
func (h *ApplicationHandler) deleteApplication(ctx *gin.Context, a *model.Application, u *model.User) error {
log.Printf("Deleting application %s.\n", a.Name)
err := h.DP.DeregisterApplication(a)
err := h.DP.DeregisterApplication(a, u)
if success := successOrAbort(ctx, http.StatusInternalServerError, err); !success {
return err
}
@ -154,7 +154,7 @@ func (h *ApplicationHandler) DeleteApplication(ctx *gin.Context) {
return
}
if err := h.deleteApplication(ctx, application); err != nil {
if err := h.deleteApplication(ctx, application, authentication.GetUser(ctx)); err != nil {
return
}