From ab69b9b1a60a83cf2b5d6c021da0cb35540df10f Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 30 Apr 2020 19:50:47 +0200
Subject: Refactor UpdateOAuth2Application (#11034)

Following on from #11008 refactor UpdateOAuth2Application
---
 routers/api/v1/user/app.go | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'routers/api/v1/user')

diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go
index f29572ef62..f426721c82 100644
--- a/routers/api/v1/user/app.go
+++ b/routers/api/v1/user/app.go
@@ -301,17 +301,12 @@ func UpdateOauth2Application(ctx *context.APIContext, data api.CreateOAuth2Appli
 	//     "$ref": "#/responses/OAuth2Application"
 	appID := ctx.ParamsInt64(":id")
 
-	err := models.UpdateOAuth2Application(models.UpdateOAuth2ApplicationOptions{
+	app, err := models.UpdateOAuth2Application(models.UpdateOAuth2ApplicationOptions{
 		Name:         data.Name,
 		UserID:       ctx.User.ID,
 		ID:           appID,
 		RedirectURIs: data.RedirectURIs,
 	})
-	if err != nil {
-		ctx.Error(http.StatusBadRequest, "", "error updating oauth2 application")
-		return
-	}
-	app, err := models.GetOAuth2ApplicationByID(appID)
 	if err != nil {
 		if models.IsErrOauthClientIDInvalid(err) || models.IsErrOAuthApplicationNotFound(err) {
 			ctx.NotFound()
@@ -320,12 +315,11 @@ func UpdateOauth2Application(ctx *context.APIContext, data api.CreateOAuth2Appli
 		}
 		return
 	}
-	secret, err := app.GenerateClientSecret()
+	app.ClientSecret, err = app.GenerateClientSecret()
 	if err != nil {
 		ctx.Error(http.StatusBadRequest, "", "error updating application secret")
 		return
 	}
-	app.ClientSecret = secret
 
 	ctx.JSON(http.StatusOK, convert.ToOAuth2Application(app))
 }
-- 
cgit v1.2.3