ti2 1.0.37 → 1.0.39

package/api.yml

@@ -132,6 +132,20 @@ components:
                 type: string
               updatedAt:
                 type: string
+    UserList:
+      type: object
+      properties:
+        users:
+          type: array
+          items:
+            type: object
+            properties:
+              userId:
+                type: string
+              createdAt:
+                type: string
+              updatedAt:
+                type: string
     AppTokenList:
       type: object
       properties:
@@ -419,6 +433,21 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/IntegrationList'
+  /users:
+    get:
+      security:
+        - bearerAuth: ['admin']
+      tags:
+        - admin
+      summary: list all created users
+      operationId: listUsers
+      responses:
+        200:
+          description: success
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UserList'
   /app/resetAppKey/{appKey}:
     get:
       security:

package/controllers/__tests__/admin.js

@@ -59,4 +59,11 @@ describe('admin', () => {
     });
     expect(value).toBeTruthy();
   });
+  it('the created user should be on the user list', async () => {
+    const { users } = await doApiGet({
+      url: '/users',
+      token: adminKey,
+    });
+    expect(users.find(currentUser => currentUser.userId === userId)).toBeTruthy();
+  });
 });

package/controllers/admin.js

@@ -60,6 +60,15 @@ const listApps = async (req, res, next) => {
   }
 };
 
+const listUsers = async (req, res, next) => {
+  try {
+    const users = await sqldb.User.findAll();
+    return res.json({ users });
+  } catch (err) {
+    return next(err);
+  }
+};
+
 const createUserToken = async (req, res, next) => {
   const {
     body: {
@@ -140,6 +149,7 @@ module.exports = {
   createUserToken,
   deleteApp,
   listApps,
+  listUsers,
   migrate,
   resetIntegrationToken,
 };

package/index.js

@@ -130,6 +130,21 @@ module.exports = async ({
       notImplemented: (req, res) => res.sendStatus(501),
     });
     if (elasticLogsClient) { // API request logs are saved on elastic
+      const mappings = {
+        dynamic: true,
+        properties: {
+          body: { type: 'object' },
+          client: { type: 'keyword' },
+          date: { type: 'long' },
+          method: { type: 'keyword' },
+          operationId: { type: 'keyword' },
+          params: { type: 'object' },
+          query: { type: 'object' },
+          url: { type: 'text' },
+          responseStatusCode: { type: 'long' },
+          responseTimeInMs: { type: 'long' },
+        },
+      };
       // setup the index
       elasticLogsClient.indices.existsTemplate({
         name: 'apilog',
@@ -144,22 +159,32 @@ module.exports = async ({
               settings: {
                 number_of_shards: 1,
               },
-              mappings: {
-                dynamic: true,
-                properties: {
-                  body: { type: 'object' },
-                  client: { type: 'keyword' },
-                  date: { type: 'long' },
-                  method: { type: 'keyword' },
-                  params: { type: 'object' },
-                  query: { type: 'object' },
-                  url: { type: 'text' },
-                  responseStatusCode: { type: 'long' },
-                  responseTimeInMs: { type: 'long' },
-                },
-              },
+              mappings,
             },
           });
+          console.log('index template created');
+        } else {
+          // index exists, we might have to updated it
+          const current = R.path(
+            ['body', 'apilog', 'mappings'],
+            await elasticLogsClient.indices.getTemplate({
+              name: 'apilog',
+            }),
+          );
+          if (!R.equals(current, mappings)) {
+            console.log('=- updating index template -=');
+            await elasticLogsClient.indices.putTemplate({
+              name: 'apilog',
+              body: {
+                index_patterns: [`${elasticLogIndex}*`],
+                settings: {
+                  number_of_shards: 1,
+                },
+                mappings,
+              },
+            });
+            console.log('updated');
+          }
         }
         const exists = await elasticLogsClient.indices.exists({
           index: elasticLogIndex,
@@ -169,6 +194,7 @@ module.exports = async ({
           await elasticLogsClient.indices.create({
             index: elasticLogIndex,
           });
+          console.log('index created');
         }
       }).catch(console.log);
       app.use((req, res, next) => {
@@ -181,6 +207,7 @@ module.exports = async ({
           query: req.query,
           appRecord: req.appRecord,
           method: req.method,
+          operationId: R.path(['openapi', 'operation', 'operationId'], req),
           client: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
         };
         elasticLogsClient.index({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "description": "Tourist Industry Exchange (TI2)",
   "main": "index.js",
   "scripts": {