Page MenuHomePhabricator
Differential D7292

[web] Add encryptionKey to PendingMultimediaUpload
ClosedPublic
Actions

Authored by bartek on Apr 3 2023, 1:27 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 16, 3:03 AM
Unknown Object (File)
Wed, Mar 5, 2:11 AM
Unknown Object (File)
Wed, Mar 5, 2:11 AM
Unknown Object (File)
Wed, Mar 5, 2:11 AM
Unknown Object (File)
Wed, Mar 5, 2:10 AM
Unknown Object (File)
Wed, Mar 5, 2:06 AM
Unknown Object (File)
Thu, Feb 27, 5:43 PM
Unknown Object (File)
Thu, Feb 27, 12:35 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
atul
marcin
Commits
rCOMMb8bf733c7726: [web] Add encryptionKey to PendingMultimediaUpload
Summary

The PendingMultimediaUpload type needs to store information if the media is encrypted along with encryption key

Depends on D7281

Test Plan

Flow check. Picked media is displayed in chat input bar.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.Apr 3 2023, 1:27 PM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptApr 3 2023, 1:27 PM
Harbormaster failed remote builds in B17949: Diff 24584!Apr 3 2023, 1:48 PM
bartek added a child revision: D7294: [web] Encrypt media before uploading.Apr 3 2023, 2:24 PM
Harbormaster completed remote builds in B17949: Diff 24584.Apr 3 2023, 2:35 PM
bartek published this revision for review.Apr 4 2023, 12:21 AM
atul accepted this revision.Apr 4 2023, 10:05 AM
This revision is now accepted and ready to land.Apr 4 2023, 10:05 AM
atul added a comment.Apr 4 2023, 10:09 AM

Minor nits inline.

web/chat/chat-input-bar.react.js
236–254 ↗(On Diff #24584)

Can we handle the "simple case" first?

bartek updated this revision to Diff 24712.Apr 6 2023, 5:57 AM

Simple case first

Harbormaster completed remote builds in B18039: Diff 24712.Apr 6 2023, 6:12 AM
Closed by commit rCOMMb8bf733c7726: [web] Add encryptionKey to PendingMultimediaUpload (authored by bartek). · Explain WhyApr 6 2023, 7:53 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMMb8bf733c7726: [web] Add encryptionKey to PendingMultimediaUpload.

Revision Contents
Changeset List

Diff 24735

View Options

web/chat/chat-input-bar.react.js

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 Lines () =>
tab: 'chat', tab: 'chat',
}; };
dispatch({ type: updateNavInfoActionType, payload }); dispatch({ type: updateNavInfoActionType, payload });
}, },
), ),
[dispatch], [dispatch],
); );
// Handle invalid device token
const localToken = useSelector(
state => state.tunnelbrokerDeviceToken.localToken,
);
const prevLocalToken = React.useRef(localToken);
React.useEffect(() => {
if (prevLocalToken.current && !localToken) {
electron?.fetchDeviceToken?.();
}
prevLocalToken.current = localToken;
}, [localToken]);
} }
function useCreatePushSubscription(): () => Promise<void> { function useCreatePushSubscription(): () => Promise<void> {
const publicKey = useSelector(state => state.pushApiPublicKey); const publicKey = useSelector(state => state.pushApiPublicKey);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const callSetDeviceToken = useSetDeviceTokenFanout(); const callSetDeviceToken = useSetDeviceTokenFanout();
const staffCanSee = useStaffCanSee(); const staffCanSee = useStaffCanSee();
▲ Show 20 Lines • Show All 136 Lines • ▼ Show 20 Lines const callback = (event: MessageEvent) => {
} }
}; };
navigator.serviceWorker.addEventListener('message', callback); navigator.serviceWorker.addEventListener('message', callback);
return () => return () =>
navigator.serviceWorker?.removeEventListener('message', callback); navigator.serviceWorker?.removeEventListener('message', callback);
}, [dispatch, supported]); }, [dispatch, supported]);
// Handle invalid device token
const localToken = useSelector(
state => state.tunnelbrokerDeviceToken.localToken,
);
const prevLocalToken = React.useRef(localToken);
React.useEffect(() => {
if (
!navigator.serviceWorker ||
!supported ||
Notification.permission !== 'granted'
) {
return;
}
if (prevLocalToken.current && !localToken) {
void createPushSubscription();
}
prevLocalToken.current = localToken;
}, [createPushSubscription, localToken, supported]);
return null; return null;
} }
export { PushNotificationsHandler, useCreatePushSubscription }; export { PushNotificationsHandler, useCreatePushSubscription };
View Options

