Yuki Takei 1 год назад
Родитель
Сommit
99e710e48b

+ 4 - 2
apps/app/src/features/growi-plugin/server/routes/apiv3/admin/index.ts

@@ -105,7 +105,8 @@ module.exports = (crowi: Crowi): Router => {
    *       - name: id
    *       - name: id
    *         in: path
    *         in: path
    *         required: true
    *         required: true
-   *         type: string
+   *         schema:
+   *           type: string
    *     responses:
    *     responses:
    *       200:
    *       200:
    *         description: OK
    *         description: OK
@@ -158,7 +159,8 @@ module.exports = (crowi: Crowi): Router => {
    *       - name: id
    *       - name: id
    *         in: path
    *         in: path
    *         required: true
    *         required: true
-   *         type: string
+   *         schema:
+   *           type: string
    *     responses:
    *     responses:
    *       200:
    *       200:
    *         description: OK
    *         description: OK

+ 20 - 1
apps/app/src/features/templates/server/routes/apiv3/index.ts

@@ -51,7 +51,8 @@ module.exports = (crowi: Crowi) => {
    *         in: query
    *         in: query
    *         description: Whether to include invalid templates
    *         description: Whether to include invalid templates
    *         required: false
    *         required: false
-   *         type: boolean
+   *         schema:
+   *           type: boolean
    *     responses:
    *     responses:
    *       200:
    *       200:
    *         description: OK
    *         description: OK
@@ -126,9 +127,15 @@ module.exports = (crowi: Crowi) => {
    *       - name: templateId
    *       - name: templateId
    *         in: path
    *         in: path
    *         description: The template ID
    *         description: The template ID
+   *         required: true
+   *         schema:
+   *           type: string
    *       - name: locale
    *       - name: locale
    *         in: path
    *         in: path
    *         description: The locale
    *         description: The locale
+   *         required: true
+   *         schema:
+   *           type: string
    *     responses:
    *     responses:
    *       200:
    *       200:
    *         description: OK
    *         description: OK
@@ -170,15 +177,27 @@ module.exports = (crowi: Crowi) => {
    *       - name: organizationId
    *       - name: organizationId
    *         in: path
    *         in: path
    *         description: The organization ID
    *         description: The organization ID
+   *         required: true
+   *         schema:
+   *           type: string
    *       - name: reposId
    *       - name: reposId
    *         in: path
    *         in: path
    *         description: The repository ID
    *         description: The repository ID
+   *         required: true
+   *         schema:
+   *           type: string
    *       - name: templateId
    *       - name: templateId
    *         in: path
    *         in: path
    *         description: The template ID
    *         description: The template ID
+   *         required: true
+   *         schema:
+   *           type: string
    *       - name: locale
    *       - name: locale
    *         in: path
    *         in: path
    *         description: The locale
    *         description: The locale
+   *         required: true
+   *         schema:
+   *           type: string
    *     responses:
    *     responses:
    *       200:
    *       200:
    *         description: OK
    *         description: OK

+ 6 - 3
apps/app/src/server/routes/apiv3/activity.ts

@@ -190,15 +190,18 @@ module.exports = (crowi: Crowi): Router => {
    *       - name: limit
    *       - name: limit
    *         in: query
    *         in: query
    *         required: false
    *         required: false
-   *         type: integer
+   *         schema:
+   *           type: integer
    *       - name: offset
    *       - name: offset
    *         in: query
    *         in: query
    *         required: false
    *         required: false
-   *         type: integer
+   *         schema:
+   *           type: integer
    *       - name: searchFilter
    *       - name: searchFilter
    *         in: query
    *         in: query
    *         required: false
    *         required: false
-   *         type: string
+   *         schema:
+   *           type: string
    *     responses:
    *     responses:
    *       200:
    *       200:
    *         description: Activity fetched successfully
    *         description: Activity fetched successfully

+ 2 - 2
apps/app/src/server/routes/apiv3/forgot-password.js

@@ -98,7 +98,7 @@ module.exports = (crowi) => {
    *      summary: Request password reset
    *      summary: Request password reset
    *      tags: [Users]
    *      tags: [Users]
    *      security:
    *      security:
-   *        -
+   *        - cookieAuth: []
    *      requestBody:
    *      requestBody:
    *        required: true
    *        required: true
    *        content:
    *        content:
@@ -160,7 +160,7 @@ module.exports = (crowi) => {
    *      summary: Reset password
    *      summary: Reset password
    *      tags: [Users]
    *      tags: [Users]
    *      security:
    *      security:
-   *        -
+   *        - cookieAuth: []
    *      requestBody:
    *      requestBody:
    *        required: true
    *        required: true
    *        content:
    *        content:

+ 2 - 2
apps/app/src/server/routes/apiv3/g2g-transfer.ts

@@ -356,7 +356,7 @@ module.exports = (crowi: Crowi): Router => {
    *                  description: Metadata of the attachment
    *                  description: Metadata of the attachment
    *      responses:
    *      responses:
    *        '200':
    *        '200':
-   *          description:
+   *          description: Successfully imported attachment file
    *          content:
    *          content:
    *            application/json:
    *            application/json:
    *              schema:
    *              schema:
@@ -406,7 +406,7 @@ module.exports = (crowi: Crowi): Router => {
    *        - transferHeaderAuth: []
    *        - transferHeaderAuth: []
    *      responses:
    *      responses:
    *        '200':
    *        '200':
-   *          description:
+   *          description: Successfully got GROWI information
    *          content:
    *          content:
    *            application/json:
    *            application/json:
    *              schema:
    *              schema:

+ 16 - 7
apps/app/src/server/routes/apiv3/page-listing.ts

@@ -114,7 +114,8 @@ const routerFactory = (crowi: Crowi): Router => {
    *       - name: path
    *       - name: path
    *         in: query
    *         in: query
    *         required: true
    *         required: true
-   *         type: string
+   *         schema:
+   *           type: string
    *     responses:
    *     responses:
    *       200:
    *       200:
    *         description: Get the ancestors and children of a page
    *         description: Get the ancestors and children of a page
@@ -177,10 +178,12 @@ const routerFactory = (crowi: Crowi): Router => {
    *     parameters:
    *     parameters:
    *       - name: id
    *       - name: id
    *         in: query
    *         in: query
-   *         type: string
+   *         schema:
+   *           type: string
    *       - name: path
    *       - name: path
    *         in: query
    *         in: query
-   *         type: string
+   *         schema:
+   *           type: string
    *     responses:
    *     responses:
    *       200:
    *       200:
    *         description: Get the children of a page
    *         description: Get the children of a page
@@ -231,16 +234,22 @@ const routerFactory = (crowi: Crowi): Router => {
    *     parameters:
    *     parameters:
    *       - name: pageIds
    *       - name: pageIds
    *         in: query
    *         in: query
-   *         type: array
+   *         schema:
+   *           type: array
+   *           items:
+   *             type: string
    *       - name: path
    *       - name: path
    *         in: query
    *         in: query
-   *         type: string
+   *         schema:
+   *           type: string
    *       - name: attachBookmarkCount
    *       - name: attachBookmarkCount
    *         in: query
    *         in: query
-   *         type: boolean
+   *         schema:
+   *           type: boolean
    *       - name: attachShortBody
    *       - name: attachShortBody
    *         in: query
    *         in: query
-   *         type: boolean
+   *         schema:
+   *           type: boolean
    *     responses:
    *     responses:
    *       200:
    *       200:
    *         description: Get the information of a page
    *         description: Get the information of a page

+ 14 - 7
apps/app/src/server/routes/apiv3/page/index.ts

@@ -760,7 +760,7 @@ module.exports = (crowi) => {
 
 
   /**
   /**
    * @swagger
    * @swagger
-   *   /:pageId/grant:
+   *   /{pageId}/grant:
    *     put:
    *     put:
    *       tags: [Page]
    *       tags: [Page]
    *       security:
    *       security:
@@ -825,12 +825,19 @@ module.exports = (crowi) => {
   /**
   /**
   * @swagger
   * @swagger
   *
   *
-  *    /page/export:
+  *    /page/export/{pageId}:
   *      get:
   *      get:
   *        tags: [Page]
   *        tags: [Page]
   *        security:
   *        security:
   *          - cookieAuth: []
   *          - cookieAuth: []
   *        description: return page's markdown
   *        description: return page's markdown
+  *        parameters:
+  *          - name: pageId
+  *            in: path
+  *            description: ID of the page
+  *            required: true
+  *            schema:
+  *              type: string
   *        responses:
   *        responses:
   *          200:
   *          200:
   *            description: Return page's markdown
   *            description: Return page's markdown
@@ -1046,7 +1053,7 @@ module.exports = (crowi) => {
   /**
   /**
    * @swagger
    * @swagger
    *
    *
-   *   /:pageId/content-width:
+   *   /{pageId}/content-width:
    *     put:
    *     put:
    *       tags: [Page]
    *       tags: [Page]
    *       summary: Update content width
    *       summary: Update content width
@@ -1099,7 +1106,7 @@ module.exports = (crowi) => {
 
 
   /**
   /**
    * @swagger
    * @swagger
-   *   /:pageId/publish:
+   *   /{pageId}/publish:
    *     put:
    *     put:
    *       tags: [Page]
    *       tags: [Page]
    *       summary: Publish page
    *       summary: Publish page
@@ -1123,7 +1130,7 @@ module.exports = (crowi) => {
 
 
   /**
   /**
    * @swagger
    * @swagger
-   *   /:pageId/unpublish:
+   *   /{pageId}/unpublish:
    *     put:
    *     put:
    *       tags: [Page]
    *       tags: [Page]
    *       summary: Unpublish page
    *       summary: Unpublish page
@@ -1147,7 +1154,7 @@ module.exports = (crowi) => {
 
 
   /**
   /**
    * @swagger
    * @swagger
-   *   /:pageId/yjs-data:
+   *   /{pageId}/yjs-data:
    *     get:
    *     get:
    *       tags: [Page]
    *       tags: [Page]
    *       summary: Get Yjs data
    *       summary: Get Yjs data
@@ -1182,7 +1189,7 @@ module.exports = (crowi) => {
 
 
   /**
   /**
    * @swagger
    * @swagger
-   *   /:pageId/sync-latest-revision-body-to-yjs-draft:
+   *   /{pageId}/sync-latest-revision-body-to-yjs-draft:
    *     put:
    *     put:
    *       tags: [Page]
    *       tags: [Page]
    *       summary: Sync latest revision body to Yjs draft
    *       summary: Sync latest revision body to Yjs draft

+ 3 - 1
apps/app/src/server/routes/apiv3/pages/index.js

@@ -368,7 +368,9 @@ module.exports = (crowi) => {
     *          200:
     *          200:
     *            description: Succeeded to resume rename page operation.
     *            description: Succeeded to resume rename page operation.
     *            content:
     *            content:
-    *              description: Empty response
+    *              application/json:
+    *                schema:
+    *                  type: object
     */
     */
   router.post('/resume-rename', accessTokenParser, loginRequiredStrictly, validator.resumeRenamePage, apiV3FormValidator,
   router.post('/resume-rename', accessTokenParser, loginRequiredStrictly, validator.resumeRenamePage, apiV3FormValidator,
     async(req, res) => {
     async(req, res) => {