Comparing version 5.6.4 to 5.6.5
@@ -112,3 +112,3 @@ "use strict"; | ||
} | ||
var audienceWhere = input.where.find(function (item) { return item.column === "audience"; }); | ||
var audienceWhere = input.where.find(function (item) { return item.column === 'audience'; }); | ||
if (!audienceWhere) { | ||
@@ -128,3 +128,3 @@ return qb; | ||
var item = _k.value; | ||
if (item.column === "audience") { | ||
if (item.column === 'audience') { | ||
continue; | ||
@@ -193,3 +193,3 @@ } | ||
} | ||
function decorateQB(qb, tablename, input) { | ||
function decorateQB(qb, tableName, input) { | ||
var e_2, _a; | ||
@@ -204,3 +204,3 @@ if (input === null || input === void 0 ? void 0 : input.skip) | ||
var item = _c.value; | ||
qb = qb.orderBy(qb.connection.driver.escape("" + item.column), item.direction); | ||
qb = qb.orderBy(qb.connection.driver.escape(tableName) + '.' + qb.connection.driver.escape(item.column), item.direction); | ||
} | ||
@@ -403,3 +403,3 @@ } | ||
if (ctx.authenticatedDid) { | ||
authMeta = { type: "sender", value: ctx.authenticatedDid }; | ||
authMeta = { type: 'sender', value: ctx.authenticatedDid }; | ||
if (Array.isArray(args.metaData)) { | ||
@@ -406,0 +406,0 @@ args.metaData.push(authMeta); |
@@ -6,2 +6,13 @@ # Change Log | ||
## [5.6.5](https://github.com/uport-project/daf/compare/v5.6.4...v5.6.5) (2020-05-25) | ||
### Bug Fixes | ||
* GraphQL orderBy ([bb06094](https://github.com/uport-project/daf/commit/bb060941fab367540d1fd8cdbc4ad6de51fb00ab)) | ||
## [5.6.4](https://github.com/uport-project/daf/compare/v5.6.3...v5.6.4) (2020-05-22) | ||
@@ -8,0 +19,0 @@ |
{ | ||
"name": "daf-core", | ||
"description": "DID Agent Framework Core", | ||
"version": "5.6.4", | ||
"version": "5.6.5", | ||
"main": "build/index.js", | ||
@@ -32,3 +32,3 @@ "types": "build/index.d.ts", | ||
"keywords": [], | ||
"gitHead": "4d8a683610cce677d9eddbda972b5162453747ec" | ||
"gitHead": "68ef8acad0a0536def8e3c6ff9ff713cfb9860f3" | ||
} |
@@ -84,7 +84,7 @@ import { | ||
function addAudienceQuery(input: FindInput, qb: SelectQueryBuilder<any>): SelectQueryBuilder<any> { | ||
function addAudienceQuery(input: FindInput, qb: SelectQueryBuilder<any>): SelectQueryBuilder<any> { | ||
if (!Array.isArray(input.where)) { | ||
return qb | ||
} | ||
const audienceWhere = input.where.find((item) => item.column === "audience") | ||
const audienceWhere = input.where.find(item => item.column === 'audience') | ||
if (!audienceWhere) { | ||
@@ -94,3 +94,3 @@ return qb | ||
const [op, value] = opToSQL(audienceWhere) | ||
return qb.andWhere(`audience.did ${op}`, {value}) | ||
return qb.andWhere(`audience.did ${op}`, { value }) | ||
} | ||
@@ -102,3 +102,3 @@ | ||
for (const item of input.where) { | ||
if (item.column === "audience") { | ||
if (item.column === 'audience') { | ||
continue | ||
@@ -155,3 +155,3 @@ } | ||
qb: SelectQueryBuilder<any>, | ||
tablename: string, | ||
tableName: string, | ||
input: FindInput, | ||
@@ -164,3 +164,6 @@ ): SelectQueryBuilder<any> { | ||
for (const item of input.order) { | ||
qb = qb.orderBy(qb.connection.driver.escape(`${item.column}`), item.direction) | ||
qb = qb.orderBy( | ||
qb.connection.driver.escape(tableName) + '.' + qb.connection.driver.escape(item.column), | ||
item.direction, | ||
) | ||
} | ||
@@ -276,3 +279,2 @@ } | ||
const claimsQuery = async (_: any, args: FindArgs, ctx: Context) => { | ||
@@ -316,3 +318,3 @@ const where = createWhereObject(args.input) | ||
if (ctx.authenticatedDid) { | ||
const authMeta = {type: "sender", value: ctx.authenticatedDid}; | ||
const authMeta = { type: 'sender', value: ctx.authenticatedDid } | ||
if (Array.isArray(args.metaData)) { | ||
@@ -319,0 +321,0 @@ args.metaData.push(authMeta) |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
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
348248
5990