@magda/authentication-plugin-sdk 2.0.0 → 2.0.1

package/dist/index.js

@@ -96,12 +96,6 @@ return /******/ (function(modules) { // webpackBootstrap
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ (function(module, exports) {
-
-module.exports = require("util");
-
-/***/ }),
-/* 1 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -116,7 +110,7 @@ module.exports = require("util");
 
 var callSiteToString = __webpack_require__(34).callSiteToString
 var eventListenerCount = __webpack_require__(34).eventListenerCount
-var relative = __webpack_require__(2).relative
+var relative = __webpack_require__(1).relative
 
 /**
  * Module exports.
@@ -629,11 +623,17 @@ function DeprecationError (namespace, message, stack) {
 
 
 /***/ }),
-/* 2 */
+/* 1 */
 /***/ (function(module, exports) {
 
 module.exports = require("path");
 
+/***/ }),
+/* 2 */
+/***/ (function(module, exports) {
+
+module.exports = require("util");
+
 /***/ }),
 /* 3 */
 /***/ (function(module, exports) {
@@ -668,7 +668,7 @@ module.exports = require("buffer");
 var Buffer = __webpack_require__(55).Buffer
 var contentDisposition = __webpack_require__(56);
 var contentType = __webpack_require__(16);
-var deprecate = __webpack_require__(1)('express');
+var deprecate = __webpack_require__(0)('express');
 var flatten = __webpack_require__(23);
 var mime = __webpack_require__(32).mime;
 var etag = __webpack_require__(58);
@@ -2076,7 +2076,7 @@ function ContentType (type) {
  * @private
  */
 
-var deprecate = __webpack_require__(1)('http-errors')
+var deprecate = __webpack_require__(0)('http-errors')
 var setPrototypeOf = __webpack_require__(10)
 var statuses = __webpack_require__(11)
 var inherits = __webpack_require__(81)
@@ -3372,7 +3372,7 @@ function getBasicNodeMethods() {
 
 var createError = __webpack_require__(133)
 var debug = __webpack_require__(136)('send')
-var deprecate = __webpack_require__(1)('send')
+var deprecate = __webpack_require__(0)('send')
 var destroy = __webpack_require__(140)
 var encodeUrl = __webpack_require__(21)
 var escapeHtml = __webpack_require__(22)
@@ -3383,10 +3383,10 @@ var mime = __webpack_require__(141)
 var ms = __webpack_require__(143)
 var onFinished = __webpack_require__(20)
 var parseRange = __webpack_require__(60)
-var path = __webpack_require__(2)
+var path = __webpack_require__(1)
 var statuses = __webpack_require__(11)
 var Stream = __webpack_require__(13)
-var util = __webpack_require__(0)
+var util = __webpack_require__(2)
 
 /**
  * Path function references.
@@ -5111,7 +5111,7 @@ function unpipe(stream) {
  */
 
 var db = __webpack_require__(108)
-var extname = __webpack_require__(2).extname
+var extname = __webpack_require__(1).extname
 
 /**
  * Module variables.
@@ -5793,7 +5793,7 @@ var Layer = __webpack_require__(50);
 var methods = __webpack_require__(31);
 var mixin = __webpack_require__(25);
 var debug = __webpack_require__(15)('express:router');
-var deprecate = __webpack_require__(1)('express');
+var deprecate = __webpack_require__(0)('express');
 var flatten = __webpack_require__(23);
 var parseUrl = __webpack_require__(8);
 var setPrototypeOf = __webpack_require__(10)
@@ -7484,7 +7484,7 @@ module.exports.parse = parse
  * @private
  */
 
-var basename = __webpack_require__(2).basename
+var basename = __webpack_require__(1).basename
 var Buffer = __webpack_require__(132).Buffer
 
 /**
@@ -9138,7 +9138,7 @@ function coerce(val) {
  * Module dependencies.
  */
 
-var relative = __webpack_require__(2).relative
+var relative = __webpack_require__(1).relative
 
 /**
  * Module exports.
@@ -9847,7 +9847,7 @@ Cookie.prototype = {
 var Cookie = __webpack_require__(64)
 var EventEmitter = __webpack_require__(29).EventEmitter
 var Session = __webpack_require__(66)
-var util = __webpack_require__(0)
+var util = __webpack_require__(2)
 
 /**
  * Module exports.
@@ -13797,7 +13797,7 @@ removedMiddlewares.forEach(function (name) {
  * @private
  */
 
-var deprecate = __webpack_require__(1)('body-parser')
+var deprecate = __webpack_require__(0)('body-parser')
 
 /**
  * Cache of loaded parsers.
@@ -14330,7 +14330,7 @@ module.exports = JSON.parse("{\"100\":\"Continue\",\"101\":\"Switching Protocols
 /***/ (function(module, exports, __webpack_require__) {
 
 try {
-  var util = __webpack_require__(0);
+  var util = __webpack_require__(2);
   if (typeof util.inherits !== 'function') throw '';
   module.exports = util.inherits;
 } catch (e) {
@@ -14725,7 +14725,7 @@ function plural(ms, n, name) {
  */
 
 var tty = __webpack_require__(12);
-var util = __webpack_require__(0);
+var util = __webpack_require__(2);
 
 /**
  * This is the Node.js implementation of `debug()`.
@@ -18543,7 +18543,7 @@ var bytes = __webpack_require__(9)
 var contentType = __webpack_require__(16)
 var createError = __webpack_require__(17)
 var debug = __webpack_require__(18)('body-parser:urlencoded')
-var deprecate = __webpack_require__(1)('body-parser')
+var deprecate = __webpack_require__(0)('body-parser')
 var read = __webpack_require__(19)
 var typeis = __webpack_require__(14)
 
@@ -19452,10 +19452,10 @@ var http = __webpack_require__(24);
 var compileETag = __webpack_require__(5).compileETag;
 var compileQueryParser = __webpack_require__(5).compileQueryParser;
 var compileTrust = __webpack_require__(5).compileTrust;
-var deprecate = __webpack_require__(1)('express');
+var deprecate = __webpack_require__(0)('express');
 var flatten = __webpack_require__(23);
 var merge = __webpack_require__(25);
-var resolve = __webpack_require__(2).resolve;
+var resolve = __webpack_require__(1).resolve;
 var setPrototypeOf = __webpack_require__(10)
 var slice = Array.prototype.slice;
 
@@ -20784,7 +20784,7 @@ function plural(ms, n, name) {
  */
 
 var tty = __webpack_require__(12);
-var util = __webpack_require__(0);
+var util = __webpack_require__(2);
 
 /**
  * This is the Node.js implementation of `debug()`.
@@ -21387,7 +21387,7 @@ function plural(ms, n, name) {
  */
 
 var tty = __webpack_require__(12);
-var util = __webpack_require__(0);
+var util = __webpack_require__(2);
 
 /**
  * This is the Node.js implementation of `debug()`.
@@ -22363,7 +22363,7 @@ module.exports = function (str, opts) {
  */
 
 var debug = __webpack_require__(15)('express:view');
-var path = __webpack_require__(2);
+var path = __webpack_require__(1);
 var fs = __webpack_require__(3);
 
 /**
@@ -22632,7 +22632,7 @@ SafeBuffer.allocUnsafeSlow = function (size) {
  * @private
  */
 
-var deprecate = __webpack_require__(1)('http-errors')
+var deprecate = __webpack_require__(0)('http-errors')
 var setPrototypeOf = __webpack_require__(10)
 var statuses = __webpack_require__(11)
 var inherits = __webpack_require__(134)
@@ -22891,7 +22891,7 @@ function populateConstructorExports (exports, codes, HttpError) {
 /***/ (function(module, exports, __webpack_require__) {
 
 try {
-  var util = __webpack_require__(0);
+  var util = __webpack_require__(2);
   /* istanbul ignore next */
   if (typeof util.inherits !== 'function') throw '';
   module.exports = util.inherits;
@@ -23308,7 +23308,7 @@ function plural(ms, n, name) {
  */
 
 var tty = __webpack_require__(12);
-var util = __webpack_require__(0);
+var util = __webpack_require__(2);
 
 /**
  * This is the Node.js implementation of `debug()`.
@@ -23639,7 +23639,7 @@ function onOpenClose() {
 /* 141 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var path = __webpack_require__(2);
+var path = __webpack_require__(1);
 var fs = __webpack_require__(3);
 
 function Mime() {
@@ -24707,7 +24707,7 @@ function parse (header) {
  */
 
 var accepts = __webpack_require__(147);
-var deprecate = __webpack_require__(1)('express');
+var deprecate = __webpack_require__(0)('express');
 var isIP = __webpack_require__(6).isIP;
 var typeis = __webpack_require__(14);
 var http = __webpack_require__(24);
@@ -26469,13 +26469,13 @@ function splitParameters(str) {
 
 var Buffer = __webpack_require__(55).Buffer
 var contentDisposition = __webpack_require__(56);
-var deprecate = __webpack_require__(1)('express');
+var deprecate = __webpack_require__(0)('express');
 var encodeUrl = __webpack_require__(21);
 var escapeHtml = __webpack_require__(22);
 var http = __webpack_require__(24);
 var isAbsolute = __webpack_require__(5).isAbsolute;
 var onFinished = __webpack_require__(20);
-var path = __webpack_require__(2);
+var path = __webpack_require__(1);
 var statuses = __webpack_require__(11)
 var merge = __webpack_require__(25);
 var sign = __webpack_require__(27).sign;
@@ -27776,7 +27776,7 @@ function vary (res, field) {
 var encodeUrl = __webpack_require__(21)
 var escapeHtml = __webpack_require__(22)
 var parseUrl = __webpack_require__(8)
-var resolve = __webpack_require__(2).resolve
+var resolve = __webpack_require__(1).resolve
 var send = __webpack_require__(32)
 var url = __webpack_require__(46)
 
@@ -29102,7 +29102,7 @@ function plural(ms, n, name) {
  */
 
 var tty = __webpack_require__(12);
-var util = __webpack_require__(0);
+var util = __webpack_require__(2);
 
 /**
  * This is the Node.js implementation of `debug()`.
@@ -29729,7 +29729,7 @@ function generateRandomBytes(size, attempts, callback) {
  */
 
 var Store = __webpack_require__(65)
-var util = __webpack_require__(0)
+var util = __webpack_require__(2)
 
 /**
  * Shim setImmediate for node.js < 0.10
@@ -47474,286 +47474,327 @@ function signedCookies (obj, secret) {
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+// @ts-check
+/// <reference types="node" />
 
 
-const util = __webpack_require__(0);
-const oneDay = 86400;
-const DEFAULT_PRUNE_INTERVAL_IN_SECONDS = 60 * 5;
 
-const currentTimestamp = function () {
-  return Math.ceil(Date.now() / 1000);
-};
+const DEFAULT_PRUNE_INTERVAL_IN_SECONDS = 60 * 15;
+const ONE_DAY = 86400;
+
+/** @typedef {*} ExpressSession */
+/** @typedef {*} ExpressSessionStore */
+/** @typedef {import('pg').Pool} Pool */
+
+/** @returns {number} */
+const currentTimestamp = () => Math.ceil(Date.now() / 1000);
 
 /**
- * See
  * @see https://www.postgresql.org/docs/9.5/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
+ * @param {string} value
+ * @returns {string}
  */
 const escapePgIdentifier = (value) => value.replace(/"/g, '""');
 
-module.exports = function (session) {
-  const Store = session.Store || session.session.Store;
+/** @typedef {(err: Error|null) => void} SimpleErrorCallback */
 
-  const PGStore = function (options) {
-    options = options || {};
-    Store.call(this, options);
+/** @typedef {{ cookie: { maxAge: number, [property: string]: any }, [property: string]: any }} SessionObject */
 
-    this.schemaName = options.schemaName ? escapePgIdentifier(options.schemaName) : null;
-    this.tableName = options.tableName ? escapePgIdentifier(options.tableName) : 'session';
+/** @typedef {(delay: number) => number} PGStorePruneDelayRandomizer */
+/** @typedef {Object<string, any>} PGStoreQueryResult */
+/** @typedef {(err: Error|null, firstRow?: PGStoreQueryResult) => void} PGStoreQueryCallback */
 
-    if (!this.schemaName && this.tableName.includes('"."')) {
-      console.warn('DEPRECATION WARNING: Schema should be provided through its dedicated "schemaName" option rather than through "tableName"');
-      this.tableName = this.tableName.replace(/^([^"]+)""\.""([^"]+)$/, '$1"."$2');
-    }
+/**
+ * @typedef PGStoreOptions
+ * @property {string} [schemaName]
+ * @property {string} [tableName]
+ * @property {number} [ttl]
+ * @property {typeof console.error} [errorLog]
+ * @property {Pool} [pool]
+ * @property {*} [pgPromise]
+ * @property {string} [conString]
+ * @property {*} [conObject]
+ * @property {false|number} [pruneSessionInterval]
+ * @property {false|PGStorePruneDelayRandomizer} [pruneSessionRandomizedInterval]
+ */
 
-    this.ttl = options.ttl;
+/**
+ * @param {ExpressSession} session
+ * @returns {ExpressSessionStore}
+ */
+module.exports = function (session) {
+  /** @type {ExpressSessionStore} */
+  const Store = session.Store ||
+    // @ts-ignore
+    session.session.Store;
 
-    this.errorLog = options.errorLog || console.error.bind(console);
+  class PGStore extends Store {
+    /** @param {PGStoreOptions} options */
+    constructor (options = {}) {
+      super(options);
 
-    if (options.pool !== undefined) {
-      this.pool = options.pool;
-      this.ownsPg = false;
-    } else if (options.pgPromise !== undefined) {
-      if (typeof options.pgPromise.query !== 'function') {
-        throw new Error('`pgPromise` config must point to an existing and configured instance of pg-promise pointing at your database');
-      }
-      this.pgPromise = options.pgPromise;
-      this.ownsPg = false;
-    } else {
-      const conString = options.conString || process.env.DATABASE_URL;
-      let conObject = options.conObject;
-
-      if (!conObject) {
-        conObject = {};
+      this.schemaName = options.schemaName ? escapePgIdentifier(options.schemaName) : undefined;
+      /** @type {string} */
+      this.tableName = options.tableName ? escapePgIdentifier(options.tableName) : 'session';
 
-        if (conString) {
-          conObject.connectionString = conString;
-        }
+      if (!this.schemaName && this.tableName.includes('"."')) {
+        console.warn('DEPRECATION WARNING: Schema should be provided through its dedicated "schemaName" option rather than through "tableName"');
+        this.tableName = this.tableName.replace(/^([^"]+)""\.""([^"]+)$/, '$1"."$2');
       }
 
-      this.pool = new (__webpack_require__(71)).Pool(conObject);
-      this.pool.on('error', err => {
-        this.errorLog('PG Pool error:', err.message);
-      });
-      this.ownsPg = true;
-    }
+      this.ttl = options.ttl;
 
-    if (options.pruneSessionInterval === false) {
-      this.pruneSessionInterval = false;
-    } else {
-      this.pruneSessionInterval = (options.pruneSessionInterval || DEFAULT_PRUNE_INTERVAL_IN_SECONDS) * 1000;
-      if (options.pruneSessionRandomizedInterval !== false) {
-        this.pruneSessionRandomizedInterval = (
-          options.pruneSessionRandomizedInterval ||
-          // Results in at least 50% of the specified interval and at most 150%. Makes it so that multiple instances doesn't all prune at the same time.
-          (delay => Math.ceil(delay / 2 + delay * Math.random()))
-        );
-      }
-      setImmediate(() => { this.pruneSessions(); });
-    }
-  };
+      this.errorLog = options.errorLog || console.error.bind(console);
 
-  /**
-   * Inherit from `Store`.
-   */
+      if (options.pool !== undefined) {
+        this.pool = options.pool;
+        this.ownsPg = false;
+      } else if (options.pgPromise !== undefined) {
+        if (typeof options.pgPromise.query !== 'function') {
+          throw new TypeError('`pgPromise` config must point to an existing and configured instance of pg-promise pointing at your database');
+        }
+        this.pgPromise = options.pgPromise;
+        this.ownsPg = false;
+      } else {
+        const conString = options.conString || process.env.DATABASE_URL;
+        let conObject = options.conObject;
 
-  util.inherits(PGStore, Store);
+        if (!conObject) {
+          conObject = {};
 
-  /**
-   * Closes the session store
-   *
-   * Currently only stops the automatic pruning, if any, from continuing
-   *
-   * @access public
-   */
+          if (conString) {
+            conObject.connectionString = conString;
+          }
+        }
 
-  PGStore.prototype.close = function () {
-    this.closed = true;
+        this.pool = new (__webpack_require__(71)).Pool(conObject);
+        this.pool.on('error', err => {
+          this.errorLog('PG Pool error:', err.message);
+        });
+        this.ownsPg = true;
+      }
 
-    if (this.pruneTimer) {
-      clearTimeout(this.pruneTimer);
-      this.pruneTimer = undefined;
+      if (options.pruneSessionInterval === false) {
+        /** @type {false|number} */
+        this.pruneSessionInterval = false;
+      } else {
+        /** @type {false|number} */
+        this.pruneSessionInterval = (options.pruneSessionInterval || DEFAULT_PRUNE_INTERVAL_IN_SECONDS) * 1000;
+        if (options.pruneSessionRandomizedInterval !== false) {
+          this.pruneSessionRandomizedInterval = (
+            options.pruneSessionRandomizedInterval ||
+            // Results in at least 50% of the specified interval and at most 150%. Makes it so that multiple instances doesn't all prune at the same time.
+            (delay => Math.ceil(delay / 2 + delay * Math.random()))
+          );
+        }
+        setImmediate(() => { this.pruneSessions(); });
+      }
     }
 
-    if (this.ownsPg) {
-      this.pool.end();
-    }
-  };
+    /**
+     * Closes the session store
+     *
+     * Currently only stops the automatic pruning, if any, from continuing
+     *
+     * @access public
+     */
+    close () {
+      this.closed = true;
 
-  /**
-   * Get a new prune delay
-   *
-   * @return {number} the quoted schema + table for use in queries
-   * @access private
-   */
+      if (this.pruneTimer) {
+        clearTimeout(this.pruneTimer);
+        this.pruneTimer = undefined;
+      }
 
-  PGStore.prototype.getPruneDelay = function () {
-    const delay = this.pruneSessionInterval;
+      if (this.ownsPg) {
+        this.pool.end();
+      }
+    }
 
-    if (!delay) throw new Error('Can not calculate delay when pruning is inactivated');
-    if (this.pruneSessionRandomizedInterval) return this.pruneSessionRandomizedInterval(delay);
+    /**
+     * Get a new prune delay
+     *
+     * @returns {number} the quoted schema + table for use in queries
+     * @access private
+     */
+    getPruneDelay () {
+      const delay = this.pruneSessionInterval;
 
-    return delay;
-  };
+      if (!delay) throw new Error('Can not calculate delay when pruning is inactivated');
+      if (this.pruneSessionRandomizedInterval) return this.pruneSessionRandomizedInterval(delay);
 
-  /**
-   * Does garbage collection for expired session in the database
-   *
-   * @param {Function} [fn] - standard Node.js callback called on completion
-   * @access public
-   */
+      return delay;
+    }
 
-  PGStore.prototype.pruneSessions = function (fn) {
-    this.query('DELETE FROM ' + this.quotedTable() + ' WHERE expire < to_timestamp($1)', [currentTimestamp()], err => {
-      if (fn && typeof fn === 'function') {
-        return fn(err);
-      }
+    /**
+     * Does garbage collection for expired session in the database
+     *
+     * @param {SimpleErrorCallback} [fn] - standard Node.js callback called on completion
+     * @access public
+     */
+    pruneSessions (fn) {
+      this.query('DELETE FROM ' + this.quotedTable() + ' WHERE expire < to_timestamp($1)', [currentTimestamp()], err => {
+        if (fn && typeof fn === 'function') {
+          return fn(err);
+        }
 
-      if (err) {
-        this.errorLog('Failed to prune sessions:', err.message);
-      }
+        if (err) {
+          this.errorLog('Failed to prune sessions:', err.message);
+        }
 
-      if (this.pruneSessionInterval && !this.closed) {
-        if (this.pruneTimer) {
-          clearTimeout(this.pruneTimer);
+        if (this.pruneSessionInterval && !this.closed) {
+          if (this.pruneTimer) {
+            clearTimeout(this.pruneTimer);
+          }
+          this.pruneTimer = setTimeout(
+            () => { this.pruneSessions(); },
+            this.getPruneDelay()
+          );
+          this.pruneTimer.unref();
         }
-        this.pruneTimer = setTimeout(
-          () => { this.pruneSessions(); },
-          this.getPruneDelay()
-        );
-        this.pruneTimer.unref();
-      }
-    });
-  };
+      });
+    }
 
-  /**
-   * Get the quoted table.
-   *
-   * @return {String} the quoted schema + table for use in queries
-   * @access private
-   */
+    /**
+     * Get the quoted table.
+     *
+     * @returns {string} the quoted schema + table for use in queries
+     * @access private
+     */
+    quotedTable () {
+      let result = '"' + this.tableName + '"';
 
-  PGStore.prototype.quotedTable = function () {
-    let result = '"' + this.tableName + '"';
+      if (this.schemaName) {
+        result = '"' + this.schemaName + '".' + result;
+      }
 
-    if (this.schemaName) {
-      result = '"' + this.schemaName + '".' + result;
+      return result;
     }
 
-    return result;
-  };
-
-  /**
-   * Figure out when a session should expire
-   *
-   * @param {Number} [maxAge] - the maximum age of the session cookie
-   * @return {Number} the unix timestamp, in seconds
-   * @access private
-   */
-
-  PGStore.prototype.getExpireTime = function (maxAge) {
-    let ttl = this.ttl;
+    /**
+     * Figure out when a session should expire
+     *
+     * @param {number} [maxAge] - the maximum age of the session cookie
+     * @returns {number} the unix timestamp, in seconds
+     * @access private
+     */
+    getExpireTime (maxAge) {
+      let ttl = this.ttl;
 
-    ttl = ttl || (typeof maxAge === 'number' ? maxAge / 1000 : oneDay);
-    ttl = Math.ceil(ttl + currentTimestamp());
+      ttl = ttl || (typeof maxAge === 'number' ? maxAge / 1000 : ONE_DAY);
+      ttl = Math.ceil(ttl + currentTimestamp());
 
-    return ttl;
-  };
+      return ttl;
+    }
 
-  /**
-   * Query the database.
-   *
-   * @param {String} query - the database query to perform
-   * @param {(Array|Function)} [params] - the parameters of the query or the callback function
-   * @param {Function} [fn] - standard Node.js callback returning the resulting rows
-   * @access private
-   */
+    /**
+     * Query the database.
+     *
+     * @param {string} query - the database query to perform
+     * @param {any[]|PGStoreQueryCallback} [params] - the parameters of the query or the callback function
+     * @param {PGStoreQueryCallback} [fn] - standard Node.js callback returning the resulting rows
+     * @access private
+     */
+    query (query, params, fn) {
+      if (typeof params === 'function') {
+        if (fn) throw new Error('Two callback functions set at once');
+        fn = params;
+        params = [];
+      }
 
-  PGStore.prototype.query = function (query, params, fn) {
-    if (!fn && typeof params === 'function') {
-      fn = params;
-      params = [];
+      if (this.pgPromise) {
+        this.pgPromise.query(query, params || [])
+          .then(
+            /** @param {PGStoreQueryResult} res */
+            // eslint-disable-next-line unicorn/no-null
+            res => { fn && fn(null, res && res[0] ? res[0] : undefined); }
+          )
+          .catch(
+            /** @param {Error} err */
+            err => { fn && fn(err); }
+          );
+      } else {
+        this.pool.query(
+          query,
+          params || [],
+          (err, res) => { fn && fn(err, res && res.rows[0] ? res.rows[0] : undefined); }
+        );
+      }
     }
 
-    if (this.pgPromise) {
-      this.pgPromise.query(query, params || [])
-        .then(function (res) { fn && fn(null, res && res[0] ? res[0] : false); })
-        .catch(function (err) { fn && fn(err, false); });
-    } else {
-      this.pool.query(query, params || [], function (err, res) {
-        if (fn) { fn(err, res && res.rows[0] ? res.rows[0] : false); }
+    /**
+     * Attempt to fetch session by the given `sid`.
+     *
+     * @param {string} sid – the session id
+     * @param {(err: Error|null, firstRow?: PGStoreQueryResult) => void} fn – a standard Node.js callback returning the parsed session object
+     * @access public
+     */
+    get (sid, fn) {
+      this.query('SELECT sess FROM ' + this.quotedTable() + ' WHERE sid = $1 AND expire >= to_timestamp($2)', [sid, currentTimestamp()], (err, data) => {
+        if (err) { return fn(err); }
+        // eslint-disable-next-line unicorn/no-null
+        if (!data) { return fn(null); }
+        try {
+          // eslint-disable-next-line unicorn/no-null
+          return fn(null, (typeof data.sess === 'string') ? JSON.parse(data.sess) : data.sess);
+        } catch (err_) {
+          return this.destroy(sid, fn);
+        }
       });
     }
-  };
-
-  /**
-   * Attempt to fetch session by the given `sid`.
-   *
-   * @param {String} sid – the session id
-   * @param {Function} fn – a standard Node.js callback returning the parsed session object
-   * @access public
-   */
-
-  PGStore.prototype.get = function (sid, fn) {
-    this.query('SELECT sess FROM ' + this.quotedTable() + ' WHERE sid = $1 AND expire >= to_timestamp($2)', [sid, currentTimestamp()], (err, data) => {
-      if (err) { return fn(err); }
-      if (!data) { return fn(); }
-      try {
-        return fn(null, (typeof data.sess === 'string') ? JSON.parse(data.sess) : data.sess);
-      } catch (e) {
-        return this.destroy(sid, fn);
-      }
-    });
-  };
-
-  /**
-   * Commit the given `sess` object associated with the given `sid`.
-   *
-   * @param {String} sid – the session id
-   * @param {Object} sess – the session object to store
-   * @param {Function} fn – a standard Node.js callback returning the parsed session object
-   * @access public
-   */
-
-  PGStore.prototype.set = function (sid, sess, fn) {
-    const expireTime = this.getExpireTime(sess.cookie.maxAge);
-    const query = 'INSERT INTO ' + this.quotedTable() + ' (sess, expire, sid) SELECT $1, to_timestamp($2), $3 ON CONFLICT (sid) DO UPDATE SET sess=$1, expire=to_timestamp($2) RETURNING sid';
-
-    this.query(query, [sess, expireTime, sid], function (err) {
-      if (fn) { fn.call(this, err); }
-    });
-  };
 
-  /**
-   * Destroy the session associated with the given `sid`.
-   *
-   * @param {String} sid – the session id
-   * @access public
-   */
+    /**
+     * Commit the given `sess` object associated with the given `sid`.
+     *
+     * @param {string} sid – the session id
+     * @param {SessionObject} sess – the session object to store
+     * @param {SimpleErrorCallback} fn – a standard Node.js callback returning the parsed session object
+     * @access public
+     */
+    set (sid, sess, fn) {
+      const expireTime = this.getExpireTime(sess.cookie.maxAge);
+      const query = 'INSERT INTO ' + this.quotedTable() + ' (sess, expire, sid) SELECT $1, to_timestamp($2), $3 ON CONFLICT (sid) DO UPDATE SET sess=$1, expire=to_timestamp($2) RETURNING sid';
 
-  PGStore.prototype.destroy = function (sid, fn) {
-    this.query('DELETE FROM ' + this.quotedTable() + ' WHERE sid = $1', [sid], function (err) {
-      if (fn) { fn(err); }
-    });
-  };
+      this.query(
+        query,
+        [sess, expireTime, sid],
+        err => { fn && fn(err); }
+      );
+    }
 
-  /**
-   * Touch the given session object associated with the given session ID.
-   *
-   * @param {String} sid – the session id
-   * @param {Object} sess – the session object to store
-   * @param {Function} fn – a standard Node.js callback returning the parsed session object
-   * @access public
-   */
+    /**
+     * Destroy the session associated with the given `sid`.
+     *
+     * @param {string} sid – the session id
+     * @param {SimpleErrorCallback} fn – a standard Node.js callback returning the parsed session object
+     * @access public
+     */
+    destroy (sid, fn) {
+      this.query(
+        'DELETE FROM ' + this.quotedTable() + ' WHERE sid = $1',
+        [sid],
+        err => { fn && fn(err); }
+      );
+    }
 
-  PGStore.prototype.touch = function (sid, sess, fn) {
-    const expireTime = this.getExpireTime(sess.cookie.maxAge);
+    /**
+     * Touch the given session object associated with the given session ID.
+     *
+     * @param {string} sid – the session id
+     * @param {SessionObject} sess – the session object to store
+     * @param {SimpleErrorCallback} fn – a standard Node.js callback returning the parsed session object
+     * @access public
+     */
+    touch (sid, sess, fn) {
+      const expireTime = this.getExpireTime(sess.cookie.maxAge);
 
-    this.query(
-      'UPDATE ' + this.quotedTable() + ' SET expire = to_timestamp($1) WHERE sid = $2 RETURNING sid',
-      [expireTime, sid],
-      function (err) { fn(err); }
-    );
-  };
+      this.query(
+        'UPDATE ' + this.quotedTable() + ' SET expire = to_timestamp($1) WHERE sid = $2 RETURNING sid',
+        [expireTime, sid],
+        err => { fn && fn(err); }
+      );
+    }
+  }
 
   return PGStore;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@magda/authentication-plugin-sdk",
   "description": "MAGDA Authentication Plugin SDK",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "scripts": {
     "prebuild": "rimraf dist tsconfig.tsbuildinfo",
     "build": "webpack && api-extractor run -l",
@@ -12,8 +12,8 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "devDependencies": {
-    "@magda/auth-api-client": "^2.0.0",
-    "@magda/typescript-common": "^2.0.0",
+    "@magda/auth-api-client": "^2.0.1",
+    "@magda/typescript-common": "^2.0.1",
     "@types/express": "^4.17.6",
     "@types/express-session": "^1.15.15",
     "@types/lodash": "^4.14.74",
@@ -26,7 +26,7 @@
     "webpack-cli": "^3.3.10"
   },
   "dependencies": {
-    "connect-pg-simple": "^6.0.1",
+    "connect-pg-simple": "^6.2.1",
     "cookie-parser": "^1.4.5",
     "express": "^4.17.1",
     "express-session": "^1.17.1",