kid-fix #4

已關閉
coolaj86 請求將 1 次程式碼提交從 kid-fix 合併至 master

查看文件

@ -108,7 +108,7 @@ module.exports.create = function (config={}) {
return db.Keypair.findOne({ return db.Keypair.findOne({
where: { where: {
// using xid because id is reserved by sequelize // using xid because id is reserved by sequelize
xid: opts.certificate.kid || opts.certificate.id || opts.subject xid: (opts.certificate && (opts.certificate.kid || opts.certificate.id)) || opts.subject
} }
}); });
}).then(function (record) { }).then(function (record) {
@ -131,7 +131,7 @@ module.exports.create = function (config={}) {
return db.Keypair.findOrCreate({ return db.Keypair.findOrCreate({
where: { where: {
// using xid because id is reserved by sequelize // using xid because id is reserved by sequelize
xid: opts.certificate.kid || opts.certificate.id || opts.subject xid: (opts.certificate && (opts.certificate.kid || opts.certificate.id)) || opts.subject
} }
}); });
}).then(function ([record,created]) { }).then(function ([record,created]) {