Skip to content

Fix channel revision overwrite on frontend user session #4897

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

Merged
marcellamaki merged 2 commits into from
Feb 5, 2025
Merged

Fix channel revision overwrite on frontend user session #4897

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
b0c3d76
Don't overwrite session on call to setSession
bjester Feb 5, 2025
bdf0efc
Add a limit to the number of changes that can be returned
bjester Feb 5, 2025
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
12 changes: 9 additions & 3 deletions contentcuration/contentcuration/frontend/shared/data/resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,10 +1116,16 @@ export const Session = new IndexedDBResource({
async getSession() {
return this.get(CURRENT_USER);
},
setSession(currentUser) {
return this.table.put({ CURRENT_USER, ...currentUser });
async setSession(currentUser) {
return this.transaction({ mode: 'rw' }, CHANGES_TABLE, async () => {
const current = await this.getSession();
if (current) {
return this.updateSession(currentUser);
}
return this.table.put({ CURRENT_USER, ...currentUser });
});
},
updateSession(currentUser) {
async updateSession(currentUser) {
return this.update(CURRENT_USER, currentUser);
},
});
Expand Down
5 changes: 4 additions & 1 deletion contentcuration/contentcuration/viewsets/sync/endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
from contentcuration.viewsets.sync.constants import CREATED


CHANGE_RETURN_LIMIT = 200


class SyncView(APIView):
authentication_classes = (SessionAuthentication,)
permission_classes = (IsAuthenticated,)
Expand Down Expand Up @@ -104,7 +107,7 @@ def return_changes(self, request, channel_revs):
"table",
"change_type",
"kwargs"
).order_by("server_rev")
).order_by("server_rev")[:CHANGE_RETURN_LIMIT]
)

if not changes_to_return:
Expand Down