Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vkontakte Auth: Change users.get to secure.checkToken #2880

Merged
merged 3 commits into from
Oct 19, 2016
Merged

Vkontakte Auth: Change users.get to secure.checkToken #2880

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b262836
Change users.get to secure.checkToken
antigp Oct 18, 2016
2bdc3ab
Configuration checks for vk auth.
antigp Oct 18, 2016
0c80f5d
Move config check to promise, remove debug log, add message to logger…
antigp Oct 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions src/authDataManager/vkontakte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
'use strict';

// Helper functions for accessing the vkontakte API.

var https = require('https');
var Parse = require('parse/node').Parse;

// Returns a promise that fulfills iff this user id is valid.
function validateAuthData(authData, params) {
return request("oauth.vk.com", "access_token?client_id=" + params.appIds + "&client_secret=" + params.appSecret + "&v=5.59&grant_type=client_credentials")
.then(function (response) {
if (response && response && response.access_token) {
return request("api.vk.com", "method/secure.checkToken?token=" + authData.access_token + "&client_secret=" + params.appSecret + "&access_token=" + response.access_token)
.then(function (response) {
if (response && response.response && response.response.user_id == authData.id) {
return ;
}
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Vk auth is invalid for this user.');
});
}
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Vk auth is disabled for app.');
});
if (!params || !params.appIds || !params.appIds.length || !params.appSecret || !params.appSecret.length ) {
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Vk auth is not configured. Missing appIds or appSecret.');
}
return request("oauth.vk.com", "access_token?client_id=" + params.appIds + "&client_secret=" + params.appSecret + "&v=5.59&grant_type=client_credentials").then(function (response) {
console.log(response)
if (response && response && response.access_token) {
return request("api.vk.com", "method/secure.checkToken?token=" + authData.access_token + "&client_secret=" + params.appSecret + "&access_token=" + response.access_token).then(function (response) {
console.log(response)
if (response && response.response && response.response.user_id == authData.id) {
return;
}
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Vk auth is invalid for this user.');
});
}
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Vk appIds or appSecret is incorrect.');
});
}

// Returns a promise that fulfills iff this app id is valid.
Expand All @@ -27,9 +31,9 @@ function validateAppId() {
}

// A promisey wrapper for api requests
function request(host,path) {
function request(host, path) {
return new Promise(function (resolve, reject) {
https.get("https://"+host + "/" + path, function (res) {
https.get("https://" + host + "/" + path, function (res) {
var data = '';
res.on('data', function (chunk) {
data += chunk;
Expand All @@ -47,4 +51,4 @@ function request(host,path) {
module.exports = {
validateAppId: validateAppId,
validateAuthData: validateAuthData
};
};