Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Server: Fixes #5958: Fixed sharing notebook with a user that does not have E2EE enabled

pull/5984/head
Laurent Cozic 2022-01-09 15:20:23 +00:00
parent 9dbf5e02eb
commit b92c650f5d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/app-desktop/runForTesting.sh
View File

@ -10,6 +10,12 @@
# ./runForTesting.sh 1 createUsers,createData,reset,e2ee,sync && ./runForTesting.sh 2 reset,e2ee,sync && ./runForTesting.sh 1 # ./runForTesting.sh 1 createUsers,createData,reset,e2ee,sync && ./runForTesting.sh 2 reset,e2ee,sync && ./runForTesting.sh 1
# ----------------------------------------------------------------------------------
# First user has E2EE, but second one doesn't:
# ----------------------------------------------------------------------------------
# ./runForTesting.sh 1 createUsers,createData,reset,e2ee,sync && ./runForTesting.sh 2 reset,sync && ./runForTesting.sh 1
# ---------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------
# Without E2EE: # Without E2EE:
# ---------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------

1
packages/server/src/routes/api/users.ts
View File

@ -34,6 +34,7 @@ router.get('api/users/:id/public_key', async (path: SubPath, ctx: AppContext) =>
if (!user) return ''; // Don't throw an error to prevent polling the end point if (!user) return ''; // Don't throw an error to prevent polling the end point
const ppk = await ctx.joplin.models.user().publicPrivateKey(user.id); const ppk = await ctx.joplin.models.user().publicPrivateKey(user.id);
if (!ppk) return '';
return { return {
id: ppk.id, id: ppk.id,