diff --git a/package.json b/package.json index 69ec2ff0bb10..d5f5ace05daf 100644 --- a/package.json +++ b/package.json @@ -130,6 +130,7 @@ "@elastic/request-crypto": "^1.0.2", "@elastic/ui-ace": "0.2.3", "@hapi/boom": "^7.4.11", + "@hapi/cookie": "^10.1.2", "@hapi/good-squeeze": "^5.2.1", "@hapi/hapi": "^18.4.1", "@hapi/wreck": "^15.1.0", @@ -187,7 +188,6 @@ "globby": "^8.0.1", "h2o2": "^8.1.2", "handlebars": "4.5.3", - "hapi-auth-cookie": "^9.0.0", "history": "^4.9.0", "hjson": "3.2.1", "hoek": "^5.0.4", @@ -333,8 +333,8 @@ "@types/globby": "^8.0.0", "@types/graphql": "^0.13.2", "@types/h2o2": "^8.1.1", - "@types/hapi-auth-cookie": "^9.1.0", "@types/hapi__boom": "^7.4.1", + "@types/hapi__cookie": "^10.1.0", "@types/hapi__hapi": "^18.2.6", "@types/has-ansi": "^3.0.0", "@types/history": "^4.7.3", diff --git a/src/core/server/http/cookie_session_storage.ts b/src/core/server/http/cookie_session_storage.ts index 85c5771f03af..ae782e05d4a8 100644 --- a/src/core/server/http/cookie_session_storage.ts +++ b/src/core/server/http/cookie_session_storage.ts @@ -18,7 +18,7 @@ */ import { Request, Server } from '@hapi/hapi'; -import hapiAuthCookie from 'hapi-auth-cookie'; +import hapiAuthCookie from '@hapi/cookie'; import { KibanaRequest, ensureRawRequest } from './router'; import { SessionStorageFactory, SessionStorage } from './session_storage'; diff --git a/yarn.lock b/yarn.lock index 31d5774de3c3..45e2adf2eac3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1591,6 +1591,16 @@ dependencies: "@hapi/boom" "7.x.x" +"@hapi/cookie@^10.1.2": + version "10.1.2" + resolved "https://registry.yarnpkg.com/@hapi/cookie/-/cookie-10.1.2.tgz#9ea7d80f05d764faaf892b84e80c1bf13f5e3bf5" + integrity sha512-wch/uT5NgDEujmaLIqUoohbEP6PUr4ML2Z6zqheWHeHrSzXangPH4dveW+fiMsoPMW2S9ecAyUjCfkh4qRfxjg== + dependencies: + "@hapi/boom" "7.x.x" + "@hapi/bounce" "1.x.x" + "@hapi/hoek" "8.x.x" + "@hapi/joi" "16.x.x" + "@hapi/cryptiles@4.x.x": version "4.2.1" resolved "https://registry.yarnpkg.com/@hapi/cryptiles/-/cryptiles-4.2.1.tgz#ff0f18d79074659838caedbb911851313ad1ffbc" @@ -4202,13 +4212,6 @@ "@types/hapi" "*" "@types/node" "*" -"@types/hapi-auth-cookie@^9.1.0": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@types/hapi-auth-cookie/-/hapi-auth-cookie-9.1.0.tgz#cbcd2236b7d429bd0632a8cc45cfd355fdd7e7a2" - integrity sha512-qsP08L+fNaE2K5dsDVKvHp0AmSBs8m9PD5eWsTdHnkJOk81iD7c0J4GYt/1aDJwZsyx6CgcxpbkPOCwBJmrwAg== - dependencies: - "@types/hapi" "*" - "@types/hapi@*": version "17.0.18" resolved "https://registry.yarnpkg.com/@types/hapi/-/hapi-17.0.18.tgz#f855fe18766aa2592a3a689c3e6eabe72989ff1a" @@ -4233,7 +4236,14 @@ resolved "https://registry.yarnpkg.com/@types/hapi__catbox/-/hapi__catbox-10.2.2.tgz#b13fbdd6006c8793eb80919158593bc2bf8307c4" integrity sha512-AWK70LgRsRWL1TNw+aT0IlS56E0pobvFdr/en0K8XazyK4Ey6T/jXhQqv/iQ6FJAAU+somMzgmt9fWq2TaaOkA== -"@types/hapi__hapi@^18.2.6": +"@types/hapi__cookie@^10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@types/hapi__cookie/-/hapi__cookie-10.1.0.tgz#4f5b8f50e344722a72ecd3a8fd1f2cbfd40b41f7" + integrity sha512-O17e7Br32yXwtV+yqF3btzHFB330pFb7eshR+Nj1STisgC5nQMVzzLAOJn9zCYHVZfDWjcM9vrFKiKKlANP0VQ== + dependencies: + "@types/hapi__hapi" "*" + +"@types/hapi__hapi@*", "@types/hapi__hapi@^18.2.6": version "18.2.6" resolved "https://registry.yarnpkg.com/@types/hapi__hapi/-/hapi__hapi-18.2.6.tgz#61c1b210c55dee4636df594e7a0868ad48c8042a" integrity sha512-sXFlSg9btu/LdHqK/N/kuQXVqZhSvibXbtZc0KfEcelRXKthdU5ZSu5qItDIov7SYnyK2faMe7dbZaC/VpC33w== @@ -15546,16 +15556,6 @@ handlebars@4.5.3, handlebars@^4.0.1, handlebars@^4.1.2: optionalDependencies: uglify-js "^3.1.4" -hapi-auth-cookie@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/hapi-auth-cookie/-/hapi-auth-cookie-9.0.0.tgz#3b0af443334e2bd92490ddb17bed16e3e9edfd01" - integrity sha512-N71Mt7Jk0+7WLnuvfSv0DoGzgpn7TqOd+/AB73RfHpLvzYoskJ9AlFV3Op60DB01RJNaABZtdcH1l4HM3DMbog== - dependencies: - boom "7.x.x" - bounce "1.x.x" - hoek "5.x.x" - joi "13.x.x" - har-schema@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"