From 8f2ddf69b8b5c5d8b766a414dab12f8885913aeb Mon Sep 17 00:00:00 2001
From: Abdur-RahmaanJ <cryptolabour@gmail.com>
Date: Tue, 21 May 2024 18:52:56 +0400
Subject: [PATCH 1/3] chore(.github): sync with debug-toolbar scaffold instead
 of Flask

---
 .github/ISSUE_TEMPLATE/bug-report.md      |  10 +-
 .github/ISSUE_TEMPLATE/config.yml         |   9 +-
 .github/ISSUE_TEMPLATE/feature-request.md |   6 +-
 .github/pull_request_template.md          |   2 +-
 .github/workflows/publish.yaml            |   2 +-
 .github/workflows/tests.yaml              |   7 +-
 LICENSE                                   |  22 --
 test_principal.py                         | 296 ----------------------
 8 files changed, 15 insertions(+), 339 deletions(-)
 delete mode 100644 LICENSE
 delete mode 100644 test_principal.py

diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 9746fda..1d9c507 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,11 +1,12 @@
 ---
 name: Bug report
-about: Report a bug in Flask-princial
+about: Report a bug in Flask-DebugToolbar (not other projects which depend on Flask-DebugToolbar)
 ---
 
 <!--
-This issue tracker is a tool to address bugs in Flask itself. Please use
-GitHub Discussions or the Pallets Discord for questions about your own code.
+This issue tracker is a tool to address bugs in Flask-DebugToolbar itself.
+Please use GitHub Discussions or the Pallets Discord for questions about your
+own code.
 
 Replace this comment with a clear outline of what the bug is.
 -->
@@ -24,4 +25,5 @@ Describe the expected behavior that should have happened but didn't.
 Environment:
 
 - Python version:
-- Flask-principal version:
+- Flask-DebugToolbar version:
+- Flask version:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 6e4c54b..b4fd5a2 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Security issue
-    url: https://github.com/pallets-eco/flask-principal/security/advisories/new
-    about: Do not report security issues publicly. Create a private advisory.
-  - name: Questions
-    url: https://github.com/pallets-eco/flask-principal/discussions/
+  - name: Questions on Discussions
+    url: https://github.com/pallets-eco/flask-debugtoolbar/discussions/
     about: Ask questions about your own code on the Discussions tab.
-  - name: Questions on
+  - name: Questions on Chat
     url: https://discord.gg/pallets
     about: Ask questions about your own code on our Discord chat.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 56a7bbc..3054225 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest a new feature for Flask-principal
+about: Suggest a new feature for Flask-DebugToolbar
 ---
 
 <!--
@@ -10,6 +10,6 @@ Include details such as links to relevant specs or previous discussions.
 
 <!--
 Replace this comment with an example of the problem which this feature
-would resolve. Is this problem solvable without changes to Flask, such
-as by subclassing or using an extension?
+would resolve. Is this problem solvable without changes to Flask-DebugToolbar,
+such as by subclassing or using an extension?
 -->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index eb124d2..dbb67e3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -15,7 +15,7 @@ fixes #<issue number>
 -->
 
 <!--
-Ensure each step in CONTRIBUTING.rst is complete, especially the following:
+Ensure each step in the contributing guide is complete, especially the following:
 
 - Add tests that demonstrate the correct behavior of the change. Tests
   should fail without the change.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index ad1f04e..d200f39 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -58,7 +58,7 @@ jobs:
     # files in the draft release.
     environment:
       name: publish
-      url: https://pypi.org/project/Flask-principal/${{ github.ref_name }}
+      url: https://pypi.org/project/Flask-DebugToolbar/${{ github.ref_name }}
     runs-on: ubuntu-latest
     permissions:
       id-token: write
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 2b9a162..fde8856 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -21,17 +21,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {python: '3.13'}
           - {python: '3.12'}
-          - {name: Windows, python: '3.12', os: windows-latest}
-          - {name: Mac, python: '3.12', os: macos-latest}
           - {python: '3.11'}
           - {python: '3.10'}
           - {python: '3.9'}
           - {python: '3.8'}
