Comparing version 0.1.9-alpha.1 to 0.1.9-alpha.3
@@ -15,2 +15,3 @@ const { DatabaseMapper } = require('./DatabaseMapper') | ||
this.queue = [] | ||
this.disconnect = this.disconnect.bind(this) | ||
} | ||
@@ -29,6 +30,6 @@ | ||
this.cancelDisconnectPlan() | ||
this.disconnectTimeout = setTimeout( | ||
() => this.disconnect(), | ||
this.getProp('inactiveTimeout', 300) | ||
) | ||
const maxAge = this.getProp('connectionMaxAge', 0) | ||
if (maxAge !== null) { | ||
this.disconnectTimeout = setTimeout(this.disconnect, maxAge) | ||
} | ||
} | ||
@@ -69,4 +70,4 @@ | ||
if (this.connected) { | ||
this.connected = false | ||
await this.disconnectDb() | ||
this.connected = false | ||
debug(`Disconnected from ${this.props.driver} database`) | ||
@@ -73,0 +74,0 @@ } |
@@ -5,6 +5,9 @@ const { CharField } = require('./CharField') | ||
class PasswordField extends CharField { | ||
static getPasswordHash (password) { | ||
const { getSettings } = require('../config') | ||
get secretKey () { | ||
return require('../config').getSettings('secretKey') | ||
} | ||
getPasswordHash (password) { | ||
return require('crypto') | ||
.createHmac('sha256', getSettings().secretKey) | ||
.createHmac('sha256', this.secretKey) | ||
.update(password) | ||
@@ -15,3 +18,3 @@ .digest('hex') | ||
parse (value) { | ||
return value && this.constructor.getPasswordHash(value) | ||
return value && this.getPasswordHash(value) | ||
} | ||
@@ -18,0 +21,0 @@ |
@@ -10,3 +10,3 @@ const { TrivialField } = require('./TrivialField') | ||
getSecretKey () { | ||
return require('../config').getSettings().secretKey | ||
return require('../config').getSettings('secretKey') | ||
} | ||
@@ -13,0 +13,0 @@ |
@@ -10,4 +10,7 @@ const logger = require('../logger') | ||
name: settings.name, | ||
level: settings.logger.level | ||
level: settings.logger.level || 'info' | ||
} | ||
if (!createTransport) { | ||
options.prettyPrint = { colorize: true } | ||
} | ||
logger.init( | ||
@@ -14,0 +17,0 @@ pino(options, createTransport && createTransport(settings.logger.options)) |
{ | ||
"name": "djorm", | ||
"version": "0.1.9-alpha.1", | ||
"version": "0.1.9-alpha.3", | ||
"description": "Django like ORM framework", | ||
@@ -36,5 +36,6 @@ "author": "Pavel Žák <pavel@zak.global>", | ||
"moment-timezone": "^0.5.33", | ||
"pino": "^6.11.3" | ||
"pino": "^6.11.3", | ||
"pino-pretty": "^5.0.2" | ||
}, | ||
"gitHead": "379dba453013329aa535e7cfe78d4cb72065f66b" | ||
"gitHead": "b47187ded50870791872cfd39e7543f565b61fdc" | ||
} |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
62132
2217
5
+ Addedpino-pretty@^5.0.2
+ Added@hapi/bourne@2.1.0(transitive)
+ Addedansi-styles@3.2.14.3.0(transitive)
+ Addedargs@5.0.3(transitive)
+ Addedcamelcase@5.0.0(transitive)
+ Addedchalk@2.4.24.1.2(transitive)
+ Addedcolor-convert@1.9.32.0.1(transitive)
+ Addedcolor-name@1.1.31.1.4(transitive)
+ Addeddateformat@4.6.3(transitive)
+ Addedend-of-stream@1.4.4(transitive)
+ Addedescape-string-regexp@1.0.5(transitive)
+ Addedhas-flag@3.0.04.0.0(transitive)
+ Addedinherits@2.0.4(transitive)
+ Addedjmespath@0.15.0(transitive)
+ Addedjoycon@3.1.1(transitive)
+ Addedleven@2.1.0(transitive)
+ Addedmri@1.1.4(transitive)
+ Addedonce@1.4.0(transitive)
+ Addedpino-pretty@5.1.3(transitive)
+ Addedpump@3.0.2(transitive)
+ Addedreadable-stream@3.6.2(transitive)
+ Addedrfdc@1.4.1(transitive)
+ Addedsafe-buffer@5.2.1(transitive)
+ Addedsplit2@3.2.2(transitive)
+ Addedstring_decoder@1.3.0(transitive)
+ Addedstrip-json-comments@3.1.1(transitive)
+ Addedsupports-color@5.5.07.2.0(transitive)
+ Addedutil-deprecate@1.0.2(transitive)
+ Addedwrappy@1.0.2(transitive)