Merge pull request #85 from gergo-papp/remove-whitelisted-apis

Move administrative routes that require whitelisted API keys under a different tag, at the end of list

Author: Gergő Papp-Szentannai

auth/niauth.yaml

@@ -30,25 +30,6 @@ paths:
         default:
           $ref: '#/responses/Error'
 
-  /session-keys:
-    post:
-      tags:
-        - keys
-      summary: Creates temporary API Keys
-      description: Create a temporary session key which is valid for 1 hour. The caller needs a whitelisted API key to issue session keys.
-      operationId: create-session-key
-      parameters:
-        - $ref: '#/parameters/CreateSessionKeyRequest'
-      responses:
-        200:
-          $ref: '#/responses/CreateSessionKeyResponse'
-        400:
-          $ref: '#/responses/ValidationError'
-        401:
-          $ref: '#/responses/Unauthorized'
-        default:
-          $ref: '#/responses/Error'
-
   /keys:
     get:
       tags:
@@ -409,6 +390,25 @@ paths:
         default:
           $ref: '#/responses/Error'
 
+  /session-keys:
+    post:
+      tags:
+        - whitelisted operations
+      summary: Creates temporary API Keys
+      description: Create a temporary session key which is valid for 1 hour. The caller needs a whitelisted API key to issue session keys.
+      operationId: create-session-key
+      parameters:
+        - $ref: '#/parameters/CreateSessionKeyRequest'
+      responses:
+        200:
+          $ref: '#/responses/CreateSessionKeyResponse'
+        400:
+          $ref: '#/responses/ValidationError'
+        401:
+          $ref: '#/responses/Unauthorized'
+        default:
+          $ref: '#/responses/Error'
+
 definitions:
   AuthStatement:
     type: object

user/niuser.yaml

@@ -15,27 +15,6 @@ securityDefinitions:
 security:
   - ApiKeyAuth: []
 paths:
-  '/orgs/{name}':
-    get:
-      tags:
-        - orgs
-      summary: 'Get organization'
-      operationId: get-org
-      description: Returns the organization with the given name
-      parameters:
-        - in: path
-          required: true
-          name: name
-          description: The org name, e.g. 'SystemLink Server'
-          type: string
-      responses:
-        200:
-          $ref: '#/responses/GetOrgResponse'
-        404:
-          $ref: '#/responses/NotFound'
-        default:
-          $ref: '#/responses/Error'
-
   '/users/query':
     post:
       tags:
@@ -303,6 +282,27 @@ paths:
         default:
           $ref: '#/responses/Error'
 
+  '/orgs/{name}':
+    get:
+      tags:
+        - whitelisted operations
+      summary: 'Get organization'
+      operationId: get-org
+      description: Returns the organization with the given name. The caller needs a whitelisted API key to read organizations.
+      parameters:
+        - in: path
+          required: true
+          name: name
+          description: The org name, e.g. 'SystemLink Server'
+          type: string
+      responses:
+        200:
+          $ref: '#/responses/GetOrgResponse'
+        404:
+          $ref: '#/responses/NotFound'
+        default:
+          $ref: '#/responses/Error'
+
   '/websocket':
     get:
       tags: