').addClass('error-message');
+
+ function error(msg) {
+ $('.title').after(errorDiv.text(msg));
+ }
+
$('.actions .certificate-delete').click(function () {
- $(this).parents('li').first().find('.certificate-revoke').addClass('show')
+ $(this).parents('.actions').hide().parents('li').first().find('.revoke-q').show();
+ });
+
+ $('.revoke-q .no').click(function () {
+ $(this).parents('.revoke-q').hide().parents('li').first().find('.actions').show();
+ });
+
+ $('.revoke-q .yes').click(function () {
+ var _this=this;
+
+ $.post('/panel/certificates/revoke', {
+ name: $(_this).data('name')
+ }, function (data) {
+ if (data.success) {
+ $(_this)
+ .parents('li')
+ .first()
+ .remove();
+ } else {
+ error(data.error);
+ }
+ });
});
});
diff --git a/public/js/pages/certificates/new.js b/public/js/pages/certificates/new.js
index f584bc8..50b65d4 100644
--- a/public/js/pages/certificates/new.js
+++ b/public/js/pages/certificates/new.js
@@ -58,6 +58,7 @@ $(function () {
zip.file(commonName + '.key', keyPem);
for(var file in data.zip) {
+ if (!data.zip.hasOwnProperty(file)) continue;
zip.file(file, data.zip[file]);
}
diff --git a/public/js/invites.js b/public/js/pages/invites.js
similarity index 65%
rename from public/js/invites.js
rename to public/js/pages/invites.js
index b5ecf6b..87ae14a 100644
--- a/public/js/invites.js
+++ b/public/js/pages/invites.js
@@ -2,20 +2,20 @@ $(function () {
var clipboard = new Clipboard('.copy');
clipboard.on('success', function(e) {
- $(e.trigger).text('Copied!')
+ $(e.trigger).text('copied!');
setTimeout(
function () {
- $(e.trigger).text('Copy');
+ $(e.trigger).text('copy');
},
2000
);
});
clipboard.on('error', function(e) {
- $(e.trigger).text('Couldn\t copy :(')
+ $(e.trigger).text('couldn\t copy :(');
setTimeout(
function () {
- $(e.trigger).text('Copy');
+ $(e.trigger).text('copy');
},
2000
);
diff --git a/src/Handler/Panel/Certificates/Revoke.php b/src/Handler/Panel/Certificates/Revoke.php
index 894d787..76b1d75 100644
--- a/src/Handler/Panel/Certificates/Revoke.php
+++ b/src/Handler/Panel/Certificates/Revoke.php
@@ -24,7 +24,6 @@ class Revoke extends Session
{
$user = $this->getUser();
$name = $this->post('name');
- $password = $this->post('password');
$cert = CertificateQuery::create()
->filterByName($name)
@@ -38,13 +37,6 @@ class Revoke extends Session
]);
}
- if (!password_verify($password, $user->getPassword())) {
- return $this->json([
- 'success' => false,
- 'error' => 'Invalid password'
- ]);
- }
-
/**
* @var CA $ca
*/
diff --git a/src/Handler/Panel/Invites.php b/src/Handler/Panel/Invites.php
index 486f6e3..c53d4b9 100644
--- a/src/Handler/Panel/Invites.php
+++ b/src/Handler/Panel/Invites.php
@@ -4,11 +4,11 @@ namespace Eater\Glim\Handler\Panel;
use Aura\Session\Segment;
+use Eater\Glim\Handler\Panel;
use Eater\Glim\Handler\Session;
-class Invites extends Session
+class Invites extends Panel
{
- protected $shouldHaveUser = true;
public function handle()
{
diff --git a/views/panel/certificates.html.twig b/views/panel/certificates.html.twig
index 7337ba6..af0fc6d 100644
--- a/views/panel/certificates.html.twig
+++ b/views/panel/certificates.html.twig
@@ -4,8 +4,12 @@
{% if user.getActiveCertificates()|length < user.getMaxKeys() %}
create
{% endif %}
-
Certificates
-
You used {{ user.getActiveCertificates()|length }} of your {{ user.getMaxKeys() }} certificates
+
+
+
Certificates
+
You used {{ user.getActiveCertificates()|length }} of your {{ user.getMaxKeys() }} certificates
+
+
{% for certificate in user.getActiveCertificates() %}
-
@@ -24,9 +28,18 @@
revoke
-
-
Invites You used {{ used_invites }} from your {{ max_invites == -1 ? 'infinite' : max_invites }} invites
-
- {% if error %}
-
- {% endif %}
-
-
-
-
- | Invite |
-
- {% if max_invites > used_invites or max_invites == -1 %}
-
- {% endif %}
- |
-
-
-
- {% for invite in invites %}
-
- |
- {{ invite.getInvite() }}
- |
-
-
- |
-
- {% else %}
-
- | You don't have any invites :( |
-
- {% endfor %}
-
-
-
+{% block panel_contents %}
+ {% if user.getActiveCertificates()|length < user.getMaxKeys() %}
+
+ {% endif %}
+
+
+
Invites
+
You used {{ used_invites }} from your {{ max_invites == -1 ? 'infinite' : max_invites }} invites
+
+
{% endblock %}