Skip to content

ModulesGarden #53

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
merged 2 commits into from
Apr 12, 2015
Merged

ModulesGarden #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83d9c63
Always use https in SSO
Apr 10, 2015
1831706
Added option to set custom new ticket link
Apr 10, 2015
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
6 changes: 5 additions & 1 deletion src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ public function __construct()
}

public function getSubmitAction() {
$url = Mage::helper('adminhtml')->getUrl('*/sso/login', array("return_url" => Mage::helper('core')->urlEncode("http://".Mage::getStoreConfig('zendesk/general/domain')."/requests/new")));
if (!$return_url = Mage::getStoreConfig('zendesk/sso_frontend/new')) {
$return_url = "http://".Mage::getStoreConfig('zendesk/general/domain')."/requests/new";
}
$url = Mage::helper('adminhtml')->getUrl('*/sso/login', array("return_url" => Mage::helper('core')->urlEncode($return_url)));

return $url;
}
}
4 changes: 2 additions & 2 deletions src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public function authenticateAction()
$jwt = JWT::encode($payload, $token);
$return = $return_url ? "&return_to=".$return_url : "";

$url = "http://".$domain."/access/jwt?jwt=" . $jwt . $return;
$url = "https://".$domain."/access/jwt?jwt=" . $jwt . $return;

Mage::log('Admin URL: ' . $url, null, 'zendesk.log');

Expand Down Expand Up @@ -202,7 +202,7 @@ public function launchAction()
$sso = Mage::getStoreConfig('zendesk/sso/enabled');

if (!$sso) {
$url = "http://".$domain;
$url = "https://".$domain;
} elseif(Mage::helper('zendesk')->isSSOAdminUsersEnabled()) {
$url = Mage::helper('zendesk')->getSSOAuthUrlAdminUsers();
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/app/code/community/Zendesk/Zendesk/controllers/SsoController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function loginAction()
$jwt = JWT::encode($payload, $token);
$return_url = $return_url ? "&return_to=".$return_url : "";

$url = "http://".$domain."/access/jwt?jwt=" . $jwt.$return_url;
$url = "https://".$domain."/access/jwt?jwt=" . $jwt.$return_url;

Mage::log('End-user URL: ' . $url, null, 'zendesk.log');

Expand Down
9 changes: 9 additions & 0 deletions src/app/code/community/Zendesk/Zendesk/etc/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,15 @@
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</token>
<new translate="label comment">
<label>New Ticket Link</label>
<frontend_type>text</frontend_type>
<sort_order>3</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<comment><![CDATA[ https://yourdomain.zendesk.com/requests/new will be used by default]]></comment>
</new>
</fields>
</sso_frontend>
<frontend_features translate="label comment">
Expand Down
1 change: 1 addition & 0 deletions src/app/locale/en_US/Zendesk_Zendesk.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,4 @@
"Show "All" tab on dashboard","Show "All" tab on dashboard"
"Generate New Token","Generate New Token"
"Token cannot be empty","Token cannot be empty"
"New Ticket Link","New Ticket Link"