From 01cd6151c14390b70be54de78015220bcccbf5c7 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 18 Aug 2024 22:09:28 +0000
Subject: [PATCH] calibre-web patch no longer needed for session

---
 flake.nix                             |  1 -
 overlays/calibre-web-cloudflare.patch | 27 ---------------------------
 overlays/calibre-web.nix              |  7 -------
 3 files changed, 35 deletions(-)
 delete mode 100644 overlays/calibre-web-cloudflare.patch
 delete mode 100644 overlays/calibre-web.nix

diff --git a/flake.nix b/flake.nix
index 6ccbc89..6693b9f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -259,7 +259,6 @@
         inputs.nur.overlay
         inputs.nix2vim.overlay
         (import ./overlays/neovim-plugins.nix inputs)
-        (import ./overlays/calibre-web.nix)
         (import ./overlays/disko.nix inputs)
         (import ./overlays/tree-sitter.nix inputs)
         (import ./overlays/mpv-scripts.nix inputs)
diff --git a/overlays/calibre-web-cloudflare.patch b/overlays/calibre-web-cloudflare.patch
deleted file mode 100644
index 80a780c..0000000
--- a/overlays/calibre-web-cloudflare.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/cps/__init__.py b/cps/__init__.py
-index f4f8dbf2..7377acdf 100644
---- a/cps/__init__.py
-+++ b/cps/__init__.py
-@@ -151,7 +151,6 @@ def create_app():
- 
-     lm.login_view = 'web.login'
-     lm.anonymous_user = ub.Anonymous
--    lm.session_protection = 'strong' if config.config_session == 1 else "basic"
- 
-     db.CalibreDB.update_config(config)
-     db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
-diff --git a/cps/admin.py b/cps/admin.py
-index 045a9523..825a28af 100644
---- a/cps/admin.py
-+++ b/cps/admin.py
-@@ -102,10 +102,6 @@ def admin_required(f):
- 
- @admi.before_app_request
- def before_request():
--    if not ub.check_user_session(current_user.id,
--                                 flask_session.get('_id')) and 'opds' not in request.path \
--      and config.config_session == 1:
--        logout_user()
-     g.constants = constants
-     g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION', '')
-     g.allow_registration = config.config_public_reg
diff --git a/overlays/calibre-web.nix b/overlays/calibre-web.nix
deleted file mode 100644
index 3f8e172..0000000
--- a/overlays/calibre-web.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-# Fix: https://github.com/janeczku/calibre-web/issues/2422
-
-_final: prev: {
-  calibre-web = prev.calibre-web.overrideAttrs (old: {
-    patches = (old.patches or [ ]) ++ [ ./calibre-web-cloudflare.patch ];
-  });
-}