Skip to content

Ensures _auth_data_[provider] gets deleted from document #1081

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

Merged
merged 2 commits into from
Mar 17, 2016
Merged

Ensures _auth_data_[provider] gets deleted from document #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21fb14d
Properly deletes authData.provider when set to null
flovilmart Mar 17, 2016
5ff186f
adds test that ensure removed linked auth are actually deleted from d…
flovilmart Mar 17, 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
65 changes: 38 additions & 27 deletions spec/OAuth.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var OAuth = require("../src/authDataManager/OAuth1Client");
var request = require('request');
var Config = require("../src/Config");

describe('OAuth', function() {

Expand Down Expand Up @@ -28,7 +29,7 @@ describe('OAuth', function() {

it("Should properly generate request signature", (done) => {
var request = {
host: "dummy.com",
host: "dummy.com",
path: "path"
};

Expand All @@ -48,7 +49,7 @@ describe('OAuth', function() {

it("Should properly build request", (done) => {
var options = {
host: "dummy.com",
host: "dummy.com",
consumer_key: "hello",
consumer_secret: "world",
auth_token: "token",
Expand Down Expand Up @@ -86,7 +87,7 @@ describe('OAuth', function() {

it("Should fail a GET request", (done) => {
var options = {
host: "api.twitter.com",
host: "api.twitter.com",
consumer_key: "XXXXXXXXXXXXXXXXXXXXXXXXX",
consumer_secret: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
};
Expand All @@ -100,7 +101,7 @@ describe('OAuth', function() {

it("Should fail a POST request", (done) => {
var options = {
host: "api.twitter.com",
host: "api.twitter.com",
consumer_key: "XXXXXXXXXXXXXXXXXXXXXXXXX",
consumer_secret: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
};
Expand All @@ -117,7 +118,7 @@ describe('OAuth', function() {

it("Should fail a request", (done) => {
var options = {
host: "localhost",
host: "localhost",
consumer_key: "XXXXXXXXXXXXXXXXXXXXXXXXX",
consumer_secret: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
};
Expand All @@ -141,8 +142,8 @@ describe('OAuth', function() {
var provider = require("../src/authDataManager/"+providerName);
jequal(typeof provider.validateAuthData, "function");
jequal(typeof provider.validateAppId, "function");
jequal(provider.validateAuthData({}, {}).constructor, Promise.prototype.constructor);
jequal(provider.validateAppId("app", "key", {}).constructor, Promise.prototype.constructor);
jequal(provider.validateAuthData({}, {}).constructor, Promise.prototype.constructor);
jequal(provider.validateAppId("app", "key", {}).constructor, Promise.prototype.constructor);
done();
});
});
Expand Down Expand Up @@ -204,12 +205,12 @@ describe('OAuth', function() {
}
};
var headers = {'X-Parse-Application-Id': 'test',
'X-Parse-REST-API-Key': 'rest',
'X-Parse-REST-API-Key': 'rest',
'Content-Type': 'application/json' }

var options = {
headers: {'X-Parse-Application-Id': 'test',
'X-Parse-REST-API-Key': 'rest',
'X-Parse-REST-API-Key': 'rest',
'Content-Type': 'application/json' },
url: 'http://localhost:8378/1/users',
body: JSON.stringify(jsonBody)
Expand Down Expand Up @@ -248,7 +249,7 @@ describe('OAuth', function() {
done();
});
});

});

it("unlink and link with custom provider", (done) => {
Expand All @@ -266,28 +267,38 @@ describe('OAuth', function() {

model._unlinkFrom("myoauth", {
success: function(model) {

ok(!model._isLinked("myoauth"),
"User should not be linked to myoauth");
ok(!provider.synchronizedUserId, "User id should be cleared");
ok(!provider.synchronizedAuthToken, "Auth token should be cleared");
ok(!provider.synchronizedExpiration,
"Expiration should be cleared");

model._linkWith("myoauth", {
success: function(model) {
ok(provider.synchronizedUserId, "User id should have a value");
ok(provider.synchronizedAuthToken,
"Auth token should have a value");
ok(provider.synchronizedExpiration,
"Expiration should have a value");
ok(model._isLinked("myoauth"),
"User should be linked to myoauth");
done();
},
error: function(model, error) {
ok(false, "linking again should succeed");
done();
}
// make sure the auth data is properly deleted
var config = new Config(Parse.applicationId);
config.database.mongoFind('_User', {
_id: model.id
}).then((res) => {
expect(res.length).toBe(1);
expect(res[0]._auth_data_myoauth).toBeUndefined();
expect(res[0]._auth_data_myoauth).not.toBeNull();

model._linkWith("myoauth", {
success: function(model) {
ok(provider.synchronizedUserId, "User id should have a value");
ok(provider.synchronizedAuthToken,
"Auth token should have a value");
ok(provider.synchronizedExpiration,
"Expiration should have a value");
ok(model._isLinked("myoauth"),
"User should be linked to myoauth");
done();
},
error: function(model, error) {
ok(false, "linking again should succeed");
done();
}
});
});
},
error: function(model, error) {
Expand All @@ -304,4 +315,4 @@ describe('OAuth', function() {
});


})
})
14 changes: 10 additions & 4 deletions src/transform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export function transformKeyValue(schema, className, restKey, restValue, options
return transformWhere(schema, className, s);
});
return {key: '$and', value: mongoSubqueries};
default:
default:
// Other auth data
var authDataMatch = key.match(/^authData\.([a-zA-Z0-9_]+)\.id$/);
if (authDataMatch) {
Expand Down Expand Up @@ -224,7 +224,7 @@ function transformUpdate(schema, className, restUpdate) {
if (className == '_User') {
restUpdate = transformAuthData(restUpdate);
}

var mongoUpdate = {};
var acl = transformACL(restUpdate);
if (acl._rperm || acl._wperm) {
Expand Down Expand Up @@ -260,7 +260,14 @@ function transformUpdate(schema, className, restUpdate) {
function transformAuthData(restObject) {
if (restObject.authData) {
Object.keys(restObject.authData).forEach((provider) => {
restObject[`_auth_data_${provider}`] = restObject.authData[provider];
let providerData = restObject.authData[provider];
if (providerData == null) {
restObject[`_auth_data_${provider}`] = {
__op: 'Delete'
}
} else {
restObject[`_auth_data_${provider}`] = providerData;
}
});
delete restObject.authData;
}
Expand Down Expand Up @@ -823,4 +830,3 @@ module.exports = {
transformWhere: transformWhere,
untransformObject: untransformObject
};