Skip to content

refactor: Isolate Parse.Query SDK usage behind a QueryAdapter #10486

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

Open
dblythy wants to merge 3 commits into
base: alpha
Choose a base branch
from
Open

refactor: Isolate Parse.Query SDK usage behind a QueryAdapter #10486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db2d4fe
refactor: Remove internal Parse.Query usage from Auth and LiveQuery
dblythy May 30, 2026
bb2d8ae
refactor: Isolate Parse.Query SDK usage behind QueryAdapter
dblythy May 30, 2026
0638023
fix: Preserve falsy beforeFind query overrides in QueryAdapter
dblythy May 30, 2026
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
37 changes: 0 additions & 37 deletions spec/Auth.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,20 +114,6 @@ describe('Auth', () => {
expect(session.get('expiresAt') > expiry).toBeTrue();
});

it('should load auth without a config', async () => {
const user = new Parse.User();
await user.signUp({
username: 'hello',
password: 'password',
});
expect(user.getSessionToken()).not.toBeUndefined();
const userAuth = await getAuthForSessionToken({
sessionToken: user.getSessionToken(),
});
expect(userAuth.user instanceof Parse.User).toBe(true);
expect(userAuth.user.id).toBe(user.id);
});

it('should load auth with a config', async () => {
const user = new Parse.User();
await user.signUp({
Expand All @@ -146,29 +132,6 @@ describe('Auth', () => {
describe('getRolesForUser', () => {
const rolesNumber = 100;

it('should load all roles without config', async () => {
const user = new Parse.User();
await user.signUp({
username: 'hello',
password: 'password',
});
expect(user.getSessionToken()).not.toBeUndefined();
const userAuth = await getAuthForSessionToken({
sessionToken: user.getSessionToken(),
});
const roles = [];
for (let i = 0; i < rolesNumber; i++) {
const acl = new Parse.ACL();
const role = new Parse.Role('roleloadtest' + i, acl);
role.getUsers().add([user]);
roles.push(role);
}
const savedRoles = await Parse.Object.saveAll(roles);
expect(savedRoles.length).toBe(rolesNumber);
const cloudRoles = await userAuth.getRolesForUser();
expect(cloudRoles.length).toBe(rolesNumber);
});

it('should load all roles with config', async () => {
const user = new Parse.User();
await user.signUp({
Expand Down
13 changes: 13 additions & 0 deletions spec/CloudCode.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2673,6 +2673,19 @@ describe('beforeFind hooks', () => {
});
});

it('should preserve a falsy query override from beforeFind (limit 0)', async () => {
Parse.Cloud.beforeFind('MyObject', req => {
req.query.limit(0);
});

const obj0 = new Parse.Object('MyObject');
const obj1 = new Parse.Object('MyObject');
await Parse.Object.saveAll([obj0, obj1]);

const results = await new Parse.Query('MyObject').find();
expect(results.length).toBe(0);
});

it('should have object found with nested relational data query', async () => {
const obj1 = Parse.Object.extend('TestObject');
const obj2 = Parse.Object.extend('TestObject2');
Expand Down
73 changes: 17 additions & 56 deletions spec/ParseLiveQueryServer.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1506,34 +1506,16 @@ describe('ParseLiveQueryServer', function () {
};
const requestId = 0;

spyOn(Parse, 'Query').and.callFake(function () {
let shouldReturn = false;
return {
equalTo() {
shouldReturn = true;
// Nothing to do here
return this;
// The user has the "liveQueryRead" role, but the ACL only grants read access
// to "otherLiveQueryRead", so it should not match.
spyOn(parseLiveQueryServer, 'getAuthForSessionToken').and.returnValue(
Promise.resolve({
userId: 'someUserId',
auth: {
getUserRoles: () => Promise.resolve(['role:liveQueryRead']),
},
containedIn() {
shouldReturn = false;
return this;
},
find() {
if (!shouldReturn) {
return Promise.resolve([]);
}
//Return a role with the name "liveQueryRead" as that is what was set on the ACL
const liveQueryRole = new Parse.Role('liveQueryRead', new Parse.ACL());
liveQueryRole.id = 'abcdef1234';
return Promise.resolve([liveQueryRole]);
},
};
});

parseLiveQueryServer._matchesACL(acl, client, requestId).then(function (isMatched) {
expect(isMatched).toBe(false);
done();
});
})
);

parseLiveQueryServer._matchesACL(acl, client, requestId).then(function (isMatched) {
expect(isMatched).toBe(false);
Expand All @@ -1553,36 +1535,15 @@ describe('ParseLiveQueryServer', function () {
};
const requestId = 0;

spyOn(Parse, 'Query').and.callFake(function () {
let shouldReturn = false;
return {
equalTo() {
shouldReturn = true;
// Nothing to do here
return this;
},
containedIn() {
shouldReturn = false;
return this;
},
find() {
if (!shouldReturn) {
return Promise.resolve([]);
}
//Return a role with the name "liveQueryRead" as that is what was set on the ACL
const liveQueryRole = new Parse.Role('liveQueryRead', new Parse.ACL());
liveQueryRole.id = 'abcdef1234';
return Promise.resolve([liveQueryRole]);
},
each(callback) {
//Return a role with the name "liveQueryRead" as that is what was set on the ACL
const liveQueryRole = new Parse.Role('liveQueryRead', new Parse.ACL());
liveQueryRole.id = 'abcdef1234';
callback(liveQueryRole);
return Promise.resolve();
// The user has the "liveQueryRead" role, which the ACL grants read access to.
spyOn(parseLiveQueryServer, 'getAuthForSessionToken').and.returnValue(
Promise.resolve({
userId: 'someUserId',
auth: {
getUserRoles: () => Promise.resolve(['role:liveQueryRead']),
},
};
});
})
);

parseLiveQueryServer._matchesACL(acl, client, requestId).then(function (isMatched) {
expect(isMatched).toBe(true);
Expand Down
4 changes: 0 additions & 4 deletions spec/ParseRole.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,6 @@ describe('Parse Role testing', () => {
testLoadRoles(Config.get('test'), done);
});

it('should recursively load roles without config', done => {
testLoadRoles(undefined, done);
});

it('_Role object should not save without name.', done => {
const role = new Parse.Role();
role.save(null, { useMasterKey: true }).then(
Expand Down
54 changes: 0 additions & 54 deletions spec/SessionTokenCache.spec.js
View file
Open in desktop

This file was deleted.

128 changes: 49 additions & 79 deletions src/Auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,32 +154,21 @@ const getAuthForSessionToken = async function ({
}
}

let results;
if (config) {
const restOptions = {
limit: 1,
include: 'user',
};
const RestQuery = require('./RestQuery');
const query = await RestQuery({
method: RestQuery.Method.get,
config,
runBeforeFind: false,
auth: master(config),
className: '_Session',
restWhere: { sessionToken },
restOptions,
});
results = (await query.execute()).results;
} else {
results = (
await new Parse.Query(Parse.Session)
.limit(1)
.include('user')
.equalTo('sessionToken', sessionToken)
.find({ useMasterKey: true })
).map(obj => obj.toJSON());
}
const restOptions = {
limit: 1,
include: 'user',
};
const RestQuery = require('./RestQuery');
const query = await RestQuery({
method: RestQuery.Method.get,
config,
runBeforeFind: false,
auth: master(config),
className: '_Session',
restWhere: { sessionToken },
restOptions,
});
const results = (await query.execute()).results;

if (results.length !== 1 || !results[0]['user']) {
throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'Invalid session token');
Expand Down Expand Up @@ -267,29 +256,23 @@ Auth.prototype.getUserRoles = function () {
Auth.prototype.getRolesForUser = async function () {
//Stack all Parse.Role
const results = [];
if (this.config) {
const restWhere = {
users: {
__type: 'Pointer',
className: '_User',
objectId: this.user.id,
},
};
const RestQuery = require('./RestQuery');
const query = await RestQuery({
method: RestQuery.Method.find,
runBeforeFind: false,
config: this.config,
auth: master(this.config),
className: '_Role',
restWhere,
});
await query.each(result => results.push(result));
} else {
await new Parse.Query(Parse.Role)
.equalTo('users', this.user)
.each(result => results.push(result.toJSON()), { useMasterKey: true });
}
const restWhere = {
users: {
__type: 'Pointer',
className: '_User',
objectId: this.user.id,
},
};
const RestQuery = require('./RestQuery');
const query = await RestQuery({
method: RestQuery.Method.find,
runBeforeFind: false,
config: this.config,
auth: master(this.config),
className: '_Role',
restWhere,
});
await query.each(result => results.push(result));
return results;
};

Expand Down Expand Up @@ -355,37 +338,24 @@ Auth.prototype.clearRoleCache = function (sessionToken) {
Auth.prototype.getRolesByIds = async function (ins) {
const results = [];
// Build an OR query across all parentRoles
if (!this.config) {
await new Parse.Query(Parse.Role)
.containedIn(
'roles',
ins.map(id => {
const role = new Parse.Object(Parse.Role);
role.id = id;
return role;
})
)
.each(result => results.push(result.toJSON()), { useMasterKey: true });
} else {
const roles = ins.map(id => {
return {
__type: 'Pointer',
className: '_Role',
objectId: id,
};
});
const restWhere = { roles: { $in: roles } };
const RestQuery = require('./RestQuery');
const query = await RestQuery({
method: RestQuery.Method.find,
config: this.config,
runBeforeFind: false,
auth: master(this.config),
const roles = ins.map(id => {
return {
__type: 'Pointer',
className: '_Role',
restWhere,
});
await query.each(result => results.push(result));
}
objectId: id,
};
});
const restWhere = { roles: { $in: roles } };
const RestQuery = require('./RestQuery');
const query = await RestQuery({
method: RestQuery.Method.find,
config: this.config,
runBeforeFind: false,
auth: master(this.config),
className: '_Role',
restWhere,
});
await query.each(result => results.push(result));
return results;
};

Expand Down
Loading
Loading