@unchainedshop/api 2.0.4 → 2.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/lib/express/createSingleSignOnMiddleware.js +3 -0
  2. package/lib/express/createSingleSignOnMiddleware.js.map +1 -1
  3. package/lib/resolvers/mutations/worker/finishWork.d.ts +3 -3
  4. package/lib/resolvers/mutations/worker/finishWork.js +3 -6
  5. package/lib/resolvers/mutations/worker/finishWork.js.map +1 -1
  6. package/package.json +11 -11
  7. package/src/express/createSingleSignOnMiddleware.ts +3 -0
  8. package/src/resolvers/mutations/worker/finishWork.ts +6 -9
package/lib/express/createSingleSignOnMiddleware.js CHANGED
@@ -10,6 +10,9 @@ const loginWithSingleSignOn = async (remoteToken, context) => {
10
10
  headers: {
11
11
  'content-type': 'application/json',
12
12
  },
13
+ // eslint-disable-next-line
14
+ // @ts-ignore
15
+ duplex: 'half',
13
16
  body: JSON.stringify({
14
17
  operationName: 'consume',
15
18
  variables: {
package/lib/express/createSingleSignOnMiddleware.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createSingleSignOnMiddleware.js","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createSingleSignOnMiddleware.js","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"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"}
package/lib/resolvers/mutations/worker/finishWork.d.ts CHANGED
@@ -2,9 +2,9 @@ import { Context, Root } from '@unchainedshop/types/api.js';
2
2
  export default function finishWork(root: Root, data: {
3
3
  workId: string;
4
4
  error?: any;
5
- finished: Date;
5
+ finished?: Date;
6
6
  result?: any;
7
7
  started?: Date;
8
- success: boolean;
9
- worker: string;
8
+ success?: boolean;
9
+ worker?: string;
10
10
  }, { modules, userId }: Context): Promise<import("@unchainedshop/types/worker.js").Work>;
package/lib/resolvers/mutations/worker/finishWork.js CHANGED
@@ -1,19 +1,16 @@
1
1
  import { log } from '@unchainedshop/logger';
2
2
  import { InvalidIdError, WorkNotFoundOrWrongStatus } from '../../../errors.js';
3
3
  export default async function finishWork(root, data, { modules, userId }) {
4
- const { workId, error, finished, result, started, success, worker } = data;
5
- log(`mutation finishWork ${workId} ${success} ${worker}`, {
4
+ const { workId, error, success } = data;
5
+ log(`mutation finishWork ${workId} ${success}`, {
6
6
  userId,
7
7
  });
8
8
  if (!workId)
9
9
  throw new InvalidIdError({ workId });
10
10
  const work = await modules.worker.finishWork(workId, {
11
- result,
12
11
  error,
13
12
  success,
14
- worker,
15
- started,
16
- finished,
13
+ ...data,
17
14
  });
18
15
  if (!work)
19
16
  throw new WorkNotFoundOrWrongStatus({ workId });
package/lib/resolvers/mutations/worker/finishWork.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"finishWork.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/worker/finishWork.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CACtC,IAAU,EACV,IAQC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAE3E,GAAG,CAAC,uBAAuB,MAAM,IAAI,OAAO,IAAI,MAAM,EAAE,EAAE;QACxD,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAElD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE;QACnD,MAAM;QACN,KAAK;QACL,OAAO;QACP,MAAM;QACN,OAAO;QACP,QAAQ;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3D,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"finishWork.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/worker/finishWork.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CACtC,IAAU,EACV,IAQC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAExC,GAAG,CAAC,uBAAuB,MAAM,IAAI,OAAO,EAAE,EAAE;QAC9C,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAElD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE;QACnD,KAAK;QACL,OAAO;QACP,GAAG,IAAI;KACR,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3D,OAAO,IAAI,CAAC;AACd,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/api",
3
- "version": "2.0.4",
3
+ "version": "2.0.7",
4
4
  "main": "lib/api-index.js",
5
5
  "exports": {
6
6
  ".": "./lib/api-index.js",
@@ -40,7 +40,7 @@
40
40
  },
41
41
  "homepage": "https://github.com/unchainedshop/unchained#readme",
42
42
  "peerDependencies": {
43
- "@apollo/server": "^4.3.3",
43
+ "@apollo/server": "^4.4.0",
44
44
  "cookie": "^0.5.0",
45
45
  "graphql": "^16.6.0"
46
46
  },
@@ -49,13 +49,13 @@
49
49
  },
50
50
  "dependencies": {
51
51
  "@metamask/eth-sig-util": "^5.0.2",
52
- "@unchainedshop/core": "^2.0.4",
53
- "@unchainedshop/events": "^2.0.4",
54
- "@unchainedshop/logger": "^2.0.4",
55
- "@unchainedshop/roles": "^2.0.4",
56
- "@unchainedshop/utils": "^2.0.4",
52
+ "@unchainedshop/core": "^2.0.7",
53
+ "@unchainedshop/events": "^2.0.7",
54
+ "@unchainedshop/logger": "^2.0.7",
55
+ "@unchainedshop/roles": "^2.0.7",
56
+ "@unchainedshop/utils": "^2.0.7",
57
57
  "accounting": "0.4.1",
58
- "dataloader": "^2.2.1",
58
+ "dataloader": "^2.2.2",
59
59
  "graphql-scalars": "^1.20.1",
60
60
  "graphql-upload": "^16.0.2",
61
61
  "locale": "0.1.0",
@@ -65,11 +65,11 @@
65
65
  "devDependencies": {
66
66
  "@types/graphql-upload": "^15.0.2",
67
67
  "@types/locale": "^0.1.1",
68
- "@types/node": "^18.13.0",
69
- "@unchainedshop/types": "^2.0.4",
68
+ "@types/node": "^18.14.0",
69
+ "@unchainedshop/types": "^2.0.7",
70
70
  "express": "^4.18.2",
71
71
  "graphql": "^16.6.0",
72
- "jest": "^29.4.2",
72
+ "jest": "^29.4.3",
73
73
  "ts-jest": "^29.0.5",
74
74
  "typescript": "^4.9.5"
75
75
  }
package/src/express/createSingleSignOnMiddleware.ts CHANGED
@@ -16,6 +16,9 @@ const loginWithSingleSignOn = async (remoteToken, context: UnchainedCore) => {
16
16
  headers: {
17
17
  'content-type': 'application/json',
18
18
  },
19
+ // eslint-disable-next-line
20
+ // @ts-ignore
21
+ duplex: 'half',
19
22
  body: JSON.stringify({
20
23
  operationName: 'consume',
21
24
  variables: {
package/src/resolvers/mutations/worker/finishWork.ts CHANGED
@@ -7,29 +7,26 @@ export default async function finishWork(
7
7
  data: {
8
8
  workId: string;
9
9
  error?: any;
10
- finished: Date;
10
+ finished?: Date;
11
11
  result?: any;
12
12
  started?: Date;
13
- success: boolean;
14
- worker: string;
13
+ success?: boolean;
14
+ worker?: string;
15
15
  },
16
16
  { modules, userId }: Context,
17
17
  ) {
18
- const { workId, error, finished, result, started, success, worker } = data;
18
+ const { workId, error, success } = data;
19
19
 
20
- log(`mutation finishWork ${workId} ${success} ${worker}`, {
20
+ log(`mutation finishWork ${workId} ${success}`, {
21
21
  userId,
22
22
  });
23
23
 
24
24
  if (!workId) throw new InvalidIdError({ workId });
25
25
 
26
26
  const work = await modules.worker.finishWork(workId, {
27
- result,
28
27
  error,
29
28
  success,
30
- worker,
31
- started,
32
- finished,
29
+ ...data,
33
30
  });
34
31
 
35
32
  if (!work) throw new WorkNotFoundOrWrongStatus({ workId });