Page MenuHomePhabricator
Differential D8256

[keyserver] Upload both multimedia holder and blob_hash
ClosedPublic
Actions

Authored by bartek on Jun 20 2023, 5:16 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 15, 5:46 PM
Unknown Object (File)
Sun, Mar 9, 8:26 AM
Unknown Object (File)
Fri, Mar 7, 7:15 PM
Unknown Object (File)
Tue, Mar 4, 10:28 AM
Unknown Object (File)
Tue, Mar 4, 10:28 AM
Unknown Object (File)
Tue, Mar 4, 10:28 AM
Unknown Object (File)
Tue, Mar 4, 10:28 AM
Unknown Object (File)
Tue, Mar 4, 10:22 AM
View All Files
Subscribers
tomek

Details

Reviewers
atul
ashoat
Commits
rCOMMeb27060339c0: [keyserver] Upload both multimedia holder and blob_hash
Summary

Resolves ENG-3962 and its subtasks. It turned out to be a one-line change on client side.
Basically, added a blobHash field to endpoint input types and passed it all the way down input-state-container -> uploadMediaMetadata endpoint -> createUploads() -> db

Test Plan

Enabled blob service uploads on web and uploaded a photo. Checked in TablePlus that both values are stored on the keyserver. Repeated for native.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
creators/
7 lines
uploads/
15 lines
lib/
types/
1 line
native/
input/
1 line
web/
input/
1 line

Diff 28241

View Options

keyserver/src/creators/upload-creator.js

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Linesfunction getUploadURL(id: string, secret: string): string {
if (isDev) { if (isDev) {
const ipV4 = ip.v4.sync() || 'localhost'; const ipV4 = ip.v4.sync() || 'localhost';
const port = parseInt(process.env.PORT, 10) || 3000; const port = parseInt(process.env.PORT, 10) || 3000;
return `http://${ipV4}:${port}${uploadPath}`; return `http://${ipV4}:${port}${uploadPath}`;
} }
return `${baseDomain}${uploadPath}`; return `${baseDomain}${uploadPath}`;
} }
function makeUploadURI(holder: ?string, id: string, secret: string): string { function makeUploadURI(blobHash: ?string, id: string, secret: string): string {
if (holder) { if (blobHash) {
return makeBlobServiceURI(holder); return makeBlobServiceURI(blobHash);
} }
return getUploadURL(id, secret); return getUploadURL(id, secret);
} }
function imagesFromRow(row: Object): Image | EncryptedImage { function imagesFromRow(row: Object): Image | EncryptedImage {
const uploadExtra = JSON.parse(row.uploadExtra); const uploadExtra = JSON.parse(row.uploadExtra);
const { width, height, blobHash, thumbHash } = uploadExtra; const { width, height, blobHash, thumbHash } = uploadExtra;
▲ Show 20 Lines • Show All 280 Lines • Show Last 20 Lines
View Options

keyserver/src/uploads/uploads.js

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Linesfunction getUploadURL(id: string, secret: string): string {
if (isDev) { if (isDev) {
const ipV4 = ip.v4.sync() || 'localhost'; const ipV4 = ip.v4.sync() || 'localhost';
const port = parseInt(process.env.PORT, 10) || 3000; const port = parseInt(process.env.PORT, 10) || 3000;
return `http://${ipV4}:${port}${uploadPath}`; return `http://${ipV4}:${port}${uploadPath}`;
} }
return `${baseDomain}${uploadPath}`; return `${baseDomain}${uploadPath}`;
} }
function makeUploadURI(holder: ?string, id: string, secret: string): string { function makeUploadURI(blobHash: ?string, id: string, secret: string): string {
if (holder) { if (blobHash) {
return makeBlobServiceURI(holder); return makeBlobServiceURI(blobHash);
} }
return getUploadURL(id, secret); return getUploadURL(id, secret);
} }
function imagesFromRow(row: Object): Image | EncryptedImage { function imagesFromRow(row: Object): Image | EncryptedImage {
const uploadExtra = JSON.parse(row.uploadExtra); const uploadExtra = JSON.parse(row.uploadExtra);
const { width, height, blobHash, thumbHash } = uploadExtra; const { width, height, blobHash, thumbHash } = uploadExtra;
▲ Show 20 Lines • Show All 280 Lines • Show Last 20 Lines
View Options

lib/types/media-types.js

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Linesfunction getUploadURL(id: string, secret: string): string {
if (isDev) { if (isDev) {
const ipV4 = ip.v4.sync() || 'localhost'; const ipV4 = ip.v4.sync() || 'localhost';
const port = parseInt(process.env.PORT, 10) || 3000; const port = parseInt(process.env.PORT, 10) || 3000;
return `http://${ipV4}:${port}${uploadPath}`; return `http://${ipV4}:${port}${uploadPath}`;
} }
return `${baseDomain}${uploadPath}`; return `${baseDomain}${uploadPath}`;
} }
function makeUploadURI(holder: ?string, id: string, secret: string): string { function makeUploadURI(blobHash: ?string, id: string, secret: string): string {
if (holder) { if (blobHash) {
return makeBlobServiceURI(holder); return makeBlobServiceURI(blobHash);
} }
return getUploadURL(id, secret); return getUploadURL(id, secret);
} }
function imagesFromRow(row: Object): Image | EncryptedImage { function imagesFromRow(row: Object): Image | EncryptedImage {
const uploadExtra = JSON.parse(row.uploadExtra); const uploadExtra = JSON.parse(row.uploadExtra);
const { width, height, blobHash, thumbHash } = uploadExtra; const { width, height, blobHash, thumbHash } = uploadExtra;
▲ Show 20 Lines • Show All 280 Lines • Show Last 20 Lines
View Options

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

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Linesfunction getUploadURL(id: string, secret: string): string {
if (isDev) { if (isDev) {
const ipV4 = ip.v4.sync() || 'localhost'; const ipV4 = ip.v4.sync() || 'localhost';
const port = parseInt(process.env.PORT, 10) || 3000; const port = parseInt(process.env.PORT, 10) || 3000;
return `http://${ipV4}:${port}${uploadPath}`; return `http://${ipV4}:${port}${uploadPath}`;
} }
return `${baseDomain}${uploadPath}`; return `${baseDomain}${uploadPath}`;
} }
function makeUploadURI(holder: ?string, id: string, secret: string): string { function makeUploadURI(blobHash: ?string, id: string, secret: string): string {
if (holder) { if (blobHash) {
return makeBlobServiceURI(holder); return makeBlobServiceURI(blobHash);
} }
return getUploadURL(id, secret); return getUploadURL(id, secret);
} }
function imagesFromRow(row: Object): Image | EncryptedImage { function imagesFromRow(row: Object): Image | EncryptedImage {
const uploadExtra = JSON.parse(row.uploadExtra); const uploadExtra = JSON.parse(row.uploadExtra);
const { width, height, blobHash, thumbHash } = uploadExtra; const { width, height, blobHash, thumbHash } = uploadExtra;
▲ Show 20 Lines • Show All 280 Lines • Show Last 20 Lines
View Options

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

Loading...