Skip to content
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

[NEW][Apps] Add a new upload API #18955

Merged
merged 10 commits into from
Sep 22, 2020
Merged

[NEW][Apps] Add a new upload API #18955

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c8d90a0
[Apps] Add a new upload API - createUpload
shiqimei Sep 18, 2020
587b319
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into file…
shiqimei Sep 18, 2020
c53c2be
Merge branch 'develop' into file-uploads
d-gubert Sep 18, 2020
c1eac67
Update Apps-Engine version
d-gubert Sep 18, 2020
fe70224
Update package.json
d-gubert Sep 18, 2020
e59fbcf
Update Apps-Engine version
d-gubert Sep 18, 2020
44b03c4
Add mime detection to upload
d-gubert Sep 22, 2020
2558df9
Send file message on upload via apps
d-gubert Sep 22, 2020
ff8ecf1
Update Apps-Engine version
d-gubert Sep 22, 2020
8439493
Merge remote-tracking branch 'origin/develop' into file-uploads
d-gubert Sep 22, 2020
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
9 changes: 9 additions & 0 deletions app/apps/server/bridges/uploads.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,13 @@ export class AppUploadBridge {
});
});
}

createUpload(details, buffer, appId) {
this.orch.debugLog(`The App ${ appId } is creating an upload "${ details.name }"`);

const fileStore = FileUpload.getStore('Uploads');
const uploadedFile = fileStore.insertSync(details, buffer);

return this.orch.getConverters().get('uploads').convertToApp(uploadedFile);
}
}
2 changes: 1 addition & 1 deletion app/file-upload/server/lib/FileUpload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const FileUpload = {
const room = Rooms.findOneById(file.rid);
const directMessageAllowed = settings.get('FileUpload_Enabled_Direct');
const fileUploadAllowed = settings.get('FileUpload_Enabled');
if (canAccessRoom(room, user, file) !== true) {
if (canAccessRoom(room, user, file) !== true && user.type !== 'app') {
d-gubert marked this conversation as resolved.
Show resolved Hide resolved
return false;
}
const language = user ? user.language : 'en';
Expand Down
152 changes: 124 additions & 28 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading