btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge branch 'master' of https://github.com/liyasthomas/postwoman

Browse Source
This commit is contained in:
Liyas Thomas
2020-05-26 07:51:05 +05:30
parent a6160be3ad 4c1abdf0d2
commit d80238d93b
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
functions/strategies/AxiosStrategy.js
View File

@@ -15,9 +15,10 @@ const axiosWithoutProxy = async (req, _store) => {
(data, headers) => { (data, headers) => {
// If the response has a JSON content type, try parsing it // If the response has a JSON content type, try parsing it
if ( if (
headers["content-type"].startsWith("application/json") || headers["content-type"] &&
headers["content-type"].startsWith("application/vnd.api+json") || (headers["content-type"].startsWith("application/json") ||
headers["content-type"].startsWith("application/hal+json") headers["content-type"].startsWith("application/vnd.api+json") ||
headers["content-type"].startsWith("application/hal+json"))
) { ) {
try { try {
const jsonData = JSON.parse(data) const jsonData = JSON.parse(data)

12
package-lock.json generated
View File

@@ -9606,9 +9606,9 @@
} }
}, },
"nuxt-i18n": { "nuxt-i18n": {
"version": "6.11.1", "version": "6.12.0",
"resolved": "https://registry.npmjs.org/nuxt-i18n/-/nuxt-i18n-6.11.1.tgz", "resolved": "https://registry.npmjs.org/nuxt-i18n/-/nuxt-i18n-6.12.0.tgz",
"integrity": "sha512-nyr53JhHRoF3Ig6slUaXRALtAUOyGbKonL5AcNXxGkRdHpzF9HJ6mZ13W2wZCf2AiH3XatRYEh6GAmwLAOUj3A==", "integrity": "sha512-d4bn8J13XVyCIbt2ARq7tk+9yiN4rrWAkCe/UA/pvhkJGAxUbrO56xL4xIPzSlT5fZ66lqTssxKq/F7H9MTMdA==",
"requires": { "requires": {
"@babel/parser": "^7.5.5", "@babel/parser": "^7.5.5",
"@babel/traverse": "^7.5.5", "@babel/traverse": "^7.5.5",
@@ -13899,9 +13899,9 @@
"integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==" "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="
}, },
"vue-i18n": { "vue-i18n": {
"version": "8.17.5", "version": "8.17.7",
"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.17.5.tgz", "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.17.7.tgz",
"integrity": "sha512-gijXwvyTH3aeJhuq8EoQ9SDDlm1mgJexNccSK1ctalxsa6C7ifbWiH7V/YGfm9WJ7udYoD8ezfZdazxxvKvKYw==" "integrity": "sha512-7IQJ+72IIIxfR6Mt+X6EDmMP1i5oETFpc0FttnWKA9cgacf1DAlyho1aTItekG+AkbNs6nz4q3sYrXaPdC0irA=="
}, },
"vue-loader": { "vue-loader": {
"version": "15.9.1", "version": "15.9.1",

2
package.json
View File

@@ -40,7 +40,7 @@
"graphql": "^14.6.0", "graphql": "^14.6.0",
"graphql-language-service-interface": "^2.3.3", "graphql-language-service-interface": "^2.3.3",
"nuxt": "^2.12.2", "nuxt": "^2.12.2",
"nuxt-i18n": "^6.11.1", "nuxt-i18n": "^6.12.0",
"paho-mqtt": "^1.1.0", "paho-mqtt": "^1.1.0",
"socket.io-client": "^2.3.0", "socket.io-client": "^2.3.0",
"socketio-wildcard": "^2.0.0", "socketio-wildcard": "^2.0.0",