aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKevin Decherf <kevin@kdecherf.com>2019-06-05 18:32:21 +0200
committerGitHub <noreply@github.com>2019-06-05 18:32:21 +0200
commit2b04b300f83cd4bb288c1fd00e2b77ec4f557a00 (patch)
treea877d48e7d7eb38965e959e860404e59164e9efb
parent757ca53f6326a9b31c9f2f8508fc432e42ecf9c5 (diff)
parentc4bf12aadee9e1f757fd9d783b034bb57b03fb17 (diff)
downloadwallabag-2b04b300f83cd4bb288c1fd00e2b77ec4f557a00.tar.gz
wallabag-2b04b300f83cd4bb288c1fd00e2b77ec4f557a00.tar.zst
wallabag-2b04b300f83cd4bb288c1fd00e2b77ec4f557a00.zip
Merge pull request #3994 from wallabag/feature/revoke-feed-token
Add ability to revoke feed token
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php28
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.th.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig16
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig9
-rw-r--r--tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php18
18 files changed, 85 insertions, 13 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 3b281d48..cea41303 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -300,6 +300,34 @@ class ConfigController extends Controller
300 } 300 }
301 301
302 /** 302 /**
303 * @param Request $request
304 *
305 * @Route("/revoke-token", name="revoke_token")
306 *
307 * @return RedirectResponse|JsonResponse
308 */
309 public function revokeTokenAction(Request $request)
310 {
311 $config = $this->getConfig();
312 $config->setFeedToken(null);
313
314 $em = $this->getDoctrine()->getManager();
315 $em->persist($config);
316 $em->flush();
317
318 if ($request->isXmlHttpRequest()) {
319 return new JsonResponse();
320 }
321
322 $this->addFlash(
323 'notice',
324 'flashes.config.notice.feed_token_revoked'
325 );
326
327 return $this->redirect($this->generateUrl('config') . '#set2');
328 }
329
330 /**
303 * Deletes a tagging rule and redirect to the config homepage. 331 * Deletes a tagging rule and redirect to the config homepage.
304 * 332 *
305 * @param TaggingRule $rule 333 * @param TaggingRule $rule
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index d9440e84..c6a91cd1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'Intet token' 92 no_token: 'Intet token'
93 token_create: 'Opret token' 93 token_create: 'Opret token'
94 token_reset: 'Nulstil token' 94 token_reset: 'Nulstil token'
95 # token_revoke: 'Revoke the token'
95 feed_links: 'RSS-Links' 96 feed_links: 'RSS-Links'
96 feed_link: 97 feed_link:
97 unread: 'Ulæst' 98 unread: 'Ulæst'
@@ -594,6 +595,7 @@ flashes:
594 # tagging_rules_updated: 'Tagging rules updated' 595 # tagging_rules_updated: 'Tagging rules updated'
595 # tagging_rules_deleted: 'Tagging rule deleted' 596 # tagging_rules_deleted: 'Tagging rule deleted'
596 # feed_token_updated: 'RSS token updated' 597 # feed_token_updated: 'RSS token updated'
598 # feed_token_revoked: 'RSS token revoked'
597 # annotations_reset: Annotations reset 599 # annotations_reset: Annotations reset
598 # tags_reset: Tags reset 600 # tags_reset: Tags reset
599 # entries_reset: Entries reset 601 # entries_reset: Entries reset
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index d3ca30cd..4b785306 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'Kein Token' 92 no_token: 'Kein Token'
93 token_create: 'Token erstellen' 93 token_create: 'Token erstellen'
94 token_reset: 'Token zurücksetzen' 94 token_reset: 'Token zurücksetzen'
95 # token_revoke: 'Revoke the token'
95 feed_links: 'RSS-Links' 96 feed_links: 'RSS-Links'
96 feed_link: 97 feed_link:
97 unread: 'Ungelesene' 98 unread: 'Ungelesene'
@@ -585,6 +586,7 @@ flashes:
585 tagging_rules_updated: 'Tagging-Regeln aktualisiert' 586 tagging_rules_updated: 'Tagging-Regeln aktualisiert'
586 tagging_rules_deleted: 'Tagging-Regel gelöscht' 587 tagging_rules_deleted: 'Tagging-Regel gelöscht'
587 feed_token_updated: 'RSS-Token aktualisiert' 588 feed_token_updated: 'RSS-Token aktualisiert'
589 # feed_token_revoked: 'RSS token revoked'
588 annotations_reset: Anmerkungen zurücksetzen 590 annotations_reset: Anmerkungen zurücksetzen
589 tags_reset: Tags zurücksetzen 591 tags_reset: Tags zurücksetzen
590 entries_reset: Einträge zurücksetzen 592 entries_reset: Einträge zurücksetzen
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 7fd67ed2..1f8c47aa 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'No token' 92 no_token: 'No token'
93 token_create: 'Create your token' 93 token_create: 'Create your token'
94 token_reset: 'Regenerate your token' 94 token_reset: 'Regenerate your token'
95 token_revoke: 'Revoke the token'
95 feed_links: 'Feed links' 96 feed_links: 'Feed links'
96 feed_link: 97 feed_link:
97 unread: 'Unread' 98 unread: 'Unread'
@@ -594,6 +595,7 @@ flashes:
594 tagging_rules_updated: 'Tagging rules updated' 595 tagging_rules_updated: 'Tagging rules updated'
595 tagging_rules_deleted: 'Tagging rule deleted' 596 tagging_rules_deleted: 'Tagging rule deleted'
596 feed_token_updated: 'Feed token updated' 597 feed_token_updated: 'Feed token updated'
598 feed_token_revoked: 'RSS token revoked'
597 annotations_reset: Annotations reset 599 annotations_reset: Annotations reset
598 tags_reset: Tags reset 600 tags_reset: Tags reset
599 entries_reset: Entries reset 601 entries_reset: Entries reset
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index d37cd08d..06fa1e48 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'Sin token' 92 no_token: 'Sin token'
93 token_create: 'Crear token' 93 token_create: 'Crear token'
94 token_reset: 'Reiniciar token' 94 token_reset: 'Reiniciar token'
95 # token_revoke: 'Revoke the token'
95 feed_links: 'URLs de feeds RSS' 96 feed_links: 'URLs de feeds RSS'
96 feed_link: 97 feed_link:
97 unread: 'sin leer' 98 unread: 'sin leer'
@@ -594,6 +595,7 @@ flashes:
594 tagging_rules_updated: 'Regla de etiquetado actualizada' 595 tagging_rules_updated: 'Regla de etiquetado actualizada'
595 tagging_rules_deleted: 'Regla de etiquetado eliminada' 596 tagging_rules_deleted: 'Regla de etiquetado eliminada'
596 feed_token_updated: 'Token RSS actualizado' 597 feed_token_updated: 'Token RSS actualizado'
598 # feed_token_revoked: 'RSS token revoked'
597 annotations_reset: Anotaciones reiniciadas 599 annotations_reset: Anotaciones reiniciadas
598 tags_reset: Etiquetas reiniciadas 600 tags_reset: Etiquetas reiniciadas
599 entries_reset: Artículos reiniciados 601 entries_reset: Artículos reiniciados
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 1f74deba..5c1eaccc 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'بدون کد' 92 no_token: 'بدون کد'
93 token_create: 'کد خود را بسازید' 93 token_create: 'کد خود را بسازید'
94 token_reset: 'بازنشانی کد' 94 token_reset: 'بازنشانی کد'
95 # token_revoke: 'Revoke the token'
95 feed_links: 'پیوند آر-اس-اس' 96 feed_links: 'پیوند آر-اس-اس'
96 feed_link: 97 feed_link:
97 unread: 'خوانده‌نشده' 98 unread: 'خوانده‌نشده'
@@ -594,6 +595,7 @@ flashes:
594 tagging_rules_updated: 'برچسب‌گذاری خودکار به‌روز شد' 595 tagging_rules_updated: 'برچسب‌گذاری خودکار به‌روز شد'
595 tagging_rules_deleted: 'قانون برچسب‌گذاری پاک شد' 596 tagging_rules_deleted: 'قانون برچسب‌گذاری پاک شد'
596 feed_token_updated: 'کد آر-اس-اس به‌روز شد' 597 feed_token_updated: 'کد آر-اس-اس به‌روز شد'
598 # feed_token_revoked: 'RSS token revoked'
597 # annotations_reset: Annotations reset 599 # annotations_reset: Annotations reset
598 # tags_reset: Tags reset 600 # tags_reset: Tags reset
599 # entries_reset: Entries reset 601 # entries_reset: Entries reset
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index f0ff9c7b..09c1cc8f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -92,6 +92,7 @@ config:
92 no_token: "Aucun jeton généré" 92 no_token: "Aucun jeton généré"
93 token_create: "Créez votre jeton" 93 token_create: "Créez votre jeton"
94 token_reset: "Réinitialisez votre jeton" 94 token_reset: "Réinitialisez votre jeton"
95 token_revoke: 'Supprimer le jeton'
95 feed_links: "Adresses de vos flux" 96 feed_links: "Adresses de vos flux"
96 feed_link: 97 feed_link:
97 unread: "Non lus" 98 unread: "Non lus"
@@ -595,6 +596,7 @@ flashes:
595 tagging_rules_updated: "Règles mises à jour" 596 tagging_rules_updated: "Règles mises à jour"
596 tagging_rules_deleted: "Règle supprimée" 597 tagging_rules_deleted: "Règle supprimée"
597 feed_token_updated: "Jeton des flux mis à jour" 598 feed_token_updated: "Jeton des flux mis à jour"
599 feed_token_revoked: 'Jeton des flux supprimé'
598 annotations_reset: "Annotations supprimées" 600 annotations_reset: "Annotations supprimées"
599 tags_reset: "Tags supprimés" 601 tags_reset: "Tags supprimés"
600 entries_reset: "Articles supprimés" 602 entries_reset: "Articles supprimés"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 68495bad..92f2415b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'Nessun token' 92 no_token: 'Nessun token'
93 token_create: 'Crea il tuo token' 93 token_create: 'Crea il tuo token'
94 token_reset: 'Rigenera il tuo token' 94 token_reset: 'Rigenera il tuo token'
95 # token_revoke: 'Revoke the token'
95 feed_links: 'Collegamenti RSS' 96 feed_links: 'Collegamenti RSS'
96 feed_link: 97 feed_link:
97 unread: 'Non letti' 98 unread: 'Non letti'
@@ -593,6 +594,7 @@ flashes:
593 tagging_rules_updated: 'Regole di etichettatura aggiornate' 594 tagging_rules_updated: 'Regole di etichettatura aggiornate'
594 tagging_rules_deleted: 'Regola di etichettatura eliminate' 595 tagging_rules_deleted: 'Regola di etichettatura eliminate'
595 feed_token_updated: 'RSS token aggiornato' 596 feed_token_updated: 'RSS token aggiornato'
597 # feed_token_revoked: 'RSS token revoked'
596 annotations_reset: Reset annotazioni 598 annotations_reset: Reset annotazioni
597 tags_reset: Reset etichette 599 tags_reset: Reset etichette
598 entries_reset: Reset articoli 600 entries_reset: Reset articoli
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 4c4e0a86..4439cbcd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'Pas cap de geton generat' 92 no_token: 'Pas cap de geton generat'
93 token_create: 'Creatz vòstre geton' 93 token_create: 'Creatz vòstre geton'
94 token_reset: 'Reïnicializatz vòstre geton' 94 token_reset: 'Reïnicializatz vòstre geton'
95 # token_revoke: 'Revoke the token'
95 feed_links: 'URLs de vòstres fluxes RSS' 96 feed_links: 'URLs de vòstres fluxes RSS'
96 feed_link: 97 feed_link:
97 unread: 'Pas legits' 98 unread: 'Pas legits'
@@ -593,6 +594,7 @@ flashes:
593 tagging_rules_updated: 'Règlas misa a jorn' 594 tagging_rules_updated: 'Règlas misa a jorn'
594 tagging_rules_deleted: 'Règla suprimida' 595 tagging_rules_deleted: 'Règla suprimida'
595 feed_token_updated: 'Geton RSS mes a jorn' 596 feed_token_updated: 'Geton RSS mes a jorn'
597 # feed_token_revoked: 'RSS token revoked'
596 annotations_reset: Anotacions levadas 598 annotations_reset: Anotacions levadas
597 tags_reset: Etiquetas levadas 599 tags_reset: Etiquetas levadas
598 entries_reset: Articles levats 600 entries_reset: Articles levats
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index edfc7f4e..8311770f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'Brak tokena' 92 no_token: 'Brak tokena'
93 token_create: 'Stwórz tokena' 93 token_create: 'Stwórz tokena'
94 token_reset: 'Zresetuj swojego tokena' 94 token_reset: 'Zresetuj swojego tokena'
95 # token_revoke: 'Revoke the token'
95 feed_links: 'RSS links' 96 feed_links: 'RSS links'
96 feed_link: 97 feed_link:
97 unread: 'Nieprzeczytane' 98 unread: 'Nieprzeczytane'
@@ -593,6 +594,7 @@ flashes:
593 tagging_rules_updated: 'Reguły tagowania zaktualizowane' 594 tagging_rules_updated: 'Reguły tagowania zaktualizowane'
594 tagging_rules_deleted: 'Reguła tagowania usunięta' 595 tagging_rules_deleted: 'Reguła tagowania usunięta'
595 feed_token_updated: 'Token kanału RSS zaktualizowany' 596 feed_token_updated: 'Token kanału RSS zaktualizowany'
597 # feed_token_revoked: 'RSS token revoked'
596 annotations_reset: Zresetuj adnotacje 598 annotations_reset: Zresetuj adnotacje
597 tags_reset: Zresetuj tagi 599 tags_reset: Zresetuj tagi
598 entries_reset: Zresetuj wpisy 600 entries_reset: Zresetuj wpisy
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 400f1d56..c83bf6c1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'Nenhum Token' 92 no_token: 'Nenhum Token'
93 token_create: 'Criar seu token' 93 token_create: 'Criar seu token'
94 token_reset: 'Gerar novamente seu token' 94 token_reset: 'Gerar novamente seu token'
95 # token_revoke: 'Revoke the token'
95 feed_links: 'Links RSS' 96 feed_links: 'Links RSS'
96 feed_link: 97 feed_link:
97 unread: 'Não lido' 98 unread: 'Não lido'
@@ -593,6 +594,7 @@ flashes:
593 tagging_rules_updated: 'Regras de tags atualizadas' 594 tagging_rules_updated: 'Regras de tags atualizadas'
594 tagging_rules_deleted: 'Regra de tag apagada' 595 tagging_rules_deleted: 'Regra de tag apagada'
595 feed_token_updated: 'Token RSS atualizado' 596 feed_token_updated: 'Token RSS atualizado'
597 # feed_token_revoked: 'RSS token revoked'
596 # annotations_reset: Annotations reset 598 # annotations_reset: Annotations reset
597 # tags_reset: Tags reset 599 # tags_reset: Tags reset
598 # entries_reset: Entries reset 600 # entries_reset: Entries reset
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 21e920e6..c8bf8083 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'Fără token' 92 no_token: 'Fără token'
93 token_create: 'Crează-ți token' 93 token_create: 'Crează-ți token'
94 token_reset: 'Resetează-ți token-ul' 94 token_reset: 'Resetează-ți token-ul'
95 # token_revoke: 'Revoke the token'
95 feed_links: 'Link-uri RSS' 96 feed_links: 'Link-uri RSS'
96 feed_link: 97 feed_link:
97 unread: 'Unread' 98 unread: 'Unread'
@@ -593,6 +594,7 @@ flashes:
593 # tagging_rules_updated: 'Tagging rules updated' 594 # tagging_rules_updated: 'Tagging rules updated'
594 # tagging_rules_deleted: 'Tagging rule deleted' 595 # tagging_rules_deleted: 'Tagging rule deleted'
595 # feed_token_updated: 'RSS token updated' 596 # feed_token_updated: 'RSS token updated'
597 # feed_token_revoked: 'RSS token revoked'
596 # annotations_reset: Annotations reset 598 # annotations_reset: Annotations reset
597 # tags_reset: Tags reset 599 # tags_reset: Tags reset
598 # entries_reset: Entries reset 600 # entries_reset: Entries reset
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
index cd7c165c..5d0e70c9 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
@@ -91,6 +91,7 @@ config:
91 no_token: 'Ключ не задан' 91 no_token: 'Ключ не задан'
92 token_create: 'Создать ключ' 92 token_create: 'Создать ключ'
93 token_reset: 'Пересоздать ключ' 93 token_reset: 'Пересоздать ключ'
94 # token_revoke: 'Revoke the token'
94 feed_links: 'ссылка на RSS' 95 feed_links: 'ссылка на RSS'
95 feed_link: 96 feed_link:
96 unread: 'непрочитанные' 97 unread: 'непрочитанные'
@@ -560,6 +561,7 @@ flashes:
560 tagging_rules_updated: 'Правила тегировния обновлены' 561 tagging_rules_updated: 'Правила тегировния обновлены'
561 tagging_rules_deleted: 'Правила тегировния удалены' 562 tagging_rules_deleted: 'Правила тегировния удалены'
562 feed_token_updated: 'RSS ключ обновлен' 563 feed_token_updated: 'RSS ключ обновлен'
564 # feed_token_revoked: 'RSS token revoked'
563 annotations_reset: "Аннотации сброшены" 565 annotations_reset: "Аннотации сброшены"
564 tags_reset: "Теги сброшены" 566 tags_reset: "Теги сброшены"
565 entries_reset: "Записи сброшены" 567 entries_reset: "Записи сброшены"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
index 5e772ddb..66426d53 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'ไม่มีเครื่องหมาย' 92 no_token: 'ไม่มีเครื่องหมาย'
93 token_create: 'สร้างเครื่องหมาย' 93 token_create: 'สร้างเครื่องหมาย'
94 token_reset: 'ทำเครื่องหมาย' 94 token_reset: 'ทำเครื่องหมาย'
95 # token_revoke: 'Revoke the token'
95 feed_links: 'ลิงค์ RSS' 96 feed_links: 'ลิงค์ RSS'
96 feed_link: 97 feed_link:
97 unread: 'ยังไมได้่อ่าน' 98 unread: 'ยังไมได้่อ่าน'
@@ -591,6 +592,7 @@ flashes:
591 tagging_rules_updated: 'อัปเดตการแท็กข้อบังคับ' 592 tagging_rules_updated: 'อัปเดตการแท็กข้อบังคับ'
592 tagging_rules_deleted: 'การลบข้อบังคับของแท็ก' 593 tagging_rules_deleted: 'การลบข้อบังคับของแท็ก'
593 feed_token_updated: 'อัปเดตเครื่องหมาย RSS ' 594 feed_token_updated: 'อัปเดตเครื่องหมาย RSS '
595 # feed_token_revoked: 'RSS token revoked'
594 annotations_reset: รีเซ็ตหมายเหตุ 596 annotations_reset: รีเซ็ตหมายเหตุ
595 tags_reset: รีเซ็ตแท็ก 597 tags_reset: รีเซ็ตแท็ก
596 entries_reset: รีเซ็ตรายการ 598 entries_reset: รีเซ็ตรายการ
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index ad11688a..50bd38e3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -92,6 +92,7 @@ config:
92 no_token: 'Belirteç (token) yok' 92 no_token: 'Belirteç (token) yok'
93 token_create: 'Yeni belirteç (token) oluştur' 93 token_create: 'Yeni belirteç (token) oluştur'
94 token_reset: 'Belirteci (token) sıfırla' 94 token_reset: 'Belirteci (token) sıfırla'
95 # token_revoke: 'Revoke the token'
95 feed_links: 'RSS akış bağlantıları' 96 feed_links: 'RSS akış bağlantıları'
96 feed_link: 97 feed_link:
97 unread: 'Okunmayan' 98 unread: 'Okunmayan'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index 4ef6ab3c..a1caf242 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -111,14 +111,14 @@
111 {% else %} 111 {% else %}
112 <em>{{ 'config.form_feed.no_token'|trans }}</em> 112 <em>{{ 'config.form_feed.no_token'|trans }}</em>
113 {% endif %} 113 {% endif %}
114 114
115 <a href="{{ path('generate_token') }}"> 115 {% if feed.token %}
116 {% if feed.token %} 116 – <a href="{{ path('generate_token') }}">{{ 'config.form_feed.token_reset'|trans }}</a>
117 {{ 'config.form_feed.token_reset'|trans }} 117 <a href="{{ path('revoke_token') }}">{{ 'config.form_feed.token_revoke'|trans }}</a>
118 {% else %} 118 {% else %}
119 {{ 'config.form_feed.token_create'|trans }} 119 <a href="{{ path('generate_token') }}">{{ 'config.form_feed.token_create'|trans }}</a>
120 {% endif %} 120 {% endif %}
121 </a> 121
122 </div> 122 </div>
123 </fieldset> 123 </fieldset>
124 124
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 818fc4e7..a48c9e28 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -140,12 +140,13 @@
140 {% else %} 140 {% else %}
141 <em>{{ 'config.form_feed.no_token'|trans }}</em> 141 <em>{{ 'config.form_feed.no_token'|trans }}</em>
142 {% endif %} 142 {% endif %}
143 – <a href="{{ path('generate_token') }}"> 143
144 {% if feed.token %} 144 {% if feed.token %}
145 {{ 'config.form_feed.token_reset'|trans }} 145 – <a href="{{ path('generate_token') }}">{{ 'config.form_feed.token_reset'|trans }}</a>
146 – <a href="{{ path('revoke_token') }}">{{ 'config.form_feed.token_revoke'|trans }}</a>
146 {% else %} 147 {% else %}
147 {{ 'config.form_feed.token_create'|trans }} 148 – <a href="{{ path('generate_token') }}">{{ 'config.form_feed.token_create'|trans }}</a>
148 {% endif %}</a> 149 {% endif %}
149 </div> 150 </div>
150 </div> 151 </div>
151 </div> 152 </div>
diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
index d8478ce3..b9e0bed2 100644
--- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
@@ -330,7 +330,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
330 $crawler = $client->followRedirect(); 330 $crawler = $client->followRedirect();
331 331
332 $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text'])); 332 $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
333 $this->assertNotContains('config.form_feed.no_token', $body[0]); 333 $this->assertContains('config.form_feed.token_reset', $body[0]);
334 } 334 }
335 335
336 public function testGenerateTokenAjax() 336 public function testGenerateTokenAjax()
@@ -351,6 +351,22 @@ class ConfigControllerTest extends WallabagCoreTestCase
351 $this->assertArrayHasKey('token', $content); 351 $this->assertArrayHasKey('token', $content);
352 } 352 }
353 353
354 public function testRevokeTokenAjax()
355 {
356 $this->logInAs('admin');
357 $client = $this->getClient();
358
359 $client->request(
360 'GET',
361 '/revoke-token',
362 [],
363 [],
364 ['HTTP_X-Requested-With' => 'XMLHttpRequest']
365 );
366
367 $this->assertSame(200, $client->getResponse()->getStatusCode());
368 }
369
354 public function testFeedUpdate() 370 public function testFeedUpdate()
355 { 371 {
356 $this->logInAs('admin'); 372 $this->logInAs('admin');