Update Auth0 and Okta (#94)

* Update Auth0 and Okta * Minor refactor
alertlogic · Mar 27, 2020 · a5eedb8 · a5eedb8
1 parent 17ec584
commit a5eedb8
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 8 deletions.
diff --git a/collectors/auth0/.npmrc b/collectors/auth0/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/collectors/auth0/auth0_collector.js b/collectors/auth0/auth0_collector.js
@@ -14,7 +14,7 @@ const request = require('request');
 const parse = require('@alertlogic/al-collector-js').Parse;
 const ManagementClient = require('auth0').ManagementClient;
 const PawsCollector = require('@alertlogic/paws-collector').PawsCollector;
-
+const packageJson = require('./package.json');
 
 const typeIdPaths = [
     { path: ['type'] }
@@ -29,6 +29,10 @@ const HOSTNAME_REGEXP = /^[htps]*:\/\/|\/$/gi;
 
 class Auth0Collector extends PawsCollector {
 
+    constructor(context, creds){
+        super(context, creds, packageJson.version);
+    }
+
     pawsInitCollectionState(event, callback) {
         const initialState = {
             since: process.env.paws_collection_start_ts ? process.env.paws_collection_start_ts : moment().subtract(5, 'minutes').toISOString(),

diff --git a/collectors/auth0/package.json b/collectors/auth0/package.json
@@ -1,6 +1,6 @@
 {
   "name": "auth0-collector",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Alert Logic AWS based Auth0 Log Collector extension",
   "repository": {},
   "private": true,
@@ -21,7 +21,7 @@
   "dependencies": {
     "auth0": "2.20.0",
     "@alertlogic/al-collector-js": "^1.4.5",
-    "@alertlogic/paws-collector": "^1.1.6",
+    "@alertlogic/paws-collector": "^1.1.7",
     "async": "3.1.0",
     "debug": "4.1.1",
     "moment": "2.24.0"

diff --git a/collectors/okta/.npmrc b/collectors/okta/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/collectors/okta/okta_collector.js b/collectors/okta/okta_collector.js
@@ -11,11 +11,13 @@
 
 const moment = require('moment');
 const okta = require('@okta/okta-sdk-nodejs');
-const healthChecks = require('./health_checks');
 const parse = require('@alertlogic/al-collector-js').Parse;
 const PawsCollector = require('@alertlogic/paws-collector').PawsCollector;
 const calcNextCollectionInterval = require('@alertlogic/paws-collector').calcNextCollectionInterval;
 
+const packageJson = require('./package.json');
+const healthChecks = require('./health_checks');
+
 const THROTTLING_ERROR_REGEXP = /rateLimit/g;
 
 const typeIdPaths = [
@@ -35,9 +37,9 @@ const sensitiveFields = [
 
 class OktaCollector extends PawsCollector {
 
-    constructor(context, {aimsCreds, pawsCreds}){
+    constructor(context, creds){
         super(context,
-            {aimsCreds, pawsCreds},
+            creds, packageJson.version,
             [healthChecks.oktaTokenHealthCheck], []);
     }
 

diff --git a/collectors/okta/package.json b/collectors/okta/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okta-collector",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Alert Logic AWS based Okta Log Collector",
   "repository": {},
   "private": true,
@@ -22,7 +22,7 @@
   "dependencies": {
     "@okta/okta-sdk-nodejs": "3.1.0",
     "@alertlogic/al-collector-js": "^1.4.5",
-    "@alertlogic/paws-collector": "^1.1.6",
+    "@alertlogic/paws-collector": "^1.1.7",
     "async": "3.1.0",
     "debug": "4.1.1",
     "moment": "2.24.0"

diff --git a/collectors/template/.npmrc b/collectors/template/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/collectors/template/collector.js.template b/collectors/template/collector.js.template
@@ -12,6 +12,7 @@
 const moment = require('moment');
 const PawsCollector = require('@alertlogic/paws-collector').PawsCollector;
 const parse = require('@alertlogic/al-collector-js').Parse;
+const packageJson = require('./package.json');
 
 
 const typeIdPaths = [