-          - {name: PyPy, python: 'pypy-3.10', tox: pypy310}
-          - {name: Minimum Versions, python: '3.12', tox: py-min}
-          - {name: Development Versions, python: '3.8', tox: py-dev}
+          - {name: Minimal, python: '3.12', tox: minimal}
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 85522fd..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2012 Ali Afshar
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/test_principal.py b/test_principal.py
deleted file mode 100644
index 885ba03..0000000
--- a/test_principal.py
+++ /dev/null
@@ -1,296 +0,0 @@
-
-from __future__ import with_statement
-
-import unittest
-
-from flask import Flask, Response
-
-from flask_principal import Principal, Permission, Denial, RoleNeed, \
-    PermissionDenied, identity_changed, Identity, identity_loaded
-
-anon_permission = Permission()
-admin_permission = Permission(RoleNeed('admin'))
-admin_or_editor = Permission(RoleNeed('admin'), RoleNeed('editor'))
-editor_permission = Permission(RoleNeed('editor'))
-admin_denied = Denial(RoleNeed('admin'))
-
-
-def _on_principal_init(sender, identity):
-    if identity.id == 'ali':
-        identity.provides.add(RoleNeed('admin'))
-
-
-class ReraiseException(Exception):
-    """For checking reraising"""
-
-
-def mkapp(with_factory=False):
-    app = Flask(__name__)
-    app.secret_key = 'notverysecret'
-    app.debug = True
-
-    if with_factory:
-        p = Principal()
-        p.init_app(app)
-    else:
-        p = Principal(app)
-
-    identity_loaded.connect(_on_principal_init)
-
-    @app.route('/')
-    def index():
-        with admin_permission.require():
-            pass
-        return Response('hello')
-
-    @app.route('/a')
-    @admin_permission.require()
-    def a():
-        return Response('hello')
-
-    @app.route('/b')
-    @anon_permission.require()
-    def b():
-        return Response('hello')
-
-    @app.route('/c')
-    def c():
-        with anon_permission.require():
-            raise ReraiseException
-
-    @app.route('/d')
-    @anon_permission.require()
-    def d():
-        raise ReraiseException
-
-    @app.route('/e')
-    def e():
-        i = mkadmin()
-        identity_changed.send(app, identity=i)
-        with admin_permission.require():
-            return Response('hello')
-
-    @app.route('/f')
-    def f():
-        i = mkadmin()
-        identity_changed.send(app, identity=i)
-        with admin_or_editor.require():
-            return Response('hello')
-
-    @app.route('/g')
-    @admin_permission.require()
-    @editor_permission.require()
-    def g():
-        return Response('hello')
-
-    @app.route('/h')
-    def h():
-        i = Identity('james')
-        identity_changed.send(app, identity=i)
-        with admin_permission.require():
-            with editor_permission.require():
-                pass
-
-    @app.route('/j')
-    def j():
-        i = Identity('james')
-        identity_changed.send(app, identity=i)
-        with admin_permission.require(403):
-            with editor_permission.require(403):
-                pass
-
-    @app.route('/k')
-    @admin_permission.require(403)
-    def k():
-        return Response('hello')
-
-    @app.route('/l')
-    def l():
-        s = []
-        if not admin_or_editor:
-            s.append("not admin")
-
-        i = Identity('ali')
-        identity_changed.send(app, identity=i)
-        if admin_or_editor:
-            s.append("now admin")
-        return Response('\n'.join(s))
-
-    @app.route("/m")
-    def m():
-        with admin_denied.require():
-            pass
-
-        return Response("OK")
-
-    @app.route("/n")
-    def n():
-        i = mkadmin()
-        identity_changed.send(app, identity=i)
-        with admin_denied.require():
-            pass
-
-        return Response("OK")
-
-    @app.route("/o")
-    def o():
-        admin_or_editor.test()
-        return Response("OK")
-
-    @app.route("/p")
-    def p():
-        admin_or_editor.test(404)
-        return Response("OK")
-
-    return app
-
-
-def mkadmin():
-    i = Identity('ali')
-    return i
-
-
-class PrincipalUnitTests(unittest.TestCase):
-
-    def test_permission_union(self):
-        p1 = Permission(('a', 'b'))
-        p2 = Permission(('a', 'c'))
-        p3 = p1.union(p2)
-        assert p1.issubset(p3)
-        assert p2.issubset(p3)
-
-    def test_permission_difference(self):
-        p1 = Permission(('a', 'b'), ('a', 'c'))
-        p2 = Permission(('a', 'c'), ('d', 'e'))
-        p3 = p1.difference(p2)
-        assert p3.needs == set([('a', 'b')])
-        p4 = p2.difference(p1)
-        assert p4.needs == set([('d', 'e')])
-
-    def test_permission_union_denial(self):
-        p1 = Permission(('a', 'b'))
-        p2 = Denial(('a', 'c'))
-        p3 = p1.union(p2)
-        assert p1.issubset(p3)
-        assert p2.issubset(p3)
-
-    def test_permission_difference_denial(self):
-        p1 = Denial(('a', 'b'), ('a', 'c'))
-        p2 = Denial(('a', 'c'), ('d', 'e'))
-        p3 = p1.difference(p2)
-        assert p3.excludes == set([('a', 'b')])
-        p4 = p2.difference(p1)
-        assert p4.excludes == set([('d', 'e')])
-
-    def test_reverse_permission(self):
-        p = Permission(('a', 'b'))
-        d = p.reverse()
-        assert ('a', 'b') in d.excludes
-
-    def test_permission_and(self):
-        p1 = Permission(RoleNeed('boss'))
-        p2 = Permission(RoleNeed('lackey'))
-
-        p3 = p1 & p2
-        p4 = p1.union(p2)
-
-        assert p3.needs == p4.needs
-
-    def test_permission_or(self):
-        p1 = Permission(RoleNeed('boss'), RoleNeed('lackey'))
-        p2 = Permission(RoleNeed('lackey'), RoleNeed('underling'))
-
-        p3 = p1 | p2
-        p4 = p1.difference(p2)
-
-        assert p3.needs == p4.needs
-
-    def test_contains(self):
-        p1 = Permission(RoleNeed('boss'), RoleNeed('lackey'))
-        p2 = Permission(RoleNeed('lackey'))
-
-        assert p2.issubset(p1)
-        assert p2 in p1
-
-
-class PrincipalApplicationTests(unittest.TestCase):
-
-    def setUp(self):
-        self.client = mkapp().test_client()
-
-    def test_deny_with(self):
-        self.assertRaises(PermissionDenied, self.client.open, '/')
-
-    def test_deny_view(self):
-        self.assertRaises(PermissionDenied, self.client.open, '/a')
-
-    def test_allow_view(self):
-        assert self.client.open('/b').data == b'hello'
-
-    def test_reraise(self):
-        self.assertRaises(ReraiseException, self.client.open, '/c')
-
-    def test_error_view(self):
-        self.assertRaises(ReraiseException, self.client.open, '/d')
-
-    def test_identity_changed(self):
-        assert self.client.open('/e').data == b'hello'
-
-    def test_identity_load(self):
-        assert self.client.open('/e').data == b'hello'
-        assert self.client.open('/a').data == b'hello'
-
-    def test_or_permissions(self):
-        assert self.client.open('/e').data == b'hello'
-        assert self.client.open('/f').data == b'hello'
-
-    def test_and_permissions_view_denied(self):
-        self.assertRaises(PermissionDenied, self.client.open, '/g')
-
-    def test_and_permissions_view(self):
-        self.assertRaises(PermissionDenied, self.client.open, '/g')
-
-    def test_and_permissions_view_with_http_exc(self):
-        response = self.client.open("/j")
-        assert response.status_code == 403
-
-    def test_and_permissions_view_with_http_exc_decorated(self):
-        response = self.client.open("/k")
-        assert response.status_code == 403
-
-    def test_and_permissions_view_with_custom_errhandler(self):
-        app = mkapp()
-
-        @app.errorhandler(403)
-        def handle_permission_denied(error):
-            assert error.description == admin_permission
-            return Response("OK")
-
-        self.client = app.test_client()
-        response = self.client.open("/k")
-        assert response.status_code == 200
-
-    def test_permission_bool(self):
-        response = self.client.open('/l')
-        assert response.status_code == 200
-        assert b'not admin' in response.data
-        assert b'now admin' in response.data
-
-    def test_denied_passes(self):
-        response = self.client.open("/m")
-        assert response.status_code == 200
-
-    def test_denied_fails(self):
-        self.assertRaises(PermissionDenied, self.client.open, '/n')
-
-    def test_permission_test(self):
-        self.assertRaises(PermissionDenied, self.client.open, '/o')
-
-    def test_permission_test_with_http_exc(self):
-        response = self.client.open("/p")
-        assert response.status_code == 404
-
-
-class FactoryMethodPrincipalApplicationTests(PrincipalApplicationTests):
-    def setUp(self):
-        self.client = mkapp(with_factory=True).test_client()

