From b527a2c766a652d3f865a4c8a84dddaf38df8031 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Thu, 26 Oct 2023 08:54:47 +0200 Subject: [PATCH 01/10] update client --- client/package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 84618f0..edf3ffb 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -426,9 +426,9 @@ } }, "@eslint-community/regexpp": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz", - "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==" + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==" }, "@eslint/eslintrc": { "version": "2.1.2", @@ -5249,9 +5249,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.566", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.566.tgz", - "integrity": "sha512-mv+fAy27uOmTVlUULy15U3DVJ+jg+8iyKH1bpwboCRhtDC69GKf1PPTZvEIhCyDr81RFqfxZJYrbgp933a1vtg==" + "version": "1.4.567", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.567.tgz", + "integrity": "sha512-8KR114CAYQ4/r5EIEsOmOMqQ9j0MRbJZR3aXD/KFA8RuKzyoUB4XrUCg+l8RUGqTVQgKNIgTpjaG8YHRPAbX2w==" }, "elliptic": { "version": "6.5.4", @@ -10079,7 +10079,7 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#35b4176094116cd139505172d4c2509176a7a4c8", + "version": "github:superdesk/newsroom-core#8bc47649b6aecc9262cdaaa24ec5787b23cac652", "from": "github:superdesk/newsroom-core#release/2.5", "requires": { "@popperjs/core": "^2.11.4", From a375a4c7042de779b544f4f8e80980104dfd73c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= Date: Tue, 27 Jun 2023 10:31:58 +0200 Subject: [PATCH 02/10] make cem ssl verification configurable (#115) CPNHUB-244 --- server/cp/cem.py | 1 + server/settings.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/server/cp/cem.py b/server/cp/cem.py index 407a805..abfe09b 100644 --- a/server/cp/cem.py +++ b/server/cp/cem.py @@ -25,4 +25,5 @@ def send_notification(_type, user, id_key: Literal["_id", "email"] = "_id"): timeout=5, json=payload, headers=headers, + verify=bool(app.config.get("CEM_VERIFY_TLS", True)), ) diff --git a/server/settings.py b/server/settings.py index 99aa4e7..6de5dd3 100644 --- a/server/settings.py +++ b/server/settings.py @@ -1,6 +1,7 @@ import os import pathlib from flask_babel import lazy_gettext +from superdesk.default_settings import strtobool from newsroom.web.default_settings import ( env, CLIENT_CONFIG, @@ -274,6 +275,7 @@ CEM_URL = os.environ.get("CEM_URL", "") CEM_APIKEY = os.environ.get("CEM_APIKEY", "") CEM_PLATFORM = os.environ.get("CEM_PLATFORM", "MyNP") +CEM_VERIFY_TLS = strtobool(os.environ.get("CEM_VERIFY_TLS", "off")) DEFAULT_ALLOW_COMPANIES_TO_MANAGE_PRODUCTS = True From 2ac5dd122afd03713929ceb8e6bc502db218b2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= Date: Fri, 30 Jun 2023 11:33:46 +0200 Subject: [PATCH 03/10] make cem timeout configurable (#116) CPNHUB-245 --- server/cp/__init__.py | 4 ++++ server/cp/cem.py | 21 ++++++++++++++------- server/settings.py | 1 + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/server/cp/__init__.py b/server/cp/__init__.py index 17a6a97..3b85720 100644 --- a/server/cp/__init__.py +++ b/server/cp/__init__.py @@ -9,5 +9,9 @@ # AUTHORS and LICENSE files distributed with this source code, or # at https://www.sourcefabric.org/superdesk/license +import logging + HEADLINE2 = "headline_extended" CORRECTION = "correction" + +logging.basicConfig(level=logging.INFO) diff --git a/server/cp/cem.py b/server/cp/cem.py index abfe09b..8130150 100644 --- a/server/cp/cem.py +++ b/server/cp/cem.py @@ -1,9 +1,11 @@ +import logging import requests from typing import Literal from flask import current_app as app +logger = logging.getLogger(__name__) session = requests.Session() @@ -20,10 +22,15 @@ def send_notification(_type, user, id_key: Literal["_id", "email"] = "_id"): } if user.get("company") and id_key == "_id": payload["company"] = str(user["company"]) - session.patch( - url, - timeout=5, - json=payload, - headers=headers, - verify=bool(app.config.get("CEM_VERIFY_TLS", True)), - ) + try: + session.patch( + url, + json=payload, + headers=headers, + timeout=int(app.config.get("CEM_TIMEOUT", 10)), + verify=bool(app.config.get("CEM_VERIFY_TLS", True)), + ) + except requests.exceptions.RequestException as err: + logger.error(err) + return + logger.info("Notification sent to CEM") diff --git a/server/settings.py b/server/settings.py index 6de5dd3..d07af13 100644 --- a/server/settings.py +++ b/server/settings.py @@ -276,6 +276,7 @@ CEM_APIKEY = os.environ.get("CEM_APIKEY", "") CEM_PLATFORM = os.environ.get("CEM_PLATFORM", "MyNP") CEM_VERIFY_TLS = strtobool(os.environ.get("CEM_VERIFY_TLS", "off")) +CEM_TIMEOUT = int(os.environ.get("CEM_TIMEOUT") or 10) DEFAULT_ALLOW_COMPANIES_TO_MANAGE_PRODUCTS = True From b0cbc58689fe63d5bc4ca2ebd6640effde38c91d Mon Sep 17 00:00:00 2001 From: Darko Tomic Date: Thu, 26 Oct 2023 10:11:09 +0200 Subject: [PATCH 04/10] CPCN-403 Command News (#141) CN theme latest code --- server/theme/theme.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/theme/theme.css b/server/theme/theme.css index 3610614..ee765a8 100644 --- a/server/theme/theme.css +++ b/server/theme/theme.css @@ -2,6 +2,8 @@ /* CORE: TYPOGRAPHY */ --font-family-core--sans: "Lato", sans-serif; --font-family-core--serif: "Titillium Web", sans-serif; + + --color-background: hsl(0, 0%, 97%); --badge-bg-highlight1: hsl(356, 72%, 46%); --color-primary: hsl(356, 72%, 46%); @@ -48,6 +50,7 @@ --sidenav-color-item-fg--active: hsla(0, 0%, 100%, 1); --sidenav-color-badge-bg: hsla(0, 0%, 98%, 1); --sidenav-color-badge-fg: hsl(356, 72%, 46%); + --sidenav-color-badge-active-outline: hsl(356, 72%, 46%); /* COMPONENT: BUTTONS */ /* // Primary */ From b6a72e26564a859e1aeb889961e918b861298063 Mon Sep 17 00:00:00 2001 From: FritzSF Date: Thu, 26 Oct 2023 14:07:06 +0200 Subject: [PATCH 05/10] [CPCN-430] & [CPCN-291] --- server/theme/theme.css | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/server/theme/theme.css b/server/theme/theme.css index ee765a8..3b22a5d 100644 --- a/server/theme/theme.css +++ b/server/theme/theme.css @@ -45,12 +45,13 @@ /* COMPONENT: SIDENAV */ - --sidenav-color-bg: hsl(0, 3%, 15%); - --sidenav-color-item-bg--active: hsl(356, 72%, 46%); - --sidenav-color-item-fg--active: hsla(0, 0%, 100%, 1); - --sidenav-color-badge-bg: hsla(0, 0%, 98%, 1); - --sidenav-color-badge-fg: hsl(356, 72%, 46%); - --sidenav-color-badge-active-outline: hsl(356, 72%, 46%); + --sidenav-color-bg: hsl(0, 3%, 15%); + --sidenav-color-item-bg--active: hsl(356, 72%, 46%); + --sidenav-color-item-fg--active: hsla(0, 0%, 100%, 1); + --sidenav-color-badge-bg: hsla(0, 0%, 98%, 1); + --sidenav-color-badge-bg--active: hsla(0, 0%, 98%, 1); + --sidenav-color-badge-fg: hsl(356, 72%, 46%); + --sidenav-color-badge-fg--active: hsl(356, 72%, 46%); /* COMPONENT: BUTTONS */ /* // Primary */ @@ -77,6 +78,12 @@ /* COMPONENT: MAIN FOOTER */ --footer-size--height: 48px; + + /* COMPONENT: ALERTIFY NOTIFIER */ + --ajs-message-color-bg--success: hsl(0, 3%, 15%); + + /* COMPONENT: SEARCH RESULT PANEL (Tags list) */ + --search-result-tags-list-color-bg: var(--main-header-color-bg); } .navbar__logo img.navbar__logo-img--fr { From abbd335db66c4ed00a4594fe363a788b89734066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= Date: Thu, 26 Oct 2023 15:03:25 +0200 Subject: [PATCH 06/10] test missing navigation in mgmt api (#143) CPCN-432 --- server/features/mgmt_api_topics.feature | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/server/features/mgmt_api_topics.feature b/server/features/mgmt_api_topics.feature index 0864862..31a1237 100644 --- a/server/features/mgmt_api_topics.feature +++ b/server/features/mgmt_api_topics.feature @@ -117,3 +117,42 @@ Feature: Management API - Topics """ When we get "/topics" Then we get list with 1 items + + Scenario: Validate if navigation exists + When we post to "/topics" + """ + { + "label": "topic1", + "company": "#companies._id#", + "topic_type": "wire", + "query": "topic1", + "is_global": true, + "user": "#users._id#", + "navigation": ["619277ef8bbbbfac6034aab7"] + } + """ + Then we get response code 400 + + When we post to "navigations" + """ + { + "name": "navigation1", + "description": "navigation1", + "order": 1 + } + """ + Then we get response code 201 + + When we post to "/topics" + """ + { + "label": "topic1", + "company": "#companies._id#", + "topic_type": "wire", + "query": "topic1", + "is_global": true, + "user": "#users._id#", + "navigation": ["#navigations._id#"] + } + """ + Then we get response code 201 From 21afc9ac68830c6ab6a4fcb1fed10433c3ca9ea7 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Thu, 26 Oct 2023 15:36:26 +0200 Subject: [PATCH 07/10] update client core --- client/package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package-lock.json b/client/package-lock.json index edf3ffb..395e118 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -10079,7 +10079,7 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#8bc47649b6aecc9262cdaaa24ec5787b23cac652", + "version": "github:superdesk/newsroom-core#1cf903add79ca7fe887e670d1065be329cdacca2", "from": "github:superdesk/newsroom-core#release/2.5", "requires": { "@popperjs/core": "^2.11.4", From 6b08a3678e1e1615ed41e90c5717a6e81be32c2a Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Thu, 26 Oct 2023 16:07:34 +0200 Subject: [PATCH 08/10] update client --- client/package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package-lock.json b/client/package-lock.json index 395e118..ae2c88e 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -10079,7 +10079,7 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#1cf903add79ca7fe887e670d1065be329cdacca2", + "version": "github:superdesk/newsroom-core#896d0daa65029d9e0e2d5d5dde03c313c8ca3782", "from": "github:superdesk/newsroom-core#release/2.5", "requires": { "@popperjs/core": "^2.11.4", From 639dd6f702f76e3ad6105488d9eb4144e2828041 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Fri, 27 Oct 2023 10:33:14 +0200 Subject: [PATCH 09/10] update client --- client/package-lock.json | 114 +++++++++------------------------------ 1 file changed, 25 insertions(+), 89 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index ae2c88e..d022a1e 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -5249,9 +5249,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.567", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.567.tgz", - "integrity": "sha512-8KR114CAYQ4/r5EIEsOmOMqQ9j0MRbJZR3aXD/KFA8RuKzyoUB4XrUCg+l8RUGqTVQgKNIgTpjaG8YHRPAbX2w==" + "version": "1.4.568", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.568.tgz", + "integrity": "sha512-3TCOv8+BY6Ltpt1/CmGBMups2IdKOyfEmz4J8yIS4xLSeMm0Rf+psSaxLuswG9qMKt+XbNbmADybtXGpTFlbDg==" }, "elliptic": { "version": "6.5.4", @@ -6129,9 +6129,9 @@ }, "dependencies": { "acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==" + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==" } } }, @@ -8994,18 +8994,11 @@ } }, "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz", + "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==", "requires": { - "kind-of": "^6.0.0" - }, - "dependencies": { - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" - } + "hasown": "^2.0.0" } }, "is-binary-path": { @@ -9017,35 +9010,20 @@ } }, "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz", + "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==", "requires": { - "kind-of": "^6.0.0" - }, - "dependencies": { - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" - } + "hasown": "^2.0.0" } }, "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz", + "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" - } + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" } }, "is-extglob": { @@ -9215,19 +9193,13 @@ } }, "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", + "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, @@ -9264,42 +9236,6 @@ } } }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -10079,7 +10015,7 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#896d0daa65029d9e0e2d5d5dde03c313c8ca3782", + "version": "github:superdesk/newsroom-core#92d4acb4f156ef9b11a4287ab1d310b11624823b", "from": "github:superdesk/newsroom-core#release/2.5", "requires": { "@popperjs/core": "^2.11.4", From 9434e2dd11b90d0a18c2231b040bb2e291d10bca Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Fri, 27 Oct 2023 13:23:58 +0200 Subject: [PATCH 10/10] update server requirements --- server/requirements.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/server/requirements.txt b/server/requirements.txt index 6bc8e02..9b859e8 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -21,7 +21,7 @@ async-timeout==4.0.3 # via redis authlib==0.14.3 # via superdesk-core -babel==2.13.0 +babel==2.13.1 # via flask-babel bcrypt==3.1.7 # via superdesk-core @@ -34,15 +34,15 @@ blinker==1.4 # raven # sentry-sdk # superdesk-core -boto3==1.28.66 +boto3==1.28.72 # via superdesk-core -botocore==1.31.66 +botocore==1.31.72 # via # boto3 # s3transfer cachelib==0.9.0 # via flask-caching -cachetools==5.3.1 +cachetools==5.3.2 # via # flask-oidc-ex # google-auth @@ -66,7 +66,7 @@ cffi==1.16.0 # cryptography chardet==3.0.4 # via superdesk-core -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via requests ciso8601==1.0.8 # via eve-elastic @@ -88,7 +88,7 @@ click-repl==0.3.0 # via celery croniter==0.3.37 # via superdesk-core -cryptography==41.0.4 +cryptography==41.0.5 # via # authlib # jwcrypto @@ -262,6 +262,8 @@ pyhanko-certvalidator==0.22.0 # via # pyhanko # xhtml2pdf +pyjwt==2.4.0 + # via superdesk-core pymemcache==4.0.0 # via superdesk-core pymongo==3.11.4 @@ -322,9 +324,10 @@ redis==4.5.5 # superdesk-core regex==2020.7.14 # via superdesk-core -reportlab==3.6.6 +reportlab==3.6.13 # via # newsroom-core + # superdesk-core # svglib # xhtml2pdf requests==2.31.0 @@ -361,9 +364,9 @@ six==1.16.0 # oauth2client # python-bidi # python-dateutil -superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@develop +superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.7.0-rc1 # via newsroom-core -superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@develop +superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.7.0-rc1 # via newsroom-core svglib==1.5.1 # via xhtml2pdf