web/input/input-state-container.react.js

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 Lines () =>
tab: 'chat', tab: 'chat',
}; };
dispatch({ type: updateNavInfoActionType, payload }); dispatch({ type: updateNavInfoActionType, payload });
}, },
), ),
[dispatch], [dispatch],
); );
// Handle invalid device token
const localToken = useSelector(
state => state.tunnelbrokerDeviceToken.localToken,
);
const prevLocalToken = React.useRef(localToken);
React.useEffect(() => {
if (prevLocalToken.current && !localToken) {
electron?.fetchDeviceToken?.();
}
prevLocalToken.current = localToken;
}, [localToken]);
} }
function useCreatePushSubscription(): () => Promise<void> { function useCreatePushSubscription(): () => Promise<void> {
const publicKey = useSelector(state => state.pushApiPublicKey); const publicKey = useSelector(state => state.pushApiPublicKey);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const callSetDeviceToken = useSetDeviceTokenFanout(); const callSetDeviceToken = useSetDeviceTokenFanout();
const staffCanSee = useStaffCanSee(); const staffCanSee = useStaffCanSee();
▲ Show 20 Lines • Show All 136 Lines • ▼ Show 20 Lines const callback = (event: MessageEvent) => {
} }
}; };
navigator.serviceWorker.addEventListener('message', callback); navigator.serviceWorker.addEventListener('message', callback);
return () => return () =>
navigator.serviceWorker?.removeEventListener('message', callback); navigator.serviceWorker?.removeEventListener('message', callback);
}, [dispatch, supported]); }, [dispatch, supported]);
// Handle invalid device token
const localToken = useSelector(
state => state.tunnelbrokerDeviceToken.localToken,
);
const prevLocalToken = React.useRef(localToken);
React.useEffect(() => {
if (
!navigator.serviceWorker ||
!supported ||
Notification.permission !== 'granted'
) {
return;
}
if (prevLocalToken.current && !localToken) {
void createPushSubscription();
}
prevLocalToken.current = localToken;
}, [createPushSubscription, localToken, supported]);
return null; return null;
} }
export { PushNotificationsHandler, useCreatePushSubscription }; export { PushNotificationsHandler, useCreatePushSubscription };
View Options

web/input/input-state.js

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 Lines () =>
tab: 'chat', tab: 'chat',
}; };
dispatch({ type: updateNavInfoActionType, payload }); dispatch({ type: updateNavInfoActionType, payload });
}, },
), ),
[dispatch], [dispatch],
); );
// Handle invalid device token
const localToken = useSelector(
state => state.tunnelbrokerDeviceToken.localToken,
);
const prevLocalToken = React.useRef(localToken);
React.useEffect(() => {
if (prevLocalToken.current && !localToken) {
electron?.fetchDeviceToken?.();
}
prevLocalToken.current = localToken;
}, [localToken]);
} }
function useCreatePushSubscription(): () => Promise<void> { function useCreatePushSubscription(): () => Promise<void> {
const publicKey = useSelector(state => state.pushApiPublicKey); const publicKey = useSelector(state => state.pushApiPublicKey);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const callSetDeviceToken = useSetDeviceTokenFanout(); const callSetDeviceToken = useSetDeviceTokenFanout();
const staffCanSee = useStaffCanSee(); const staffCanSee = useStaffCanSee();
▲ Show 20 Lines • Show All 136 Lines • ▼ Show 20 Lines const callback = (event: MessageEvent) => {
} }
}; };
navigator.serviceWorker.addEventListener('message', callback); navigator.serviceWorker.addEventListener('message', callback);
return () => return () =>
navigator.serviceWorker?.removeEventListener('message', callback); navigator.serviceWorker?.removeEventListener('message', callback);
}, [dispatch, supported]); }, [dispatch, supported]);
// Handle invalid device token
const localToken = useSelector(
state => state.tunnelbrokerDeviceToken.localToken,
);
const prevLocalToken = React.useRef(localToken);
React.useEffect(() => {
if (
!navigator.serviceWorker ||
!supported ||
Notification.permission !== 'granted'
) {
return;
}
if (prevLocalToken.current && !localToken) {
void createPushSubscription();
}
prevLocalToken.current = localToken;
}, [createPushSubscription, localToken, supported]);
return null; return null;
} }
export { PushNotificationsHandler, useCreatePushSubscription }; export { PushNotificationsHandler, useCreatePushSubscription };