From 05916570cdcfb32e1b1fec5ebd3dfbed36cfc3f5 Mon Sep 17 00:00:00 2001
From: Abdur-RahmaanJ <cryptolabour@gmail.com>
Date: Tue, 21 May 2024 19:36:15 +0400
Subject: [PATCH 2/3] chore(typing): remove mypy

---
 .github/workflows/tests.yaml |  5 -----
 pyproject.toml               | 10 ----------
 requirements/dev.txt         | 10 ----------
 requirements/typing.in       |  1 -
 requirements/typing.txt      |  6 ------
 tox.ini                      |  1 -
 6 files changed, 33 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index fde8856..8d4368e 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -46,10 +46,5 @@ jobs:
           python-version: '3.x'
           cache: pip
           cache-dependency-path: requirements*/*.txt
-      - name: cache mypy
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
-        with:
-          path: ./.mypy_cache
-          key: mypy|${{ hashFiles('pyproject.toml') }}
       - run: pip install tox
       - run: tox run -e typing
diff --git a/pyproject.toml b/pyproject.toml
index 1ce4e05..e1e70a8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -46,16 +46,6 @@ source = ["src", "tests"]
 [tool.coverage.paths]
 source = ["src", "*/site-packages"]
 
-[tool.mypy]
-python_version = "3.8"
-files = ["src", "tests"]
-show_error_codes = true
-pretty = true
-strict = true
-
-[[tool.mypy.overrides]]
-ignore_missing_imports = true
-
 [tool.pyright]
 pythonVersion = "3.8"
 include = ["src", "tests"]
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 7ef4f45..6a845f5 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -61,12 +61,6 @@ markupsafe==2.1.5
     # via
     #   -r docs.txt
     #   jinja2
