add APIFormat convert method and file header

models/oauth2_application.go

@@ -258,7 +258,7 @@ func ListOAuth2Applications(uid int64, listOptions ListOptions) ([]*OAuth2Applic
  Where("uid=?", uid).
  Desc("id")
 
- if listOptions.Page == 0 {
+ if listOptions.Page != 0 {
  sess = listOptions.setSessionPagination(sess)
 
  apps := make([]*OAuth2Application, 0, listOptions.PageSize)

modules/convert/convert.go

@@ -388,3 +388,14 @@ func ToTopicResponse(topic *models.Topic) *api.TopicResponse {
  Updated: topic.UpdatedUnix.AsTime(),
  }
 }
+
+// ToOAuth2Application convert from models.OAuth2Application to api.OAuth2Application
+func ToOAuth2Application(app *models.OAuth2Application) *api.OAuth2Application {
+ return &api.OAuth2Application{
+ ID: app.ID,
+ Name: app.Name,
+ ClientID: app.ClientID,
+ ClientSecret: app.ClientSecret,
+ RedirectURIs: app.RedirectURIs,
+ }
+}

routers/api/v1/swagger/app.go

@@ -1,3 +1,8 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package swagger
 
 import (

routers/api/v1/user/app.go

@@ -10,6 +10,7 @@ import (
 
  "code.gitea.io/gitea/models"
  "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/convert"
  api "code.gitea.io/gitea/modules/structs"
  "code.gitea.io/gitea/routers/api/v1/utils"
 )
@@ -168,13 +169,7 @@ func CreateOauth2Application(ctx *context.APIContext, data api.CreateOAuth2Appli
  }
  app.ClientSecret = secret
 
- ctx.JSON(http.StatusCreated, api.OAuth2Application{
- ID: app.ID,
- Name: app.Name,
- ClientID: app.ClientID,
- ClientSecret: app.ClientSecret,
- RedirectURIs: app.RedirectURIs,
- })
+ ctx.JSON(http.StatusCreated, convert.ToOAuth2Application(app))
 }
 
 // ListOauth2Applications list all the Oauth2 application
@@ -205,12 +200,7 @@ func ListOauth2Applications(ctx *context.APIContext) {
 
  apiApps := make([]*api.OAuth2Application, len(apps))
  for i := range apps {
- apiApps[i] = &api.OAuth2Application{
- ID: apps[i].ID,
- Name: apps[i].Name,
- ClientID: apps[i].ClientID,
- RedirectURIs: apps[i].RedirectURIs,
- }
+ apiApps[i] = convert.ToOAuth2Application(apps[i])
  }
  ctx.JSON(http.StatusOK, &apiApps)
 }