Skip to content
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

Jump to bottom

fix(jwt): handle bigint / numeric in JWTs #376

Merged
merged 7 commits into from
Jan 10, 2019
Merged

fix(jwt): handle bigint / numeric in JWTs #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a7badc
Change jwt_token to use bigint/numeric
benjie Jan 10, 2019
a8e2636
Add failing test for JWTs with bigints/numeric
benjie Jan 10, 2019
7d92e08
pgField should cast leaf types correctly
benjie Jan 10, 2019
027c4a8
Update out of date snapshot
benjie Jan 10, 2019
005bf3f
Throw an error rather than warning
benjie Jan 10, 2019
eb43bd3
Lint
benjie Jan 10, 2019
de3636e
Merge branch 'master' into jwt-bigint
benjie Jan 10, 2019
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
16 changes: 15 additions & 1 deletion packages/graphile-build-pg/src/plugins/PgJWTPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default (function PgJWTPlugin(
pgRegisterGqlTypeByTypeId,
pg2GqlMapper,
pgTweaksByTypeId,
pgTweakFragmentForTypeAndModifier,
graphql: { GraphQLScalarType },
inflection,
pgParseIdentifier: parseIdentifier,
Expand Down Expand Up @@ -118,7 +119,20 @@ export default (function PgJWTPlugin(
};

pgTweaksByTypeId[compositeType.id] = fragment =>
sql.fragment`to_json(${fragment})`;
sql.fragment`json_build_object(${sql.join(
compositeClass.attributes.map(
attr =>
sql.fragment`${sql.literal(
attr.name
)}::text, ${pgTweakFragmentForTypeAndModifier(
sql.fragment`(${fragment}).${sql.identifier(attr.name)}`,
attr.type,
attr.typeModifier,
{}
)}`
),
", "
)})`;
});
return _;
});
Expand Down
5 changes: 4 additions & 1 deletion packages/graphile-build-pg/src/plugins/makeProcField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,10 @@ export default function makeProcField(
: null),
},
{},
false
false,
{
pgType: returnType,
}
),
// Result
}
Expand Down
17 changes: 16 additions & 1 deletion packages/graphile-build-pg/src/plugins/pgField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export default function pgField(
pgQueryFromResolveData: queryFromResolveData,
getSafeAliasFromAlias,
getSafeAliasFromResolveInfo,
pgTweakFragmentForTypeAndModifier,
} = build;
return fieldWithHooks(
fieldName,
Expand All @@ -26,6 +27,13 @@ export default function pgField(
const isListType =
nullableType !== namedType &&
nullableType.constructor === build.graphql.GraphQLList;
const isLeafType = build.graphql.isLeafType(FieldType);
if (isLeafType && !options.pgType) {
// eslint-disable-next-line no-console
throw new Error(
"pgField call omits options.pgType for a leaf type; certain tweaks may not be applied!"
);
}
const {
getDataFromParsedResolveInfoFragment,
addDataGenerator,
Expand All @@ -52,7 +60,14 @@ export default function pgField(
: sql.identifier(Symbol());
const query = queryFromResolveData(
whereFrom ? whereFrom(queryBuilder) : sql.identifier(Symbol()),
tableAlias,
isLeafType && options.pgType
? pgTweakFragmentForTypeAndModifier(
tableAlias,
options.pgType,
options.pgTypeModifier,
{}
)
: tableAlias,
resolveData,
whereFrom === false
? { onlyJsonField: true }
Expand Down
21 changes: 17 additions & 4 deletions packages/postgraphile-core/__tests__/integration/__snapshots__/queries-jwt.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Object {
"authenticate": Object {
"jwtToken": Object {
"a": 1,
"b": 2,
"c": 3,
"b": "2",
"c": "3",
"exp": 2130969600,
"role": "yay",
},
Expand All @@ -30,8 +30,8 @@ exports[`jwt pgJwtTypeIdentifier 1`] = `
Object {
"a": 1,
"aud": "postgraphile",
"b": 2,
"c": 3,
"b": "2",
"c": "3",
"exp": 2130969600,
"iat": "[timestamp]",
"iss": "postgraphile",
Expand All @@ -55,3 +55,16 @@ Object {
},
}
`;

exports[`jwt pgJwtTypeIdentifier, big numbers 1`] = `
Object {
"a": 1,
"aud": "postgraphile",
"b": "1234567890123456789.123456789",
"c": "987654321098765432",
"exp": 2130969600,
"iat": "[timestamp]",
"iss": "postgraphile",
"role": "yay",
}
`;
30 changes: 24 additions & 6 deletions packages/postgraphile-core/__tests__/integration/queries-jwt.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ const { graphql } = require("graphql");
const { withPgClient } = require("../helpers");
const { createPostGraphileSchema } = require("../..");
const { readFile: rawReadFile } = require("fs");
const { printSchema } = require("graphql/utilities");
const debug = require("debug")("graphile-build:schema");
//const { printSchema } = require("graphql/utilities");
//const debug = require("debug")("graphile-build:schema");
const jwt = require("jsonwebtoken");

function readFile(filename, encoding) {
Expand All @@ -27,7 +27,7 @@ const tests = [
{
name: "jwt normal",
query: `mutation {
authenticate(input: {a: 1, b: 2, c: 3}) {
authenticate(input: {a: 1, b: "2", c: "3"}) {
jwtToken {
role
exp
Expand All @@ -42,7 +42,25 @@ const tests = [
{
name: "jwt pgJwtTypeIdentifier",
query: `mutation {
authenticate(input: {a: 1, b: 2, c: 3}) {
authenticate(input: {a: 1, b: "2", c: "3"}) {
jwtToken
}
}`,
schema: "withJwt",
process: ({
data: {
authenticate: { jwtToken: str },
},
}) => {
return Object.assign(jwt.verify(str, jwtSecret), {
iat: "[timestamp]",
});
},
},
{
name: "jwt pgJwtTypeIdentifier, big numbers",
query: `mutation {
authenticate(input: {a: 1, b: "1234567890123456789.123456789", c: "987654321098765432"}) {
jwtToken
}
}`,
Expand All @@ -69,7 +87,7 @@ const tests = [
{
name: "jwt pgJwtTypeIdentifier with payload",
query: `mutation {
authenticatePayload(input: {a: 1, b: 2, c: 3}) {
authenticatePayload(input: {a: 1, b: "2", c: "3"}) {
authPayload {
jwt
id
Expand Down Expand Up @@ -106,7 +124,7 @@ beforeAll(() => {
jwtSecret: jwtSecret,
}),
]);
debug(printSchema(withJwt));
//debug(printSchema(withJwt));
return {
normal,
withJwt,
Expand Down
16 changes: 8 additions & 8 deletions .../postgraphile-core/__tests__/integration/schema/__snapshots__/defaultOptions.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ type AuthenticateFailPayload {
\\"\\"\\"All input for the \`authenticate\` mutation.\\"\\"\\"
input AuthenticateInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand All @@ -241,8 +241,8 @@ input AuthenticateInput {
\\"\\"\\"All input for the \`authenticateMany\` mutation.\\"\\"\\"
input AuthenticateManyInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand Down Expand Up @@ -284,8 +284,8 @@ type AuthenticatePayload {
\\"\\"\\"All input for the \`authenticatePayload\` mutation.\\"\\"\\"
input AuthenticatePayloadInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand Down Expand Up @@ -3220,8 +3220,8 @@ type JsonIdentityMutationPayload {

type JwtToken {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt
exp: Int
role: String
}
Expand Down
16 changes: 8 additions & 8 deletions .../postgraphile-core/__tests__/integration/schema/__snapshots__/function-clash.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ type AuthenticateFailPayload {
\\"\\"\\"All input for the \`authenticate\` mutation.\\"\\"\\"
input AuthenticateInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand All @@ -241,8 +241,8 @@ input AuthenticateInput {
\\"\\"\\"All input for the \`authenticateMany\` mutation.\\"\\"\\"
input AuthenticateManyInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand Down Expand Up @@ -284,8 +284,8 @@ type AuthenticatePayload {
\\"\\"\\"All input for the \`authenticatePayload\` mutation.\\"\\"\\"
input AuthenticatePayloadInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand Down Expand Up @@ -3220,8 +3220,8 @@ type JsonIdentityMutationPayload {

type JwtToken {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt
exp: Int
role: String
}
Expand Down
16 changes: 8 additions & 8 deletions packages/postgraphile-core/__tests__/integration/schema/__snapshots__/indexes.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ type AuthenticateFailPayload {
\\"\\"\\"All input for the \`authenticate\` mutation.\\"\\"\\"
input AuthenticateInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand All @@ -241,8 +241,8 @@ input AuthenticateInput {
\\"\\"\\"All input for the \`authenticateMany\` mutation.\\"\\"\\"
input AuthenticateManyInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand Down Expand Up @@ -284,8 +284,8 @@ type AuthenticatePayload {
\\"\\"\\"All input for the \`authenticatePayload\` mutation.\\"\\"\\"
input AuthenticatePayloadInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand Down Expand Up @@ -3108,8 +3108,8 @@ type JsonIdentityMutationPayload {

type JwtToken {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt
exp: Int
role: String
}
Expand Down
12 changes: 6 additions & 6 deletions packages/postgraphile-core/__tests__/integration/schema/__snapshots__/jwt.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ type AuthenticateFailPayload {
\\"\\"\\"All input for the \`authenticate\` mutation.\\"\\"\\"
input AuthenticateInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand All @@ -85,8 +85,8 @@ input AuthenticateInput {
\\"\\"\\"All input for the \`authenticateMany\` mutation.\\"\\"\\"
input AuthenticateManyInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand Down Expand Up @@ -128,8 +128,8 @@ type AuthenticatePayload {
\\"\\"\\"All input for the \`authenticatePayload\` mutation.\\"\\"\\"
input AuthenticatePayloadInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand Down
16 changes: 8 additions & 8 deletions packages/postgraphile-core/__tests__/integration/schema/__snapshots__/rbac.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,8 +1543,8 @@ type AuthenticateFailPayload {
\\"\\"\\"All input for the \`authenticate\` mutation.\\"\\"\\"
input AuthenticateInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand All @@ -1556,8 +1556,8 @@ input AuthenticateInput {
\\"\\"\\"All input for the \`authenticateMany\` mutation.\\"\\"\\"
input AuthenticateManyInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand Down Expand Up @@ -1599,8 +1599,8 @@ type AuthenticatePayload {
\\"\\"\\"All input for the \`authenticatePayload\` mutation.\\"\\"\\"
input AuthenticatePayloadInput {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt

\\"\\"\\"
An arbitrary string value with no semantic meaning. Will be included in the
Expand Down Expand Up @@ -4535,8 +4535,8 @@ type JsonIdentityMutationPayload {

type JwtToken {
a: Int
b: Int
c: Int
b: BigFloat
c: BigInt
exp: Int
role: String
}
Expand Down
Loading