From 8f449f3eb9a7916b7534bdb59c65e8bd63786cec Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Mon, 2 Nov 2020 22:16:51 +0100 Subject: [PATCH] views: fix csrf token reference --- views/account.njk | 12 ++--- views/backend/mail_domain.njk | 4 +- views/backend/mailbox.njk | 6 +-- views/backend/mailboxes.njk | 6 +-- views/layouts/base.njk | 4 +- views/login.njk | 4 +- views/register.njk | 4 +- yarn.lock | 84 +++++++++++++++++------------------ 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/views/account.njk b/views/account.njk index 3d5fa1d..bea6a95 100644 --- a/views/account.njk +++ b/views/account.njk @@ -46,7 +46,7 @@ onclick="return confirm('Are you sure you want to set {{ email.email }} as your main address?');"> Set as main address - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }}
@@ -56,7 +56,7 @@ onclick="return confirm('Are you sure you want to delete {{ email.email }}?');"> Remove - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }}
@@ -72,7 +72,7 @@ - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }} @@ -104,7 +104,7 @@ Delete - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }} @@ -131,8 +131,8 @@ - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/views/backend/mail_domain.njk b/views/backend/mail_domain.njk index 861bc85..e861003 100644 --- a/views/backend/mail_domain.njk +++ b/views/backend/mail_domain.njk @@ -18,8 +18,8 @@ - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/views/backend/mailbox.njk b/views/backend/mailbox.njk index 773bd51..771326f 100644 --- a/views/backend/mailbox.njk +++ b/views/backend/mailbox.njk @@ -36,7 +36,7 @@ Delete - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }} @@ -55,8 +55,8 @@ - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/views/backend/mailboxes.njk b/views/backend/mailboxes.njk index 1f9dc20..ded89c7 100644 --- a/views/backend/mailboxes.njk +++ b/views/backend/mailboxes.njk @@ -21,7 +21,7 @@ - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }} @@ -55,7 +55,7 @@ Remove - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }} @@ -98,4 +98,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/views/layouts/base.njk b/views/layouts/base.njk index 7192bfd..c3c6703 100644 --- a/views/layouts/base.njk +++ b/views/layouts/base.njk @@ -27,7 +27,7 @@
  • - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }}
  • {% else %} @@ -56,4 +56,4 @@ {% endblock %} -{% block footer %}{{ app.name }} v{{ app_version }} - all rights reserved.{% endblock %} \ No newline at end of file +{% block footer %}{{ app.name }} v{{ app_version }} - all rights reserved.{% endblock %} diff --git a/views/login.njk b/views/login.njk index 8486ab1..918a751 100644 --- a/views/login.njk +++ b/views/login.njk @@ -13,7 +13,7 @@ - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }}

    @@ -21,4 +21,4 @@

    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/views/register.njk b/views/register.njk index cc0fa27..3971ffd 100644 --- a/views/register.njk +++ b/views/register.njk @@ -27,8 +27,8 @@ - {{ macros.csrf(getCSRFToken) }} + {{ macros.csrf(getCsrfToken) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/yarn.lock b/yarn.lock index ec6cc78..a1f0415 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1395,60 +1395,60 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^4.3.0": - version "4.6.0" - resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.0.tgz#210cd538bb703f883aff81d3996961f5dba31fdb" - integrity sha512-1+419X+Ynijytr1iWI+/IcX/kJryc78YNpdaXR1aRO1sU3bC0vZrIAF1tIX7rudVI84W7o7M4zo5p1aVt70fAg== + version "4.6.1" + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.1.tgz#99d77eb7a016fd5a5e749d2c44a7e4c317eb7da3" + integrity sha512-SNZyflefTMK2JyrPfFFzzoy2asLmZvZJ6+/L5cIqg4HfKGiW2Gr1Go1OyEVqne/U4QwmoasuMwppoBHWBWF2nA== dependencies: - "@typescript-eslint/experimental-utils" "4.6.0" - "@typescript-eslint/scope-manager" "4.6.0" + "@typescript-eslint/experimental-utils" "4.6.1" + "@typescript-eslint/scope-manager" "4.6.1" debug "^4.1.1" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.6.0": - version "4.6.0" - resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.0.tgz#f750aef4dd8e5970b5c36084f0a5ca2f0db309a4" - integrity sha512-pnh6Beh2/4xjJVNL+keP49DFHk3orDHHFylSp3WEjtgW3y1U+6l+jNnJrGlbs6qhAz5z96aFmmbUyKhunXKvKw== +"@typescript-eslint/experimental-utils@4.6.1": + version "4.6.1" + resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.1.tgz#a9c691dfd530a9570274fe68907c24c07a06c4aa" + integrity sha512-qyPqCFWlHZXkEBoV56UxHSoXW2qnTr4JrWVXOh3soBP3q0o7p4pUEMfInDwIa0dB/ypdtm7gLOS0hg0a73ijfg== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.6.0" - "@typescript-eslint/types" "4.6.0" - "@typescript-eslint/typescript-estree" "4.6.0" + "@typescript-eslint/scope-manager" "4.6.1" + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/typescript-estree" "4.6.1" eslint-scope "^5.0.0" eslint-utils "^2.0.0" "@typescript-eslint/parser@^4.3.0": - version "4.6.0" - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.6.0.tgz#7e9ff7df2f21d5c8f65f17add3b99eeeec33199d" - integrity sha512-Dj6NJxBhbdbPSZ5DYsQqpR32MwujF772F2H3VojWU6iT4AqL4BKuoNWOPFCoSZvCcADDvQjDpa6OLDAaiZPz2Q== + version "4.6.1" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.6.1.tgz#b801bff67b536ecc4a840ac9289ba2be57e02428" + integrity sha512-lScKRPt1wM9UwyKkGKyQDqf0bh6jm8DQ5iN37urRIXDm16GEv+HGEmum2Fc423xlk5NUOkOpfTnKZc/tqKZkDQ== dependencies: - "@typescript-eslint/scope-manager" "4.6.0" - "@typescript-eslint/types" "4.6.0" - "@typescript-eslint/typescript-estree" "4.6.0" + "@typescript-eslint/scope-manager" "4.6.1" + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/typescript-estree" "4.6.1" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.6.0": - version "4.6.0" - resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.6.0.tgz#b7d8b57fe354047a72dfb31881d9643092838662" - integrity sha512-uZx5KvStXP/lwrMrfQQwDNvh2ppiXzz5TmyTVHb+5TfZ3sUP7U1onlz3pjoWrK9konRyFe1czyxObWTly27Ang== +"@typescript-eslint/scope-manager@4.6.1": + version "4.6.1" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.6.1.tgz#21872b91cbf7adfc7083f17b8041149148baf992" + integrity sha512-f95+80r6VdINYscJY1KDUEDcxZ3prAWHulL4qRDfNVD0I5QAVSGqFkwHERDoLYJJWmEAkUMdQVvx7/c2Hp+Bjg== dependencies: - "@typescript-eslint/types" "4.6.0" - "@typescript-eslint/visitor-keys" "4.6.0" + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/visitor-keys" "4.6.1" -"@typescript-eslint/types@4.6.0": - version "4.6.0" - resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.6.0.tgz#157ca925637fd53c193c6bf226a6c02b752dde2f" - integrity sha512-5FAgjqH68SfFG4UTtIFv+rqYJg0nLjfkjD0iv+5O27a0xEeNZ5rZNDvFGZDizlCD1Ifj7MAbSW2DPMrf0E9zjA== +"@typescript-eslint/types@4.6.1": + version "4.6.1" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.6.1.tgz#d3ad7478f53f22e7339dc006ab61aac131231552" + integrity sha512-k2ZCHhJ96YZyPIsykickez+OMHkz06xppVLfJ+DY90i532/Cx2Z+HiRMH8YZQo7a4zVd/TwNBuRCdXlGK4yo8w== -"@typescript-eslint/typescript-estree@4.6.0": - version "4.6.0" - resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.0.tgz#85bd98dcc8280511cfc5b2ce7b03a9ffa1732b08" - integrity sha512-s4Z9qubMrAo/tw0CbN0IN4AtfwuehGXVZM0CHNMdfYMGBDhPdwTEpBrecwhP7dRJu6d9tT9ECYNaWDHvlFSngA== +"@typescript-eslint/typescript-estree@4.6.1": + version "4.6.1" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.1.tgz#6025cce724329413f57e4959b2d676fceeca246f" + integrity sha512-/J/kxiyjQQKqEr5kuKLNQ1Finpfb8gf/NpbwqFFYEBjxOsZ621r9AqwS9UDRA1Rrr/eneX/YsbPAIhU2rFLjXQ== dependencies: - "@typescript-eslint/types" "4.6.0" - "@typescript-eslint/visitor-keys" "4.6.0" + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/visitor-keys" "4.6.1" debug "^4.1.1" globby "^11.0.1" is-glob "^4.0.1" @@ -1456,12 +1456,12 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.6.0": - version "4.6.0" - resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.0.tgz#fb05d6393891b0a089b243fc8f9fb8039383d5da" - integrity sha512-38Aa9Ztl0XyFPVzmutHXqDMCu15Xx8yKvUo38Gu3GhsuckCh3StPI5t2WIO9LHEsOH7MLmlGfKUisU8eW1Sjhg== +"@typescript-eslint/visitor-keys@4.6.1": + version "4.6.1" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.1.tgz#6b125883402d8939df7b54528d879e88f7ba3614" + integrity sha512-owABze4toX7QXwOLT3/D5a8NecZEjEWU1srqxENTfqsY3bwVnl3YYbOh6s1rp2wQKO9RTHFGjKes08FgE7SVMw== dependencies: - "@typescript-eslint/types" "4.6.0" + "@typescript-eslint/types" "4.6.1" eslint-visitor-keys "^2.0.0" "@webassemblyjs/ast@1.9.0": @@ -9382,9 +9382,9 @@ widest-line@^3.1.0: string-width "^4.0.0" wms-core@^0.22.0: - version "0.22.0" - resolved "https://registry.npmjs.org/wms-core/-/wms-core-0.22.0.tgz#193e302ff57a4e0c7ae2b97cff158a2576b7c736" - integrity sha512-xKWzZ9t7wLV5h3FQOSWHiaeMUmyRDiJ5zPr/jDBSS8/Hvj45IlDzPNdtuALfY2tuRZUeMB95j1oJIz9FAFOIRQ== + version "0.22.1" + resolved "https://registry.npmjs.org/wms-core/-/wms-core-0.22.1.tgz#152be44322d0fe1d76994bc095c6733a5ffaaa4d" + integrity sha512-I/yRVr7X4L9smiARY5GrIJXYn6GGr54oqmYPeuyJ19dRmx4psF+mLdA031ZfLwjA52Ou3ETIWYJBket1XcwkJg== dependencies: argon2 "^0.27.0" compression "^1.7.4"