-mypy==1.10.0
-    # via -r typing.txt
-mypy-extensions==1.0.0
-    # via
-    #   -r typing.txt
-    #   mypy
 nodeenv==1.8.0
     # via
     #   -r typing.txt
@@ -151,10 +145,6 @@ sphinxcontrib-serializinghtml==1.1.5
     #   sphinx
 tox==4.15.0
     # via -r dev.in
-typing-extensions==4.11.0
-    # via
-    #   -r typing.txt
-    #   mypy
 urllib3==2.2.1
     # via
     #   -r docs.txt
diff --git a/requirements/typing.in b/requirements/typing.in
index 8be59c5..f7d9470 100644
--- a/requirements/typing.in
+++ b/requirements/typing.in
@@ -1,3 +1,2 @@
-mypy
 pyright
 pytest
diff --git a/requirements/typing.txt b/requirements/typing.txt
index d6365ba..831dfd9 100644
--- a/requirements/typing.txt
+++ b/requirements/typing.txt
@@ -6,10 +6,6 @@
 #
 iniconfig==2.0.0
     # via pytest
-mypy==1.10.0
-    # via -r typing.in
-mypy-extensions==1.0.0
-    # via mypy
 nodeenv==1.8.0
     # via pyright
 packaging==24.0
@@ -20,8 +16,6 @@ pyright==1.1.363
     # via -r typing.in
 pytest==8.2.1
     # via -r typing.in
