Skip to content

Commit

Permalink
[fc] Repository: plone.restapi
Browse files Browse the repository at this point in the history 
Branch: refs/heads/main
Date: 2024-09-03T19:18:12-07:00
Author: Alessandro Ceglie (sauzher) <sauzher@gmail.com>
Commit: plone/plone.restapi@aec08ce

fix #1802 and #1803 (#1804)

* fix #1802 and #1803

* changelog

* accepted stevepiercy suggestion on changelog

Files changed:
A news/1802.bugfix
M src/plone/restapi/pas/add_plugin.zpt
M src/plone/restapi/pas/config.zpt
  • Loading branch information
@davisagli
davisagli committed Sep 4, 2024
1 parent 6f772a1 commit 41b7b1e
Showing 1 changed file with 15 additions and 24 deletions.
39 changes: 15 additions & 24 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@
Repository: plone.staticresources
Repository: plone.restapi


Branch: refs/heads/2.1.x
Date: 2024-09-03T10:15:00+02:00
Author: Peter Mathis (petschki) <peter.mathis@kombinat.at>
Commit: https://github.com/plone/plone.staticresources/commit/299b6ea81dd59adf8a379fc6b6c34bcde6fe63d5
Branch: refs/heads/main
Date: 2024-09-03T19:18:12-07:00
Author: Alessandro Ceglie (sauzher) <sauzher@gmail.com>
Commit: https://github.com/plone/plone.restapi/commit/aec08ce8f9d787694142a76b16f3147fef5d628c

Preparing release 2.1.16
fix #1802 and #1803 (#1804)

Files changed:
M CHANGES.rst
M setup.py
D news/352.bugfix

b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 2bd27d554..a7b869b77 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -8,6 +8,16 @@ Changelog\n \n .. towncrier release notes start\n \n+2.1.16 (2024-09-03)\n+-------------------\n+\n+Bug fixes:\n+\n+\n+- Upgrade dependencies and development resources.\n+ [petschki] (#352)\n+\n+\n 2.1.15 (2024-08-20)\n -------------------\n \ndiff --git a/news/352.bugfix b/news/352.bugfix\ndeleted file mode 100644\nindex 50b464090..000000000\n--- a/news/352.bugfix\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-Upgrade dependencies and development resources.\n-[petschki]\ndiff --git a/setup.py b/setup.py\nindex 983538056..20f09bd55 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -11,7 +11,7 @@\n \n setup(\n name="plone.staticresources",\n- version="2.1.16.dev0",\n+ version="2.1.16",\n description="Static resources for Plone",\n long_description=long_description,\n long_description_content_type="text/x-rst",\n'

Repository: plone.staticresources


Branch: refs/heads/2.1.x
Date: 2024-09-03T10:16:01+02:00
Author: Peter Mathis (petschki) <peter.mathis@kombinat.at>
Commit: https://github.com/plone/plone.staticresources/commit/364177667b3dd9588d9417c1d7b73e58a8e622b8

Back to development: 2.1.17
* fix #1802 and #1803

* changelog

* accepted stevepiercy suggestion on changelog

Files changed:
M setup.py
A news/1802.bugfix
M src/plone/restapi/pas/add_plugin.zpt
M src/plone/restapi/pas/config.zpt

b'diff --git a/setup.py b/setup.py\nindex 20f09bd55..bdbb2e7a8 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -11,7 +11,7 @@\n \n setup(\n name="plone.staticresources",\n- version="2.1.16",\n+ version="2.1.17.dev0",\n description="Static resources for Plone",\n long_description=long_description,\n long_description_content_type="text/x-rst",\n'
b'diff --git a/news/1802.bugfix b/news/1802.bugfix\nnew file mode 100644\nindex 000000000..347ab28a2\n--- /dev/null\n+++ b/news/1802.bugfix\n@@ -0,0 +1 @@\n+Fixed implementation of the `jwt_auth` plugin. It now can be added, and its properties, `use_keyring` and `store_tokens`, can be updated. @sauzher\ndiff --git a/src/plone/restapi/pas/add_plugin.zpt b/src/plone/restapi/pas/add_plugin.zpt\nindex b7e8c3636..74ef44710 100644\n--- a/src/plone/restapi/pas/add_plugin.zpt\n+++ b/src/plone/restapi/pas/add_plugin.zpt\n@@ -14,7 +14,7 @@\n <div class="form-group row">\n <label for="id_" class="form-label col-sm-3 col-md-2">Id</label>\n <div class="col-sm-9 col-md-10">\n- <input id="id_" name="id" class="form-control" type="text" tal:attributes="value request/id|string:jwt_auth" />\n+ <input id="id_" name="id_" class="form-control" type="text" tal:attributes="value request/id_|string:jwt_auth" />\n </div>\n </div>\n \ndiff --git a/src/plone/restapi/pas/config.zpt b/src/plone/restapi/pas/config.zpt\nindex bfe372989..ecb3859a8 100644\n--- a/src/plone/restapi/pas/config.zpt\n+++ b/src/plone/restapi/pas/config.zpt\n@@ -10,19 +10,19 @@\n <form action="manage_updateConfig" method="post">\n <div class="form-group">\n <label class="form-label" for="token_timeout">Token Validity Timeout (in seconds)</label>\n- <input type="text" \n+ <input type="text"\n name="token_timeout"\n class="form-control"\n tal:attributes="value context/token_timeout|nothing"/>\n <small class="form-text text-muted">After this, the token is invalid and the user must login again. Set to 0 for the token to remain valid indefinitely.</small>\n </div>\n- \n+\n <div class="form-group">\n <div class="form-check">\n- <input class="form-check-input" \n- type="checkbox" value="" \n- name="use_keyring" \n- id="use_keyring" \n+ <input class="form-check-input"\n+ type="checkbox" value="True"\n+ name="use_keyring"\n+ id="use_keyring"\n tal:attributes="checked python: context.use_keyring and \'checked\'">\n <label class="form-check-label" for="use_keyring">Use Keyring</label>\n <small class="form-text text-muted">If enabled, tokens are signed with a secret from Plone\'s keyring. If you want tokens that remain valid indefinitely you should disable this.</small>\n@@ -31,10 +31,10 @@\n \n <div class="form-group">\n <div class="form-check">\n- <input class="form-check-input" \n- type="checkbox" value="" \n- name="store_tokens" \n- id="store_tokens" \n+ <input class="form-check-input"\n+ type="checkbox" value="True"\n+ name="store_tokens"\n+ id="store_tokens"\n tal:attributes="checked python: context.store_tokens and \'checked\'">\n <label class="form-check-label" for="store_tokens">Store tokens</label>\n <small class="form-text text-muted">By default tokens are not stored on the server and thus can\'t be invalidated. If enabled, tokens that don\'t expire can be invalidated.</small>\n'

0 comments on commit 41b7b1e

Please sign in to comment.