express-drupal7-session-middleware - npm Package Compare versions

Comparing version 1.0.2 to 1.0.3

lib/CSRFToken.js

@@ -10,6 +10,6 @@ "use strict";
 
-var _crypto = _interopRequireDefault(require("crypto"));
-
 var _knex = _interopRequireDefault(require("knex"));
 
+var _utils = require("./utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -57,8 +57,4 @@
 
-  const key = `${sessionId}${privateKey}${hashSalt}`;
-
-  const token = _crypto.default.createHmac('sha256', key).update(value).digest().toString('base64');
-
-  return token.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+  return (0, _utils.createDrupalToken)(sessionId, privateKey, hashSalt, value);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9DU1JGVG9rZW4uanMiXSwibmFtZXMiOlsicHJpdmF0ZUtleSIsImdldENTUkZUb2tlbiIsImtuZXgiLCJzZXNzaW9uSWQiLCJoYXNoU2FsdCIsInZhbHVlIiwibGVuZ3RoIiwicmVzdWx0cyIsInJhdyIsImVycm9yIiwiY29uc29sZSIsImxvZyIsIlBIUFVuc2VyaWFsaXplIiwidW5zZXJpYWxpemUiLCJrZXkiLCJ0b2tlbiIsImNyeXB0byIsImNyZWF0ZUhtYWMiLCJ1cGRhdGUiLCJkaWdlc3QiLCJ0b1N0cmluZyIsInJlcGxhY2UiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7OztBQUVBLElBQUlBLFVBQVUsR0FBRyxFQUFqQjtBQUVBOzs7Ozs7OztBQU9lLGVBQWVDLFlBQWYsQ0FBNEJDLElBQTVCLEVBQWtDQyxTQUFsQyxFQUE2Q0MsUUFBN0MsRUFBdURDLEtBQXZELEVBQThEO0FBQzNFLE1BQUksQ0FBQ0YsU0FBTCxFQUFnQjtBQUNkLFdBQU8sS0FBUDtBQUNEOztBQUNELE1BQUksQ0FBQ0gsVUFBVSxDQUFDTSxNQUFoQixFQUF3QjtBQUN0QixRQUFJQyxPQUFPLEdBQUcsRUFBZDs7QUFDQSxRQUFJO0FBQ0ZBLE1BQUFBLE9BQU8sR0FBRyxNQUFNTCxJQUFJLENBQUNNLEdBQUwsQ0FBUywyQ0FBVCxFQUFzRCxDQUFDLG9CQUFELENBQXRELENBQWhCO0FBQ0QsS0FGRCxDQUVFLE9BQU9DLEtBQVAsRUFBYztBQUNkQyxNQUFBQSxPQUFPLENBQUNDLEdBQVIsQ0FBWUYsS0FBWjtBQUNBLGFBQU8sS0FBUDtBQUNEOztBQUNELFFBQUksQ0FBQ0YsT0FBRCxJQUFZLENBQUNBLE9BQU8sQ0FBQyxDQUFELENBQXBCLElBQTJCLENBQUNBLE9BQU8sQ0FBQyxDQUFELENBQVAsQ0FBVyxDQUFYLENBQWhDLEVBQStDO0FBQzdDLGFBQU8sS0FBUDtBQUNEOztBQUNELFFBQUk7QUFDRlAsTUFBQUEsVUFBVSxHQUFHWSx3QkFBZUMsV0FBZixDQUEyQk4sT0FBTyxDQUFDLENBQUQsQ0FBUCxDQUFXLENBQVgsRUFBY0YsS0FBekMsQ0FBYjtBQUNELEtBRkQsQ0FFRSxPQUFPSSxLQUFQLEVBQWM7QUFDZEMsTUFBQUEsT0FBTyxDQUFDQyxHQUFSLENBQVlGLEtBQVo7QUFDQSxhQUFPLEtBQVA7QUFDRDs7QUFDRCxRQUFJLENBQUNULFVBQVUsQ0FBQ00sTUFBaEIsRUFBd0I7QUFDdEIsYUFBTyxLQUFQO0FBQ0Q7QUFDRjs7QUFFRCxRQUFNUSxHQUFHLEdBQUksR0FBRVgsU0FBVSxHQUFFSCxVQUFXLEdBQUVJLFFBQVMsRUFBakQ7O0FBRUEsUUFBTVcsS0FBSyxHQUFHQyxnQkFDWEMsVUFEVyxDQUNBLFFBREEsRUFDVUgsR0FEVixFQUVYSSxNQUZXLENBRUpiLEtBRkksRUFHWGMsTUFIVyxHQUlYQyxRQUpXLENBSUYsUUFKRSxDQUFkOztBQU1BLFNBQU9MLEtBQUssQ0FDVE0sT0FESSxDQUNJLEtBREosRUFDVyxHQURYLEVBRUpBLE9BRkksQ0FFSSxLQUZKLEVBRVcsR0FGWCxFQUdKQSxPQUhJLENBR0ksSUFISixFQUdVLEVBSFYsQ0FBUDtBQUlEIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFBIUFVuc2VyaWFsaXplIGZyb20gJ3BocC11bnNlcmlhbGl6ZSc7XG5pbXBvcnQgY3J5cHRvIGZyb20gJ2NyeXB0byc7XG5pbXBvcnQgS25leEluc3RhbmNlIGZyb20gJ2tuZXgnO1xuXG5sZXQgcHJpdmF0ZUtleSA9ICcnO1xuXG4vKipcbiAqIFJldHVybiBhIGRydXBhbCBDU1JGIHRva2VuLlxuICogQHBhcmFtIHtLbmV4SW5zdGFuY2V9IGtuZXggLSBBbiBpbnN0YW5jZSBvZiBrbmV4IGNvbm5lY3RlZCB0byB0aGUgZHJ1cGFsIGRhdGFiYXNlLlxuICogQHBhcmFtIHtTdHJpbmd9IHNlc3Npb25JZCAtIFRoZSBkcnVwYWwgc2Vzc2lvbiBpZC5cbiAqIEBwYXJhbSB7U3RyaW5nfSBoYXNoU2FsdCAtIFRoZSBoYXNoc2FsdCBmcm9tIHRoZSBkcnVwYWwgcGhwIGNvbmZpZy5cbiAqIEBwYXJhbSB7U3RyaW5nfSB2YWx1ZSAtIFRoZSB2YWx1ZSB0byBlbmNvZGUuXG4gKi9cbmV4cG9ydCBkZWZhdWx0IGFzeW5jIGZ1bmN0aW9uIGdldENTUkZUb2tlbihrbmV4LCBzZXNzaW9uSWQsIGhhc2hTYWx0LCB2YWx1ZSkge1xuICBpZiAoIXNlc3Npb25JZCkge1xuICAgIHJldHVybiBmYWxzZTtcbiAgfVxuICBpZiAoIXByaXZhdGVLZXkubGVuZ3RoKSB7XG4gICAgbGV0IHJlc3VsdHMgPSBbXTtcbiAgICB0cnkge1xuICAgICAgcmVzdWx0cyA9IGF3YWl0IGtuZXgucmF3KCdTRUxFQ1QgdmFsdWUgRlJPTSB2YXJpYWJsZSBXSEVSRSBuYW1lID0gPycsIFsnZHJ1cGFsX3ByaXZhdGVfa2V5J10pO1xuICAgIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgICBjb25zb2xlLmxvZyhlcnJvcik7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfVxuICAgIGlmICghcmVzdWx0cyB8fCAhcmVzdWx0c1swXSB8fCAhcmVzdWx0c1swXVswXSkge1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH1cbiAgICB0cnkge1xuICAgICAgcHJpdmF0ZUtleSA9IFBIUFVuc2VyaWFsaXplLnVuc2VyaWFsaXplKHJlc3VsdHNbMF1bMF0udmFsdWUpO1xuICAgIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgICBjb25zb2xlLmxvZyhlcnJvcik7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfVxuICAgIGlmICghcHJpdmF0ZUtleS5sZW5ndGgpIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gIH1cblxuICBjb25zdCBrZXkgPSBgJHtzZXNzaW9uSWR9JHtwcml2YXRlS2V5fSR7aGFzaFNhbHR9YDtcblxuICBjb25zdCB0b2tlbiA9IGNyeXB0b1xuICAgIC5jcmVhdGVIbWFjKCdzaGEyNTYnLCBrZXkpXG4gICAgLnVwZGF0ZSh2YWx1ZSlcbiAgICAuZGlnZXN0KClcbiAgICAudG9TdHJpbmcoJ2Jhc2U2NCcpO1xuXG4gIHJldHVybiB0b2tlblxuICAgIC5yZXBsYWNlKC9cXCsvZywgJy0nKVxuICAgIC5yZXBsYWNlKC9cXC8vZywgJ18nKVxuICAgIC5yZXBsYWNlKC89L2csICcnKTtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9DU1JGVG9rZW4uanMiXSwibmFtZXMiOlsicHJpdmF0ZUtleSIsImdldENTUkZUb2tlbiIsImtuZXgiLCJzZXNzaW9uSWQiLCJoYXNoU2FsdCIsInZhbHVlIiwibGVuZ3RoIiwicmVzdWx0cyIsInJhdyIsImVycm9yIiwiY29uc29sZSIsImxvZyIsIlBIUFVuc2VyaWFsaXplIiwidW5zZXJpYWxpemUiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7OztBQUVBLElBQUlBLFVBQVUsR0FBRyxFQUFqQjtBQUVBOzs7Ozs7OztBQU9lLGVBQWVDLFlBQWYsQ0FBNEJDLElBQTVCLEVBQWtDQyxTQUFsQyxFQUE2Q0MsUUFBN0MsRUFBdURDLEtBQXZELEVBQThEO0FBQzNFLE1BQUksQ0FBQ0YsU0FBTCxFQUFnQjtBQUNkLFdBQU8sS0FBUDtBQUNEOztBQUNELE1BQUksQ0FBQ0gsVUFBVSxDQUFDTSxNQUFoQixFQUF3QjtBQUN0QixRQUFJQyxPQUFPLEdBQUcsRUFBZDs7QUFDQSxRQUFJO0FBQ0ZBLE1BQUFBLE9BQU8sR0FBRyxNQUFNTCxJQUFJLENBQUNNLEdBQUwsQ0FBUywyQ0FBVCxFQUFzRCxDQUFDLG9CQUFELENBQXRELENBQWhCO0FBQ0QsS0FGRCxDQUVFLE9BQU9DLEtBQVAsRUFBYztBQUNkQyxNQUFBQSxPQUFPLENBQUNDLEdBQVIsQ0FBWUYsS0FBWjtBQUNBLGFBQU8sS0FBUDtBQUNEOztBQUNELFFBQUksQ0FBQ0YsT0FBRCxJQUFZLENBQUNBLE9BQU8sQ0FBQyxDQUFELENBQXBCLElBQTJCLENBQUNBLE9BQU8sQ0FBQyxDQUFELENBQVAsQ0FBVyxDQUFYLENBQWhDLEVBQStDO0FBQzdDLGFBQU8sS0FBUDtBQUNEOztBQUNELFFBQUk7QUFDRlAsTUFBQUEsVUFBVSxHQUFHWSx3QkFBZUMsV0FBZixDQUEyQk4sT0FBTyxDQUFDLENBQUQsQ0FBUCxDQUFXLENBQVgsRUFBY0YsS0FBekMsQ0FBYjtBQUNELEtBRkQsQ0FFRSxPQUFPSSxLQUFQLEVBQWM7QUFDZEMsTUFBQUEsT0FBTyxDQUFDQyxHQUFSLENBQVlGLEtBQVo7QUFDQSxhQUFPLEtBQVA7QUFDRDs7QUFDRCxRQUFJLENBQUNULFVBQVUsQ0FBQ00sTUFBaEIsRUFBd0I7QUFDdEIsYUFBTyxLQUFQO0FBQ0Q7QUFDRjs7QUFFRCxTQUFPLDhCQUFrQkgsU0FBbEIsRUFBNkJILFVBQTdCLEVBQXlDSSxRQUF6QyxFQUFtREMsS0FBbkQsQ0FBUDtBQUNEIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFBIUFVuc2VyaWFsaXplIGZyb20gJ3BocC11bnNlcmlhbGl6ZSc7XG5pbXBvcnQgS25leEluc3RhbmNlIGZyb20gJ2tuZXgnO1xuaW1wb3J0IHsgY3JlYXRlRHJ1cGFsVG9rZW4gfSBmcm9tICcuL3V0aWxzJztcblxubGV0IHByaXZhdGVLZXkgPSAnJztcblxuLyoqXG4gKiBSZXR1cm4gYSBkcnVwYWwgQ1NSRiB0b2tlbi5cbiAqIEBwYXJhbSB7S25leEluc3RhbmNlfSBrbmV4IC0gQW4gaW5zdGFuY2Ugb2Yga25leCBjb25uZWN0ZWQgdG8gdGhlIGRydXBhbCBkYXRhYmFzZS5cbiAqIEBwYXJhbSB7U3RyaW5nfSBzZXNzaW9uSWQgLSBUaGUgZHJ1cGFsIHNlc3Npb24gaWQuXG4gKiBAcGFyYW0ge1N0cmluZ30gaGFzaFNhbHQgLSBUaGUgaGFzaHNhbHQgZnJvbSB0aGUgZHJ1cGFsIHBocCBjb25maWcuXG4gKiBAcGFyYW0ge1N0cmluZ30gdmFsdWUgLSBUaGUgdmFsdWUgdG8gZW5jb2RlLlxuICovXG5leHBvcnQgZGVmYXVsdCBhc3luYyBmdW5jdGlvbiBnZXRDU1JGVG9rZW4oa25leCwgc2Vzc2lvbklkLCBoYXNoU2FsdCwgdmFsdWUpIHtcbiAgaWYgKCFzZXNzaW9uSWQpIHtcbiAgICByZXR1cm4gZmFsc2U7XG4gIH1cbiAgaWYgKCFwcml2YXRlS2V5Lmxlbmd0aCkge1xuICAgIGxldCByZXN1bHRzID0gW107XG4gICAgdHJ5IHtcbiAgICAgIHJlc3VsdHMgPSBhd2FpdCBrbmV4LnJhdygnU0VMRUNUIHZhbHVlIEZST00gdmFyaWFibGUgV0hFUkUgbmFtZSA9ID8nLCBbJ2RydXBhbF9wcml2YXRlX2tleSddKTtcbiAgICB9IGNhdGNoIChlcnJvcikge1xuICAgICAgY29uc29sZS5sb2coZXJyb3IpO1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH1cbiAgICBpZiAoIXJlc3VsdHMgfHwgIXJlc3VsdHNbMF0gfHwgIXJlc3VsdHNbMF1bMF0pIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gICAgdHJ5IHtcbiAgICAgIHByaXZhdGVLZXkgPSBQSFBVbnNlcmlhbGl6ZS51bnNlcmlhbGl6ZShyZXN1bHRzWzBdWzBdLnZhbHVlKTtcbiAgICB9IGNhdGNoIChlcnJvcikge1xuICAgICAgY29uc29sZS5sb2coZXJyb3IpO1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH1cbiAgICBpZiAoIXByaXZhdGVLZXkubGVuZ3RoKSB7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIGNyZWF0ZURydXBhbFRva2VuKHNlc3Npb25JZCwgcHJpdmF0ZUtleSwgaGFzaFNhbHQsIHZhbHVlKTtcbn1cbiJdfQ==

package.json

 {
   "name": "express-drupal7-session-middleware",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Express middleware to retrieve a user session from a drupal 7 cookie",
@@ -29,8 +29,8 @@ "repository": "[e-mail]:rawpixel1/express-drupal7-session-middleware.git",
     "eslint-config-prettier": "^4.3.0",
-    "eslint-plugin-import": "^2.18.0",
+    "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-prettier": "^3.1.0",
-    "eslint-plugin-react": "^7.14.2",
+    "eslint-plugin-react": "^7.14.3",
     "knex": "^0.17.6",
-    "mocha": "^6.1.4",
+    "mocha": "^6.2.0",
     "prettier": "^1.18.2"
@@ -37,0 +37,0 @@ },

test/index.js

 import { expect } from 'chai';
 import { describe, it } from 'mocha';
+import { createDrupalToken } from '../src/utils';
 
-describe('1 = 1', () => {
-  it('work', () => {
-    expect(1).to.eql(1);
+describe('CSRF Token', () => {
+  it('create a valid Drupal token', () => {
+    expect(createDrupalToken('PHC0SZ6jHa_fOrBa55M8y4C3-gK29GHIG8gKVU1lU4s', 'sdfweger34tgq34', 'j09bh0jh45jh45-jg', 'service')).to.eql('G5EzHQeNfBfsCXvqji6uqytHT5g58Ya_Z98drJKjoMk');
   });
 });

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

21966

increased by7.78%

Number of package files

13

increased by8.33%

Lines of code

180

increased by9.76%

Worsened metrics

Number of downloads

3

decreased by-25%

No dependency changes