-typing-extensions==4.11.0
-    # via mypy
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/tox.ini b/tox.ini
index 59a0b75..6d153f6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,6 @@ commands = pre-commit run --all-files
 [testenv:typing]
 deps = -r requirements/typing.txt
 commands =
-    mypy
     pyright
     pyright --verifytypes flask_principal --ignoreexternal
 

From 535b69b566860f3e45c24ccddf82884cec21fe74 Mon Sep 17 00:00:00 2001
From: Abdur-RahmaanJ <cryptolabour@gmail.com>
Date: Tue, 21 May 2024 19:40:19 +0400
Subject: [PATCH 3/3] chore(typing): remove typing in ci and tests

---
 .github/workflows/tests.yaml | 11 -----------
 requirements/dev.in          |  1 -
 requirements/dev.txt         | 14 ++------------
 tox.ini                      |  8 --------
 4 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 8d4368e..b0065e7 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -37,14 +37,3 @@ jobs:
           cache-dependency-path: requirements*/*.txt
       - run: pip install tox
       - run: tox run -e ${{ matrix.tox || format('py{0}', matrix.python) }}
-  typing:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
-      - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
-        with:
-          python-version: '3.x'
-          cache: pip
-          cache-dependency-path: requirements*/*.txt
-      - run: pip install tox
-      - run: tox run -e typing
diff --git a/requirements/dev.in b/requirements/dev.in
index 1efde82..d112371 100644
--- a/requirements/dev.in
+++ b/requirements/dev.in
@@ -1,5 +1,4 @@
 -r docs.txt
 -r tests.txt
--r typing.txt
 pre-commit
 tox
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 6a845f5..1608ca6 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -51,7 +51,6 @@ imagesize==1.4.1
 iniconfig==2.0.0
     # via
     #   -r tests.txt
-    #   -r typing.txt
     #   pytest
 jinja2==3.1.4
     # via
@@ -62,15 +61,11 @@ markupsafe==2.1.5
     #   -r docs.txt
     #   jinja2
 nodeenv==1.8.0
-    # via
-    #   -r typing.txt
-    #   pre-commit
-    #   pyright
+    # via pre-commit
 packaging==24.0
     # via
     #   -r docs.txt
     #   -r tests.txt
-    #   -r typing.txt
     #   pallets-sphinx-themes
     #   pyproject-api
     #   pytest
@@ -85,7 +80,6 @@ platformdirs==4.2.2
 pluggy==1.5.0
     # via
     #   -r tests.txt
-    #   -r typing.txt
     #   pytest
     #   tox
 pre-commit==3.7.1
@@ -96,12 +90,8 @@ pygments==2.17.2
     #   sphinx
 pyproject-api==1.6.1
     # via tox
-pyright==1.1.363
-    # via -r typing.txt
 pytest==8.2.1
-    # via
-    #   -r tests.txt
-    #   -r typing.txt
+    # via -r tests.txt
 pyyaml==6.0.1
     # via pre-commit
 requests==2.32.0
diff --git a/tox.ini b/tox.ini
index 6d153f6..01606ec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,6 @@ envlist =
     py3{12,11,10,9,8}
     minimal
     style
-    typing
     docs
 skip_missing_interpreters = true
 
@@ -24,12 +23,6 @@ deps = pre-commit
 skip_install = true
 commands = pre-commit run --all-files
 
-[testenv:typing]
-deps = -r requirements/typing.txt
-commands =
-    pyright
-    pyright --verifytypes flask_principal --ignoreexternal
-
 [testenv:docs]
 deps = -r requirements/docs.txt
 commands = sphinx-build -E -W -b dirhtml docs docs/_build/dirhtml
@@ -50,5 +43,4 @@ commands =
     pip-compile build.in -q {posargs:-U}
     pip-compile docs.in -q {posargs:-U}
     pip-compile tests.in -q {posargs:-U}
-    pip-compile typing.in -q {posargs:-U}
     pip-compile dev.in -q {posargs:-U}
\ No newline at end of file