Squashed commit of the following:
commit9f259de4f6Merge:dc91c12fcd5f5dAuthor: Benoy Bose <benoybose@cosq.net> Date: Mon Apr 14 00:11:12 2025 +0530 Merge branch 'dev' of cosqnet.com:cosqnet/fitlien-services into dev commitdc91c123bbAuthor: Benoy Bose <benoybose@cosq.net> Date: Mon Apr 14 00:11:09 2025 +0530 Updated bucket permissions commitfcd5f5db47Author: DhanshCOSQ <dhanshas@cosq.net> Date: Sun Apr 13 10:07:51 2025 +0000 feature/fitlien-add-cors (#18) Reviewed-on: #18 Co-authored-by: DhanshCOSQ <dhanshas@cosq.net> Co-committed-by: DhanshCOSQ <dhanshas@cosq.net> commit01c87ffcfaAuthor: DhanshCOSQ <dhanshas@cosq.net> Date: Sun Apr 13 08:19:03 2025 +0000 Changed collection names (#17) Reviewed-on: #17 Co-authored-by: DhanshCOSQ <dhanshas@cosq.net> Co-committed-by: DhanshCOSQ <dhanshas@cosq.net> commit0ecef0c051Merge:7a346f60944760Author: Benoy Bose <benoybose@cosq.net> Date: Sun Apr 13 13:29:42 2025 +0530 Merge branch 'dev' of cosqnet.com:cosqnet/fitlien-services into dev commit7a346f62a8Author: Benoy Bose <benoybose@cosq.net> Date: Sun Apr 13 13:29:36 2025 +0530 Updated firestore rules and index commit094476072eMerge:08f1243a9e4b31Author: Aswin B. S <aswinbs@cosq.net> Date: Sun Apr 13 06:19:20 2025 +0000 Merge pull request 'Updated return url.' (#16) from feature/test-deploy into dev Reviewed-on: #16
This commit is contained in:
parent
748c01044c
commit
6d1d175ca9
@ -2,6 +2,7 @@
|
||||
"projects": {
|
||||
"debug": "fitlien-dev",
|
||||
"qa": "fitlien-qa",
|
||||
"release": "fitlien"
|
||||
"release": "fitlien",
|
||||
"default": "fitlien-dev"
|
||||
}
|
||||
}
|
||||
@ -14,8 +14,7 @@
|
||||
"firebase-debug.*.log",
|
||||
"*.local"
|
||||
],
|
||||
"predeploy": [
|
||||
]
|
||||
"predeploy": []
|
||||
}
|
||||
],
|
||||
"storage": {
|
||||
|
||||
@ -1,5 +1,33 @@
|
||||
{
|
||||
"indexes": [
|
||||
{
|
||||
"collectionGroup": "day_pass_bookings",
|
||||
"queryScope": "COLLECTION",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "userId",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "createdAt",
|
||||
"order": "DESCENDING"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"collectionGroup": "day_pass_entries",
|
||||
"queryScope": "COLLECTION",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "bookingId",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "entryDate",
|
||||
"order": "ASCENDING"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"collectionGroup": "gyms",
|
||||
"queryScope": "COLLECTION_GROUP",
|
||||
@ -13,6 +41,144 @@
|
||||
"order": "ASCENDING"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"collectionGroup": "gyms",
|
||||
"queryScope": "COLLECTION",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "userId",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "name",
|
||||
"order": "ASCENDING"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"collectionGroup": "memberships",
|
||||
"queryScope": "COLLECTION",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "gymId",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "createdAt",
|
||||
"order": "DESCENDING"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"collectionGroup": "notifications",
|
||||
"queryScope": "COLLECTION",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "clientId",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "timestamp",
|
||||
"order": "DESCENDING"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"collectionGroup": "notifications",
|
||||
"queryScope": "COLLECTION",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "clientId",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "type",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "timestamp",
|
||||
"order": "DESCENDING"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"collectionGroup": "notifications",
|
||||
"queryScope": "COLLECTION",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "ownerId",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "timestamp",
|
||||
"order": "DESCENDING"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"collectionGroup": "notifications",
|
||||
"queryScope": "COLLECTION",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "ownerId",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "type",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "timestamp",
|
||||
"order": "DESCENDING"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"collectionGroup": "notifications",
|
||||
"queryScope": "COLLECTION",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "trainerId",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "timestamp",
|
||||
"order": "DESCENDING"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"collectionGroup": "notifications",
|
||||
"queryScope": "COLLECTION",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "type",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "userId",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "timestamp",
|
||||
"order": "DESCENDING"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"collectionGroup": "terms_and_conditions",
|
||||
"queryScope": "COLLECTION",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "normalizedName",
|
||||
"order": "ASCENDING"
|
||||
},
|
||||
{
|
||||
"fieldPath": "userUid",
|
||||
"order": "ASCENDING"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"fieldOverrides": []
|
||||
|
||||
@ -1,19 +1,16 @@
|
||||
rules_version = '2';
|
||||
|
||||
service cloud.firestore {
|
||||
match /databases/{database}/documents {
|
||||
|
||||
// This rule allows anyone with your Firestore database reference to view, edit,
|
||||
// and delete all data in your Firestore database. It is useful for getting
|
||||
// started, but it is configured to expire after 30 days because it
|
||||
// leaves your app open to attackers. At that time, all client
|
||||
// requests to your Firestore database will be denied.
|
||||
//
|
||||
// Make sure to write security rules for your app before that time, or else
|
||||
// all client requests to your Firestore database will be denied until you Update
|
||||
// your rules
|
||||
match /{document=**} {
|
||||
allow read, write: if request.time < timestamp.date(2025, 1, 10);
|
||||
allow read, write: if request.auth != null;
|
||||
}
|
||||
match /day_pass_bookings/{bookingId} {
|
||||
allow read: if true;
|
||||
allow write: if request.auth != null;
|
||||
}
|
||||
match /gyms/{gymId} {
|
||||
allow read: if true;
|
||||
allow write: if request.auth != null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -422,7 +422,7 @@ export const createCashfreeOrder = onRequest({
|
||||
customer_phone: customerPhone
|
||||
},
|
||||
order_meta: {
|
||||
return_url: `http://${webHostUrl}/?order_id=${orderId}&hash_key=${hashKey}&user_id=${userId}&gym_id=${gymId}#/payment-status-screen`,
|
||||
return_url: `http://${webHostUrl}?order_id=${orderId}&hash_key=${hashKey}&user_id=${userId}&gym_id=${gymId}#/payment-status-screen`,
|
||||
},
|
||||
order_note: productInfo || 'Fitlien Membership'
|
||||
},
|
||||
|
||||
@ -1,12 +1,9 @@
|
||||
rules_version = '2';
|
||||
|
||||
// Craft rules based on data in your Firestore database
|
||||
// allow write: if firestore.get(
|
||||
// /databases/(default)/documents/users/$(request.auth.uid)).data.isAdmin;
|
||||
service firebase.storage {
|
||||
match /b/{bucket}/o {
|
||||
match /{allPaths=**} {
|
||||
allow read, write: if false;
|
||||
allow read, write: if request.auth != null;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user