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

Jump to bottom

session tests coverage #231

Merged
merged 2 commits into from
Nov 12, 2020
Merged

session tests coverage #231

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
80eaf29
test(firestore): update firestore security rules
yinonov Nov 12, 2020
43c034f
session tests coverage
yinonov Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 32 additions & 4 deletions firestore.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,29 @@ service cloud.firestore {
function isPublic() {
return 'status' in resource.data && resource.data.status == 'public';
}

function updatesToPublic() {
return 'status' in request.resource.data && request.resource.data.status == 'public';
}

function priceValid(data) {
return 'price' in data && data.price.keys().hasAll(['currency', 'display']);
// return 'price' in request.resource.data;
}

function jointResourcesCheckout(requiredFields){
return resource.data.keys()
.concat(request.resource.data.keys())
.hasAll(requiredFields);
}

function isStatusRequest() { return 'status' in request.resource.data }
function isPublishRequest() { return request.resource.data.status == 'public' }
function isValidPublishRequest() {
return
jointResourcesCheckout(['title', 'description', 'owner', 'price'])
&& (priceValid(resource.data) || priceValid(request.resource.data));
}
// //////////////////

match /sessions/{session} {
Expand All @@ -49,11 +72,16 @@ service cloud.firestore {
['title', 'owner'],
['description', 'type', 'format', 'thumbRef', 'level', 'price', 'activities', 'pillar', 'promo', 'relatedSessions', 'duration', 'when', 'eventId', 'resourceId']
);
allow update: if isOwner(resource.data.owner.uid)

allow update: if
isOwner(resource.data.owner.uid)
&& (
!isPublic() ||
editOnlyChangesFields(['title', 'description', 'thumbRef', 'level', 'price', 'activities', 'pillar', 'promo', 'relatedSessions', 'duration', 'entryId'])
);
!isStatusRequest()
|| !isPublishRequest()
|| isValidPublishRequest()
)
&& editOnlyChangesFields(['title', 'description', 'thumbRef', 'level', 'price', 'activities', 'pillar', 'promo', 'relatedSessions', 'duration', 'entryId', 'status']);

allow delete: if isOwner(resource.data.owner.uid) && !isPublic();
}

Expand Down
2 changes: 1 addition & 1 deletion functions/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
!.eslintrc.js

# Except the test files
test/**/*.js
test/*.js

# TypeScript v1 declaration files
typings/
Expand Down
1 change: 1 addition & 0 deletions functions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"deploy": "firebase deploy --only functions",
"logs": "firebase functions:log",
"test": "mocha --exit",
"test:dev": "mocha --watch",
"_comment": "use the 'getCustomConfig' to retrieve config which will also includes stripe token",
"getCustomConfig": "firebase functions:config:get > .runtimeconfig.json"
},
Expand Down