Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) add more tests for inaccessible workspaces; fix doc count

Browse Source 
Summary:
 * Checks that empty workspaces are listed correctly, including in
   cases where docs or workspaces have been made inaccessible to
   the user doing the listing.
 * Checks that when a document quota is in force, the count is
   correct, and not dependent on ACLs.
 * Fixes the document count used for document quotas, which in
   fact was not counting docs the current user did not have access
   to.

Test Plan: added tests

Reviewers: dsagal

Reviewed By: dsagal

Differential Revision: https://phab.getgrist.com/D2570
This commit is contained in:
Paul Fitzpatrick 2020-07-31 09:51:26 -04:00
parent 9f5e92f404
commit ee018ff183
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/gen-server/lib/HomeDBManager.ts
View File

@ -1376,7 +1376,6 @@ export class HomeDBManager extends EventEmitter {
// document database until the document has actually been imported. // document database until the document has actually been imported.
public async addDocument(scope: Scope, wsId: number, props: Partial<DocumentProperties>, public async addDocument(scope: Scope, wsId: number, props: Partial<DocumentProperties>,
docId?: string): Promise<QueryResult<number>> { docId?: string): Promise<QueryResult<number>> {
const {userId} = scope;
const name = props.name; const name = props.name;
if (!name) { if (!name) {
return { return {
@ -1401,7 +1400,7 @@ export class HomeDBManager extends EventEmitter {
return queryResult; return queryResult;
} }
const workspace: Workspace = queryResult.data; const workspace: Workspace = queryResult.data;
await this._checkRoomForAnotherDoc(userId, workspace, manager); await this._checkRoomForAnotherDoc(workspace, manager);
// Create a new document. // Create a new document.
const doc = new Document(); const doc = new Document();
doc.id = docId || makeId(); doc.id = docId || makeId();
@ -1931,7 +1930,6 @@ export class HomeDBManager extends EventEmitter {
wsId: number wsId: number
): Promise<QueryResult<void>> { ): Promise<QueryResult<void>> {
return await this._connection.transaction(async manager => { return await this._connection.transaction(async manager => {
const {userId} = scope;
// Get the doc // Get the doc
const docQuery = this._doc(scope, { const docQuery = this._doc(scope, {
manager, manager,
@ -1984,7 +1982,7 @@ export class HomeDBManager extends EventEmitter {
const docGroups = doc.aclRules.map(rule => rule.group); const docGroups = doc.aclRules.map(rule => rule.group);
if (doc.workspace.org.id !== workspace.org.id) { if (doc.workspace.org.id !== workspace.org.id) {
// Doc is going to a new org. Check that there is room for it there. // Doc is going to a new org. Check that there is room for it there.
await this._checkRoomForAnotherDoc(userId, workspace, manager); await this._checkRoomForAnotherDoc(workspace, manager);
// Check also that doc doesn't have too many shares. // Check also that doc doesn't have too many shares.
if (firstLevelUsers.length > 0) { if (firstLevelUsers.length > 0) {
const sourceOrg = doc.workspace.org; const sourceOrg = doc.workspace.org;
@ -3453,12 +3451,13 @@ export class HomeDBManager extends EventEmitter {
} }
// Throw an error if there's no room for adding another document. // Throw an error if there's no room for adding another document.
private async _checkRoomForAnotherDoc(userId: number, workspace: Workspace, manager: EntityManager) { private async _checkRoomForAnotherDoc(workspace: Workspace, manager: EntityManager) {
const features = workspace.org.billingAccount.product.features; const features = workspace.org.billingAccount.product.features;
if (features.maxDocsPerOrg !== undefined) { if (features.maxDocsPerOrg !== undefined) {
// we need to count how many docs are in the current org, and if we // we need to count how many docs are in the current org, and if we
// are already at or above the limit, then fail. // are already at or above the limit, then fail.
const wss = this.unwrapQueryResult(await this.getOrgWorkspaces({userId}, workspace.org.id, const wss = this.unwrapQueryResult(await this.getOrgWorkspaces({userId: this.getPreviewerUserId()},
workspace.org.id,
{manager})); {manager}));
const count = wss.map(ws => ws.docs.length).reduce((a, b) => a + b, 0); const count = wss.map(ws => ws.docs.length).reduce((a, b) => a + b, 0);
if (count >= features.maxDocsPerOrg) { if (count >= features.maxDocsPerOrg) {
@ -3630,7 +3629,7 @@ export class HomeDBManager extends EventEmitter {
} }
const doc: Document = this.unwrapQueryResult(await verifyIsPermitted(docQuery)); const doc: Document = this.unwrapQueryResult(await verifyIsPermitted(docQuery));
if (!removedAt) { if (!removedAt) {
await this._checkRoomForAnotherDoc(scope.userId, doc.workspace, manager); await this._checkRoomForAnotherDoc(doc.workspace, manager);
} }
await manager.createQueryBuilder() await manager.createQueryBuilder()
.update(Document).set({removedAt}).where({id: doc.id}) .update(Document).set({removedAt}).where({id: doc.id})