Merge pull request #184 from jhiner/999

[AUTHZ-999] Update extension with tenant logs v3 compatibility
auth0-extensions · Jul 19, 2019 · 31f55d0 · 31f55d0
2 parents a309f20 + 2da6f1b
commit 31f55d0
Show file tree

Hide file tree

Showing 12 changed files with 1,198 additions and 770 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -48,12 +48,12 @@ jobs:
       - run:
           name: FOSSA Init
           command: fossa init
-      - run:
-          name: FOSSA Analyze
-          command: fossa analyze
-      - run:
-          name: FOSSA Test
-          command: fossa test
+      # - run:
+          # name: FOSSA Analyze
+          # command: fossa analyze
+      # - run:
+          # name: FOSSA Test
+          # command: fossa test
 
       # code climate requires before-build and after-build to be executed around test
       - run:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.7.0] - 2019-07-19
+
+### Changes
+
+- Compatibility with Tenant Logs v3
+
 ## [3.6.4] - 2019-07-09
 
 ### Fixed

diff --git a/client/containers/Logs.jsx b/client/containers/Logs.jsx
@@ -85,7 +85,6 @@ class LogsContainer extends Component {
         </div>
         <div className="row">
           <div className="col-xs-12 wrapper">
-            <TableTotals currentCount={logs.records.size} totalCount={logs.total} textFormat={languageDictionary.tableTotalsTextFormat} />
             {this.createToolbar(true)}
           </div>
         </div>

diff --git a/client/reducers/logs.js b/client/reducers/logs.js
@@ -26,9 +26,8 @@ export const logs = createReducer(fromJS(initialState), { // eslint-disable-line
     const { data } = action.payload;
     return state.merge({
       loading: false,
-      total: data.total,
       nextPage: action.meta.page + 1,
-      records: state.get('records').concat(fromJS(data.logs.map(log => {
+      records: state.get('records').concat(fromJS(data.map(log => {
         log.shortType = log.type;
         log.type = logTypes[log.type];
         if (!log.type) {

diff --git a/client/reducers/user.js b/client/reducers/user.js
@@ -39,8 +39,8 @@ const userLogs = createReducer(fromJS(initialState.logs), {
   [constants.FETCH_USER_LOGS_FULFILLED]: (state, action) =>
     state.merge({
       loading: false,
-      records: fromJS(typeof action.payload.data.logs !== 'undefined' ?
-        action.payload.data.logs.map(log => {
+      records: fromJS(typeof action.payload.data !== 'undefined' ?
+        action.payload.data.map(log => {
           log.time_ago = moment(log.date).fromNow();
           log.shortType = log.type;
           log.type = logTypes[log.type];

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "auth0-delegated-admin",
-  "version": "3.6.4",
+  "version": "3.7.0",
   "description": "This extension allows non-dashboard administrators to manage (a subset of) users.",
   "engines": {
     "node": ">8.9"
@@ -38,7 +38,7 @@
     "auth0-extension-tools": "1.3.3",
     "auth0-extension-ui": "^1.2.2",
     "auth0-js": "^9.6.0",
-    "axios": "^0.14.0",
+    "axios": "^0.19.0",
     "bluebird": "^3.4.0",
     "body-parser": "^1.15.1",
     "codemirror": "^5.19.0",
@@ -91,7 +91,7 @@
     "@babel/polyfill": "^7.0.0",
     "@babel/preset-env": "^7.2.0",
     "@babel/register": "^7.0.0",
-    "auth0-extensions-cli": "^4.0.1",
+    "auth0-extensions-cli": "^4.0.3",
     "autoprefixer": "^6.5.1",
     "babel-eslint": "7.1.1",
     "babel-loader": "^8.0.4",
@@ -103,7 +103,7 @@
     "css-loader": "0.26.1",
     "enzyme": "^3.9.0",
     "enzyme-adapter-react-15": "^1.4.0",
-    "eslint": "^3.9.1",
+    "eslint": "^4.19.1",
     "eslint-config-auth0": "^6.0.1",
     "eslint-config-auth0-base": "^12.1.0",
     "eslint-plugin-babel": "^3.3.0",

diff --git a/server/routes/logs.js b/server/routes/logs.js
@@ -11,7 +11,6 @@ export default (scriptManager) => {
     req.auth0.logs
       .getAll({
         q: 'NOT type: sapi AND NOT type:fapi',
-        include_totals: true,
         sort: 'date:-1',
         per_page: 20,
         page: req.query.page || 0,

diff --git a/server/routes/users.js b/server/routes/users.js
@@ -516,9 +516,6 @@ export default (storage, scriptManager) => {
       .then((accessToken) => {
         const options = {
           uri: `https://${config('AUTH0_DOMAIN')}/api/v2/users/${encodeURIComponent(req.params.id)}/logs`,
-          qs: {
-            include_totals: true
-          },
           headers: {
             authorization: `Bearer ${accessToken}`
           },

diff --git a/tests/client/reducers/logs.tests.js b/tests/client/reducers/logs.tests.js
@@ -90,27 +90,24 @@ describe('logs reducer', () => {
       logs(initialState, {
         type: constants.FETCH_LOGS_FULFILLED,
         payload: {
-          data: {
-            total: 100,
-            logs: [
-              {
-                _id: '49559553682563810286559514517590841916612030849441857538',
-                client_name: 'My App',
-                connection: 'Username-Password-Authentication',
-                date: '2016-09-26T13:03:50.703Z',
-                type: 'custom_type',
-                user_name: '[email protected]'
-              },
-              {
-                _id: '49559553682563810286559514516535449676088458549131214850',
-                client_name: 'My App',
-                connection: 'Username-Password-Authentication',
-                date: '2016-09-26T13:03:36.005Z',
-                type: 's',
-                user_name: '[email protected]'
-              }
-            ]
-          }
+          data: [
+            {
+              _id: '49559553682563810286559514517590841916612030849441857538',
+              client_name: 'My App',
+              connection: 'Username-Password-Authentication',
+              date: '2016-09-26T13:03:50.703Z',
+              type: 'custom_type',
+              user_name: '[email protected]'
+            },
+            {
+              _id: '49559553682563810286559514516535449676088458549131214850',
+              client_name: 'My App',
+              connection: 'Username-Password-Authentication',
+              date: '2016-09-26T13:03:36.005Z',
+              type: 's',
+              user_name: '[email protected]'
+            }
+          ]
         },
         meta: {
           page: 1
@@ -133,7 +130,7 @@ describe('logs reducer', () => {
                 color: '#FFA500'
               }
             },
-            user_name: '[email protected]',
+            user_name: '[email protected]'
           },
           {
             _id: '49559553682563810286559514516535449676088458549131214850',
@@ -148,11 +145,10 @@ describe('logs reducer', () => {
                 color: 'green'
               }
             },
-            user_name: '[email protected]',
+            user_name: '[email protected]'
           }
         ],
         currentRecord: null,
-        total: 100,
         nextPage: 2
       }
     );

diff --git a/tests/client/reducers/user.tests.js b/tests/client/reducers/user.tests.js
@@ -100,26 +100,24 @@ describe('user reducer', () => {
       user(initialState, {
         type: constants.FETCH_USER_LOGS_FULFILLED,
         payload: {
-          data: {
-            logs: [
-              {
-                _id: '49559553682563810286559514517590841916612030849441857538',
-                client_name: 'My App',
-                connection: 'Username-Password-Authentication',
-                date: '2016-09-26T13:03:50.703Z',
-                type: 's',
-                user_name: '[email protected]'
-              },
-              {
-                _id: '49559553682563810286559514516535449676088458549131214850',
-                client_name: 'My App',
-                connection: 'Username-Password-Authentication',
-                date: '2016-09-26T13:03:36.005Z',
-                type: 's',
-                user_name: '[email protected]'
-              }
-            ]
-          }
+          data: [
+            {
+              _id: '49559553682563810286559514517590841916612030849441857538',
+              client_name: 'My App',
+              connection: 'Username-Password-Authentication',
+              date: '2016-09-26T13:03:50.703Z',
+              type: 's',
+              user_name: '[email protected]'
+            },
+            {
+              _id: '49559553682563810286559514516535449676088458549131214850',
+              client_name: 'My App',
+              connection: 'Username-Password-Authentication',
+              date: '2016-09-26T13:03:36.005Z',
+              type: 's',
+              user_name: '[email protected]'
+            }
+          ]
         }
       }).toJSON()
     ).toEqual(
@@ -182,26 +180,24 @@ describe('user reducer', () => {
       user(initialState, {
         type: constants.FETCH_USER_LOGS_FULFILLED,
         payload: {
-          data: {
-            logs: [
-              {
-                _id: '49559553682563810286559514517590841916612030849441857538',
-                client_name: 'My App',
-                connection: 'Username-Password-Authentication',
-                date: '2016-09-26T13:03:50.703Z',
-                type: 's',
-                user_name: '[email protected]'
-              },
-              {
-                _id: '49559553682563810286559514516535449676088458549131214850',
-                client_name: 'My App',
-                connection: 'Username-Password-Authentication',
-                date: '2016-09-26T13:03:36.005Z',
-                type: 'custom_type',
-                user_name: '[email protected]'
-              }
-            ]
-          }
+          data: [
+            {
+              _id: '49559553682563810286559514517590841916612030849441857538',
+              client_name: 'My App',
+              connection: 'Username-Password-Authentication',
+              date: '2016-09-26T13:03:50.703Z',
+              type: 's',
+              user_name: '[email protected]'
+            },
+            {
+              _id: '49559553682563810286559514516535449676088458549131214850',
+              client_name: 'My App',
+              connection: 'Username-Password-Authentication',
+              date: '2016-09-26T13:03:36.005Z',
+              type: 'custom_type',
+              user_name: '[email protected]'
+            }
+          ]
         }
       }).toJSON()
     ).toEqual(
@@ -264,7 +260,7 @@ describe('user reducer', () => {
       user(initialState, {
         type: constants.FETCH_USER_LOGS_FULFILLED,
         payload: {
-          data: {}
+          data: []
         }
       }).toJSON()
     ).toEqual(

diff --git a/webtask.json b/webtask.json
@@ -1,7 +1,7 @@
 {
   "title": "Delegated Administration Dashboard",
   "name": "auth0-delegated-admin",
-  "version": "3.6.4",
+  "version": "3.7.0",
   "author": "auth0",
   "useHashName": false,
   "description": "This extension allows non-dashboard administrators to manage (a subset of) users.",