Skip to content

Use Buffer.from #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
montalvomiguelo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use Buffer.from #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
219e80d
Use Buffer.from instead
montalvomiguelo Aug 9, 2018
7f05c30
Use sqlite for testing
montalvomiguelo Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function EncryptedField(Sequelize, key, opt) {
}

var self = this;
self.key = new Buffer(key, 'hex');
self.key = Buffer.from(key, 'hex');
self.Sequelize = Sequelize;

opt = opt || {};
Expand All @@ -32,7 +32,7 @@ EncryptedField.prototype.vault = function(name) {
return {};
}

previous = new Buffer(previous);
previous = Buffer.from(previous);

var iv = previous.slice(0, self._iv_length);
var content = previous.slice(self._iv_length, previous.length);
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"babel-preset-es2015": "6.9.0",
"babel-register": "6.9.0",
"mocha": "2.0.1",
"pg": "6.0.1",
"sequelize": "3.23.4"
"sequelize": "3.23.4",
"sqlite3": "^3.1.4"
}
}
}
7 changes: 5 additions & 2 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import assert from 'assert';
import Sequelize from 'sequelize';
import EncryptedField from '../';

const sequelize = new Sequelize('postgres://postgres@db:5432/postgres');
const sequelize = new Sequelize({
dialect: 'sqlite',
storage: ':memory:'
});

const key1 = 'a593e7f567d01031d153b5af6d9a25766b95926cff91c6be3438c7f7ac37230e';
const key2 = 'a593e7f567d01031d153b5af6d9a25766b95926cff91c6be3438c7f7ac37230f';
Expand All @@ -23,7 +26,7 @@ describe('sequelize-encrypted', () => {
});

before('create models', async () => {
await User.sync({force: true});
await User.sync();
});

it('should save an encrypted field', async () => {
Expand Down