Added Auth fields #147
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -146,6 +146,10 @@ public function getAdmin() { | |
| /** | ||
| * @param string $name | ||
| * @param string $url | ||
| * @param string $loginurl | ||
| * @param string $login | ||
| * @param string $password | ||
| * @param string $headers | ||
| * @param string $lang | ||
| * @param string $type | ||
| * @param string $device | ||
|
|
@@ -154,9 +158,9 @@ public function getAdmin() { | |
| * @param int $redirect | ||
| * @return DataResponse | ||
| */ | ||
| public function add($name, $url, $loginurl, $login, $password, $headers, $lang, $type, $device, $icon, array $groups, $redirect) { | ||
| try { | ||
| return new DataResponse($this->sitesManager->addSite($name, $url, $loginurl, $login, $password, $headers, $lang, $type, $device, $icon, $groups, (bool) $redirect)); | ||
| } catch (InvalidNameException $e) { | ||
| return new DataResponse(['error' => $this->l->t('The given label is invalid'), 'field' => 'name'], Http::STATUS_BAD_REQUEST); | ||
| } catch (InvalidURLException $e) { | ||
|
|
@@ -178,6 +182,10 @@ public function add($name, $url, $lang, $type, $device, $icon, array $groups, $r | |
| * @param int $id | ||
| * @param string $name | ||
| * @param string $url | ||
| * @param string $loginurl | ||
| * @param string $login | ||
| * @param string $password | ||
| * @param string $headers | ||
| * @param string $lang | ||
| * @param string $type | ||
| * @param string $device | ||
|
|
@@ -186,9 +194,9 @@ public function add($name, $url, $lang, $type, $device, $icon, array $groups, $r | |
| * @param int $redirect | ||
| * @return DataResponse | ||
| */ | ||
| public function update($id, $name, $url, $loginurl, $login, $password, $headers, $lang, $type, $device, $icon, array $groups, $redirect) { | ||
| try { | ||
| return new DataResponse($this->sitesManager->updateSite($id, $name, $url, $loginurl, $login, $password, $headers, $lang, $type, $device, $icon, $groups, (bool) $redirect)); | ||
| } catch (SiteNotFoundException $e) { | ||
| return new DataResponse(['error' => $this->l->t('The site does not exist'), 'field' => 'site'], Http::STATUS_NOT_FOUND); | ||
| } catch (InvalidNameException $e) { | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -129,11 +129,17 @@ protected function createResponse($id, array $site) { | |
|
|
||
| $response = new TemplateResponse('external', 'frame', [ | ||
| 'url' => $site['url'], | ||
| 'loginurl' => $site['loginurl'], | ||
| //'authsecret' => base64_encode($site['login']. ":" . $site['password']), | ||
| 'username' => $site['login'], | ||
| 'password' => $site['password'], | ||
| 'headers' => $site['headers'], | ||
| ], 'user'); | ||
|
|
||
| $policy = new ContentSecurityPolicy(); | ||
| $policy->addAllowedChildSrcDomain('*'); | ||
| $policy->addAllowedFrameDomain('*'); | ||
| $policy->addAllowedConnectDomain('*'); | ||
| $response->setContentSecurityPolicy($policy); | ||
|
|
||
| return $response; | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -197,6 +197,10 @@ protected function fillSiteArray(array $site) { | |
| /** | ||
| * @param string $name | ||
| * @param string $url | ||
| * @param string $loginurl | ||
| * @param string $login | ||
| * @param string $password | ||
| * @param string $headers | ||
| * @param string $lang | ||
| * @param string $type | ||
| * @param string $device | ||
|
|
@@ -212,7 +216,7 @@ protected function fillSiteArray(array $site) { | |
| * @throws GroupNotFoundException | ||
| * @throws IconNotFoundException | ||
| */ | ||
| public function addSite($name, $url, $loginurl, $login, $password, $headers, $lang, $type, $device, $icon, array $groups, $redirect) { | ||
| $id = 1 + (int) $this->config->getAppValue('external', 'max_site', 0); | ||
|
|
||
| if ($name === '') { | ||
|
|
@@ -269,6 +273,10 @@ public function addSite($name, $url, $lang, $type, $device, $icon, array $groups | |
| 'id' => $id, | ||
| 'name' => $name, | ||
| 'url' => $url, | ||
| 'loginurl' => $loginurl, | ||
| 'login' => $login, | ||
| 'password' => $password, | ||
| 'headers' => $headers, | ||
| 'lang' => $lang, | ||
| 'type' => $type, | ||
| 'device' => $device, | ||
|
|
@@ -286,6 +294,10 @@ public function addSite($name, $url, $lang, $type, $device, $icon, array $groups | |
| * @param int $id | ||
| * @param string $name | ||
| * @param string $url | ||
| * @param string $loginurl | ||
| * @param string $login | ||
| * @param string $password | ||
| * @param string $headers | ||
| * @param string $lang | ||
| * @param string $type | ||
| * @param string $device | ||
|
|
@@ -302,7 +314,7 @@ public function addSite($name, $url, $lang, $type, $device, $icon, array $groups | |
| * @throws GroupNotFoundException | ||
| * @throws IconNotFoundException | ||
| */ | ||
| public function updateSite($id, $name, $url, $loginurl, $login, $password, $headers, $lang, $type, $device, $icon, array $groups, $redirect) { | ||
| $sites = $this->getSites(); | ||
| if (!isset($sites[$id])) { | ||
| throw new SiteNotFoundException(); | ||
|
|
@@ -361,6 +373,10 @@ public function updateSite($id, $name, $url, $lang, $type, $device, $icon, array | |
| 'id' => $id, | ||
| 'name' => $name, | ||
| 'url' => $url, | ||
| 'loginurl' => $loginurl, | ||
| 'login' => $login, | ||
| 'password' => $password, | ||
| 'headers' => $headers, | ||
| 'lang' => $lang, | ||
| 'type' => $type, | ||
| 'device' => $device, | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -26,4 +26,10 @@ | |
|
|
||
| /** @var array $_ */ | ||
| ?> | ||
| <!-- <input type="hidden" id="external_authsecret" value="<?php p($_['authsecret']); ?>" /> --> | ||
| <input type="hidden" id="external_url" value="<?php p($_['url']); ?>" /> | ||
| <input type="hidden" id="external_loginurl" value="<?php p($_['loginurl']); ?>" /> | ||
| <input type="hidden" id="external_username" value="<?php p($_['username']); ?>" /> | ||
| <input type="hidden" id="external_password" value="<?php p($_['password']); ?>" /> | ||
| <input type="hidden" id="external_headers" value="<?php p($_['headers']); ?>" /> | ||
| <iframe id="ifm" src="<?php p($_['url']); ?>"></iframe> | ||
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.
For coherence with i18n/en_GB.js