Skip to content

Commit d8085b5

Browse files
committed
Merge branch 'develop'
2 parents e5eb697 + 5690aaa commit d8085b5

File tree

100 files changed

+2664
-1415
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+2664
-1415
lines changed

cloud/firebase.json

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,30 @@
3333
},
3434
"singleProjectMode": true
3535
},
36-
"hosting": {
36+
"hosting": [{
3737
"site": "voxxrin-v3",
3838
"public": "hosting/public",
3939
"ignore": [
4040
"firebase.json",
4141
"**/.*",
4242
"**/node_modules/**"
4343
],
44+
"rewrites": [{
45+
"source": "!(/assets/**|/favicon.*|/sw.js|/manifest.webmanifest)",
46+
"destination": "/index.html"
47+
}]
48+
}, {
49+
"site": "voxxrin-v3-api",
4450
"rewrites": [
45-
{
46-
"source": "!(/assets/**|/favicon.*|/sw.js|/manifest.webmanifest)",
47-
"destination": "/index.html"
48-
}
51+
{ "source": "/api/**", "function": "api" },
52+
{ "source": "hello", "function": "hello" },
53+
{ "source": "crawl", "function": "crawl" },
54+
{ "source": "talkFeedbacksViewers", "function": "talkFeedbacksViewers" },
55+
{ "source": "attendeesFeedbacks", "function": "attendeesFeedbacks" },
56+
{ "source": "publicEventStats", "function": "publicEventStats" },
57+
{ "source": "eventStats", "function": "eventStats" },
58+
{ "source": "migrateFirestoreSchema", "function": "migrateFirestoreSchema" },
59+
{ "source": "globalStats", "function": "globalStats" }
4960
]
50-
}
61+
}]
5162
}

cloud/firestore/firestore.default.rules

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ service cloud.firestore {
2626
allow list, write: if false;
2727
}
2828

29+
match /global-infos/self {
30+
allow read, write: if false;
31+
}
32+
2933
match /crawlers/{crawlerId} {
3034
allow read, write: if false;
3135
}
@@ -52,13 +56,17 @@ service cloud.firestore {
5256
allow read: if true;
5357
allow write: if false;
5458
}
55-
match /talksStats-allInOne/self {
59+
match /talksStats-slowPaced/{talkId} {
5660
allow read: if true;
5761
allow write: if false;
5862
}
63+
match /talksStats-allInOne/self {
64+
allow get: if true;
65+
allow list, write: if false;
66+
}
5967
match /roomsStats-allInOne/self {
60-
allow read: if true;
61-
allow write: if false;
68+
allow get: if true;
69+
allow list, write: if false;
6270
}
6371

6472
match /organizer-space/{secretOrganizerToken} {
@@ -113,7 +121,7 @@ service cloud.firestore {
113121

114122
// TODO: Remove it once Devoxx BE is over
115123
match /__computed/self {
116-
allow get: if true;
124+
allow get: if iAm(userId);
117125
allow list, write: if false;
118126
}
119127
match /talksNotes/{talkId} {

0 commit comments

Comments
 (0)