Skip to content

Commit 4bbbb8d

Browse files
committed
Wrap json parsing
1 parent f959608 commit 4bbbb8d

File tree

11 files changed

+57
-12
lines changed

11 files changed

+57
-12
lines changed

src/Adapters/Auth/facebook.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ function graphRequest(path) {
4343
data += chunk;
4444
});
4545
res.on('end', function() {
46-
data = JSON.parse(data);
46+
try {
47+
data = JSON.parse(data);
48+
} catch(e) {
49+
return reject(e);
50+
}
4751
resolve(data);
4852
});
4953
}).on('error', function() {

src/Adapters/Auth/github.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ function request(path, access_token) {
3636
data += chunk;
3737
});
3838
res.on('end', function() {
39-
data = JSON.parse(data);
39+
try {
40+
data = JSON.parse(data);
41+
} catch(e) {
42+
return reject(e);
43+
}
4044
resolve(data);
4145
});
4246
}).on('error', function() {

src/Adapters/Auth/google.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ function request(path) {
5555
data += chunk;
5656
});
5757
res.on('end', function() {
58-
data = JSON.parse(data);
58+
try {
59+
data = JSON.parse(data);
60+
} catch(e) {
61+
return reject(e);
62+
}
5963
resolve(data);
6064
});
6165
}).on('error', function() {

src/Adapters/Auth/janrainengage.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function request(api_key, auth_token) {
4141
}
4242
};
4343

44-
return new Promise(function (resolve) {
44+
return new Promise(function (resolve, reject) {
4545
// Create the post request.
4646
var post_req = https.request(post_options, function (res) {
4747
var data = '';
@@ -52,7 +52,12 @@ function request(api_key, auth_token) {
5252
});
5353
// Once we have all the data, we can parse it and return the data we want.
5454
res.on('end', function () {
55-
resolve(JSON.parse(data));
55+
try {
56+
data = JSON.parse(data);
57+
} catch(e) {
58+
return reject(e);
59+
}
60+
resolve(data);
5661
});
5762
});
5863

src/Adapters/Auth/linkedin.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ function request(path, access_token, is_mobile_sdk) {
4242
data += chunk;
4343
});
4444
res.on('end', function() {
45-
data = JSON.parse(data);
45+
try {
46+
data = JSON.parse(data);
47+
} catch(e) {
48+
return reject(e);
49+
}
4650
resolve(data);
4751
});
4852
}).on('error', function() {

src/Adapters/Auth/meetup.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ function request(path, access_token) {
3535
data += chunk;
3636
});
3737
res.on('end', function() {
38-
data = JSON.parse(data);
38+
try {
39+
data = JSON.parse(data);
40+
} catch(e) {
41+
return reject(e);
42+
}
3943
resolve(data);
4044
});
4145
}).on('error', function() {

src/Adapters/Auth/qq.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ function graphRequest(path) {
3232
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'qq auth is invalid for this user.');
3333
}
3434
data = data.substring(starPos + 1,endPos - 1);
35-
data = JSON.parse(data);
35+
try {
36+
data = JSON.parse(data);
37+
} catch(e) {
38+
return reject(e);
39+
}
3640
resolve(data);
3741
});
3842
}).on('error', function () {

src/Adapters/Auth/spotify.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ function request(path, access_token) {
4949
data += chunk;
5050
});
5151
res.on('end', function() {
52-
data = JSON.parse(data);
52+
try {
53+
data = JSON.parse(data);
54+
} catch(e) {
55+
return reject(e);
56+
}
5357
resolve(data);
5458
});
5559
}).on('error', function() {

src/Adapters/Auth/vkontakte.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ function request(host, path) {
4747
data += chunk;
4848
});
4949
res.on('end', function () {
50-
data = JSON.parse(data);
50+
try {
51+
data = JSON.parse(data);
52+
} catch(e) {
53+
return reject(e);
54+
}
5155
resolve(data);
5256
});
5357
}).on('error', function () {

src/Adapters/Auth/wechat.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ function graphRequest(path) {
2626
data += chunk;
2727
});
2828
res.on('end', function () {
29-
data = JSON.parse(data);
29+
try {
30+
data = JSON.parse(data);
31+
} catch(e) {
32+
return reject(e);
33+
}
3034
resolve(data);
3135
});
3236
}).on('error', function () {

src/Adapters/Auth/weibo.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ function graphRequest(access_token) {
3939
data += chunk;
4040
});
4141
res.on('end', function () {
42-
data = JSON.parse(data);
42+
try {
43+
data = JSON.parse(data);
44+
} catch(e) {
45+
return reject(e);
46+
}
4347
resolve(data);
4448
});
4549
res.on('error', function () {

0 commit comments

Comments
 (0)