Merge branch 'master' into admin/users

NodeBB · Oct 13, 2020 · 933989e · 933989e
2 parents 682e926 + 1687380
commit 933989e
Show file tree

Hide file tree

Showing 5 changed files with 260 additions and 264 deletions.
diff --git a/install/package.json b/install/package.json
@@ -97,7 +97,7 @@
         "nodebb-plugin-spam-be-gone": "0.7.2",
         "nodebb-rewards-essentials": "0.1.3",
         "nodebb-theme-lavender": "5.0.14",
-        "nodebb-theme-persona": "10.2.59",
+        "nodebb-theme-persona": "10.2.60",
         "nodebb-theme-slick": "1.2.39",
         "nodebb-theme-vanilla": "11.2.22",
         "nodebb-widget-essentials": "4.1.2",

diff --git a/public/openapi/write.yaml b/public/openapi/write.yaml
@@ -28,8 +28,255 @@ tags:
   - name: categories
     description: Administrative calls to manage categories
 paths:
-  /users/:
-    $ref: 'write/users.yaml'
+  '/users/{uid}':
+    delete:
+      tags:
+        - users
+      summary: delete a single user account
+      parameters:
+        - in: path
+          name: uid
+          schema:
+            type: integer
+          required: true
+          description: uid of the user to delete
+      responses:
+        '200':
+          description: user account deleted
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    $ref: components/schemas/Status.yaml#/Status
+                  response:
+                    type: object
+    put:
+      tags:
+        - users
+      summary: update a user account
+      parameters:
+        - in: path
+          name: uid
+          schema:
+            type: integer
+          required: true
+          description: uid of the user to update
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: components/schemas/UserRequest.yaml#/UserRequest
+      responses:
+        '200':
+          description: user profile updated
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    $ref: components/schemas/Status.yaml#/Status
+                  response:
+                    $ref: components/schemas/UserObj.yaml#/UserObj
+        '401':
+          $ref: components/responses/401.yaml#/401
+        '403':
+          $ref: components/responses/403.yaml#/403
+        '426':
+          $ref: components/responses/426.yaml#/426
+        '500':
+          $ref: components/responses/500.yaml#/500
+  '/users/{uid}/password':
+    put:
+      tags:
+        - users
+      summary: change a user's password
+      parameters:
+        - in: path
+          name: uid
+          schema:
+            type: integer
+          required: true
+          description: uid of the user to update
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                currentPassword:
+                  type: string
+                  description: test
+                  example: oldp455word
+                newPassword:
+                  type: string
+                  example: s3cre7password
+              required:
+                - newPassword
+      responses:
+        '200':
+          description: user profile updated
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    $ref: components/schemas/Status.yaml#/Status
+                  response:
+                    type: object
+  '/users/{uid}/follow':
+    post:
+      tags:
+        - users
+      summary: follow a user
+      parameters:
+        - in: path
+          name: uid
+          schema:
+            type: integer
+          required: true
+          description: uid of the user to follow
+      responses:
+        '200':
+          description: successfully followed user
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    $ref: components/schemas/Status.yaml#/Status
+                  response:
+                    type: object
+    delete:
+      tags:
+        - users
+      summary: unfollows a user
+      parameters:
+        - in: path
+          name: uid
+          schema:
+            type: integer
+          required: true
+          description: uid of the user to unfollow
+      responses:
+        '200':
+          description: successfully unfollowed user
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    $ref: components/schemas/Status.yaml#/Status
+                  response:
+                    type: object
+  '/users/{uid}/ban':
+    put:
+      tags:
+        - users
+      summary: ban a user
+      parameters:
+        - in: path
+          name: uid
+          schema:
+            type: integer
+          required: true
+          description: uid of the user to ban
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                until:
+                  type: number
+                  description: UNIX timestamp of the ban expiry
+                  example: 1585775608076
+                reason:
+                  type: string
+                  example: the reason for the ban
+      responses:
+        '200':
+          description: successfully banned user
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    $ref: components/schemas/Status.yaml#/Status
+                  response:
+                    type: object
+    delete:
+      tags:
+        - users
+      summary: unbans a user
+      parameters:
+        - in: path
+          name: uid
+          schema:
+            type: integer
+          required: true
+          description: uid of the user to unban
+      responses:
+        '200':
+          description: successfully unbanned user
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    $ref: components/schemas/Status.yaml#/Status
+                  response:
+                    type: object
+  '/users/{uid}/tokens':
+    post:
+      tags:
+        - users
+      summary: generate a user token
+      description: This route can only be used to generate tokens for the same user. In other words, you cannot use this route to generate a token for a different user than the one you are authenticated as.
+      responses:
+        '200':
+          description: successfully generated a user token
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    $ref: components/schemas/Status.yaml#/Status
+                  response:
+                    type: object
+    delete:
+      tags:
+        - users
+      summary: delete user token
+      parameters:
+        - in: path
+          name: token
+          schema:
+            type: string
+          required: true
+          description: a valid API token
+      responses:
+        '200':
+          description: successfully deleted user token
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    $ref: components/schemas/Status.yaml#/Status
+                  response:
+                    type: object
   /categories/:
     $ref: 'write/categories.yaml'
   /groups/: