Skip to content

Commit f27a046

Browse files
authored
Merge pull request #24 from mittwald/bump
bump dependencies
2 parents e0cf588 + 70036ff commit f27a046

File tree

8 files changed

+1552
-1878
lines changed

8 files changed

+1552
-1878
lines changed

.eslintrc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rules:
1515
- error
1616
- default: array-simple
1717
"@typescript-eslint/await-thenable": error
18-
"@typescript-eslint/class-name-casing": error
18+
# "@typescript-eslint/class-name-casing": error
1919
"@typescript-eslint/consistent-type-assertions": off
2020
"@typescript-eslint/consistent-type-definitions":
2121
- error
@@ -26,7 +26,7 @@ rules:
2626
allowHigherOrderFunctions: true
2727
allowTypedFunctionExpressions: true
2828
"@typescript-eslint/explicit-member-accessibility": error
29-
"@typescript-eslint/generic-type-naming": error
29+
# "@typescript-eslint/generic-type-naming": error
3030
"@typescript-eslint/member-delimiter-style":
3131
- error
3232
- multiline:

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
jobs:
55
test:
66
runs-on: ubuntu-latest
7-
container: node:10-jessie
7+
container: node:12
88
services:
99
vault:
1010
image: vault
@@ -15,7 +15,7 @@ jobs:
1515
# Setup .npmrc file to publish to npm
1616
- uses: actions/setup-node@v1
1717
with:
18-
node-version: "10.x"
18+
node-version: "12.x"
1919
registry-url: "https://npm.pkg.github.com"
2020
# Defaults to the user or organization that owns the workflow file
2121
scope: "@mittwald"

.prettierrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"jsxSingleQuote": false,
66
"trailingComma": "all",
77
"bracketSpacing": true,
8-
"jsxBracketSameLine": false,
98
"arrowParens": "always",
109
"proseWrap": "always",
1110
"htmlWhitespaceSensitivity": "css",

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,29 @@
4040
"keywords": [],
4141
"dependencies": {
4242
"request": "^2.88.0",
43-
"request-promise-native": "^1.0.7",
44-
"ts-interface-checker": "^0.1.9",
43+
"request-promise-native": "^1.0.9",
44+
"ts-interface-checker": "^1.0.2",
4545
"verror": "^1.10.0"
4646
},
4747
"devDependencies": {
48-
"@types/debug": "^4.1.5",
49-
"@types/jest": "^25.2.3",
48+
"@types/debug": "^4.1.7",
49+
"@types/jest": "^27.0.2",
5050
"@types/node": "^14.0.11",
51-
"@types/request-promise-native": "^1.0.16",
51+
"@types/request-promise-native": "^1.0.18",
5252
"@types/verror": "^1.10.4",
53-
"@typescript-eslint/eslint-plugin": "^2.22.0",
54-
"@typescript-eslint/parser": "^2.22.0",
55-
"eslint": "^7.1.0",
56-
"eslint-config-prettier": "^6.11.0",
57-
"eslint-plugin-jest": "^23.13.2",
58-
"eslint-plugin-prettier": "^3.1.3",
59-
"jest": "^26.0.1",
53+
"@typescript-eslint/eslint-plugin": "^5.0.0",
54+
"@typescript-eslint/parser": "^5.0.0",
55+
"eslint": "^8.0.1",
56+
"eslint-config-prettier": "^8.3.0",
57+
"eslint-plugin-jest": "^25.2.1",
58+
"eslint-plugin-prettier": "^4.0.0",
59+
"jest": "^27.2.5",
6060
"jsonpointer-cli": "^1.0.0",
6161
"npm-run-all": "^4.1.5",
62-
"prettier": "^2.0.5",
63-
"ts-interface-builder": "^0.2.1",
64-
"ts-jest": "^26.1.0",
65-
"tslint": "^6.1.2",
66-
"typescript": "^3.9.5"
62+
"prettier": "^2.4.1",
63+
"ts-interface-builder": "^0.3.2",
64+
"ts-jest": "^27.0.6",
65+
"tslint": "^6.1.3",
66+
"typescript": "^4.4.4"
6767
}
6868
}

src/engines/transit_types-ti.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export const ITransitDecryptOptionsBatch = t.iface([], {
120120

121121
export const ITransitDecryptResponseSingle = t.iface([], {
122122
"data": t.iface([], {
123-
"plaintext": "string",
123+
"plaintext": t.union("string", "undefined"),
124124
}),
125125
});
126126

src/engines/transit_types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export interface ITransitDecryptOptionsBatch {
113113

114114
export interface ITransitDecryptResponseSingle {
115115
data: {
116-
plaintext: string;
116+
plaintext: string | undefined;
117117
};
118118
}
119119

tests/engines/transit.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@ describe("Transit Vault Client", () => {
117117
expect(dec).toEqual("hello");
118118
});
119119

120-
test("should response with 400 if the keyID for decryption is invalid", async () => {
121-
const encrypted = await client.encryptText("400test", "plainText");
120+
test("should respond with 500 if the keyID for decryption is invalid", async () => {
121+
const encrypted = await client.encryptText("500test", "plainText");
122122
const invalidKeyID = "invalid";
123123
await client.create(invalidKeyID);
124124
try {
125125
await client.decryptText(invalidKeyID, encrypted);
126126
} catch (err) {
127-
expect(err.response.statusCode).toEqual(400);
127+
expect(err.response.statusCode).toEqual(500);
128128
}
129129
});
130130

0 commit comments

Comments
 (0)