cone.tokens 0.2__tar.gz → 0.3__tar.gz

{cone.tokens-0.2 → cone.tokens-0.3}/CHANGES.rst

@@ -1,6 +1,16 @@
 Changes
 =======
 
+0.3 (2023-09-28)
+----------------
+
+- Tokens can be bulk deleted.
+  [lenadax]
+
+- Tokens can be created from scanned value.
+  [rnix]
+
+
 0.2 (2023-09-27)
 ----------------
 

{cone.tokens-0.2/src/cone.tokens.egg-info → cone.tokens-0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cone.tokens
-Version: 0.2
+Version: 0.3
 Summary: cone token api
 Home-page: http://github.com/conestack/cone.tokens
 Author: Cone Contributors
@@ -10,13 +10,8 @@ Keywords: node pyramid cone web
 Classifier: Environment :: Web Environment
 Classifier: Programming Language :: Python
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-License-File: LICENSE.rst
-Requires-Dist: setuptools
-Requires-Dist: cone.sql
-Requires-Dist: python-dateutil
-Requires-Dist: qrcode[pil]
 Provides-Extra: test
-Requires-Dist: zope.testrunner; extra == "test"
+License-File: LICENSE.rst
 
 .. image:: https://img.shields.io/pypi/v/cone.tokens.svg
     :target: https://pypi.python.org/pypi/cone.tokens
@@ -170,6 +165,16 @@ Contributors
 Changes
 =======
 
+0.3 (2023-09-28)
+----------------
+
+- Tokens can be bulk deleted.
+  [lenadax]
+
+- Tokens can be created from scanned value.
+  [rnix]
+
+
 0.2 (2023-09-27)
 ----------------
 

{cone.tokens-0.2 → cone.tokens-0.3}/setup.py

@@ -9,7 +9,7 @@ def read_file(name):
         return f.read()
 
 
-version = '0.2'
+version = '0.3'
 shortdesc = 'cone token api'
 longdesc = '\n\n'.join([read_file(name) for name in [
     'README.rst',

{cone.tokens-0.2 → cone.tokens-0.3}/src/cone/tokens/api.py

@@ -74,10 +74,11 @@ class TokenAPI(object):
         if request:
             return request.authenticated_userid
 
-    def _log_usage(self, token_uid, error_code=None):
+    def _log_usage(self, token_uid, token_value, error_code=None):
         record = TokenUsageRecord()
         record.uid = uuid.uuid4()
         record.token_uid = token_uid
+        record.token_value = token_value
         record.timestamp = datetime.now()
         record.error_code = error_code
         record.user = self._authenticated_userid
@@ -88,28 +89,28 @@ class TokenAPI(object):
         token = self.get_token(token_uid)
         if token.usage_count == 0:
             exc = TokenUsageCountExceeded(token_uid)
-            self._log_usage(token_uid, error_code=exc.error_code)
+            self._log_usage(token_uid, token.value, error_code=exc.error_code)
             raise exc
         now = datetime.now()
         if token.last_used:
             if token.last_used + timedelta(0, token.lock_time) > now:
                 exc = TokenLockTimeViolation(token_uid)
-                self._log_usage(token_uid, error_code=exc.error_code)
+                self._log_usage(token_uid, token.value, error_code=exc.error_code)
                 raise exc
         valid_from = token.valid_from
         valid_to = token.valid_to
         if valid_from and now < valid_from:
             exc = TokenTimeRangeViolation(token_uid)
-            self._log_usage(token_uid, error_code=exc.error_code)
+            self._log_usage(token_uid, token.value, error_code=exc.error_code)
             raise exc
         if valid_to and now > valid_to:
             exc = TokenTimeRangeViolation(token_uid)
-            self._log_usage(token_uid, error_code=exc.error_code)
+            self._log_usage(token_uid, token.value, error_code=exc.error_code)
             raise exc
         if token.usage_count != -1:
             token.usage_count -= 1
         token.last_used = now
-        self._log_usage(token_uid)
+        self._log_usage(token_uid, token.value)
         return True
 
     def add(

{cone.tokens-0.2 → cone.tokens-0.3}/src/cone/tokens/browser/api.py

@@ -4,11 +4,17 @@ from cone.tokens.exceptions import TokenValueError
 from cone.tokens.model import TokenContainer
 from cone.tokens.model import TokenNode
 from cone.tokens.settings import get_settings_node
+from pyramid.i18n import get_localizer
+from pyramid.i18n import TranslationStringFactory
 from pyramid.view import view_config
 import dateutil.parser
+import json
 import uuid
 
 
+_ = TranslationStringFactory('cone.tokens')
+
+
 def read_string(request, param, kw, default=None):
     if param in request.params:
         value = request.params[param]
@@ -140,6 +146,36 @@ def add_token(model, request):
     return dict(success=True, token_uid=str(uid))
 
 
+@view_config(
+    name='delete_tokens',
+    request_method='POST',
+    accept='application/json',
+    renderer='json',
+    context=TokenContainer,
+    permission='delete')
+def delete_tokens(model, request):
+    api = TokenAPI(request)
+    token_uids = request.params.get('token_uids', None)
+    if not token_uids:
+        return
+    token_uids = json.loads(token_uids)
+    token_count = len(token_uids)
+    for t_uid in token_uids:
+        uid = uuid.UUID(t_uid)
+        try:
+            api.delete(uid)
+        except Exception as e:
+            return dict(success=False, message=str(e))
+    ts = _(
+        'deleted_tokens',
+        default='Successfully deleted ${count} Tokens.',
+        mapping={'count': token_count}
+    )
+    localizer = get_localizer(request)
+    message = localizer.translate(ts)
+    return dict(success=True, message=message)
+
+
 @view_config(
     name='update_token',
     request_method='POST',

{cone.tokens-0.2 → cone.tokens-0.3}/src/cone/tokens/browser/static/cone.tokens.js

@@ -112,8 +112,15 @@ var cone_tokens = (function (exports, $, ts) {
             this.filter = $('button[name="filter"]', this.tokens_title);
             this.filter_tokens = this.filter_tokens.bind(this);
             this.filter.on('click', this.filter_tokens);
+            this.delete_tokens_container = $('.delete-tokens', this.tokens_title);
+            this.delete_tokens_btn = $(
+                'button[name="delete-tokens"]',
+                this.delete_tokens_container
+            );
+            this.delete_tokens = this.delete_tokens.bind(this);
+            this.delete_tokens_btn.on('click', this.delete_tokens);
             this.set_token_size = this.set_token_size.bind(this);
-            this.size_input = $('input[name="token-size"]');
+            this.size_input = $('input[name="token-size"]', this.tokens_title);
             this.size_input.on('change', this.set_token_size);
             if (this.tokens.length) {
                 this.original_size = parseInt($(this.tokens[0]).attr('width'));
@@ -189,9 +196,51 @@ var cone_tokens = (function (exports, $, ts) {
                     }
                 });
             }
-            let amount = parseInt(this.add_tokens_input.val());
+            let amount = this.add_tokens_input.val();
+            if (!amount) {
+                return;
+            } else {
+                amount = parseInt(amount);
+            }
             add(amount, 0);
         }
+        delete_tokens(evt) {
+            const base_url = this.token_settings.base_url;
+            ts.show_dialog({
+                title: 'Delete tokens?',
+                message: 'Do you really want to delete selected tokens?',
+                on_confirm: () => {
+                    let uids = [];
+                    for (let token of this.tokens) {
+                        let uid = $(token).data('token-uid');
+                        uids.push(uid);
+                    }
+                    ts.ajax.request({
+                        url: `${base_url}/delete_tokens`,
+                        params: {token_uids: JSON.stringify(uids)},
+                        type: 'json',
+                        method: 'POST',
+                        success: (data, status, request) => {
+                            if (data.success) {
+                                ts.ajax.action({
+                                    name: 'tokens_overview',
+                                    selector: '#content',
+                                    mode: 'inner',
+                                    url: base_url,
+                                    params: {}
+                                });
+                                ts.show_message({message: data.message, flavor:''});
+                            } else {
+                                ts.show_error(data.message);
+                            }
+                        },
+                        error: (request, status, error) => {
+                            ts.show_error(`Failed to request JSON API: ${error}`);
+                        }
+                    });
+                }
+            });
+        }
         set_token_size(evt) {
             evt.preventDefault();
             let size = this.size_input.val();
@@ -246,6 +295,16 @@ var cone_tokens = (function (exports, $, ts) {
                 this.query_token(input.val());
             });
         }
+        load_token(token_uid) {
+            console.log('load token: ' + token_uid);
+            ts.ajax.action({
+                name: 'layout',
+                selector: '#layout',
+                mode: 'replace',
+                url: `${this.base_url}/${token_uid}`,
+                params: {}
+            });
+        }
         query_token(value) {
             ts.ajax.request({
                 url: `${this.base_url}/query_token`,
@@ -255,15 +314,30 @@ var cone_tokens = (function (exports, $, ts) {
                     if (data.success) {
                         if (!data.token) {
                             this.active = false;
-                            ts.show_error('Token not exists');
-                        } else {
-                            ts.ajax.action({
-                                name: 'layout',
-                                selector: '#layout',
-                                mode: 'replace',
-                                url: `${this.base_url}/${data.token.uid}`,
-                                params: {}
+                            ts.show_dialog({
+                                title: 'Token not exists?',
+                                message: 'Do you want to create it?',
+                                on_confirm: () => {
+                                    ts.ajax.request({
+                                        url: `${this.base_url}/add_token`,
+                                        params: {value: value},
+                                        type: 'json',
+                                        method: 'POST',
+                                        success: (data, status, request) => {
+                                            if (data.success) {
+                                                this.load_token(data.token_uid);
+                                            } else {
+                                                ts.show_error(data.message);
+                                            }
+                                        },
+                                        error: (request, status, error) => {
+                                            ts.show_error(`Failed to request JSON API: ${error}`);
+                                        }
+                                    });
+                                }
                             });
+                        } else {
+                            this.load_token(data.token.uid);
                         }
                     } else {
                         ts.show_error(data.message);

cone.tokens-0.3/src/cone/tokens/browser/static/cone.tokens.min.js

@@ -0,0 +1 @@
+var cone_tokens=function(t,e,s){"use strict";class n{static initialize(t){e(".token",t).each((function(){new n(e(this))}))}constructor(t){this.elem=t,this.settings=t.data("token-settings");const s=this;e(".btn-group.timeranges button",t).each((function(){const t=e(this);t.on("click",(function(e){s.set_timerange(t.data("timerange-scope"))}))})),e(".btn-group.usage-count button",t).each((function(){const t=e(this);t.on("click",(function(e){s.set_usage_count(t.data("usage-count"))}))}))}request_api(t){const e=this.settings;s.ajax.request({url:`${e.base_url}/update_token`,params:t,type:"json",method:"POST",success:(t,n,i)=>{t.success?s.ajax.action({name:"content",selector:"#content",mode:"inner",url:`${e.base_url}`,params:{}}):s.show_error(t.message)},error:(t,e,n)=>{s.show_error(`Failed to request JSON API: ${n}`)}})}set_timerange(t){const e=this.settings.timeranges;let s,n,i;if(Object.keys(e).includes(t)){s=e[t];let o=s.start.split(":");n=new Date,n.setHours(o[0],o[1],0);let a=s.end.split(":");i=new Date,i.setHours(a[0],a[1],0)}function o(t){return t&&(t=new Date(t.getTime()-6e4*t.getTimezoneOffset())),t?t.toISOString():""}this.request_api({valid_from:o(n),valid_to:o(i)})}set_usage_count(t){this.request_api({usage_count:t})}}class i{static initialize(t){e(".tokens-overview-container",t).each((function(){new i(e(this))}))}constructor(t){this.container=t,this.tokens_elem=e("#tokens-overview",t),this.tokens=e("object.token_qr",this.tokens_elem),this.tokens_title=e("#tokens-overview-title",t),this.token_settings=this.container.data("token-settings"),this.add_tokens_container=e(".add-tokens",this.tokens_title),this.add_tokens_input=e('input[name="amount"]',this.add_tokens_container),this.add_tokens_btn=e('button[name="add-tokens"]',this.add_tokens_container),this.add_tokens=this.add_tokens.bind(this),this.add_tokens_btn.on("click",this.add_tokens),this.start=e('input[name="start"]',this.tokens_title).addClass("datepicker").data("date-locale","de"),this.end=e('input[name="end"]',this.tokens_title).addClass("datepicker").data("date-locale","de"),this.filter=e('button[name="filter"]',this.tokens_title),this.filter_tokens=this.filter_tokens.bind(this),this.filter.on("click",this.filter_tokens),this.delete_tokens_container=e(".delete-tokens",this.tokens_title),this.delete_tokens_btn=e('button[name="delete-tokens"]',this.delete_tokens_container),this.delete_tokens=this.delete_tokens.bind(this),this.delete_tokens_btn.on("click",this.delete_tokens),this.set_token_size=this.set_token_size.bind(this),this.size_input=e('input[name="token-size"]',this.tokens_title),this.size_input.on("change",this.set_token_size),this.tokens.length?this.original_size=parseInt(e(this.tokens[0]).attr("width")):this.original_size=256,this.token_size=100}get token_size(){return this._token_size}set token_size(t){t||(t=100);let s=this.original_size*(t/100);this.tokens_elem.css("grid-template-columns",`repeat( auto-fit, minmax(${s}px, 1fr) )`),this.tokens.each((function(){let t=e(this);t.attr("width",`${s}px`),t.attr("height",`${s}px`)})),this.size_input.val()||this.size_input.val(t),this._token_size=t}filter_tokens(t){t.preventDefault();let e={start:this.start.val(),end:this.end.val()};s.ajax.action({name:"tokens_overview",mode:"inner",selector:"#content",url:this.token_settings.base_url,params:e})}add_tokens(t){const e=this.token_settings.base_url;let n=this.add_tokens_input.val();n&&(n=parseInt(n),function t(n,i){s.ajax.request({url:`${e}/add_token`,params:{},type:"json",method:"POST",success:(o,a,r)=>{o.success?n===(i+=1)?s.ajax.action({name:"tokens_overview",selector:"#content",mode:"inner",url:e,params:{}}):t(n,i):s.show_error(o.message)},error:(t,e,n)=>{s.show_error(`Failed to request JSON API: ${n}`)}})}(n,0))}delete_tokens(t){const n=this.token_settings.base_url;s.show_dialog({title:"Delete tokens?",message:"Do you really want to delete selected tokens?",on_confirm:()=>{let t=[];for(let s of this.tokens){let n=e(s).data("token-uid");t.push(n)}s.ajax.request({url:`${n}/delete_tokens`,params:{token_uids:JSON.stringify(t)},type:"json",method:"POST",success:(t,e,i)=>{t.success?(s.ajax.action({name:"tokens_overview",selector:"#content",mode:"inner",url:n,params:{}}),s.show_message({message:t.message,flavor:""})):s.show_error(t.message)},error:(t,e,n)=>{s.show_error(`Failed to request JSON API: ${n}`)}})}})}set_token_size(t){t.preventDefault();let e=this.size_input.val();this.token_size=e}}class o{static initialize(t){e(".tokens-container",t).each((function(){new o(e(this))}))}constructor(t){this.elem=t,this.base_url=t.data("base-url"),this.button=e(".scan-token",t),this._input_wrapper=null,this._input=null,this.scan_token=this.scan_token.bind(this),this.button.on("click",(t=>{this.scan_token()}))}get active(){return null!==this._input}set active(t){if(t==this.value)return;let s=this.button;if(t){let t=this._input_wrapper=e("<div/>").css("width",0).css("overflow","hidden"),n=this._input=e('<input type="text">');t.append(n),this.elem.append(t),s.removeClass("inactive").addClass("active"),n[0].focus()}else this._input_wrapper.remove(),this._input_wrapper=null,this._input=null,s.removeClass("active").addClass("inactive")}scan_token(){this.active=!0;let t=this._input;t.one("change",(()=>{this.query_token(t.val())}))}load_token(t){console.log("load token: "+t),s.ajax.action({name:"layout",selector:"#layout",mode:"replace",url:`${this.base_url}/${t}`,params:{}})}query_token(t){s.ajax.request({url:`${this.base_url}/query_token`,params:{value:t},type:"json",success:(e,n,i)=>{e.success?e.token?this.load_token(e.token.uid):(this.active=!1,s.show_dialog({title:"Token not exists?",message:"Do you want to create it?",on_confirm:()=>{s.ajax.request({url:`${this.base_url}/add_token`,params:{value:t},type:"json",method:"POST",success:(t,e,n)=>{t.success?this.load_token(t.token_uid):s.show_error(t.message)},error:(t,e,n)=>{s.show_error(`Failed to request JSON API: ${n}`)}})}})):s.show_error(e.message)},error:(t,e,n)=>{s.show_error(`Failed to request JSON API: ${n}`)}})}}return e((function(){s.ajax.register(n.initialize,!0),s.ajax.register(o.initialize,!0),s.ajax.register(i.initialize,!0)})),t.TokenScanner=o,t.TokensOverview=i,Object.defineProperty(t,"__esModule",{value:!0}),t}({},jQuery,ts);

{cone.tokens-0.2 → cone.tokens-0.3}/src/cone/tokens/browser/templates/token.pt

@@ -60,7 +60,7 @@
 
         <li class="list-group-item flex-group">
           <div>
-            <strong>Usage Count</strong>:
+            <strong i18n:translate="usage_count">Usage Count</strong>:
             <span tal:condition="model.attrs['usage_count'] > -1"
                   tal:content="model.attrs['usage_count']">
               Usage Count

{cone.tokens-0.2 → cone.tokens-0.3}/src/cone/tokens/browser/templates/tokens_overview.pt

@@ -16,8 +16,9 @@
       <div class="form-inline add-tokens">
         <label for="amount" i18n:translate="amount">Amount</label>
         <input type="number"
-                name="amount"
-                class="form-control add-tokens-amount" />
+               name="amount"
+               min=0
+               class="form-control add-tokens-amount" />
         <button name="add-tokens"
                 class="btn btn-default"
                 i18n:translate="add_token">
@@ -46,10 +47,19 @@
       </button>
       </div>
 
+      <div class="form-inline delete-tokens">
+        <button name="delete-tokens"
+                class="btn btn-danger"
+                i18n:translate="delete_token">
+          Delete selected Tokens
+        </button>
+      </div>
+
       <div class="form-inline">
         <label for="token-size" i18n:translate="token_size">Token Size</label>
         <input type="number"
             name="token-size"
+            min=0
             class="form-control token-button"
             value="100" />
         %
@@ -61,6 +71,7 @@
       <tal:token repeat="token tokens">
         <object class="token_qr"
                 data="${context.qrcode(token.value)}"
+                data-token-uid="${token.uid}"
                 type="image/png"
                 height="256px"
                 width="256px">

{cone.tokens-0.2 → cone.tokens-0.3}/src/cone/tokens/browser/tokens.py

@@ -83,6 +83,9 @@ class TokensOverview(ProtectedContentTile):
 
     @property
     def tokens(self):
+        action = self.request.params.get('ajax.action', None)
+        if not action:
+            return
         start = self.start
         end = self.end
         session = get_session(self.request)

{cone.tokens-0.2 → cone.tokens-0.3}/src/cone/tokens/locale/cone.tokens.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2023-09-27 13:37+0200\n"
+"POT-Creation-Date: 2023-09-28 13:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,6 +74,7 @@ msgstr ""
 
 #. Default: Usage Count
 #: ./src/cone/tokens/browser/token.py:202
+#: ./src/cone/tokens/browser/templates/token.pt:63
 msgid "usage_count"
 msgstr ""
 
@@ -93,6 +94,11 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
+#. Default: Successfully deleted ${count} Tokens.
+#: ./src/cone/tokens/browser/api.py:169
+msgid "deleted_tokens"
+msgstr ""
+
 #. Default: Token Settings
 #: ./src/cone/tokens/browser/settings.py:37
 msgid "token_settings"
@@ -123,7 +129,7 @@ msgstr ""
 #: ./src/cone/tokens/browser/settings.py:95
 #: ./src/cone/tokens/browser/settings.py:125
 #: ./src/cone/tokens/browser/settings.py:155
-#: ./src/cone/tokens/browser/templates/tokens_overview.pt:29
+#: ./src/cone/tokens/browser/templates/tokens_overview.pt:30
 msgid "start"
 msgstr ""
 
@@ -131,7 +137,7 @@ msgstr ""
 #: ./src/cone/tokens/browser/settings.py:105
 #: ./src/cone/tokens/browser/settings.py:135
 #: ./src/cone/tokens/browser/settings.py:165
-#: ./src/cone/tokens/browser/templates/tokens_overview.pt:37
+#: ./src/cone/tokens/browser/templates/tokens_overview.pt:38
 msgid "end"
 msgstr ""
 
@@ -217,16 +223,21 @@ msgid "amount"
 msgstr ""
 
 #. Default: Add Tokens
-#: ./src/cone/tokens/browser/templates/tokens_overview.pt:23
+#: ./src/cone/tokens/browser/templates/tokens_overview.pt:24
 msgid "add_token"
 msgstr ""
 
 #. Default: Filter
-#: ./src/cone/tokens/browser/templates/tokens_overview.pt:44
+#: ./src/cone/tokens/browser/templates/tokens_overview.pt:45
 msgid "filter"
 msgstr ""
 
+#. Default: Delete selected Tokens
+#: ./src/cone/tokens/browser/templates/tokens_overview.pt:53
+msgid "delete_token"
+msgstr ""
+
 #. Default: Token Size
-#: ./src/cone/tokens/browser/templates/tokens_overview.pt:50
+#: ./src/cone/tokens/browser/templates/tokens_overview.pt:59
 msgid "token_size"
 msgstr ""

{cone.tokens-0.2 → cone.tokens-0.3}/src/cone/tokens/locale/de/LC_MESSAGES/cone.tokens.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cone.tokens 1.0\n"
-"POT-Creation-Date: 2023-09-27 13:37+0200\n"
+"POT-Creation-Date: 2023-09-28 13:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,7 +44,7 @@ msgstr "Tokens"
 #. Default: Valid from date must be before valid to date
 #: src/cone/tokens/browser/token.py:120
 msgid "timerange_error"
-msgstr ""
+msgstr "Anfangsdatum muss vor Enddatum liegen"
 
 #. Default: Value already used by another token
 #: src/cone/tokens/browser/token.py:136
@@ -69,6 +69,7 @@ msgstr "Gültig bis"
 
 #. Default: Usage Count
 #: src/cone/tokens/browser/token.py:202
+#: src/cone/tokens/browser/templates/token.pt:63
 msgid "usage_count"
 msgstr "Benutzungen"
 
@@ -88,6 +89,11 @@ msgstr "Speichern"
 msgid "cancel"
 msgstr "Abbrechen"
 
+#. Default: Successfully deleted ${count} Tokens.
+#: src/cone/tokens/browser/api.py:169
+msgid "deleted_tokens"
+msgstr "${count} Tokens gelöscht."
+
 #. Default: Token Settings
 #: src/cone/tokens/browser/settings.py:37
 msgid "token_settings"
@@ -118,7 +124,7 @@ msgstr "Endzeit muss angegeben werden."
 #: src/cone/tokens/browser/settings.py:95
 #: src/cone/tokens/browser/settings.py:125
 #: src/cone/tokens/browser/settings.py:155
-#: src/cone/tokens/browser/templates/tokens_overview.pt:29
+#: src/cone/tokens/browser/templates/tokens_overview.pt:30
 msgid "start"
 msgstr "Start"
 
@@ -126,7 +132,7 @@ msgstr "Start"
 #: src/cone/tokens/browser/settings.py:105
 #: src/cone/tokens/browser/settings.py:135
 #: src/cone/tokens/browser/settings.py:165
-#: src/cone/tokens/browser/templates/tokens_overview.pt:37
+#: src/cone/tokens/browser/templates/tokens_overview.pt:38
 msgid "end"
 msgstr "Ende"
 
@@ -212,16 +218,21 @@ msgid "amount"
 msgstr ""
 
 #. Default: Add Tokens
-#: src/cone/tokens/browser/templates/tokens_overview.pt:23
+#: src/cone/tokens/browser/templates/tokens_overview.pt:24
 msgid "add_token"
 msgstr "Tokens erstellen"
 
 #. Default: Filter
-#: src/cone/tokens/browser/templates/tokens_overview.pt:44
+#: src/cone/tokens/browser/templates/tokens_overview.pt:45
 msgid "filter"
 msgstr "Filter"
 
+#. Default: Delete selected Tokens
+#: src/cone/tokens/browser/templates/tokens_overview.pt:53
+msgid "delete_token"
+msgstr "Ausgewählte Tokens löschen"
+
 #. Default: Token Size
-#: src/cone/tokens/browser/templates/tokens_overview.pt:50
+#: src/cone/tokens/browser/templates/tokens_overview.pt:59
 msgid "token_size"
 msgstr "Token Größe"

{cone.tokens-0.2 → cone.tokens-0.3}/src/cone/tokens/locale/en/LC_MESSAGES/cone.tokens.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cone.tokens 1.0\n"
-"POT-Creation-Date: 2023-09-27 13:37+0200\n"
+"POT-Creation-Date: 2023-09-28 13:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,6 +69,7 @@ msgstr "Valid to"
 
 #. Default: Usage Count
 #: src/cone/tokens/browser/token.py:202
+#: src/cone/tokens/browser/templates/token.pt:63
 msgid "usage_count"
 msgstr "Usage Count"
 
@@ -88,6 +89,12 @@ msgstr "Save"
 msgid "cancel"
 msgstr "Cancel"
 
+#. Default: Successfully deleted ${count} Tokens.
+#: src/cone/tokens/browser/api.py:169
+#, fuzzy
+msgid "deleted_tokens"
+msgstr "Add Tokens"
+
 #. Default: Token Settings
 #: src/cone/tokens/browser/settings.py:37
 msgid "token_settings"
@@ -118,7 +125,7 @@ msgstr "End Time is required."
 #: src/cone/tokens/browser/settings.py:95
 #: src/cone/tokens/browser/settings.py:125
 #: src/cone/tokens/browser/settings.py:155
-#: src/cone/tokens/browser/templates/tokens_overview.pt:29
+#: src/cone/tokens/browser/templates/tokens_overview.pt:30
 msgid "start"
 msgstr "Start"
 
@@ -126,7 +133,7 @@ msgstr "Start"
 #: src/cone/tokens/browser/settings.py:105
 #: src/cone/tokens/browser/settings.py:135
 #: src/cone/tokens/browser/settings.py:165
-#: src/cone/tokens/browser/templates/tokens_overview.pt:37
+#: src/cone/tokens/browser/templates/tokens_overview.pt:38
 msgid "end"
 msgstr "End"
 
@@ -212,16 +219,21 @@ msgid "amount"
 msgstr "Amount"
 
 #. Default: Add Tokens
-#: src/cone/tokens/browser/templates/tokens_overview.pt:23
+#: src/cone/tokens/browser/templates/tokens_overview.pt:24
 msgid "add_token"
 msgstr "Add Tokens"
 
 #. Default: Filter
-#: src/cone/tokens/browser/templates/tokens_overview.pt:44
+#: src/cone/tokens/browser/templates/tokens_overview.pt:45
 msgid "filter"
 msgstr "Filter"
 
+#. Default: Delete selected Tokens
+#: src/cone/tokens/browser/templates/tokens_overview.pt:53
+msgid "delete_token"
+msgstr "Delete selected Tokens"
+
 #. Default: Token Size
-#: src/cone/tokens/browser/templates/tokens_overview.pt:50
+#: src/cone/tokens/browser/templates/tokens_overview.pt:59
 msgid "token_size"
 msgstr "Token Size"

{cone.tokens-0.2 → cone.tokens-0.3}/src/cone/tokens/model.py

@@ -104,6 +104,7 @@ class TokenUsageRecord(SQLBase):
 
     uid = Column(GUID, primary_key=True)
     token_uid = Column(GUID)
+    token_value = Column(String)
     timestamp = Column(DateTime)
     error_code = Column(Integer)
     user = Column(String)

{cone.tokens-0.2 → cone.tokens-0.3}/src/cone/tokens/tests/test_api.py

@@ -114,6 +114,7 @@ class TestTokenAPI(NodeTestCase):
 
         usage_record = session.query(TokenUsageRecord).one()
         self.assertEqual(usage_record.token_uid, token_uid)
+        self.assertEqual(usage_record.token_value, 'token value')
         self.assertIsInstance(usage_record.timestamp, datetime)
         self.assertEqual(usage_record.error_code, None)
         self.assertEqual(usage_record.user, None)

{cone.tokens-0.2 → cone.tokens-0.3/src/cone.tokens.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cone.tokens
-Version: 0.2
+Version: 0.3
 Summary: cone token api
 Home-page: http://github.com/conestack/cone.tokens
 Author: Cone Contributors
@@ -10,13 +10,8 @@ Keywords: node pyramid cone web
 Classifier: Environment :: Web Environment
 Classifier: Programming Language :: Python
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-License-File: LICENSE.rst
-Requires-Dist: setuptools
-Requires-Dist: cone.sql
-Requires-Dist: python-dateutil
-Requires-Dist: qrcode[pil]
 Provides-Extra: test
-Requires-Dist: zope.testrunner; extra == "test"
+License-File: LICENSE.rst
 
 .. image:: https://img.shields.io/pypi/v/cone.tokens.svg
     :target: https://pypi.python.org/pypi/cone.tokens
@@ -170,6 +165,16 @@ Contributors
 Changes
 =======
 
+0.3 (2023-09-28)
+----------------
+
+- Tokens can be bulk deleted.
+  [lenadax]
+
+- Tokens can be created from scanned value.
+  [rnix]
+
+
 0.2 (2023-09-27)
 ----------------
 

cone.tokens-0.2/src/cone/tokens/browser/static/cone.tokens.min.js

@@ -1 +0,0 @@
-var cone_tokens=function(t,e,s){"use strict";class i{static initialize(t){e(".token",t).each((function(){new i(e(this))}))}constructor(t){this.elem=t,this.settings=t.data("token-settings");const s=this;e(".btn-group.timeranges button",t).each((function(){const t=e(this);t.on("click",(function(e){s.set_timerange(t.data("timerange-scope"))}))})),e(".btn-group.usage-count button",t).each((function(){const t=e(this);t.on("click",(function(e){s.set_usage_count(t.data("usage-count"))}))}))}request_api(t){const e=this.settings;s.ajax.request({url:`${e.base_url}/update_token`,params:t,type:"json",method:"POST",success:(t,i,n)=>{t.success?s.ajax.action({name:"content",selector:"#content",mode:"inner",url:`${e.base_url}`,params:{}}):s.show_error(t.message)},error:(t,e,i)=>{s.show_error(`Failed to request JSON API: ${i}`)}})}set_timerange(t){const e=this.settings.timeranges;let s,i,n;if(Object.keys(e).includes(t)){s=e[t];let a=s.start.split(":");i=new Date,i.setHours(a[0],a[1],0);let o=s.end.split(":");n=new Date,n.setHours(o[0],o[1],0)}function a(t){return t&&(t=new Date(t.getTime()-6e4*t.getTimezoneOffset())),t?t.toISOString():""}this.request_api({valid_from:a(i),valid_to:a(n)})}set_usage_count(t){this.request_api({usage_count:t})}}class n{static initialize(t){e(".tokens-overview-container",t).each((function(){new n(e(this))}))}constructor(t){this.container=t,this.tokens_elem=e("#tokens-overview",t),this.tokens=e("object.token_qr",this.tokens_elem),this.tokens_title=e("#tokens-overview-title",t),this.token_settings=this.container.data("token-settings"),this.add_tokens_container=e(".add-tokens",this.tokens_title),this.add_tokens_input=e('input[name="amount"]',this.add_tokens_container),this.add_tokens_btn=e('button[name="add-tokens"]',this.add_tokens_container),this.add_tokens=this.add_tokens.bind(this),this.add_tokens_btn.on("click",this.add_tokens),this.start=e('input[name="start"]',this.tokens_title).addClass("datepicker").data("date-locale","de"),this.end=e('input[name="end"]',this.tokens_title).addClass("datepicker").data("date-locale","de"),this.filter=e('button[name="filter"]',this.tokens_title),this.filter_tokens=this.filter_tokens.bind(this),this.filter.on("click",this.filter_tokens),this.set_token_size=this.set_token_size.bind(this),this.size_input=e('input[name="token-size"]'),this.size_input.on("change",this.set_token_size),this.tokens.length?this.original_size=parseInt(e(this.tokens[0]).attr("width")):this.original_size=256,this.token_size=100}get token_size(){return this._token_size}set token_size(t){t||(t=100);let s=this.original_size*(t/100);this.tokens_elem.css("grid-template-columns",`repeat( auto-fit, minmax(${s}px, 1fr) )`),this.tokens.each((function(){let t=e(this);t.attr("width",`${s}px`),t.attr("height",`${s}px`)})),this.size_input.val()||this.size_input.val(t),this._token_size=t}filter_tokens(t){t.preventDefault();let e={start:this.start.val(),end:this.end.val()};s.ajax.action({name:"tokens_overview",mode:"inner",selector:"#content",url:this.token_settings.base_url,params:e})}add_tokens(t){const e=this.token_settings.base_url;!function t(i,n){s.ajax.request({url:`${e}/add_token`,params:{},type:"json",method:"POST",success:(a,o,r)=>{a.success?i===(n+=1)?s.ajax.action({name:"tokens_overview",selector:"#content",mode:"inner",url:e,params:{}}):t(i,n):s.show_error(a.message)},error:(t,e,i)=>{s.show_error(`Failed to request JSON API: ${i}`)}})}(parseInt(this.add_tokens_input.val()),0)}set_token_size(t){t.preventDefault();let e=this.size_input.val();this.token_size=e}}class a{static initialize(t){e(".tokens-container",t).each((function(){new a(e(this))}))}constructor(t){this.elem=t,this.base_url=t.data("base-url"),this.button=e(".scan-token",t),this._input_wrapper=null,this._input=null,this.scan_token=this.scan_token.bind(this),this.button.on("click",(t=>{this.scan_token()}))}get active(){return null!==this._input}set active(t){if(t==this.value)return;let s=this.button;if(t){let t=this._input_wrapper=e("<div/>").css("width",0).css("overflow","hidden"),i=this._input=e('<input type="text">');t.append(i),this.elem.append(t),s.removeClass("inactive").addClass("active"),i[0].focus()}else this._input_wrapper.remove(),this._input_wrapper=null,this._input=null,s.removeClass("active").addClass("inactive")}scan_token(){this.active=!0;let t=this._input;t.one("change",(()=>{this.query_token(t.val())}))}query_token(t){s.ajax.request({url:`${this.base_url}/query_token`,params:{value:t},type:"json",success:(t,e,i)=>{t.success?t.token?s.ajax.action({name:"layout",selector:"#layout",mode:"replace",url:`${this.base_url}/${t.token.uid}`,params:{}}):(this.active=!1,s.show_error("Token not exists")):s.show_error(t.message)},error:(t,e,i)=>{s.show_error(`Failed to request JSON API: ${i}`)}})}}return e((function(){s.ajax.register(i.initialize,!0),s.ajax.register(a.initialize,!0),s.ajax.register(n.initialize,!0)})),t.TokenScanner=a,t.TokensOverview=n,Object.defineProperty(t,"__esModule",{value:!0}),t}({},jQuery,ts);