Merge develop to QA

.github/workflows/publishQA.yml

@@ -12,13 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        project: [BPL, OE, SE]
+        project: [OE, SE]
         stage: [cm_scripts_active, cm_webapp_active]
         include:
-        - project: BPL
-          ECR_REPOSITORY: BPL_ECR_REPOSITORY
-          AWS_ACCESS_KEY_ID: SE_AWS_ACCESS_KEY_ID
-          AWS_SECRET_ACCESS_KEY: SE_AWS_SECRET_ACCESS_KEY
         - project: OE
           ECR_REPOSITORY: OE_ECR_REPOSITORY
           AWS_ACCESS_KEY_ID: OE_AWS_ACCESS_KEY_ID
@@ -31,12 +27,6 @@ jobs:
           container_tag: qa-cron-latest
         - stage: cm_webapp_active
           container_tag: qa-latest
-        - project: BPL
-          stage: cm_scripts_active
-          cluster_service: BPL_SCRIPTS_CLUSTER_SERVICE
-        - project: BPL
-          stage: cm_webapp_active
-          cluster_service: BPL_WEBAPP_CLUSTER_SERVICE
         - project: OE
           stage: cm_scripts_active
           cluster_service: OE_SCRIPTS_CLUSTER_SERVICE

.github/workflows/test.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install --upgrade pip
-          pip install tox tox-gh-actions tox-docker
+          pip install tox tox-gh-actions tox-docker==4.1.0 docker==6.1.3 -r requirements-dev.txt
 
       - name: Run Tests
         run: |

Dockerfile

@@ -57,9 +57,7 @@ COPY ./docker/localdev_postgres_init.sh /docker-entrypoint-initdb.d/localdev_pos
 #
 #   * We create a user, 'simplified', to be the non-root user we step down to
 #
-#   * We install NodeJS from the Nodesource packages, which lets us use Node 10,
-#     and avoids dependency conflicts between node and libxmlsec1 over the SSL
-#     library version that we'll get via system packages.
+#   * We install NodeJS from the Nodesource packages.
 #
 ###############################################################################
 
@@ -75,8 +73,8 @@ RUN apt-get update \
     ca-certificates \
     gnupg \
  && curl -sSL ${NODESOURCE_KEYFILE} | apt-key add - \
- && echo "deb https://deb.nodesource.com/node_14.x focal main" >> /etc/apt/sources.list.d/nodesource.list \
- && echo "deb-src https://deb.nodesource.com/node_14.x focal main" >> /etc/apt/sources.list.d/nodesource.list \
+ && echo "deb https://deb.nodesource.com/node_20.x jammy main" >> /etc/apt/sources.list.d/nodesource.list \
+ && echo "deb-src https://deb.nodesource.com/node_20.x jammy main" >> /etc/apt/sources.list.d/nodesource.list \
  && apt-get update \
  && apt-get install --yes --no-install-recommends \
     build-essential \
@@ -223,14 +221,14 @@ CMD ["webapp"]
 ###############################################################################
 
 FROM cm_webapp_base AS cm_webapp_local
-ENV FLASK_ENV development
+ENV FLASK_DEBUG 1
 
 ###############################################################################
 ## cm_webapp_active - self-contained version of webapp, for remote deploy
 ###############################################################################
 
 FROM cm_webapp_base AS cm_webapp_active
-ENV FLASK_ENV production
+ENV FLASK_DEBUG 0
 
 COPY --chown=simplified:simplified . /home/simplified/circulation/
 
@@ -265,14 +263,14 @@ CMD ["scripts", "|& tee -a /var/log/cron.log 2>$1"]
 ###############################################################################
 
 FROM cm_scripts_base AS cm_scripts_local
-ENV FLASK_ENV development
+ENV FLASK_DEBUG 1
 
 ###############################################################################
 ## cm_scripts_active - self-contained version of scripts, for remote deploy
 ###############################################################################
 
 FROM cm_scripts_base AS cm_scripts_active
-ENV FLASK_ENV production
+ENV FLASK_DEBUG 0
 
 COPY --chown=simplified:simplified . /home/simplified/circulation/
 
@@ -288,13 +286,13 @@ CMD ["exec"]
 ###############################################################################
 
 FROM cm_exec_base AS cm_exec_local
-ENV FLASK_ENV development
+ENV FLASK_DEBUG 1
 
 ###############################################################################
 ## cm_exec_active - self-contained version of exec, for remote deploy
 ###############################################################################
 
 FROM cm_exec_base AS cm_exec_active
-ENV FLASK_ENV production
+ENV FLASK_DEBUG 0
 
 COPY --chown=simplified:simplified . /home/simplified/circulation/

api/admin/controller/__init__.py

@@ -351,16 +351,16 @@ def __call__(self, collection, book, path=None):
                 redirect_url = flask.request.url
 
                 if (collection):
-                    quoted_collection = urllib.parse.quote(collection)
                     redirect_url = redirect_url.replace(
-                        quoted_collection,
-                        quoted_collection.replace("/", "%2F"))
+                        collection,
+                        urllib.parse.quote_plus(collection)
+                    )
 
-                if (book):
-                    quoted_book = urllib.parse.quote(book)
+                if (book): 
                     redirect_url = redirect_url.replace(
-                        quoted_book,
-                        quoted_book.replace("/", "%2F"))
+                        book,
+                        urllib.parse.quote_plus(book)
+                    )
 
                 return redirect(self.url_for('admin_sign_in', redirect=redirect_url))