-
Notifications
You must be signed in to change notification settings - Fork 118
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.
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
WIP: Admin setting iframe #4373
Draft
codewithvk
wants to merge
12
commits into
nextcloud:main
Choose a base branch
from
codewithvk:private/codewithvk/cool_setting_iframe
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
c0fe494
Initial cool admin setting iframe setup
codewithvk 7e840f9
WIP auth
codewithvk 7fac5ca
Temp: Auth handling stuff
codewithvk 104c780
WIP: wopi setting upload
codewithvk a26cab5
Created an AppData-based directory for system settings and user settings
codewithvk cb707b1
Create a Settings controller API endpoint for handling AppData-based …
codewithvk 4a62c88
Temporary Commit: Created a temporary UI to validate the functionalit…
codewithvk d70c466
Change the admin settings iframe URL to adminIntegratorSettings.
codewithvk ce2ccba
WOPI: Update the wopi setting upload route to accept a file and store…
codewithvk e1f8021
add delete button and create wopi/setting route to handle wopi file r…
codewithvk cc91ef8
Manage setting configs files with dynamic routes
codewithvk c2e7a19
Code cleanup: Remove POC helper functions
codewithvk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,6 +66,34 @@ public function generateFileToken($fileId, $owner, $editor, $version, $updatable | |
return $wopi; | ||
} | ||
|
||
public function generateUserSettingsToken($fileId, $owner, $editor, $version, $updatable, $serverHost, ?string $guestDisplayname = null, $hideDownload = false, $direct = false, $templateId = 0, $share = null) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We probably can simplify the signature of this method a lot. Most of it is passed in as dummy/default values |
||
$token = $this->random->generate(32, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS); | ||
|
||
$wopi = Wopi::fromParams([ | ||
'fileid' => $fileId, | ||
'ownerUid' => $owner, | ||
'editorUid' => $editor, | ||
'version' => $version, | ||
'canwrite' => $updatable, | ||
'serverHost' => $serverHost, | ||
'token' => $token, | ||
'expiry' => $this->calculateNewTokenExpiry(), | ||
'guestDisplayname' => $guestDisplayname, | ||
'hideDownload' => $hideDownload, | ||
'direct' => $direct, | ||
'templateId' => $templateId, | ||
'remoteServer' => '', | ||
'remoteServerToken' => '', | ||
'share' => $share, | ||
'tokenType' => Wopi::TOKEN_TYPE_SETTING_AUTH | ||
]); | ||
|
||
/** @var Wopi $wopi */ | ||
$wopi = $this->insert($wopi); | ||
|
||
return $wopi; | ||
} | ||
|
||
public function generateInitiatorToken($uid, $remoteServer) { | ||
$token = $this->random->generate(32, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS); | ||
|
||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems dangerous, we should always use
$this->userId
and not let the user id be passed as request data.Additionally we need to check if the user id is an admin (Can be done through https://github.com/nextcloud/server/blob/dff881544920f426b984f91b7bc8dece1f351342/lib/public/IGroupManager.php#L115