domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Refactor UpdateOAuth2Application (#11034)

Browse source 
Following on from #11008 refactor UpdateOAuth2Application
This commit is contained in:
6543 2020-04-30 19:50:47 +02:00 • committed by GitHub
parent c25969e694
commit ab69b9b1a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
models/oauth2_application.go
View file

@ -196,18 +196,34 @@ type UpdateOAuth2ApplicationOptions struct {
}
// UpdateOAuth2Application updates an oauth2 application
func UpdateOAuth2Application(opts UpdateOAuth2ApplicationOptions) error {
return updateOAuth2Application(x, opts)
func UpdateOAuth2Application(opts UpdateOAuth2ApplicationOptions) (*OAuth2Application, error) {
sess := x.NewSession()
if err := sess.Begin(); err != nil {
return nil, err
}
defer sess.Close()
app, err := getOAuth2ApplicationByID(sess, opts.ID)
if err != nil {
return nil, err
}
if app.UID != opts.UserID {
return nil, fmt.Errorf("UID missmatch")
}
app.Name = opts.Name
app.RedirectURIs = opts.RedirectURIs
if err = updateOAuth2Application(sess, app); err != nil {
return nil, err
}
app.ClientSecret = ""
return app, sess.Commit()
}
func updateOAuth2Application(e Engine, opts UpdateOAuth2ApplicationOptions) error {
app := &OAuth2Application{
ID: opts.ID,
UID: opts.UserID,
Name: opts.Name,
RedirectURIs: opts.RedirectURIs,
}
if _, err := e.ID(opts.ID).Update(app); err != nil {
func updateOAuth2Application(e Engine, app *OAuth2Application) error {
if _, err := e.ID(app.ID).Update(app); err != nil {
return err
}
return nil