Skip to content

Direct editing API to allow file editing using a one-time token #17625

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
rullzer merged 9 commits into from
Nov 28, 2019
Merged

Direct editing API to allow file editing using a one-time token #17625

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e52793c
Direct editing API to allow file editing using a one-time token for
juliusknorr Oct 14, 2019
bccf236
encapsulate templates
tobiasKaminsky Oct 31, 2019
103c6fb
Add background job for token cleanup
juliusknorr Nov 6, 2019
c8d3e32
Direct editing token tests
juliusknorr Nov 14, 2019
bc36cc8
Move editor list to capabilities
juliusknorr Nov 25, 2019
9a2694f
Code style fixes and cleanup
juliusknorr Nov 25, 2019
329e8c2
Add mimetype to creators
juliusknorr Nov 26, 2019
fb1b88a
Expose editor id for creators
juliusknorr Nov 26, 2019
bde624b
Only expose link to info endpoint in capabilties
juliusknorr Nov 27, 2019
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
Prev Previous commit
Next Next commit
Add mimetype to creators 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Nov 27, 2019
commit 329e8c2604a35bded6afac75b59f611002d6db5e
7 changes: 2 additions & 5 deletions apps/files/lib/Capabilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,9 @@ private function getDirectEditingCapabilitites(): array {
'id' => $id,
'name' => $creator->getName(),
'extension' => $creator->getExtension(),
'templates' => false
'templates' => $creator instanceof ACreateFromTemplate,
'mimetype' => $creator->getMimetype()
];
if ($creator instanceof ACreateFromTemplate) {
$capabilities['creators'][$id]['templates'] = true;
}

}
}
return $capabilities;
Expand Down
8 changes: 8 additions & 0 deletions lib/public/DirectEditing/ACreateEmpty.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ abstract public function getName(): string;
*/
abstract public function getExtension(): string;

/**
* Mimetype of the resulting created file
*
* @since 18.0.0
* @return string
*/
abstract public function getMimetype(): string;

/**
* Add content when creating empty files
*
Expand Down
4 changes: 4 additions & 0 deletions tests/lib/DirectEditing/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ public function getName(): string {
public function getExtension(): string {
return '.txt';
}

public function getMimetype(): string {
return 'text/plain';
}
}

class Editor implements IEditor {
Expand Down