From eb70f6a066cbcc8604ab5a7e2f1e64a72af95480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kate=C5=99ina=20Churanov=C3=A1?= <katerina@churanova.eu>
Date: Sat, 11 Dec 2021 15:49:05 +0100
Subject: [PATCH 01/15] fix: making the key name in the config database unique

---
 ...add_unique_index_to_settings_table_keys.py | 24 +++++++++++++++++++
 powerdnsadmin/models/setting.py               |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 migrations/versions/b24bf17725d2_add_unique_index_to_settings_table_keys.py

diff --git a/migrations/versions/b24bf17725d2_add_unique_index_to_settings_table_keys.py b/migrations/versions/b24bf17725d2_add_unique_index_to_settings_table_keys.py
new file mode 100644
index 0000000..48cfbe9
--- /dev/null
+++ b/migrations/versions/b24bf17725d2_add_unique_index_to_settings_table_keys.py
@@ -0,0 +1,24 @@
+"""Add unique index to settings table keys
+
+Revision ID: b24bf17725d2
+Revises: 0967658d9c0d
+Create Date: 2021-12-12 20:29:17.103441
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'b24bf17725d2'
+down_revision = '0967658d9c0d'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_index(op.f('ix_setting_name'), 'setting', ['name'], unique=True)
+
+
+def downgrade():
+    op.drop_index(op.f('ix_setting_name'), table_name='setting')
diff --git a/powerdnsadmin/models/setting.py b/powerdnsadmin/models/setting.py
index a46cfb6..4b9bcc5 100644
--- a/powerdnsadmin/models/setting.py
+++ b/powerdnsadmin/models/setting.py
@@ -11,7 +11,7 @@ from .base import db
 
 class Setting(db.Model):
     id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(64))
+    name = db.Column(db.String(64), unique=True, index=True)
     value = db.Column(db.Text())
 
     defaults = {

From 6a2ba1b1c3fa5d3876429a165b45fc1010f55251 Mon Sep 17 00:00:00 2001
From: AdvanticGmbH <github@advantic.de>
Date: Tue, 28 Jun 2022 11:15:43 +0200
Subject: [PATCH 02/15] Add list to manage with an account associated domains

---
 powerdnsadmin/routes/admin.py                 | 43 +++++++--
 .../templates/admin_edit_account.html         | 92 ++++++++++++-------
 2 files changed, 95 insertions(+), 40 deletions(-)

diff --git a/powerdnsadmin/routes/admin.py b/powerdnsadmin/routes/admin.py
index c5f28d1..c8c9536 100644
--- a/powerdnsadmin/routes/admin.py
+++ b/powerdnsadmin/routes/admin.py
@@ -610,14 +610,24 @@ def manage_user():
 @operator_role_required
 def edit_account(account_name=None):
     users = User.query.all()
+    account = Account.query.filter(
+        Account.name == account_name).first()
+    all_accounts = Account.query.all()
+    accounts = {}
+    domains = Domain.query.all()
+
+    for acc in all_accounts:
+        accounts[acc.id] = acc
 
     if request.method == 'GET':
-        if account_name is None:
+        if account_name is None or not account:
             return render_template('admin_edit_account.html',
+                                   account=None,
                                    account_user_ids=[],
                                    users=users,
+                                   domains=domains,
+                                   accounts=accounts,
                                    create=1)
-
         else:
             account = Account.query.filter(
                 Account.name == account_name).first()
@@ -626,11 +636,14 @@ def edit_account(account_name=None):
                                    account=account,
                                    account_user_ids=account_user_ids,
                                    users=users,
+                                   domains=domains,
+                                   accounts=accounts,
                                    create=0)
 
     if request.method == 'POST':
         fdata = request.form
         new_user_list = request.form.getlist('account_multi_user')
+        new_domain_list = request.form.getlist('account_domains')
 
         # on POST, synthesize account and account_user_ids from form data
         if not account_name:
@@ -654,6 +667,8 @@ def edit_account(account_name=None):
                                        account=account,
                                        account_user_ids=account_user_ids,
                                        users=users,
+                                       domains=domains,
+                                       accounts=accounts,
                                        create=create,
                                        invalid_accountname=True)
 
@@ -662,19 +677,33 @@ def edit_account(account_name=None):
                                        account=account,
                                        account_user_ids=account_user_ids,
                                        users=users,
+                                       domains=domains,
+                                       accounts=accounts,
                                        create=create,
                                        duplicate_accountname=True)
 
             result = account.create_account()
-            history = History(msg='Create account {0}'.format(account.name),
-                              created_by=current_user.username)
-
         else:
             result = account.update_account()
-            history = History(msg='Update account {0}'.format(account.name),
-                              created_by=current_user.username)
 
         if result['status']:
+            account = Account.query.filter(
+                Account.name == account_name).first()
+            old_domains = Domain.query.filter(Domain.account_id == account.id).all()
+
+            for domain_name in new_domain_list:
+                domain = Domain.query.filter(
+                    Domain.name == domain_name).first()
+                if account.id != domain.account_id:
+                    Domain(name=domain_name).assoc_account(account.id)
+            
+            for domain in old_domains:
+                if domain.name not in new_domain_list:
+                    Domain(name=domain.name).assoc_account(None)
+
+            history = History(msg='{0} account {1}'.format('Create' if create else 'Update', account.name),
+                              created_by=current_user.username)
+
             account.grant_privileges(new_user_list)
             history.add()
             return redirect(url_for('admin.manage_account'))
diff --git a/powerdnsadmin/templates/admin_edit_account.html b/powerdnsadmin/templates/admin_edit_account.html
index 1946bc9..ee8d1be 100644
--- a/powerdnsadmin/templates/admin_edit_account.html
+++ b/powerdnsadmin/templates/admin_edit_account.html
@@ -90,6 +90,28 @@
                             </select>
                         </div>
                     </div>
+                    <div class="box-body">
+                        <p>Domains on the right are associated with the account. Red marked domain names are already associated with other accounts.
+                            Moving already associated domains to this account will overwrite the previous associated account.
+                        </p>
+                        <p>Hover over the red domain names to show the associated account. Click on domains to move between columns.</p>
+                        <div class="form-group col-xs-2">
+                            <select multiple="multiple" class="form-control" id="account_domains"
+                                name="account_domains">
+                                {% for domain in domains %}
+                                    {% if account != None and domain.account_id != None and account.id != domain.account_id %}
+                                        {% with account_id=domain.account_id %}
+                                            <option style="color: red" data-toggle="tooltip" title="Associated with: {{ accounts[account_id].name }}"
+                                                value="{{ domain.name }}">{{ domain.name }}</option>
+                                        {% endwith %}
+                                    {% else %}
+                                        <option {% if account.id == domain.account_id %}selected{% endif %}
+                                            value="{{ domain.name }}">{{ domain.name }}</option>
+                                    {% endif %}
+                                {% endfor %}
+                            </select>
+                        </div>
+                    </div>
                     <div class="box-footer">
                         <button type="submit"
                             class="btn btn-flat btn-primary">{% if create %}Create{% else %}Update{% endif %}
@@ -127,40 +149,44 @@
 {% endblock %}
 {% block extrascripts %}
 <script>
-    $("#account_multi_user").multiSelect({
-        selectableHeader: "<input type='text' class='search-input' autocomplete='off' placeholder='Username'>",
-        selectionHeader: "<input type='text' class='search-input' autocomplete='off' placeholder='Username'>",
-        afterInit: function (ms) {
-            var that = this,
-                $selectableSearch = that.$selectableUl.prev(),
-                $selectionSearch = that.$selectionUl.prev(),
-                selectableSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selectable:not(.ms-selected)',
-                selectionSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selection.ms-selected';
+    function addMultiSelect(id, placeholder) {
+        $(id).multiSelect({
+            selectableHeader: `<input type='text' class='search-input' autocomplete='off' placeholder='${placeholder}'>`,
+            selectionHeader: `<input type='text' class='search-input' autocomplete='off' placeholder='${placeholder}'>`,
+            afterInit: function (ms) {
+                var that = this,
+                    $selectableSearch = that.$selectableUl.prev(),
+                    $selectionSearch = that.$selectionUl.prev(),
+                    selectableSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selectable:not(.ms-selected)',
+                    selectionSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selection.ms-selected';
 
-            that.qs1 = $selectableSearch.quicksearch(selectableSearchString)
-                .on('keydown', function (e) {
-                    if (e.which === 40) {
-                        that.$selectableUl.focus();
-                        return false;
-                    }
-                });
+                that.qs1 = $selectableSearch.quicksearch(selectableSearchString)
+                    .on('keydown', function (e) {
+                        if (e.which === 40) {
+                            that.$selectableUl.focus();
+                            return false;
+                        }
+                    });
 
-            that.qs2 = $selectionSearch.quicksearch(selectionSearchString)
-                .on('keydown', function (e) {
-                    if (e.which == 40) {
-                        that.$selectionUl.focus();
-                        return false;
-                    }
-                });
-        },
-        afterSelect: function () {
-            this.qs1.cache();
-            this.qs2.cache();
-        },
-        afterDeselect: function () {
-            this.qs1.cache();
-            this.qs2.cache();
-        }
-    });
+                that.qs2 = $selectionSearch.quicksearch(selectionSearchString)
+                    .on('keydown', function (e) {
+                        if (e.which == 40) {
+                            that.$selectionUl.focus();
+                            return false;
+                        }
+                    });
+            },
+            afterSelect: function () {
+                this.qs1.cache();
+                this.qs2.cache();
+            },
+            afterDeselect: function () {
+                this.qs1.cache();
+                this.qs2.cache();
+            }
+        });
+    }
+    addMultiSelect("#account_multi_user", "Username")
+    addMultiSelect("#account_domains", "Domain")
 </script>
 {% endblock %}

From cfab13824df74525a9b54f0549bbbc0acfa76ede Mon Sep 17 00:00:00 2001
From: AdvanticGmbH <github@advantic.de>
Date: Tue, 28 Jun 2022 11:16:45 +0200
Subject: [PATCH 03/15] Add history entries for  association changes of domains

---
 powerdnsadmin/models/domain.py |  9 +++++++++
 powerdnsadmin/routes/admin.py  | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/powerdnsadmin/models/domain.py b/powerdnsadmin/models/domain.py
index bbd71e1..6db2d40 100644
--- a/powerdnsadmin/models/domain.py
+++ b/powerdnsadmin/models/domain.py
@@ -2,6 +2,7 @@ import json
 import re
 import traceback
 from flask import current_app
+from flask_login import current_user
 from urllib.parse import urljoin
 from distutils.util import strtobool
 
@@ -835,6 +836,7 @@ class Domain(db.Model):
 
         headers = {'X-API-Key': self.PDNS_API_KEY, 'Content-Type': 'application/json'}
 
+        account_name_old = Account().get_name_by_id(domain.account_id)
         account_name = Account().get_name_by_id(account_id)
 
         post_data = {"account": account_name}
@@ -858,6 +860,13 @@ class Domain(db.Model):
                     self.update()
                 msg_str = 'Account changed for domain {0} successfully'
                 current_app.logger.info(msg_str.format(domain_name))
+                history = History(msg='Update domain {0} associate account {1}'.format(domain.name, 'none' if account_name == '' else account_name),
+                              detail = json.dumps({
+                                    'assoc_account': 'None' if account_name == '' else account_name,
+                                    'dissoc_account': 'None' if account_name_old == '' else account_name_old
+                                }),
+                              created_by=current_user.username)
+                history.add()
                 return {'status': 'ok', 'msg': 'account changed successfully'}
 
         except Exception as e:
diff --git a/powerdnsadmin/routes/admin.py b/powerdnsadmin/routes/admin.py
index c8c9536..837e6d4 100644
--- a/powerdnsadmin/routes/admin.py
+++ b/powerdnsadmin/routes/admin.py
@@ -919,6 +919,16 @@ class DetailedHistory():
                 ''',
                 history_status=DetailedHistory.get_key_val(detail_dict, 'status'),
                 history_msg=DetailedHistory.get_key_val(detail_dict, 'msg'))
+        
+        elif 'Update domain' in history.msg and 'associate account' in history.msg: # When an account gets associated or dissociate with domains
+            self.detailed_msg = render_template_string('''
+                <table class="table table-bordered table-striped">
+                    <tr><td>Associate: </td><td>{{ history_assoc_account }}</td></tr>
+                    <tr><td>Dissociate:</td><td>{{ history_dissoc_account }}</td></tr>
+                </table>
+                ''',
+                history_assoc_account=DetailedHistory.get_key_val(detail_dict, 'assoc_account'),
+                history_dissoc_account=DetailedHistory.get_key_val(detail_dict, 'dissoc_account'))
 
     # check for lower key as well for old databases
     @staticmethod

From 3c68b611c6f9676a97dca03c7b63e1f969048d03 Mon Sep 17 00:00:00 2001
From: AdvanticGmbH <81569672+AdvanticGmbH@users.noreply.github.com>
Date: Wed, 29 Jun 2022 08:56:01 +0200
Subject: [PATCH 04/15] Update powerdnsadmin/routes/admin.py

Looks good to me

Co-authored-by: Corubba <97832352+corubba@users.noreply.github.com>
---
 powerdnsadmin/routes/admin.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/powerdnsadmin/routes/admin.py b/powerdnsadmin/routes/admin.py
index 837e6d4..ffba8af 100644
--- a/powerdnsadmin/routes/admin.py
+++ b/powerdnsadmin/routes/admin.py
@@ -613,12 +613,9 @@ def edit_account(account_name=None):
     account = Account.query.filter(
         Account.name == account_name).first()
     all_accounts = Account.query.all()
-    accounts = {}
+    accounts = {acc.id: acc for acc in all_accounts}
     domains = Domain.query.all()
 
-    for acc in all_accounts:
-        accounts[acc.id] = acc
-
     if request.method == 'GET':
         if account_name is None or not account:
             return render_template('admin_edit_account.html',

From 41a39958656fb49b17e61db721917c1a7cf2eee6 Mon Sep 17 00:00:00 2001
From: Pascal de Bruijn <pascal.debruijn@dustin.nl>
Date: Tue, 6 Sep 2022 16:28:45 +0200
Subject: [PATCH 05/15] routes/index.py: otp_force shouldn't apply to OAuth

as 2FA policies are typically enforced on the OAuth proviers end

Relates to #1051
---
 powerdnsadmin/routes/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py
index 3a6f55c..3cb365d 100644
--- a/powerdnsadmin/routes/index.py
+++ b/powerdnsadmin/routes/index.py
@@ -580,7 +580,7 @@ def get_azure_groups(uri):
 def authenticate_user(user, authenticator, remember=False):
     login_user(user, remember=remember)
     signin_history(user.username, authenticator, True)
-    if Setting().get('otp_force') and Setting().get('otp_field_enabled') and not user.otp_secret:
+    if Setting().get('otp_force') and Setting().get('otp_field_enabled') and not user.otp_secret and session['authentication_type'] not in ['OAuth']:
         user.update_profile(enable_otp=True)
         user_id = current_user.id
         prepare_welcome_user(user_id)

From 44cf98a159b27278d3e59db41a81dc0b56b35615 Mon Sep 17 00:00:00 2001
From: corubba <corubba@gmx.de>
Date: Thu, 19 May 2022 00:52:59 +0200
Subject: [PATCH 06/15] Fix test docker

The Dockerfile did not work as is, because the dependencies in
requirements.txt are newer than the stretch-image with its python v3.5
can support/run. Use stable debian with the lts nodejs instead, plus
had to add some libs to make the wheel build succeed.
jsonschema v4 breaks things, so its version needs to be pinned until
bravado is fixed [0].

[0] https://github.com/Yelp/bravado-core/pull/385/files#r731674447
---
 docker-test/Dockerfile | 6 +++---
 requirements.txt       | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker-test/Dockerfile b/docker-test/Dockerfile
index 577e120..e5f4d4e 100644
--- a/docker-test/Dockerfile
+++ b/docker-test/Dockerfile
@@ -1,11 +1,11 @@
-FROM debian:stretch-slim
+FROM debian:stable-slim
 LABEL maintainer="k@ndk.name"
 
 ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8
 
 RUN apt-get update -y \
-    && apt-get install -y --no-install-recommends apt-transport-https locales locales-all python3-pip python3-setuptools python3-dev curl libsasl2-dev libldap2-dev libssl-dev libxml2-dev libxslt1-dev libxmlsec1-dev libffi-dev build-essential libmariadb-dev-compat \
-    && curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+    && apt-get install -y --no-install-recommends apt-transport-https locales locales-all python3-pip python3-setuptools python3-dev curl libsasl2-dev libldap2-dev libssl-dev libxml2-dev libxslt1-dev libxmlsec1-dev libffi-dev libxmlsec1-openssl pkg-config build-essential libmariadb-dev-compat \
+    && curl -sL https://deb.nodesource.com/setup_lts.x | bash - \
     && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
     && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
     && apt-get update -y \
diff --git a/requirements.txt b/requirements.txt
index 1fc2864..6415116 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,6 +20,7 @@ rjsmin==1.2.0
 Authlib==0.15
 Flask-SeaSurf==1.1.1
 bravado-core==5.17.0
+jsonschema[format]>=2.5.1,<4.0.0 # until https://github.com/Yelp/bravado-core/pull/385
 lima==0.5
 pytest==6.1.1
 pytimeparse==1.1.8

From b9eb593acd58455ca0d6552182b97cf25ca00e31 Mon Sep 17 00:00:00 2001
From: corubba <corubba@gmx.de>
Date: Thu, 19 May 2022 00:53:05 +0200
Subject: [PATCH 07/15] Fix tests

Increased the version of pytest to make it work with py 3.10 [0].
The GET calls no longer return list but the object itself, fixed the
tests and assertions to account for that. The tests did not account for
the later added `allow_user_remove_domain` setting. And there were
issues with missing and non-stopped patchers/mocks.

Now all tests are at least passing.

[0] https://github.com/pytest-dev/pytest/pull/8540
---
 requirements.txt                              |  2 +-
 tests/fixtures.py                             |  4 +++
 .../integration/api/apikey/test_admin_user.py |  4 +--
 tests/integration/api/management/__init__.py  | 14 +++++---
 .../api/management/test_admin_user.py         | 17 ++++++----
 tests/integration/api/management/test_user.py | 16 +++++----
 tests/unit/zone/test_admin_apikey.py          | 30 ++++++++++++++++
 tests/unit/zone/test_admin_user.py            | 26 ++++++++++++++
 tests/unit/zone/test_user.py                  | 26 ++++++++++++++
 tests/unit/zone/test_user_apikey.py           | 34 +++++++++++++++++++
 10 files changed, 153 insertions(+), 20 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 6415116..6ecea27 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,7 +22,7 @@ Flask-SeaSurf==1.1.1
 bravado-core==5.17.0
 jsonschema[format]>=2.5.1,<4.0.0 # until https://github.com/Yelp/bravado-core/pull/385
 lima==0.5
-pytest==6.1.1
+pytest==6.2.5
 pytimeparse==1.1.8
 PyYAML==5.4
 Flask-SSLify==0.1.5
diff --git a/tests/fixtures.py b/tests/fixtures.py
index 39b6a70..3662916 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -36,6 +36,8 @@ def load_data(setting_name, *args, **kwargs):
         return 10
     if setting_name == 'allow_user_create_domain':
         return True
+    if setting_name == 'allow_user_remove_domain':
+        return True
 
 
 @pytest.fixture
@@ -131,6 +133,7 @@ def initial_apikey_data():
     api_url_setting = Setting('pdns_api_url', pdns_api_url)
     api_key_setting = Setting('pdns_api_key', os.environ['PDNS_API_KEY'])
     allow_create_domain_setting = Setting('allow_user_create_domain', True)
+    allow_remove_domain_setting = Setting('allow_user_remove_domain', True)
 
     try:
         flask_migrate.upgrade()
@@ -138,6 +141,7 @@ def initial_apikey_data():
         db.session.add(api_url_setting)
         db.session.add(api_key_setting)
         db.session.add(allow_create_domain_setting)
+        db.session.add(allow_remove_domain_setting)
 
         test_user_apikey = app.config.get('TEST_USER_APIKEY')
         test_admin_apikey = app.config.get('TEST_ADMIN_APIKEY')
diff --git a/tests/integration/api/apikey/test_admin_user.py b/tests/integration/api/apikey/test_admin_user.py
index d8d8f29..c367fe1 100644
--- a/tests/integration/api/apikey/test_admin_user.py
+++ b/tests/integration/api/apikey/test_admin_user.py
@@ -39,7 +39,7 @@ class TestIntegrationApiApiKeyAdminUser(object):
         assert res.status_code == 201
 
         apikey_url_format = "/api/v1/pdnsadmin/apikeys/{0}"
-        apikey_url = apikey_url_format.format(data[0]['id'])
+        apikey_url = apikey_url_format.format(data['id'])
 
         res = client.delete(apikey_url, headers=basic_auth_admin_headers)
 
@@ -123,7 +123,7 @@ class TestIntegrationApiApiKeyAdminUser(object):
         assert res.status_code == 201
 
         apikey_url_format = "/api/v1/pdnsadmin/apikeys/{0}"
-        apikey_url = apikey_url_format.format(data[0]['id'])
+        apikey_url = apikey_url_format.format(data['id'])
         res = client.delete(apikey_url, headers=basic_auth_admin_headers)
 
         assert res.status_code == 204
diff --git a/tests/integration/api/management/__init__.py b/tests/integration/api/management/__init__.py
index b546f46..af748be 100644
--- a/tests/integration/api/management/__init__.py
+++ b/tests/integration/api/management/__init__.py
@@ -14,8 +14,10 @@ class IntegrationApiManagement(object):
             assert res.status_code == status_code
         if res.status_code == 200:
             data = res.get_json(force=True)
-            assert len(data) == 1
-            return data[0]
+            assert isinstance(data, dict)
+            assert len(data) == 7
+            assert data.get('id', None)
+            return data
         return None
 
     def check_account(self, cmpdata, data=None):
@@ -37,8 +39,10 @@ class IntegrationApiManagement(object):
         assert res.status_code == status_code
         if status_code == 200:
             data = res.get_json(force=True)
-            assert len(data) == 1
-            return data[0]
+            assert isinstance(data, dict)
+            assert len(data) == 7
+            assert data.get('id', None)
+            return data
         return None
 
     def check_user(self, cmpdata, data=None):
@@ -50,5 +54,5 @@ class IntegrationApiManagement(object):
             elif key == 'role':
                 assert data[key]['name'] == cmpdata['role_name']
             else:
-                assert key in ("id",)
+                assert key in ("id","accounts",)
         return data
diff --git a/tests/integration/api/management/test_admin_user.py b/tests/integration/api/management/test_admin_user.py
index 3df0384..eae61f8 100644
--- a/tests/integration/api/management/test_admin_user.py
+++ b/tests/integration/api/management/test_admin_user.py
@@ -89,8 +89,9 @@ class TestIntegrationApiManagementAdminUser(IntegrationApiManagement):
         )
         data = res.get_json(force=True)
         assert res.status_code == 200
-        assert len(data) == 1
-        data = data[0]
+        assert isinstance(data, dict)
+        assert len(data) == 7
+        assert data.get('id', None)
         account_id = data["id"]
         for key, value in account_data.items():
             assert data[key] == value
@@ -142,10 +143,12 @@ class TestIntegrationApiManagementAdminUser(IntegrationApiManagement):
         )
         data = res.get_json(force=True)
         assert res.status_code == 201
-        assert len(data) == 1
+        assert isinstance(data, dict)
+        assert len(data) == 6
+        assert data.get('id', None)
 
         # Check user
-        user1 = self.check_user(user1_data, data[0])
+        user1 = self.check_user(user1_data, data)
         user1_id = user1["id"]
 
         updated = user1_data.copy()
@@ -240,10 +243,12 @@ class TestIntegrationApiManagementAdminUser(IntegrationApiManagement):
         )
         data = res.get_json(force=True)
         assert res.status_code == 201
-        assert len(data) == 1
+        assert isinstance(data, dict)
+        assert len(data) == 6
+        assert data.get('id', None)
 
         # Check user
-        user1 = self.check_user(user1_data, data[0])
+        user1 = self.check_user(user1_data, data)
         user1_id = user1["id"]
 
         # Assert test account has no users
diff --git a/tests/integration/api/management/test_user.py b/tests/integration/api/management/test_user.py
index b56652e..31bf69f 100644
--- a/tests/integration/api/management/test_user.py
+++ b/tests/integration/api/management/test_user.py
@@ -33,8 +33,8 @@ class TestIntegrationApiManagementUser(IntegrationApiManagement):
                          headers=basic_auth_user_headers)
         data = res.get_json(force=True)
         assert res.status_code == 200
-        assert len(data) == 1, data
-        self.user = data
+        assert data
+        self.user = [data]
 
     def test_accounts(
             self, client, initial_data,                          # noqa: F811
@@ -118,10 +118,12 @@ class TestIntegrationApiManagementUser(IntegrationApiManagement):
         )
         data = res.get_json(force=True)
         assert res.status_code == 201
-        assert len(data) == 1
+        assert isinstance(data, dict)
+        assert len(data) == 6
+        assert data.get('id', None)
 
         # Check user
-        user1 = self.check_user(user1_data, data[0])
+        user1 = self.check_user(user1_data, data)
         user1_id = user1["id"]
 
         # Update to defaults (should fail)
@@ -181,10 +183,12 @@ class TestIntegrationApiManagementUser(IntegrationApiManagement):
         )
         data = res.get_json(force=True)
         assert res.status_code == 201
-        assert len(data) == 1
+        assert isinstance(data, dict)
+        assert len(data) == 6
+        assert data.get('id', None)
 
         # Check user
-        user1 = self.check_user(user1_data, data[0])
+        user1 = self.check_user(user1_data, data)
         user1_id = user1["id"]
 
         # Assert test account has no users
diff --git a/tests/unit/zone/test_admin_apikey.py b/tests/unit/zone/test_admin_apikey.py
index 6f3a9c3..fed2561 100644
--- a/tests/unit/zone/test_admin_apikey.py
+++ b/tests/unit/zone/test_admin_apikey.py
@@ -27,6 +27,9 @@ class TestUnitApiZoneAdminApiKey(object):
         self.github_setting_patcher = patch(
             'powerdnsadmin.services.github.Setting',
             spec=powerdnsadmin.models.setting.Setting)
+        self.azure_setting_patcher = patch(
+            'powerdnsadmin.services.azure.Setting',
+            spec=powerdnsadmin.models.setting.Setting)
         self.oidc_setting_patcher = patch(
             'powerdnsadmin.services.oidc.Setting',
             spec=powerdnsadmin.models.setting.Setting)
@@ -54,6 +57,9 @@ class TestUnitApiZoneAdminApiKey(object):
         self.mock_setting_patcher = patch(
             'powerdnsadmin.routes.api.Setting',
             spec=powerdnsadmin.models.setting.Setting)
+        self.mock_decorators_setting_patcher = patch(
+            'powerdnsadmin.decorators.Setting',
+            spec=powerdnsadmin.models.setting.Setting)
 
         data = admin_apikey_data()
         api_key = ApiKey(desc=data['description'],
@@ -63,6 +69,7 @@ class TestUnitApiZoneAdminApiKey(object):
 
         self.mock_google_setting = self.google_setting_patcher.start()
         self.mock_github_setting = self.github_setting_patcher.start()
+        self.mock_azure_setting = self.azure_setting_patcher.start()
         self.mock_oidc_setting = self.oidc_setting_patcher.start()
         self.mock_helpers_setting = self.helpers_setting_patcher.start()
         self.mock_models_setting = self.models_setting_patcher.start()
@@ -75,17 +82,40 @@ class TestUnitApiZoneAdminApiKey(object):
         self.mock_apikey = self.mock_apikey_patcher.start()
         self.mock_hist = self.mock_hist_patcher.start()
         self.mock_setting = self.mock_setting_patcher.start()
+        self.mock_decorators_setting = self.mock_decorators_setting_patcher.start()
 
         self.mock_google_setting.return_value.get.side_effect = load_data
         self.mock_github_setting.return_value.get.side_effect = load_data
+        self.mock_azure_setting.return_value.get.side_effect = load_data
         self.mock_oidc_setting.return_value.get.side_effect = load_data
         self.mock_helpers_setting.return_value.get.side_effect = load_data
         self.mock_models_setting.return_value.get.side_effect = load_data
         self.mock_domain_model_setting.return_value.get.side_effect = load_data
         self.mock_record_model_setting.return_value.get.side_effect = load_data
         self.mock_server_model_setting.return_value.get.side_effect = load_data
+        self.mock_decorators_setting.return_value.get.side_effect = load_data
         self.mock_apikey.return_value.is_validate.return_value = api_key
 
+        yield
+
+        for patcher in [
+            self.google_setting_patcher,
+            self.github_setting_patcher,
+            self.azure_setting_patcher,
+            self.oidc_setting_patcher,
+            self.helpers_setting_patcher,
+            self.models_setting_patcher,
+            self.domain_model_setting_patcher,
+            self.record_model_setting_patcher,
+            self.server_model_setting_patcher,
+            self.mock_apikey_patcher,
+            self.mock_hist_patcher,
+            self.mock_setting_patcher,
+            self.mock_decorators_setting_patcher,
+        ]:
+            patcher.stop()
+
+
     def test_empty_get(self, client, common_data_mock, admin_apikey):
         with patch('powerdnsadmin.routes.api.Domain') as mock_domain, \
              patch('powerdnsadmin.lib.utils.requests.get') as mock_get:
diff --git a/tests/unit/zone/test_admin_user.py b/tests/unit/zone/test_admin_user.py
index 085ba74..7212045 100644
--- a/tests/unit/zone/test_admin_user.py
+++ b/tests/unit/zone/test_admin_user.py
@@ -22,6 +22,9 @@ class TestUnitApiZoneAdminUser(object):
         self.github_setting_patcher = patch(
             'powerdnsadmin.services.github.Setting',
             spec=powerdnsadmin.models.setting.Setting)
+        self.azure_setting_patcher = patch(
+            'powerdnsadmin.services.azure.Setting',
+            spec=powerdnsadmin.models.setting.Setting)
         self.oidc_setting_patcher = patch(
             'powerdnsadmin.services.oidc.Setting',
             spec=powerdnsadmin.models.setting.Setting)
@@ -57,6 +60,7 @@ class TestUnitApiZoneAdminUser(object):
 
         self.mock_google_setting = self.google_setting_patcher.start()
         self.mock_github_setting = self.github_setting_patcher.start()
+        self.mock_azure_setting = self.azure_setting_patcher.start()
         self.mock_oidc_setting = self.oidc_setting_patcher.start()
         self.mock_base_route_user = self.base_route_user_patcher.start()
         self.mock_helpers_setting = self.helpers_setting_patcher.start()
@@ -74,6 +78,7 @@ class TestUnitApiZoneAdminUser(object):
 
         self.mock_google_setting.return_value.get.side_effect = load_data
         self.mock_github_setting.return_value.get.side_effect = load_data
+        self.mock_azure_setting.return_value.get.side_effect = load_data
         self.mock_oidc_setting.return_value.get.side_effect = load_data
         self.mock_helpers_setting.return_value.get.side_effect = load_data
         self.mock_models_setting.return_value.get.side_effect = load_data
@@ -91,6 +96,27 @@ class TestUnitApiZoneAdminUser(object):
         self.mock_base_route_user.query.filter.return_value.first.return_value = self.mockk
         self.mock_base_route_user.return_value.is_validate.return_value = True
 
+        yield
+
+        for patcher in [
+            self.google_setting_patcher,
+            self.github_setting_patcher,
+            self.azure_setting_patcher,
+            self.oidc_setting_patcher,
+            self.base_route_user_patcher,
+            self.helpers_setting_patcher,
+            self.models_setting_patcher,
+            self.domain_model_setting_patcher,
+            self.record_model_setting_patcher,
+            self.server_model_setting_patcher,
+            self.decorators_setting_patcher,
+            self.api_setting_patcher,
+            self.mock_user_patcher,
+            self.mock_hist_patcher,
+        ]:
+            patcher.stop()
+
+
     def test_empty_get(self, client, common_data_mock,
                        basic_auth_admin_headers):
         with patch('powerdnsadmin.routes.api.Domain') as mock_domain, \
diff --git a/tests/unit/zone/test_user.py b/tests/unit/zone/test_user.py
index 7a8d8d9..b15e944 100644
--- a/tests/unit/zone/test_user.py
+++ b/tests/unit/zone/test_user.py
@@ -22,6 +22,9 @@ class TestUnitApiZoneUser(object):
         self.github_setting_patcher = patch(
             'powerdnsadmin.services.github.Setting',
             spec=powerdnsadmin.models.setting.Setting)
+        self.azure_setting_patcher = patch(
+            'powerdnsadmin.services.azure.Setting',
+            spec=powerdnsadmin.models.setting.Setting)
         self.oidc_setting_patcher = patch(
             'powerdnsadmin.services.oidc.Setting',
             spec=powerdnsadmin.models.setting.Setting)
@@ -57,6 +60,7 @@ class TestUnitApiZoneUser(object):
 
         self.mock_google_setting = self.google_setting_patcher.start()
         self.mock_github_setting = self.github_setting_patcher.start()
+        self.mock_azure_setting = self.azure_setting_patcher.start()
         self.mock_oidc_setting = self.oidc_setting_patcher.start()
         self.mock_base_route_user = self.base_route_user_patcher.start()
         self.mock_helpers_setting = self.helpers_setting_patcher.start()
@@ -74,6 +78,7 @@ class TestUnitApiZoneUser(object):
 
         self.mock_google_setting.return_value.get.side_effect = load_data
         self.mock_github_setting.return_value.get.side_effect = load_data
+        self.mock_azure_setting.return_value.get.side_effect = load_data
         self.mock_oidc_setting.return_value.get.side_effect = load_data
         self.mock_helpers_setting.return_value.get.side_effect = load_data
         self.mock_models_setting.return_value.get.side_effect = load_data
@@ -91,6 +96,27 @@ class TestUnitApiZoneUser(object):
         self.mock_base_route_user.query.filter.return_value.first.return_value = self.mockk
         self.mock_base_route_user.return_value.is_validate.return_value = True
 
+        yield
+
+        for patcher in [
+            self.google_setting_patcher,
+            self.github_setting_patcher,
+            self.azure_setting_patcher,
+            self.oidc_setting_patcher,
+            self.base_route_user_patcher,
+            self.helpers_setting_patcher,
+            self.models_setting_patcher,
+            self.domain_model_setting_patcher,
+            self.record_model_setting_patcher,
+            self.server_model_setting_patcher,
+            self.decorators_setting_patcher,
+            self.api_setting_patcher,
+            self.mock_user_patcher,
+            self.mock_hist_patcher,
+        ]:
+            patcher.stop()
+
+
     def test_create_zone(self, client, common_data_mock, zone_data,
                          basic_auth_user_headers, created_zone_data):
         with patch('powerdnsadmin.lib.helper.requests.request') as mock_post, \
diff --git a/tests/unit/zone/test_user_apikey.py b/tests/unit/zone/test_user_apikey.py
index 84cd53c..e8bd915 100644
--- a/tests/unit/zone/test_user_apikey.py
+++ b/tests/unit/zone/test_user_apikey.py
@@ -25,6 +25,9 @@ class TestUnitApiZoneUserApiKey(object):
         self.github_setting_patcher = patch(
             'powerdnsadmin.services.github.Setting',
             spec=powerdnsadmin.models.setting.Setting)
+        self.azure_setting_patcher = patch(
+            'powerdnsadmin.services.azure.Setting',
+            spec=powerdnsadmin.models.setting.Setting)
         self.oidc_setting_patcher = patch(
             'powerdnsadmin.services.oidc.Setting',
             spec=powerdnsadmin.models.setting.Setting)
@@ -49,9 +52,16 @@ class TestUnitApiZoneUserApiKey(object):
         self.mock_hist_patcher = patch(
             'powerdnsadmin.routes.api.History',
             spec=powerdnsadmin.models.history.History)
+        self.mock_setting_patcher = patch(
+            'powerdnsadmin.routes.api.Setting',
+            spec=powerdnsadmin.models.setting.Setting)
+        self.mock_decorators_setting_patcher = patch(
+            'powerdnsadmin.decorators.Setting',
+            spec=powerdnsadmin.models.setting.Setting)
 
         self.mock_google_setting = self.google_setting_patcher.start()
         self.mock_github_setting = self.github_setting_patcher.start()
+        self.mock_azure_setting = self.azure_setting_patcher.start()
         self.mock_oidc_setting = self.oidc_setting_patcher.start()
         self.mock_helpers_setting = self.helpers_setting_patcher.start()
         self.mock_models_setting = self.models_setting_patcher.start()
@@ -63,15 +73,19 @@ class TestUnitApiZoneUserApiKey(object):
         )
         self.mock_apikey = self.mock_apikey_patcher.start()
         self.mock_hist = self.mock_hist_patcher.start()
+        self.mock_setting = self.mock_setting_patcher.start()
+        self.mock_decorators_setting = self.mock_decorators_setting_patcher.start()
 
         self.mock_google_setting.return_value.get.side_effect = load_data
         self.mock_github_setting.return_value.get.side_effect = load_data
+        self.mock_azure_setting.return_value.get.side_effect = load_data
         self.mock_oidc_setting.return_value.get.side_effect = load_data
         self.mock_helpers_setting.return_value.get.side_effect = load_data
         self.mock_models_setting.return_value.get.side_effect = load_data
         self.mock_domain_model_setting.return_value.get.side_effect = load_data
         self.mock_record_model_setting.return_value.get.side_effect = load_data
         self.mock_server_model_setting.return_value.get.side_effect = load_data
+        self.mock_decorators_setting.return_value.get.side_effect = load_data
 
         data = user_apikey_data()
         domain = Domain(name=data['domains'][0])
@@ -83,6 +97,26 @@ class TestUnitApiZoneUserApiKey(object):
 
         self.mock_apikey.return_value.is_validate.return_value = api_key
 
+        yield
+
+        for patcher in [
+            self.google_setting_patcher,
+            self.github_setting_patcher,
+            self.azure_setting_patcher,
+            self.oidc_setting_patcher,
+            self.helpers_setting_patcher,
+            self.models_setting_patcher,
+            self.domain_model_setting_patcher,
+            self.record_model_setting_patcher,
+            self.server_model_setting_patcher,
+            self.mock_apikey_patcher,
+            self.mock_hist_patcher,
+            self.mock_setting_patcher,
+            self.mock_decorators_setting_patcher,
+        ]:
+            patcher.stop()
+
+
     def test_create_zone(self, client, common_data_mock, zone_data,
                          user_apikey, created_zone_data):
         with patch('powerdnsadmin.lib.helper.requests.request') as mock_post, \

From e920bf5009056b15fc9e1a5141089928c6bd0fab Mon Sep 17 00:00:00 2001
From: corubba <corubba@gmx.de>
Date: Thu, 23 Jun 2022 22:22:05 +0200
Subject: [PATCH 08/15] Fix broken code

PR #1089 is the culprit, as was already predicted in the review.
---
 powerdnsadmin/decorators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/powerdnsadmin/decorators.py b/powerdnsadmin/decorators.py
index 6382141..50e4a3f 100644
--- a/powerdnsadmin/decorators.py
+++ b/powerdnsadmin/decorators.py
@@ -388,7 +388,7 @@ def apikey_can_configure_dnssec(http_methods=[]):
 def allowed_record_types(f):
     @wraps(f)
     def decorated_function(*args, **kwargs):
-        if request.method == 'GET':
+        if request.method in ['GET', 'DELETE', 'PUT']:
             return f(*args, **kwargs)
 
         if g.apikey.role.name in ['Administrator', 'Operator']:

From 8d849ee2a12280234599787e22eaea982fc84685 Mon Sep 17 00:00:00 2001
From: corubba <corubba@gmx.de>
Date: Fri, 24 Jun 2022 14:19:52 +0200
Subject: [PATCH 09/15] Cleanup

The `unit/apikey` directory is removed because it does not contain any
tests. Same for `unit/test_decorators.py`.
The `fixture` module is renamed to the special-name `conftest` [0] so
they are available in all tests without the need to import them. With
that in place, I removed all now unneeded or previously already unused
imports from the tests.
Also removed that wierd `sys.path` bit from `unit/zone/test_admin_apikey.py`,
no idea what that was originally intended for.

[0] https://docs.pytest.org/en/6.2.x/fixture.html#conftest-py-sharing-fixtures-across-multiple-files
---
 tests/{fixtures.py => conftest.py}                   | 0
 tests/integration/api/apikey/test_admin_user.py      | 3 +--
 tests/integration/api/apikey/test_user.py            | 3 ---
 tests/integration/api/management/test_admin_user.py  | 6 +-----
 tests/integration/api/management/test_user.py        | 4 ----
 tests/integration/api/zone/test_admin_user.py        | 3 ---
 tests/integration/api/zone/test_apikey_admin_user.py | 3 ---
 tests/integration/api/zone/test_apikey_user.py       | 3 ---
 tests/integration/api/zone/test_user.py              | 2 --
 tests/unit/apikey/__init__.py                        | 0
 tests/unit/test_decorators.py                        | 0
 tests/unit/zone/test_admin_apikey.py                 | 9 ++-------
 tests/unit/zone/test_admin_user.py                   | 4 +---
 tests/unit/zone/test_user.py                         | 4 +---
 tests/unit/zone/test_user_apikey.py                  | 7 ++-----
 15 files changed, 8 insertions(+), 43 deletions(-)
 rename tests/{fixtures.py => conftest.py} (100%)
 delete mode 100644 tests/unit/apikey/__init__.py
 delete mode 100644 tests/unit/test_decorators.py

diff --git a/tests/fixtures.py b/tests/conftest.py
similarity index 100%
rename from tests/fixtures.py
rename to tests/conftest.py
diff --git a/tests/integration/api/apikey/test_admin_user.py b/tests/integration/api/apikey/test_admin_user.py
index c367fe1..04e9806 100644
--- a/tests/integration/api/apikey/test_admin_user.py
+++ b/tests/integration/api/apikey/test_admin_user.py
@@ -4,8 +4,7 @@ from collections import namedtuple
 
 from powerdnsadmin.lib.validators import validate_apikey
 from powerdnsadmin.lib.schema import ApiKeySchema
-from tests.fixtures import client, initial_data, basic_auth_admin_headers
-from tests.fixtures import user_apikey_data, admin_apikey_data, zone_data
+from tests.conftest import user_apikey_data, admin_apikey_data
 
 
 class TestIntegrationApiApiKeyAdminUser(object):
diff --git a/tests/integration/api/apikey/test_user.py b/tests/integration/api/apikey/test_user.py
index 17fc970..1d0751d 100644
--- a/tests/integration/api/apikey/test_user.py
+++ b/tests/integration/api/apikey/test_user.py
@@ -1,11 +1,8 @@
-import pytest
 import json
 from collections import namedtuple
 
 from powerdnsadmin.lib.validators import validate_zone
 from powerdnsadmin.lib.schema import DomainSchema
-from tests.fixtures import client, initial_data, basic_auth_user_headers
-from tests.fixtures import zone_data
 
 
 class TestIntegrationApiZoneUser(object):
diff --git a/tests/integration/api/management/test_admin_user.py b/tests/integration/api/management/test_admin_user.py
index eae61f8..b017320 100644
--- a/tests/integration/api/management/test_admin_user.py
+++ b/tests/integration/api/management/test_admin_user.py
@@ -1,9 +1,5 @@
-
 import json
-from tests.fixtures import (    # noqa: F401
-    client, initial_data, basic_auth_admin_headers,
-    test_admin_user, test_user, account_data, user1_data,
-)
+
 from . import IntegrationApiManagement
 
 
diff --git a/tests/integration/api/management/test_user.py b/tests/integration/api/management/test_user.py
index 31bf69f..548702a 100644
--- a/tests/integration/api/management/test_user.py
+++ b/tests/integration/api/management/test_user.py
@@ -1,10 +1,6 @@
 
 import json
 
-from tests.fixtures import (    # noqa: F401
-    client, initial_data, basic_auth_admin_headers, basic_auth_user_headers,
-    test_admin_user, test_user, account_data, user1_data,
-)
 from . import IntegrationApiManagement
 
 
diff --git a/tests/integration/api/zone/test_admin_user.py b/tests/integration/api/zone/test_admin_user.py
index 2aa9c44..f1c12a7 100644
--- a/tests/integration/api/zone/test_admin_user.py
+++ b/tests/integration/api/zone/test_admin_user.py
@@ -1,11 +1,8 @@
-import pytest
 import json
 from collections import namedtuple
 
 from powerdnsadmin.lib.validators import validate_zone
 from powerdnsadmin.lib.schema import DomainSchema
-from tests.fixtures import client, initial_data, basic_auth_admin_headers
-from tests.fixtures import zone_data
 
 
 class TestIntegrationApiZoneAdminUser(object):
diff --git a/tests/integration/api/zone/test_apikey_admin_user.py b/tests/integration/api/zone/test_apikey_admin_user.py
index 9090ed6..494366f 100644
--- a/tests/integration/api/zone/test_apikey_admin_user.py
+++ b/tests/integration/api/zone/test_apikey_admin_user.py
@@ -3,9 +3,6 @@ from collections import namedtuple
 
 from powerdnsadmin.lib.validators import validate_zone
 from powerdnsadmin.lib.schema import DomainSchema
-from tests.fixtures import client
-from tests.fixtures import zone_data, initial_apikey_data
-from tests.fixtures import admin_apikey_integration
 
 
 class TestIntegrationApiZoneAdminApiKey(object):
diff --git a/tests/integration/api/zone/test_apikey_user.py b/tests/integration/api/zone/test_apikey_user.py
index b0c96bc..94ddac1 100644
--- a/tests/integration/api/zone/test_apikey_user.py
+++ b/tests/integration/api/zone/test_apikey_user.py
@@ -3,9 +3,6 @@ from collections import namedtuple
 
 from powerdnsadmin.lib.validators import validate_zone
 from powerdnsadmin.lib.schema import DomainSchema
-from tests.fixtures import client
-from tests.fixtures import zone_data, initial_apikey_data
-from tests.fixtures import user_apikey_integration
 
 class TestIntegrationApiZoneUserApiKey(object):
 
diff --git a/tests/integration/api/zone/test_user.py b/tests/integration/api/zone/test_user.py
index 7392521..1d0751d 100644
--- a/tests/integration/api/zone/test_user.py
+++ b/tests/integration/api/zone/test_user.py
@@ -3,8 +3,6 @@ from collections import namedtuple
 
 from powerdnsadmin.lib.validators import validate_zone
 from powerdnsadmin.lib.schema import DomainSchema
-from tests.fixtures import client, initial_data, basic_auth_user_headers
-from tests.fixtures import zone_data
 
 
 class TestIntegrationApiZoneUser(object):
diff --git a/tests/unit/apikey/__init__.py b/tests/unit/apikey/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/unit/test_decorators.py b/tests/unit/test_decorators.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/unit/zone/test_admin_apikey.py b/tests/unit/zone/test_admin_apikey.py
index fed2561..9d1ca28 100644
--- a/tests/unit/zone/test_admin_apikey.py
+++ b/tests/unit/zone/test_admin_apikey.py
@@ -2,9 +2,6 @@ import json
 import pytest
 from unittest.mock import patch
 from collections import namedtuple
-import sys
-import os
-sys.path.append(os.getcwd())
 
 import powerdnsadmin
 from powerdnsadmin.models.setting import Setting
@@ -12,10 +9,8 @@ from powerdnsadmin.models.domain import Domain
 from powerdnsadmin.models.api_key import ApiKey
 from powerdnsadmin.models.role import Role
 from powerdnsadmin.lib.validators import validate_zone
-from powerdnsadmin.lib.schema import DomainSchema, ApiKeySchema
-from tests.fixtures import client, initial_data, created_zone_data
-from tests.fixtures import user_apikey, admin_apikey, zone_data
-from tests.fixtures import admin_apikey_data, load_data
+from powerdnsadmin.lib.schema import DomainSchema
+from tests.conftest import admin_apikey_data, load_data
 
 
 class TestUnitApiZoneAdminApiKey(object):
diff --git a/tests/unit/zone/test_admin_user.py b/tests/unit/zone/test_admin_user.py
index 7212045..922aa64 100644
--- a/tests/unit/zone/test_admin_user.py
+++ b/tests/unit/zone/test_admin_user.py
@@ -5,12 +5,10 @@ from collections import namedtuple
 
 import powerdnsadmin
 from powerdnsadmin.models.user import User
-from powerdnsadmin.models.role import Role
 from powerdnsadmin.models.domain import Domain
 from powerdnsadmin.lib.validators import validate_zone
 from powerdnsadmin.lib.schema import DomainSchema
-from tests.fixtures import client, basic_auth_admin_headers
-from tests.fixtures import zone_data, created_zone_data, load_data
+from tests.conftest import load_data
 
 
 class TestUnitApiZoneAdminUser(object):
diff --git a/tests/unit/zone/test_user.py b/tests/unit/zone/test_user.py
index b15e944..3d37492 100644
--- a/tests/unit/zone/test_user.py
+++ b/tests/unit/zone/test_user.py
@@ -5,12 +5,10 @@ from collections import namedtuple
 
 import powerdnsadmin
 from powerdnsadmin.models.user import User
-from powerdnsadmin.models.role import Role
 from powerdnsadmin.models.domain import Domain
 from powerdnsadmin.lib.validators import validate_zone
 from powerdnsadmin.lib.schema import DomainSchema
-from tests.fixtures import client, basic_auth_user_headers
-from tests.fixtures import zone_data, created_zone_data, load_data
+from tests.conftest import load_data
 
 
 class TestUnitApiZoneUser(object):
diff --git a/tests/unit/zone/test_user_apikey.py b/tests/unit/zone/test_user_apikey.py
index e8bd915..77b1018 100644
--- a/tests/unit/zone/test_user_apikey.py
+++ b/tests/unit/zone/test_user_apikey.py
@@ -1,7 +1,6 @@
 import json
 import pytest
 from unittest.mock import patch
-from base64 import b64encode
 from collections import namedtuple
 
 import powerdnsadmin
@@ -10,10 +9,8 @@ from powerdnsadmin.models.domain import Domain
 from powerdnsadmin.models.api_key import ApiKey
 from powerdnsadmin.models.role import Role
 from powerdnsadmin.lib.validators import validate_zone
-from powerdnsadmin.lib.schema import DomainSchema, ApiKeySchema
-from tests.fixtures import client, initial_data, created_zone_data
-from tests.fixtures import user_apikey, zone_data
-from tests.fixtures import user_apikey_data, load_data
+from powerdnsadmin.lib.schema import DomainSchema
+from tests.conftest import user_apikey_data, load_data
 
 
 class TestUnitApiZoneUserApiKey(object):

From 8dd03a4d85a75dd8cee0e2a8f330aeec65c7d4e4 Mon Sep 17 00:00:00 2001
From: Ymage <heltem+git@o2php.com>
Date: Thu, 22 Dec 2022 22:47:02 +0100
Subject: [PATCH 10/15] Update tests fix

Fix migration init_db 'id'
Handle app context when needed
Fix conftest fixtures
Rearrange test Dockerfiles
Hide DeprecationWarning during pytest execution
Upgrade all python packages
---
 docker-compose-test.yml                       |   6 +-
 docker-test/Dockerfile                        |  30 ++-
 docker-test/start.sh                          |   4 +-
 migrations/env.py                             |  46 ++--
 migrations/versions/787bdba9e147_init_db.py   |   6 +-
 requirements.txt                              |  59 ++--
 tests/conftest.py                             | 251 +++++++++---------
 .../integration/api/apikey/test_admin_user.py |   8 +-
 tests/integration/api/apikey/test_user.py     |   2 +-
 tests/integration/api/management/test_user.py |  98 ++++---
 tests/unit/zone/test_admin_apikey.py          | 145 +++++-----
 tests/unit/zone/test_admin_user.py            | 104 ++++----
 tests/unit/zone/test_user.py                  | 112 ++++----
 tests/unit/zone/test_user_apikey.py           | 150 +++++------
 14 files changed, 537 insertions(+), 484 deletions(-)

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
index 7dcf4a0..77c8dba 100644
--- a/docker-compose-test.yml
+++ b/docker-compose-test.yml
@@ -1,11 +1,11 @@
-version: "2.1"
+version: "3.8"
 
 services:
   powerdns-admin:
+    image: powerdns-admin-test
     build:
       context: .
       dockerfile: docker-test/Dockerfile
-    image: powerdns-admin-test
     container_name: powerdns-admin-test
     ports:
       - "9191:80"
@@ -17,10 +17,10 @@ services:
       - pdns-server
 
   pdns-server:
+    image: pdns-server-test
     build:
       context: .
       dockerfile: docker-test/Dockerfile.pdns
-    image: pdns-server-test
     ports:
       - "5053:53"
       - "5053:53/udp"
diff --git a/docker-test/Dockerfile b/docker-test/Dockerfile
index e5f4d4e..17f934f 100644
--- a/docker-test/Dockerfile
+++ b/docker-test/Dockerfile
@@ -1,15 +1,35 @@
-FROM debian:stable-slim
+FROM debian:bullseye-slim
 LABEL maintainer="k@ndk.name"
 
 ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8
 
 RUN apt-get update -y \
-    && apt-get install -y --no-install-recommends apt-transport-https locales locales-all python3-pip python3-setuptools python3-dev curl libsasl2-dev libldap2-dev libssl-dev libxml2-dev libxslt1-dev libxmlsec1-dev libffi-dev libxmlsec1-openssl pkg-config build-essential libmariadb-dev-compat \
+    && apt-get install -y --no-install-recommends \
+        apt-transport-https \
+        curl \
+        build-essential \
+        libffi-dev \
+        libldap2-dev \
+        libmariadb-dev-compat \
+        libsasl2-dev \
+        libssl-dev \
+        libxml2-dev \
+        libxmlsec1-dev \
+        libxmlsec1-openssl \
+        libxslt1-dev \
+        locales \
+        locales-all \
+        pkg-config \
+        python3-dev \
+        python3-pip \
+        python3-setuptools \
     && curl -sL https://deb.nodesource.com/setup_lts.x | bash - \
     && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
     && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
     && apt-get update -y \
-    && apt-get install -y nodejs yarn \
+    && apt-get install -y --no-install-recommends \
+        nodejs \
+        yarn \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
 
@@ -21,8 +41,6 @@ RUN pip3 install --upgrade pip
 RUN pip3 install -r requirements.txt
 
 COPY . /app
-COPY ./docker/entrypoint.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/entrypoint.sh
 
 ENV FLASK_APP=powerdnsadmin/__init__.py
 RUN yarn install --pure-lockfile --production \
@@ -31,4 +49,4 @@ RUN yarn install --pure-lockfile --production \
 
 COPY ./docker-test/wait-for-pdns.sh /opt
 RUN chmod u+x /opt/wait-for-pdns.sh
-CMD ["/opt/wait-for-pdns.sh", "/usr/local/bin/pytest","--capture=no","-vv"]
+CMD ["/opt/wait-for-pdns.sh", "/usr/local/bin/pytest", "-W", "ignore::DeprecationWarning", "--capture=no", "-vv"]
diff --git a/docker-test/start.sh b/docker-test/start.sh
index 9a66017..efd1c0e 100644
--- a/docker-test/start.sh
+++ b/docker-test/start.sh
@@ -10,9 +10,9 @@ fi
 
 # Import schema structure
 if [ -e "/data/pdns.sql" ]; then
-    rm /data/pdns.db
+    rm -f /data/pdns.db
     cat /data/pdns.sql | sqlite3 /data/pdns.db
-    rm /data/pdns.sql
+    rm -f /data/pdns.sql
     echo "Imported schema structure"
 fi
 
diff --git a/migrations/env.py b/migrations/env.py
index 4742e14..8b3fb33 100755
--- a/migrations/env.py
+++ b/migrations/env.py
@@ -1,8 +1,13 @@
 from __future__ import with_statement
-from alembic import context
-from sqlalchemy import engine_from_config, pool
-from logging.config import fileConfig
+
 import logging
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+from flask import current_app
+
+from alembic import context
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
@@ -17,9 +22,9 @@ logger = logging.getLogger('alembic.env')
 # for 'autogenerate' support
 # from myapp import mymodel
 # target_metadata = mymodel.Base.metadata
-from flask import current_app
-config.set_main_option('sqlalchemy.url',
-                       current_app.config.get('SQLALCHEMY_DATABASE_URI').replace("%","%%"))
+config.set_main_option(
+    'sqlalchemy.url',
+    str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
 target_metadata = current_app.extensions['migrate'].db.metadata
 
 # other values from the config, defined by the needs of env.py,
@@ -41,7 +46,9 @@ def run_migrations_offline():
 
     """
     url = config.get_main_option("sqlalchemy.url")
-    context.configure(url=url)
+    context.configure(
+        url=url, target_metadata=target_metadata, literal_binds=True
+    )
 
     with context.begin_transaction():
         context.run_migrations()
@@ -65,22 +72,23 @@ def run_migrations_online():
                 directives[:] = []
                 logger.info('No changes in schema detected.')
 
-    engine = engine_from_config(config.get_section(config.config_ini_section),
-                                prefix='sqlalchemy.',
-                                poolclass=pool.NullPool)
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section),
+        prefix='sqlalchemy.',
+        poolclass=pool.NullPool,
+    )
 
-    connection = engine.connect()
-    context.configure(connection=connection,
-                      target_metadata=target_metadata,
-                      process_revision_directives=process_revision_directives,
-                      render_as_batch=config.get_main_option('sqlalchemy.url').startswith('sqlite:'),
-                      **current_app.extensions['migrate'].configure_args)
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=target_metadata,
+            process_revision_directives=process_revision_directives,
+            **current_app.extensions['migrate'].configure_args
+        )
 
-    try:
         with context.begin_transaction():
             context.run_migrations()
-    finally:
-        connection.close()
+
 
 if context.is_offline_mode():
     run_migrations_offline()
diff --git a/migrations/versions/787bdba9e147_init_db.py b/migrations/versions/787bdba9e147_init_db.py
index aa781de..c4c7aa2 100644
--- a/migrations/versions/787bdba9e147_init_db.py
+++ b/migrations/versions/787bdba9e147_init_db.py
@@ -56,9 +56,9 @@ def seed_data():
 
     op.bulk_insert(template_table,
         [
-            {id: 1, 'name': 'basic_template_1', 'description': 'Basic Template #1'},
-            {id: 2, 'name': 'basic_template_2', 'description': 'Basic Template #2'},
-            {id: 3, 'name': 'basic_template_3', 'description': 'Basic Template #3'}
+            {'id': 1, 'name': 'basic_template_1', 'description': 'Basic Template #1'},
+            {'id': 2, 'name': 'basic_template_2', 'description': 'Basic Template #2'},
+            {'id': 3, 'name': 'basic_template_3', 'description': 'Basic Template #3'}
         ]
     )
 
diff --git a/requirements.txt b/requirements.txt
index 6ecea27..11b1421 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,34 +1,41 @@
-Flask==1.1.2
-Flask-Assets==2.0
-Flask-Login==0.5.0
-Flask-SQLAlchemy==2.4.4
-Flask-Migrate==2.5.3
-SQLAlchemy==1.3.19
-mysqlclient==2.0.1
+mysqlclient==2.1.1
 configobj==5.0.6
-bcrypt>=3.1.7
-requests==2.24.0
-python-ldap==3.4.2
-pyotp==2.4.0
-qrcode==6.1
+bcrypt==4.0.1
+requests==2.28.1
+python-ldap==3.4.3
+pyotp==2.8.0
+qrcode==7.3.1
 dnspython>=1.16.0
-gunicorn==20.0.4
-python3-saml
-pytz==2020.1
+gunicorn==20.1.0
+python3-saml==1.14.0
+pytz==2022.7
 cssmin==0.2.0
-rjsmin==1.2.0
-Authlib==0.15
+rjsmin==1.2.1
+Authlib==1.2.0
 Flask-SeaSurf==1.1.1
-bravado-core==5.17.0
+bravado-core==5.17.1
 jsonschema[format]>=2.5.1,<4.0.0 # until https://github.com/Yelp/bravado-core/pull/385
 lima==0.5
-pytest==6.2.5
 pytimeparse==1.1.8
-PyYAML==5.4
-Flask-SSLify==0.1.5
+alembic==1.9.0
+certifi==2022.12.7
+cffi==1.15.1
+passlib==1.7.4
+pyasn1==0.4.8
+webcolors==1.12
+zipp==3.11.0
+Flask==2.2.2
+Flask-Assets==2.0
+Flask-Login==0.6.2
+Flask-SQLAlchemy==3.0.2
+Flask-Migrate==4.0.0
+SQLAlchemy==1.4.45
+pyOpenSSL==22.1.0
+Authlib==1.2.0
+Flask-SeaSurf==1.1.1
+PyYAML==6.0
 Flask-Mail==0.9.1
-flask-session==0.3.2
-Jinja2==3.0.3
-itsdangerous==2.0.1
-werkzeug==2.0.3
-cryptography==36.0.2
+Flask-SSLify==0.1.5
+Flask-Session==0.4.0
+lxml==4.6.5
+pytest==7.2.0
diff --git a/tests/conftest.py b/tests/conftest.py
index 3662916..f5de9e8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,26 +1,28 @@
 import os
-import pytest
-import flask_migrate
 from base64 import b64encode
 
-from powerdnsadmin import create_app
-from powerdnsadmin.models.base import db
-from powerdnsadmin.models.user import User
-from powerdnsadmin.models.setting import Setting
-from powerdnsadmin.models.api_key import ApiKey
+import pytest
+from flask_migrate import upgrade as flask_migrate_upgrade
 
-app = create_app('../configs/test.py')
-ctx = app.app_context()
-ctx.push()
+from powerdnsadmin import create_app
+from powerdnsadmin.models.api_key import ApiKey
+from powerdnsadmin.models.base import db
+from powerdnsadmin.models.setting import Setting
+from powerdnsadmin.models.user import User
+
+
+@pytest.fixture(scope="session")
+def app():
+    app = create_app('../configs/test.py')
+    yield app
 
 
 @pytest.fixture
-def client():
+def client(app):
     app.config['TESTING'] = True
     client = app.test_client()
     yield client
 
-
 def load_data(setting_name, *args, **kwargs):
     if setting_name == 'maintenance':
         return 0
@@ -41,17 +43,17 @@ def load_data(setting_name, *args, **kwargs):
 
 
 @pytest.fixture
-def test_admin_user():
+def test_admin_user(app):
     return app.config.get('TEST_ADMIN_USER')
 
 
 @pytest.fixture
-def test_user():
+def test_user(app):
     return app.config.get('TEST_USER')
 
 
 @pytest.fixture
-def basic_auth_admin_headers():
+def basic_auth_admin_headers(app):
     test_admin_user = app.config.get('TEST_ADMIN_USER')
     test_admin_pass = app.config.get('TEST_ADMIN_PASSWORD')
     user_pass = "{0}:{1}".format(test_admin_user, test_admin_pass)
@@ -63,7 +65,7 @@ def basic_auth_admin_headers():
 
 
 @pytest.fixture
-def basic_auth_user_headers():
+def basic_auth_user_headers(app):
     test_user = app.config.get('TEST_USER')
     test_user_pass = app.config.get('TEST_USER_PASSWORD')
     user_pass = "{0}:{1}".format(test_user, test_user_pass)
@@ -75,7 +77,8 @@ def basic_auth_user_headers():
 
 
 @pytest.fixture(scope="module")
-def initial_data():
+def initial_data(app):
+
     pdns_proto = os.environ['PDNS_PROTO']
     pdns_host = os.environ['PDNS_HOST']
     pdns_port = os.environ['PDNS_PORT']
@@ -85,46 +88,44 @@ def initial_data():
     api_key_setting = Setting('pdns_api_key', os.environ['PDNS_API_KEY'])
     allow_create_domain_setting = Setting('allow_user_create_domain', True)
 
-    try:
-        flask_migrate.upgrade()
+    with app.app_context():
+        try:
+            flask_migrate_upgrade(directory="migrations")
+            db.session.add(api_url_setting)
+            db.session.add(api_key_setting)
+            db.session.add(allow_create_domain_setting)
 
-        db.session.add(api_url_setting)
-        db.session.add(api_key_setting)
-        db.session.add(allow_create_domain_setting)
+            test_user = app.config.get('TEST_USER')
+            test_user_pass = app.config.get('TEST_USER_PASSWORD')
+            test_admin_user = app.config.get('TEST_ADMIN_USER')
+            test_admin_pass = app.config.get('TEST_ADMIN_PASSWORD')
 
-        test_user = app.config.get('TEST_USER')
-        test_user_pass = app.config.get('TEST_USER_PASSWORD')
-        test_admin_user = app.config.get('TEST_ADMIN_USER')
-        test_admin_pass = app.config.get('TEST_ADMIN_PASSWORD')
+            admin_user = User(username=test_admin_user,
+                              plain_text_password=test_admin_pass,
+                              email="admin@admin.com")
+            ret = admin_user.create_local_user()
 
-        admin_user = User(username=test_admin_user,
-                          plain_text_password=test_admin_pass,
-                          email="admin@admin.com")
-        msg = admin_user.create_local_user()
+            if not ret['status']:
+                raise Exception("Error occurred creating user {0}".format(ret['msg']))
 
-        if not msg:
-            raise Exception("Error occurred creating user {0}".format(msg))
+            ordinary_user = User(username=test_user,
+                                 plain_text_password=test_user_pass,
+                                 email="test@test.com")
+            ret = ordinary_user.create_local_user()
 
-        ordinary_user = User(username=test_user,
-                             plain_text_password=test_user_pass,
-                             email="test@test.com")
-        msg = ordinary_user.create_local_user()
+            if not ret['status']:
+                raise Exception("Error occurred creating user {0}".format(ret['msg']))
 
-        if not msg:
-            raise Exception("Error occurred creating user {0}".format(msg))
-
-    except Exception as e:
-        print("Unexpected ERROR: {0}".format(e))
-        raise e
+        except Exception as e:
+            print("Unexpected ERROR: {0}".format(e))
+            raise e
 
     yield
-
-    db.session.close()
     os.unlink(app.config['TEST_DB_LOCATION'])
 
 
 @pytest.fixture(scope="module")
-def initial_apikey_data():
+def initial_apikey_data(app):
     pdns_proto = os.environ['PDNS_PROTO']
     pdns_host = os.environ['PDNS_HOST']
     pdns_port = os.environ['PDNS_PORT']
@@ -135,42 +136,40 @@ def initial_apikey_data():
     allow_create_domain_setting = Setting('allow_user_create_domain', True)
     allow_remove_domain_setting = Setting('allow_user_remove_domain', True)
 
-    try:
-        flask_migrate.upgrade()
+    with app.app_context():
+        try:
+            flask_migrate_upgrade(directory="migrations")
+            db.session.add(api_url_setting)
+            db.session.add(api_key_setting)
+            db.session.add(allow_create_domain_setting)
+            db.session.add(allow_remove_domain_setting)
 
-        db.session.add(api_url_setting)
-        db.session.add(api_key_setting)
-        db.session.add(allow_create_domain_setting)
-        db.session.add(allow_remove_domain_setting)
+            test_user_apikey = app.config.get('TEST_USER_APIKEY')
+            test_admin_apikey = app.config.get('TEST_ADMIN_APIKEY')
 
-        test_user_apikey = app.config.get('TEST_USER_APIKEY')
-        test_admin_apikey = app.config.get('TEST_ADMIN_APIKEY')
+            dummy_apikey = ApiKey(desc="dummy", role_name="Administrator")
 
-        dummy_apikey = ApiKey(desc="dummy", role_name="Administrator")
+            admin_key = dummy_apikey.get_hashed_password(
+                plain_text_password=test_admin_apikey).decode('utf-8')
 
-        admin_key = dummy_apikey.get_hashed_password(
-            plain_text_password=test_admin_apikey).decode('utf-8')
+            admin_apikey = ApiKey(key=admin_key,
+                                  desc="test admin apikey",
+                                  role_name="Administrator")
+            admin_apikey.create()
 
-        admin_apikey = ApiKey(key=admin_key,
-                              desc="test admin apikey",
-                              role_name="Administrator")
-        admin_apikey.create()
+            user_key = dummy_apikey.get_hashed_password(
+                plain_text_password=test_user_apikey).decode('utf-8')
 
-        user_key = dummy_apikey.get_hashed_password(
-            plain_text_password=test_user_apikey).decode('utf-8')
+            user_apikey = ApiKey(key=user_key,
+                                 desc="test user apikey",
+                                 role_name="User")
+            user_apikey.create()
 
-        user_apikey = ApiKey(key=user_key,
-                             desc="test user apikey",
-                             role_name="User")
-        user_apikey.create()
-
-    except Exception as e:
-        print("Unexpected ERROR: {0}".format(e))
-        raise e
+        except Exception as e:
+            print("Unexpected ERROR: {0}".format(e))
+            raise e
 
     yield
-
-    db.session.close()
     os.unlink(app.config['TEST_DB_LOCATION'])
 
 
@@ -187,61 +186,51 @@ def zone_data():
 @pytest.fixture
 def created_zone_data():
     data = {
-        'url':
-        '/api/v1/servers/localhost/zones/example.org.',
-        'soa_edit_api':
-        'DEFAULT',
-        'last_check':
-        0,
+        'url': '/api/v1/servers/localhost/zones/example.org.',
+        'soa_edit_api': 'DEFAULT',
+        'last_check': 0,
         'masters': [],
-        'dnssec':
-        False,
-        'notified_serial':
-        0,
-        'nsec3narrow':
-        False,
-        'serial':
-        2019013101,
-        'nsec3param':
-        '',
-        'soa_edit':
-        '',
-        'api_rectify':
-        False,
-        'kind':
-        'Native',
+        'dnssec': False,
+        'notified_serial': 0,
+        'nsec3narrow': False,
+        'serial': 2019013101,
+        'nsec3param': '',
+        'soa_edit': '',
+        'api_rectify': False,
+        'kind': 'Native',
         'rrsets': [{
             'comments': [],
-            'type':
-            'SOA',
-            'name':
-            'example.org.',
-            'ttl':
-            3600,
+            'type': 'SOA',
+            'name': 'example.org.',
+            'ttl': 3600,
             'records': [{
-                'content':
-                'a.misconfigured.powerdns.server. hostmaster.example.org. 2019013101 10800 3600 604800 3600',
+                'content': 'a.misconfigured.powerdns.server. hostmaster.example.org. 2019013101 10800 3600 604800 3600',
                 'disabled': False
             }]
         }, {
             'comments': [],
-            'type':
-            'NS',
-            'name':
-            'example.org.',
-            'ttl':
-            3600,
+            'type': 'NS',
+            'name': 'example.org.',
+            'ttl': 3600,
             'records': [{
                 'content': 'ns1.example.org.',
                 'disabled': False
             }]
         }],
-        'name':
-        'example.org.',
-        'account':
-        '',
-        'id':
-        'example.org.'
+        'name': 'example.org.',
+        'account': '',
+        'id': 'example.org.'
+    }
+    return data
+
+
+def user_data(app):
+    test_user = app.config.get('TEST_USER')
+    test_user_pass = app.config.get('TEST_USER_PASSWORD')
+    data = {
+        "username": test_user,
+        "plain_text_password": test_user_pass,
+        "email": "test@test.com"
     }
     return data
 
@@ -261,37 +250,39 @@ def admin_apikey_data():
 
 
 @pytest.fixture(scope='module')
-def user_apikey_integration():
+def user_apikey_integration(app):
     test_user_apikey = app.config.get('TEST_USER_APIKEY')
     headers = create_apikey_headers(test_user_apikey)
     return headers
 
 
 @pytest.fixture(scope='module')
-def admin_apikey_integration():
+def admin_apikey_integration(app):
     test_user_apikey = app.config.get('TEST_ADMIN_APIKEY')
     headers = create_apikey_headers(test_user_apikey)
     return headers
 
 
 @pytest.fixture(scope='module')
-def user_apikey():
-    data = user_apikey_data()
-    api_key = ApiKey(desc=data['description'],
-                     role_name=data['role'],
-                     domains=[])
-    headers = create_apikey_headers(api_key.plain_key)
-    return headers
+def user_apikey(app):
+    with app.app_context():
+        data = user_apikey_data()
+        api_key = ApiKey(desc=data['description'],
+                         role_name=data['role'],
+                         domains=[])
+        headers = create_apikey_headers(api_key.plain_key)
+        return headers
 
 
 @pytest.fixture(scope='module')
-def admin_apikey():
-    data = admin_apikey_data()
-    api_key = ApiKey(desc=data['description'],
-                     role_name=data['role'],
-                     domains=[])
-    headers = create_apikey_headers(api_key.plain_key)
-    return headers
+def admin_apikey(app):
+    with app.app_context():
+        data = admin_apikey_data()
+        api_key = ApiKey(desc=data['description'],
+                         role_name=data['role'],
+                         domains=[])
+        headers = create_apikey_headers(api_key.plain_key)
+        return headers
 
 
 def create_apikey_headers(passw):
diff --git a/tests/integration/api/apikey/test_admin_user.py b/tests/integration/api/apikey/test_admin_user.py
index 04e9806..3bc0c82 100644
--- a/tests/integration/api/apikey/test_admin_user.py
+++ b/tests/integration/api/apikey/test_admin_user.py
@@ -8,7 +8,7 @@ from tests.conftest import user_apikey_data, admin_apikey_data
 
 
 class TestIntegrationApiApiKeyAdminUser(object):
-    def test_empty_get(self, client, initial_data, basic_auth_admin_headers):
+    def test_empty_get(self, initial_data, client, basic_auth_admin_headers):
         res = client.get("/api/v1/pdnsadmin/apikeys",
                          headers=basic_auth_admin_headers)
         data = res.get_json(force=True)
@@ -18,7 +18,7 @@ class TestIntegrationApiApiKeyAdminUser(object):
     @pytest.mark.parametrize(
         "apikey_data",
         [user_apikey_data(), admin_apikey_data()])
-    def test_create_apikey(self, client, initial_data, apikey_data, zone_data,
+    def test_create_apikey(self, initial_data, client, apikey_data, zone_data,
                            basic_auth_admin_headers):
         res = client.post("/api/v1/pdnsadmin/zones",
                           headers=basic_auth_admin_headers,
@@ -53,7 +53,7 @@ class TestIntegrationApiApiKeyAdminUser(object):
     @pytest.mark.parametrize(
         "apikey_data",
         [user_apikey_data(), admin_apikey_data()])
-    def test_get_multiple_apikey(self, client, initial_data, apikey_data,
+    def test_get_multiple_apikey(self, initial_data, client, apikey_data,
                                  zone_data, basic_auth_admin_headers):
         res = client.post("/api/v1/pdnsadmin/zones",
                           headers=basic_auth_admin_headers,
@@ -102,7 +102,7 @@ class TestIntegrationApiApiKeyAdminUser(object):
     @pytest.mark.parametrize(
         "apikey_data",
         [user_apikey_data(), admin_apikey_data()])
-    def test_delete_apikey(self, client, initial_data, apikey_data, zone_data,
+    def test_delete_apikey(self, initial_data, client, apikey_data, zone_data,
                            basic_auth_admin_headers):
         res = client.post("/api/v1/pdnsadmin/zones",
                           headers=basic_auth_admin_headers,
diff --git a/tests/integration/api/apikey/test_user.py b/tests/integration/api/apikey/test_user.py
index 1d0751d..34fdd86 100644
--- a/tests/integration/api/apikey/test_user.py
+++ b/tests/integration/api/apikey/test_user.py
@@ -5,7 +5,7 @@ from powerdnsadmin.lib.validators import validate_zone
 from powerdnsadmin.lib.schema import DomainSchema
 
 
-class TestIntegrationApiZoneUser(object):
+class TestIntegrationApiApiKeyUser(object):
     def test_empty_get(self, initial_data, client, basic_auth_user_headers):
         res = client.get("/api/v1/pdnsadmin/zones",
                          headers=basic_auth_user_headers)
diff --git a/tests/integration/api/management/test_user.py b/tests/integration/api/management/test_user.py
index 548702a..65a5869 100644
--- a/tests/integration/api/management/test_user.py
+++ b/tests/integration/api/management/test_user.py
@@ -1,4 +1,3 @@
-
 import json
 
 from . import IntegrationApiManagement
@@ -6,57 +5,57 @@ from . import IntegrationApiManagement
 
 class TestIntegrationApiManagementUser(IntegrationApiManagement):
 
-    def test_accounts_empty_get(
-            self, client, initial_data,                         # noqa: F811
-            basic_auth_user_headers):                           # noqa: F811
+    def test_accounts_empty_get(self, initial_data, client,  # noqa: F811
+                                basic_auth_user_headers):  # noqa: F811
         res = client.get("/api/v1/pdnsadmin/accounts",
                          headers=basic_auth_user_headers)
         assert res.status_code == 401
 
-    def test_users_empty_get(
-            self, client, initial_data,                         # noqa: F811
-            test_admin_user, test_user,                         # noqa: F811
-            basic_auth_user_headers):                           # noqa: F811
+    def test_users_empty_get(self, initial_data, client,  # noqa: F811
+                             test_admin_user, test_user,  # noqa: F811
+                             basic_auth_user_headers):  # noqa: F811
         res = client.get("/api/v1/pdnsadmin/users",
                          headers=basic_auth_user_headers)
         assert res.status_code == 401
 
-    def test_self_get(
-            self, initial_data, client, test_user,              # noqa: F811
-            basic_auth_user_headers):                           # noqa: F811
-        self.user = None
+    def test_self_get(self, initial_data, client, basic_auth_user_headers, test_user):  # noqa: F811
         res = client.get("/api/v1/pdnsadmin/users/{}".format(test_user),
                          headers=basic_auth_user_headers)
         data = res.get_json(force=True)
         assert res.status_code == 200
         assert data
-        self.user = [data]
 
-    def test_accounts(
-            self, client, initial_data,                          # noqa: F811
-            account_data,                                        # noqa: F811
-            basic_auth_admin_headers, basic_auth_user_headers):  # noqa: F811
+    def test_create_account_fail(self, client, initial_data, account_data,  # noqa: F811
+                                 basic_auth_user_headers):  # noqa: F811
+
+        # Create account (should fail)
+        res = client.post("/api/v1/pdnsadmin/accounts",
+                          headers=basic_auth_user_headers,
+                          data=json.dumps(account_data),
+                          content_type="application/json")
+        assert res.status_code == 401
+
+    def test_create_account_as_admin(self, app, initial_data, client, account_data,  # noqa: F811
+                                     basic_auth_admin_headers):  # noqa: F811
         self.client = client
         self.basic_auth_admin_headers = basic_auth_admin_headers
 
-        # Create account (should fail)
-        res = client.post(
-            "/api/v1/pdnsadmin/accounts",
-            headers=basic_auth_user_headers,
-            data=json.dumps(account_data),
-            content_type="application/json",
-        )
-        assert res.status_code == 401
+        with app.test_request_context():
+            # Create account (as admin)
+            res = client.post("/api/v1/pdnsadmin/accounts",
+                              headers=basic_auth_admin_headers,
+                              data=json.dumps(account_data),
+                              content_type="application/json")
+            data = res.get_json(force=True)
+            assert res.status_code == 201
 
-        # Create account (as admin)
-        res = client.post(
-            "/api/v1/pdnsadmin/accounts",
-            headers=basic_auth_admin_headers,
-            data=json.dumps(account_data),
-            content_type="application/json",
-        )
-        data = res.get_json(force=True)
-        assert res.status_code == 201
+    def test_update_account_fail(
+            self, initial_data, client,  # noqa: F811
+            account_data,  # noqa: F811
+            basic_auth_user_headers,
+            basic_auth_admin_headers):  # noqa: F811
+        self.client = client
+        self.basic_auth_admin_headers = basic_auth_admin_headers
 
         # Check account
         data = self.check_account(account_data)
@@ -71,6 +70,18 @@ class TestIntegrationApiManagementUser(IntegrationApiManagement):
         )
         assert res.status_code == 401
 
+    def test_delete_account_fail(
+            self, initial_data, client,  # noqa: F811
+            account_data,  # noqa: F811
+            basic_auth_user_headers,
+            basic_auth_admin_headers):  # noqa: F811
+        self.client = client
+        self.basic_auth_admin_headers = basic_auth_admin_headers
+
+        # Check account
+        data = self.check_account(account_data)
+        account_id = data["id"]
+
         # Delete account (should fail)
         res = client.delete(
             "/api/v1/pdnsadmin/accounts/{}".format(account_id),
@@ -80,6 +91,17 @@ class TestIntegrationApiManagementUser(IntegrationApiManagement):
         )
         assert res.status_code == 401
 
+    def test_delete_account_as_admin(
+            self, client, initial_data,  # noqa: F811
+            account_data,  # noqa: F811
+            basic_auth_admin_headers):  # noqa: F811
+        self.client = client
+        self.basic_auth_admin_headers = basic_auth_admin_headers
+
+        # Check account
+        data = self.check_account(account_data)
+        account_id = data["id"]
+
         # Cleanup (delete account as admin)
         res = client.delete(
             "/api/v1/pdnsadmin/accounts/{}".format(account_id),
@@ -90,8 +112,8 @@ class TestIntegrationApiManagementUser(IntegrationApiManagement):
         assert res.status_code == 204
 
     def test_users(
-            self, client, initial_data,                          # noqa: F811
-            user1_data,                                          # noqa: F811
+            self, client, initial_data,  # noqa: F811
+            user1_data,  # noqa: F811
             basic_auth_admin_headers, basic_auth_user_headers):  # noqa: F811
         self.client = client
         self.basic_auth_admin_headers = basic_auth_admin_headers
@@ -150,8 +172,8 @@ class TestIntegrationApiManagementUser(IntegrationApiManagement):
         assert res.status_code == 204
 
     def test_account_users(
-            self, client, initial_data,                          # noqa: F811
-            account_data, user1_data,                            # noqa: F811
+            self, client, initial_data,  # noqa: F811
+            account_data, user1_data,  # noqa: F811
             basic_auth_admin_headers, basic_auth_user_headers):  # noqa: F811
         self.client = client
         self.basic_auth_admin_headers = basic_auth_admin_headers
diff --git a/tests/unit/zone/test_admin_apikey.py b/tests/unit/zone/test_admin_apikey.py
index 9d1ca28..ccef69c 100644
--- a/tests/unit/zone/test_admin_apikey.py
+++ b/tests/unit/zone/test_admin_apikey.py
@@ -15,81 +15,82 @@ from tests.conftest import admin_apikey_data, load_data
 
 class TestUnitApiZoneAdminApiKey(object):
     @pytest.fixture
-    def common_data_mock(self):
-        self.google_setting_patcher = patch(
-            'powerdnsadmin.services.google.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.github_setting_patcher = patch(
-            'powerdnsadmin.services.github.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.azure_setting_patcher = patch(
-            'powerdnsadmin.services.azure.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.oidc_setting_patcher = patch(
-            'powerdnsadmin.services.oidc.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.helpers_setting_patcher = patch(
-            'powerdnsadmin.lib.helper.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.models_setting_patcher = patch(
-            'powerdnsadmin.models.setting.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.domain_model_setting_patcher = patch(
-            'powerdnsadmin.models.domain.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.record_model_setting_patcher = patch(
-            'powerdnsadmin.models.record.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.server_model_setting_patcher = patch(
-            'powerdnsadmin.models.server.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.mock_apikey_patcher = patch(
-            'powerdnsadmin.decorators.ApiKey',
-            spec=powerdnsadmin.models.api_key.ApiKey)
-        self.mock_hist_patcher = patch(
-            'powerdnsadmin.routes.api.History',
-            spec=powerdnsadmin.models.history.History)
-        self.mock_setting_patcher = patch(
-            'powerdnsadmin.routes.api.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.mock_decorators_setting_patcher = patch(
-            'powerdnsadmin.decorators.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
+    def common_data_mock(self, app):
+        with app.app_context():
+            self.google_setting_patcher = patch(
+                'powerdnsadmin.services.google.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.github_setting_patcher = patch(
+                'powerdnsadmin.services.github.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.azure_setting_patcher = patch(
+                'powerdnsadmin.services.azure.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.oidc_setting_patcher = patch(
+                'powerdnsadmin.services.oidc.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.helpers_setting_patcher = patch(
+                'powerdnsadmin.lib.helper.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.models_setting_patcher = patch(
+                'powerdnsadmin.models.setting.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.domain_model_setting_patcher = patch(
+                'powerdnsadmin.models.domain.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.record_model_setting_patcher = patch(
+                'powerdnsadmin.models.record.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.server_model_setting_patcher = patch(
+                'powerdnsadmin.models.server.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.mock_apikey_patcher = patch(
+                'powerdnsadmin.decorators.ApiKey',
+                spec=powerdnsadmin.models.api_key.ApiKey)
+            self.mock_hist_patcher = patch(
+                'powerdnsadmin.routes.api.History',
+                spec=powerdnsadmin.models.history.History)
+            self.mock_setting_patcher = patch(
+                'powerdnsadmin.routes.api.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.mock_decorators_setting_patcher = patch(
+                'powerdnsadmin.decorators.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
 
-        data = admin_apikey_data()
-        api_key = ApiKey(desc=data['description'],
-                         role_name=data['role'],
-                         domains=[])
-        api_key.role = Role(name=data['role'])
+            data = admin_apikey_data()
+            api_key = ApiKey(desc=data['description'],
+                             role_name=data['role'],
+                             domains=[])
+            api_key.role = Role(name=data['role'])
 
-        self.mock_google_setting = self.google_setting_patcher.start()
-        self.mock_github_setting = self.github_setting_patcher.start()
-        self.mock_azure_setting = self.azure_setting_patcher.start()
-        self.mock_oidc_setting = self.oidc_setting_patcher.start()
-        self.mock_helpers_setting = self.helpers_setting_patcher.start()
-        self.mock_models_setting = self.models_setting_patcher.start()
-        self.mock_domain_model_setting = self.domain_model_setting_patcher.start(
-        )
-        self.mock_record_model_setting = self.record_model_setting_patcher.start(
-        )
-        self.mock_server_model_setting = self.server_model_setting_patcher.start(
-        )
-        self.mock_apikey = self.mock_apikey_patcher.start()
-        self.mock_hist = self.mock_hist_patcher.start()
-        self.mock_setting = self.mock_setting_patcher.start()
-        self.mock_decorators_setting = self.mock_decorators_setting_patcher.start()
+            self.mock_google_setting = self.google_setting_patcher.start()
+            self.mock_github_setting = self.github_setting_patcher.start()
+            self.mock_azure_setting = self.azure_setting_patcher.start()
+            self.mock_oidc_setting = self.oidc_setting_patcher.start()
+            self.mock_helpers_setting = self.helpers_setting_patcher.start()
+            self.mock_models_setting = self.models_setting_patcher.start()
+            self.mock_domain_model_setting = self.domain_model_setting_patcher.start(
+            )
+            self.mock_record_model_setting = self.record_model_setting_patcher.start(
+            )
+            self.mock_server_model_setting = self.server_model_setting_patcher.start(
+            )
+            self.mock_apikey = self.mock_apikey_patcher.start()
+            self.mock_hist = self.mock_hist_patcher.start()
+            self.mock_setting = self.mock_setting_patcher.start()
+            self.mock_decorators_setting = self.mock_decorators_setting_patcher.start()
 
-        self.mock_google_setting.return_value.get.side_effect = load_data
-        self.mock_github_setting.return_value.get.side_effect = load_data
-        self.mock_azure_setting.return_value.get.side_effect = load_data
-        self.mock_oidc_setting.return_value.get.side_effect = load_data
-        self.mock_helpers_setting.return_value.get.side_effect = load_data
-        self.mock_models_setting.return_value.get.side_effect = load_data
-        self.mock_domain_model_setting.return_value.get.side_effect = load_data
-        self.mock_record_model_setting.return_value.get.side_effect = load_data
-        self.mock_server_model_setting.return_value.get.side_effect = load_data
-        self.mock_decorators_setting.return_value.get.side_effect = load_data
-        self.mock_apikey.return_value.is_validate.return_value = api_key
+            self.mock_google_setting.return_value.get.side_effect = load_data
+            self.mock_github_setting.return_value.get.side_effect = load_data
+            self.mock_azure_setting.return_value.get.side_effect = load_data
+            self.mock_oidc_setting.return_value.get.side_effect = load_data
+            self.mock_helpers_setting.return_value.get.side_effect = load_data
+            self.mock_models_setting.return_value.get.side_effect = load_data
+            self.mock_domain_model_setting.return_value.get.side_effect = load_data
+            self.mock_record_model_setting.return_value.get.side_effect = load_data
+            self.mock_server_model_setting.return_value.get.side_effect = load_data
+            self.mock_decorators_setting.return_value.get.side_effect = load_data
+            self.mock_apikey.return_value.is_validate.return_value = api_key
 
         yield
 
diff --git a/tests/unit/zone/test_admin_user.py b/tests/unit/zone/test_admin_user.py
index 922aa64..c4412de 100644
--- a/tests/unit/zone/test_admin_user.py
+++ b/tests/unit/zone/test_admin_user.py
@@ -13,7 +13,8 @@ from tests.conftest import load_data
 
 class TestUnitApiZoneAdminUser(object):
     @pytest.fixture
-    def common_data_mock(self):
+    def common_data_mock(self, app, initial_data):
+
         self.google_setting_patcher = patch(
             'powerdnsadmin.services.google.Setting',
             spec=powerdnsadmin.models.setting.Setting)
@@ -26,17 +27,11 @@ class TestUnitApiZoneAdminUser(object):
         self.oidc_setting_patcher = patch(
             'powerdnsadmin.services.oidc.Setting',
             spec=powerdnsadmin.models.setting.Setting)
-        self.api_setting_patcher = patch(
-            'powerdnsadmin.routes.api.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.base_route_user_patcher = patch(
-            'powerdnsadmin.routes.base.User',
-            spec=powerdnsadmin.models.user.User)
         self.helpers_setting_patcher = patch(
             'powerdnsadmin.lib.helper.Setting',
             spec=powerdnsadmin.models.setting.Setting)
         self.models_setting_patcher = patch(
-            'powerdnsadmin.models.Setting',
+            'powerdnsadmin.models.setting.Setting',
             spec=powerdnsadmin.models.setting.Setting)
         self.domain_model_setting_patcher = patch(
             'powerdnsadmin.models.domain.Setting',
@@ -47,52 +42,60 @@ class TestUnitApiZoneAdminUser(object):
         self.server_model_setting_patcher = patch(
             'powerdnsadmin.models.server.Setting',
             spec=powerdnsadmin.models.setting.Setting)
-        self.decorators_setting_patcher = patch(
-            'powerdnsadmin.decorators.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.mock_user_patcher = patch('powerdnsadmin.decorators.User',
-                                       spec=powerdnsadmin.models.user.User)
+        self.mock_user_patcher = patch(
+            'powerdnsadmin.decorators.User',
+            spec=powerdnsadmin.models.user.User)
         self.mock_hist_patcher = patch(
             'powerdnsadmin.routes.api.History',
             spec=powerdnsadmin.models.history.History)
+        self.mock_setting_patcher = patch(
+            'powerdnsadmin.routes.api.Setting',
+            spec=powerdnsadmin.models.setting.Setting)
+        self.mock_decorators_setting_patcher = patch(
+            'powerdnsadmin.decorators.Setting',
+            spec=powerdnsadmin.models.setting.Setting)
+        self.base_route_user_patcher = patch(
+            'powerdnsadmin.routes.base.User',
+            spec=powerdnsadmin.models.user.User)
 
-        self.mock_google_setting = self.google_setting_patcher.start()
-        self.mock_github_setting = self.github_setting_patcher.start()
-        self.mock_azure_setting = self.azure_setting_patcher.start()
-        self.mock_oidc_setting = self.oidc_setting_patcher.start()
-        self.mock_base_route_user = self.base_route_user_patcher.start()
-        self.mock_helpers_setting = self.helpers_setting_patcher.start()
-        self.mock_models_setting = self.models_setting_patcher.start()
-        self.mock_domain_model_setting = self.domain_model_setting_patcher.start(
-        )
-        self.mock_record_model_setting = self.record_model_setting_patcher.start(
-        )
-        self.mock_server_model_setting = self.server_model_setting_patcher.start(
-        )
-        self.decorators_setting = self.decorators_setting_patcher.start()
-        self.api_setting = self.api_setting_patcher.start()
-        self.mock_user = self.mock_user_patcher.start()
-        self.mock_hist = self.mock_hist_patcher.start()
+        with app.app_context():
+            self.mock_google_setting = self.google_setting_patcher.start()
+            self.mock_github_setting = self.github_setting_patcher.start()
+            self.mock_azure_setting = self.azure_setting_patcher.start()
+            self.mock_oidc_setting = self.oidc_setting_patcher.start()
+            self.mock_base_route_user = self.base_route_user_patcher.start()
+            self.mock_helpers_setting = self.helpers_setting_patcher.start()
+            self.mock_models_setting = self.models_setting_patcher.start()
+            self.mock_domain_model_setting = self.domain_model_setting_patcher.start(
+            )
+            self.mock_record_model_setting = self.record_model_setting_patcher.start(
+            )
+            self.mock_server_model_setting = self.server_model_setting_patcher.start(
+            )
+            self.mock_user = self.mock_user_patcher.start()
+            self.mock_hist = self.mock_hist_patcher.start()
+            self.mock_setting = self.mock_setting_patcher.start()
+            self.mock_decorators_setting = self.mock_decorators_setting_patcher.start()
 
-        self.mock_google_setting.return_value.get.side_effect = load_data
-        self.mock_github_setting.return_value.get.side_effect = load_data
-        self.mock_azure_setting.return_value.get.side_effect = load_data
-        self.mock_oidc_setting.return_value.get.side_effect = load_data
-        self.mock_helpers_setting.return_value.get.side_effect = load_data
-        self.mock_models_setting.return_value.get.side_effect = load_data
-        self.mock_domain_model_setting.return_value.get.side_effect = load_data
-        self.mock_record_model_setting.return_value.get.side_effect = load_data
-        self.mock_server_model_setting.return_value.get.side_effect = load_data
-        self.decorators_setting.return_value.get.side_effect = load_data
-        self.api_setting.return_value.get.side_effect = load_data
+            self.mock_google_setting.return_value.get.side_effect = load_data
+            self.mock_github_setting.return_value.get.side_effect = load_data
+            self.mock_azure_setting.return_value.get.side_effect = load_data
+            self.mock_oidc_setting.return_value.get.side_effect = load_data
+            self.mock_helpers_setting.return_value.get.side_effect = load_data
+            self.mock_models_setting.return_value.get.side_effect = load_data
+            self.mock_domain_model_setting.return_value.get.side_effect = load_data
+            self.mock_record_model_setting.return_value.get.side_effect = load_data
+            self.mock_server_model_setting.return_value.get.side_effect = load_data
+            self.mock_decorators_setting.return_value.get.side_effect = load_data
+            self.mock_setting.return_value.get.side_effect = load_data
 
-        self.mockk = MagicMock()
-        self.mockk.role.name = "Administrator"
+            self.mockk = MagicMock()
+            self.mockk.role.name = "Administrator"
 
-        self.mock_user.query.filter.return_value.first.return_value = self.mockk
-        self.mock_user.return_value.is_validate.return_value = True
-        self.mock_base_route_user.query.filter.return_value.first.return_value = self.mockk
-        self.mock_base_route_user.return_value.is_validate.return_value = True
+            self.mock_user.query.filter.return_value.first.return_value = self.mockk
+            self.mock_user.return_value.is_validate.return_value = True
+            self.mock_base_route_user.query.filter.return_value.first.return_value = self.mockk
+            self.mock_base_route_user.return_value.is_validate.return_value = True
 
         yield
 
@@ -107,10 +110,10 @@ class TestUnitApiZoneAdminUser(object):
             self.domain_model_setting_patcher,
             self.record_model_setting_patcher,
             self.server_model_setting_patcher,
-            self.decorators_setting_patcher,
-            self.api_setting_patcher,
             self.mock_user_patcher,
             self.mock_hist_patcher,
+            self.mock_setting_patcher,
+            self.mock_decorators_setting_patcher,
         ]:
             patcher.stop()
 
@@ -159,8 +162,7 @@ class TestUnitApiZoneAdminUser(object):
                              headers=basic_auth_admin_headers)
             data = res.get_json(force=True)
 
-            fake_domain = namedtuple("Domain",
-                                     data[0].keys())(*data[0].values())
+            fake_domain = namedtuple("Domain", data[0].keys())(*data[0].values())
             domain_schema = DomainSchema(many=True)
 
             json.dumps(domain_schema.dump([fake_domain]))
diff --git a/tests/unit/zone/test_user.py b/tests/unit/zone/test_user.py
index 3d37492..f7fe335 100644
--- a/tests/unit/zone/test_user.py
+++ b/tests/unit/zone/test_user.py
@@ -13,7 +13,8 @@ from tests.conftest import load_data
 
 class TestUnitApiZoneUser(object):
     @pytest.fixture
-    def common_data_mock(self):
+    def common_data_mock(self, app, initial_data):
+
         self.google_setting_patcher = patch(
             'powerdnsadmin.services.google.Setting',
             spec=powerdnsadmin.models.setting.Setting)
@@ -26,17 +27,11 @@ class TestUnitApiZoneUser(object):
         self.oidc_setting_patcher = patch(
             'powerdnsadmin.services.oidc.Setting',
             spec=powerdnsadmin.models.setting.Setting)
-        self.api_setting_patcher = patch(
-            'powerdnsadmin.routes.api.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.base_route_user_patcher = patch(
-            'powerdnsadmin.routes.base.User',
-            spec=powerdnsadmin.models.user.User)
         self.helpers_setting_patcher = patch(
             'powerdnsadmin.lib.helper.Setting',
             spec=powerdnsadmin.models.setting.Setting)
         self.models_setting_patcher = patch(
-            'powerdnsadmin.models.Setting',
+            'powerdnsadmin.models.setting.Setting',
             spec=powerdnsadmin.models.setting.Setting)
         self.domain_model_setting_patcher = patch(
             'powerdnsadmin.models.domain.Setting',
@@ -47,52 +42,60 @@ class TestUnitApiZoneUser(object):
         self.server_model_setting_patcher = patch(
             'powerdnsadmin.models.server.Setting',
             spec=powerdnsadmin.models.setting.Setting)
-        self.decorators_setting_patcher = patch(
-            'powerdnsadmin.decorators.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.mock_user_patcher = patch('powerdnsadmin.decorators.User',
-                                       spec=powerdnsadmin.models.user.User)
+        self.mock_user_patcher = patch(
+            'powerdnsadmin.decorators.User',
+            spec=powerdnsadmin.models.user.User)
         self.mock_hist_patcher = patch(
             'powerdnsadmin.routes.api.History',
             spec=powerdnsadmin.models.history.History)
+        self.mock_setting_patcher = patch(
+            'powerdnsadmin.routes.api.Setting',
+            spec=powerdnsadmin.models.setting.Setting)
+        self.mock_decorators_setting_patcher = patch(
+            'powerdnsadmin.decorators.Setting',
+            spec=powerdnsadmin.models.setting.Setting)
+        self.base_route_user_patcher = patch(
+            'powerdnsadmin.routes.base.User',
+            spec=powerdnsadmin.models.user.User)
 
-        self.mock_google_setting = self.google_setting_patcher.start()
-        self.mock_github_setting = self.github_setting_patcher.start()
-        self.mock_azure_setting = self.azure_setting_patcher.start()
-        self.mock_oidc_setting = self.oidc_setting_patcher.start()
-        self.mock_base_route_user = self.base_route_user_patcher.start()
-        self.mock_helpers_setting = self.helpers_setting_patcher.start()
-        self.mock_models_setting = self.models_setting_patcher.start()
-        self.mock_domain_model_setting = self.domain_model_setting_patcher.start(
-        )
-        self.mock_record_model_setting = self.record_model_setting_patcher.start(
-        )
-        self.mock_server_model_setting = self.server_model_setting_patcher.start(
-        )
-        self.decorators_setting = self.decorators_setting_patcher.start()
-        self.api_setting = self.api_setting_patcher.start()
-        self.mock_user = self.mock_user_patcher.start()
-        self.mock_hist = self.mock_hist_patcher.start()
+        with app.app_context():
+            self.mock_google_setting = self.google_setting_patcher.start()
+            self.mock_github_setting = self.github_setting_patcher.start()
+            self.mock_azure_setting = self.azure_setting_patcher.start()
+            self.mock_oidc_setting = self.oidc_setting_patcher.start()
+            self.mock_base_route_user = self.base_route_user_patcher.start()
+            self.mock_helpers_setting = self.helpers_setting_patcher.start()
+            self.mock_models_setting = self.models_setting_patcher.start()
+            self.mock_domain_model_setting = self.domain_model_setting_patcher.start(
+            )
+            self.mock_record_model_setting = self.record_model_setting_patcher.start(
+            )
+            self.mock_server_model_setting = self.server_model_setting_patcher.start(
+            )
+            self.mock_user = self.mock_user_patcher.start()
+            self.mock_hist = self.mock_hist_patcher.start()
+            self.mock_setting = self.mock_setting_patcher.start()
+            self.mock_decorators_setting = self.mock_decorators_setting_patcher.start()
 
-        self.mock_google_setting.return_value.get.side_effect = load_data
-        self.mock_github_setting.return_value.get.side_effect = load_data
-        self.mock_azure_setting.return_value.get.side_effect = load_data
-        self.mock_oidc_setting.return_value.get.side_effect = load_data
-        self.mock_helpers_setting.return_value.get.side_effect = load_data
-        self.mock_models_setting.return_value.get.side_effect = load_data
-        self.mock_domain_model_setting.return_value.get.side_effect = load_data
-        self.mock_record_model_setting.return_value.get.side_effect = load_data
-        self.mock_server_model_setting.return_value.get.side_effect = load_data
-        self.decorators_setting.return_value.get.side_effect = load_data
-        self.api_setting.return_value.get.side_effect = load_data
+            self.mock_google_setting.return_value.get.side_effect = load_data
+            self.mock_github_setting.return_value.get.side_effect = load_data
+            self.mock_azure_setting.return_value.get.side_effect = load_data
+            self.mock_oidc_setting.return_value.get.side_effect = load_data
+            self.mock_helpers_setting.return_value.get.side_effect = load_data
+            self.mock_models_setting.return_value.get.side_effect = load_data
+            self.mock_domain_model_setting.return_value.get.side_effect = load_data
+            self.mock_record_model_setting.return_value.get.side_effect = load_data
+            self.mock_server_model_setting.return_value.get.side_effect = load_data
+            self.mock_decorators_setting.return_value.get.side_effect = load_data
+            self.mock_setting.return_value.get.side_effect = load_data
 
-        self.mockk = MagicMock()
-        self.mockk.role.name = "User"
+            self.mockk = MagicMock()
+            self.mockk.role.name = "User"
 
-        self.mock_user.query.filter.return_value.first.return_value = self.mockk
-        self.mock_user.return_value.is_validate.return_value = True
-        self.mock_base_route_user.query.filter.return_value.first.return_value = self.mockk
-        self.mock_base_route_user.return_value.is_validate.return_value = True
+            self.mock_user.query.filter.return_value.first.return_value = self.mockk
+            self.mock_user.return_value.is_validate.return_value = True
+            self.mock_base_route_user.query.filter.return_value.first.return_value = self.mockk
+            self.mock_base_route_user.return_value.is_validate.return_value = True
 
         yield
 
@@ -107,10 +110,10 @@ class TestUnitApiZoneUser(object):
             self.domain_model_setting_patcher,
             self.record_model_setting_patcher,
             self.server_model_setting_patcher,
-            self.decorators_setting_patcher,
-            self.api_setting_patcher,
             self.mock_user_patcher,
             self.mock_hist_patcher,
+            self.mock_setting_patcher,
+            self.mock_decorators_setting_patcher,
         ]:
             patcher.stop()
 
@@ -118,7 +121,7 @@ class TestUnitApiZoneUser(object):
     def test_create_zone(self, client, common_data_mock, zone_data,
                          basic_auth_user_headers, created_zone_data):
         with patch('powerdnsadmin.lib.helper.requests.request') as mock_post, \
-             patch('powerdnsadmin.routes.api.Domain') as mock_domain:
+                patch('powerdnsadmin.routes.api.Domain') as mock_domain:
             mock_post.return_value.status_code = 201
             mock_post.return_value.content = json.dumps(created_zone_data)
             mock_post.return_value.headers = {}
@@ -139,8 +142,9 @@ class TestUnitApiZoneUser(object):
         with patch('powerdnsadmin.routes.api.get_user_domains') as mock_user_domains:
             test_domain = Domain(1, name=zone_data['name'].rstrip("."))
             mock_user_domains.return_value = [test_domain]
+
             res = client.get("/api/v1/pdnsadmin/zones",
-                            headers=basic_auth_user_headers)
+                             headers=basic_auth_user_headers)
             data = res.get_json(force=True)
 
             fake_domain = namedtuple("Domain", data[0].keys())(*data[0].values())
@@ -151,9 +155,9 @@ class TestUnitApiZoneUser(object):
 
     def test_delete_zone(self, client, common_data_mock, zone_data,
                          basic_auth_user_headers):
-        with patch('powerdnsadmin.lib.utils.requests.request') as mock_delete, \
-             patch('powerdnsadmin.routes.api.Domain') as mock_domain, \
-             patch('powerdnsadmin.routes.api.get_user_domains') as mock_user_domains:
+        with patch('powerdnsadmin.lib.helper.requests.request') as mock_delete, \
+                patch('powerdnsadmin.routes.api.Domain') as mock_domain, \
+                patch('powerdnsadmin.routes.api.get_user_domains') as mock_user_domains:
             test_domain = Domain(1, name=zone_data['name'].rstrip("."))
 
             mock_domain.return_value.update.return_value = True
diff --git a/tests/unit/zone/test_user_apikey.py b/tests/unit/zone/test_user_apikey.py
index 77b1018..b1911ce 100644
--- a/tests/unit/zone/test_user_apikey.py
+++ b/tests/unit/zone/test_user_apikey.py
@@ -15,84 +15,85 @@ from tests.conftest import user_apikey_data, load_data
 
 class TestUnitApiZoneUserApiKey(object):
     @pytest.fixture
-    def common_data_mock(self):
-        self.google_setting_patcher = patch(
-            'powerdnsadmin.services.google.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.github_setting_patcher = patch(
-            'powerdnsadmin.services.github.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.azure_setting_patcher = patch(
-            'powerdnsadmin.services.azure.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.oidc_setting_patcher = patch(
-            'powerdnsadmin.services.oidc.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.helpers_setting_patcher = patch(
-            'powerdnsadmin.lib.helper.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.models_setting_patcher = patch(
-            'powerdnsadmin.models.setting.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.domain_model_setting_patcher = patch(
-            'powerdnsadmin.models.domain.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.record_model_setting_patcher = patch(
-            'powerdnsadmin.models.record.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.server_model_setting_patcher = patch(
-            'powerdnsadmin.models.server.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.mock_apikey_patcher = patch(
-            'powerdnsadmin.decorators.ApiKey',
-            spec=powerdnsadmin.models.api_key.ApiKey)
-        self.mock_hist_patcher = patch(
-            'powerdnsadmin.routes.api.History',
-            spec=powerdnsadmin.models.history.History)
-        self.mock_setting_patcher = patch(
-            'powerdnsadmin.routes.api.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
-        self.mock_decorators_setting_patcher = patch(
-            'powerdnsadmin.decorators.Setting',
-            spec=powerdnsadmin.models.setting.Setting)
+    def common_data_mock(self, app):
+        with app.app_context():
+            self.google_setting_patcher = patch(
+                'powerdnsadmin.services.google.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.github_setting_patcher = patch(
+                'powerdnsadmin.services.github.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.azure_setting_patcher = patch(
+                'powerdnsadmin.services.azure.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.oidc_setting_patcher = patch(
+                'powerdnsadmin.services.oidc.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.helpers_setting_patcher = patch(
+                'powerdnsadmin.lib.helper.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.models_setting_patcher = patch(
+                'powerdnsadmin.models.setting.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.domain_model_setting_patcher = patch(
+                'powerdnsadmin.models.domain.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.record_model_setting_patcher = patch(
+                'powerdnsadmin.models.record.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.server_model_setting_patcher = patch(
+                'powerdnsadmin.models.server.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.mock_apikey_patcher = patch(
+                'powerdnsadmin.decorators.ApiKey',
+                spec=powerdnsadmin.models.api_key.ApiKey)
+            self.mock_hist_patcher = patch(
+                'powerdnsadmin.routes.api.History',
+                spec=powerdnsadmin.models.history.History)
+            self.mock_setting_patcher = patch(
+                'powerdnsadmin.routes.api.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
+            self.mock_decorators_setting_patcher = patch(
+                'powerdnsadmin.decorators.Setting',
+                spec=powerdnsadmin.models.setting.Setting)
 
-        self.mock_google_setting = self.google_setting_patcher.start()
-        self.mock_github_setting = self.github_setting_patcher.start()
-        self.mock_azure_setting = self.azure_setting_patcher.start()
-        self.mock_oidc_setting = self.oidc_setting_patcher.start()
-        self.mock_helpers_setting = self.helpers_setting_patcher.start()
-        self.mock_models_setting = self.models_setting_patcher.start()
-        self.mock_domain_model_setting = self.domain_model_setting_patcher.start(
-        )
-        self.mock_record_model_setting = self.record_model_setting_patcher.start(
-        )
-        self.mock_server_model_setting = self.server_model_setting_patcher.start(
-        )
-        self.mock_apikey = self.mock_apikey_patcher.start()
-        self.mock_hist = self.mock_hist_patcher.start()
-        self.mock_setting = self.mock_setting_patcher.start()
-        self.mock_decorators_setting = self.mock_decorators_setting_patcher.start()
+            self.mock_google_setting = self.google_setting_patcher.start()
+            self.mock_github_setting = self.github_setting_patcher.start()
+            self.mock_azure_setting = self.azure_setting_patcher.start()
+            self.mock_oidc_setting = self.oidc_setting_patcher.start()
+            self.mock_helpers_setting = self.helpers_setting_patcher.start()
+            self.mock_models_setting = self.models_setting_patcher.start()
+            self.mock_domain_model_setting = self.domain_model_setting_patcher.start(
+            )
+            self.mock_record_model_setting = self.record_model_setting_patcher.start(
+            )
+            self.mock_server_model_setting = self.server_model_setting_patcher.start(
+            )
+            self.mock_apikey = self.mock_apikey_patcher.start()
+            self.mock_hist = self.mock_hist_patcher.start()
+            self.mock_setting = self.mock_setting_patcher.start()
+            self.mock_decorators_setting = self.mock_decorators_setting_patcher.start()
 
-        self.mock_google_setting.return_value.get.side_effect = load_data
-        self.mock_github_setting.return_value.get.side_effect = load_data
-        self.mock_azure_setting.return_value.get.side_effect = load_data
-        self.mock_oidc_setting.return_value.get.side_effect = load_data
-        self.mock_helpers_setting.return_value.get.side_effect = load_data
-        self.mock_models_setting.return_value.get.side_effect = load_data
-        self.mock_domain_model_setting.return_value.get.side_effect = load_data
-        self.mock_record_model_setting.return_value.get.side_effect = load_data
-        self.mock_server_model_setting.return_value.get.side_effect = load_data
-        self.mock_decorators_setting.return_value.get.side_effect = load_data
+            self.mock_google_setting.return_value.get.side_effect = load_data
+            self.mock_github_setting.return_value.get.side_effect = load_data
+            self.mock_azure_setting.return_value.get.side_effect = load_data
+            self.mock_oidc_setting.return_value.get.side_effect = load_data
+            self.mock_helpers_setting.return_value.get.side_effect = load_data
+            self.mock_models_setting.return_value.get.side_effect = load_data
+            self.mock_domain_model_setting.return_value.get.side_effect = load_data
+            self.mock_record_model_setting.return_value.get.side_effect = load_data
+            self.mock_server_model_setting.return_value.get.side_effect = load_data
+            self.mock_decorators_setting.return_value.get.side_effect = load_data
 
-        data = user_apikey_data()
-        domain = Domain(name=data['domains'][0])
+            data = user_apikey_data()
+            domain = Domain(name=data['domains'][0])
 
-        api_key = ApiKey(desc=data['description'],
-                         role_name=data['role'],
-                         domains=[domain])
-        api_key.role = Role(name=data['role'])
+            api_key = ApiKey(desc=data['description'],
+                             role_name=data['role'],
+                             domains=[domain])
+            api_key.role = Role(name=data['role'])
 
-        self.mock_apikey.return_value.is_validate.return_value = api_key
+            self.mock_apikey.return_value.is_validate.return_value = api_key
 
         yield
 
@@ -143,8 +144,7 @@ class TestUnitApiZoneUserApiKey(object):
                              headers=user_apikey)
             data = res.get_json(force=True)
 
-            fake_domain = namedtuple("Domain",
-                                     data[0].keys())(*data[0].values())
+            fake_domain = namedtuple("Domain", data[0].keys())(*data[0].values())
             domain_schema = DomainSchema(many=True)
 
             json.dumps(domain_schema.dump([fake_domain]))

From 7d153932b3c8cdbce39f9e2fa647fd481a4b06a3 Mon Sep 17 00:00:00 2001
From: Ymage <heltem+git@o2php.com>
Date: Thu, 22 Dec 2022 22:50:01 +0100
Subject: [PATCH 11/15] Fix back_populate relationships

---
 powerdnsadmin/models/role.py | 4 ++--
 powerdnsadmin/models/user.py | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/powerdnsadmin/models/role.py b/powerdnsadmin/models/role.py
index a5cf530..5440f3d 100644
--- a/powerdnsadmin/models/role.py
+++ b/powerdnsadmin/models/role.py
@@ -5,7 +5,7 @@ class Role(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(64), index=True, unique=True)
     description = db.Column(db.String(128))
-    users = db.relationship('User', backref='role', lazy=True)
+    users = db.relationship('User', back_populates='role', lazy=True)
     apikeys = db.relationship('ApiKey', back_populates='role', lazy=True)
 
     def __init__(self, id=None, name=None, description=None):
@@ -20,4 +20,4 @@ class Role(db.Model):
         self.description = description
 
     def __repr__(self):
-        return '<Role {0}r>'.format(self.name)
+        return '<Role {0}>'.format(self.name)
diff --git a/powerdnsadmin/models/user.py b/powerdnsadmin/models/user.py
index 1e39569..78104f6 100644
--- a/powerdnsadmin/models/user.py
+++ b/powerdnsadmin/models/user.py
@@ -34,6 +34,7 @@ class User(db.Model):
     otp_secret = db.Column(db.String(16))
     confirmed = db.Column(db.SmallInteger, nullable=False, default=0)
     role_id = db.Column(db.Integer, db.ForeignKey('role.id'))
+    role = db.relationship('Role', back_populates="users", lazy=True)
     accounts = None
 
     def __init__(self,

From 1d885278d4164d60e6ba66ed97de1cbbf2565c42 Mon Sep 17 00:00:00 2001
From: Ymage <heltem+git@o2php.com>
Date: Thu, 22 Dec 2022 22:55:05 +0100
Subject: [PATCH 12/15] Cosmetic

---
 powerdnsadmin/routes/api.py | 113 ++++++++++++++++--------------------
 1 file changed, 51 insertions(+), 62 deletions(-)

diff --git a/powerdnsadmin/routes/api.py b/powerdnsadmin/routes/api.py
index 3df31e1..4a18c1d 100644
--- a/powerdnsadmin/routes/api.py
+++ b/powerdnsadmin/routes/api.py
@@ -1,22 +1,21 @@
 import json
-from urllib.parse import urljoin
+import secrets
+import string
 from base64 import b64encode
-from flask import (
-    Blueprint, g, request, abort, current_app, make_response, jsonify,
-)
+from urllib.parse import urljoin
+
+from flask import (Blueprint, g, request, abort, current_app, make_response, jsonify)
 from flask_login import current_user
 
 from .base import csrf
-from ..models.base import db
-from ..models import (
-    User, Domain, DomainUser, Account, AccountUser, History, Setting, ApiKey,
-    Role,
+from ..decorators import (
+    api_basic_auth, api_can_create_domain, is_json, apikey_auth,
+    apikey_can_create_domain, apikey_can_remove_domain,
+    apikey_is_admin, apikey_can_access_domain, apikey_can_configure_dnssec,
+    api_role_can, apikey_or_basic_auth,
+    callback_if_request_body_contains_key, allowed_record_types, allowed_record_ttl
 )
 from ..lib import utils, helper
-from ..lib.schema import (
-    ApiKeySchema, DomainSchema, ApiPlainKeySchema, UserSchema, AccountSchema,
-    UserDetailedSchema,
-)
 from ..lib.errors import (
     StructuredException,
     DomainNotExists, DomainAlreadyExists, DomainAccessForbidden,
@@ -26,15 +25,15 @@ from ..lib.errors import (
     UserCreateFail, UserCreateDuplicate, UserUpdateFail, UserDeleteFail,
     UserUpdateFailEmail, InvalidAccountNameException
 )
-from ..decorators import (
-    api_basic_auth, api_can_create_domain, is_json, apikey_auth,
-    apikey_can_create_domain, apikey_can_remove_domain,
-    apikey_is_admin, apikey_can_access_domain, apikey_can_configure_dnssec,
-    api_role_can, apikey_or_basic_auth,
-    callback_if_request_body_contains_key, allowed_record_types, allowed_record_ttl
+from ..lib.schema import (
+    ApiKeySchema, DomainSchema, ApiPlainKeySchema, UserSchema, AccountSchema,
+    UserDetailedSchema,
 )
-import secrets
-import string
+from ..models import (
+    User, Domain, DomainUser, Account, AccountUser, History, Setting, ApiKey,
+    Role,
+)
+from ..models.base import db
 
 api_bp = Blueprint('api', __name__, url_prefix='/api/v1')
 apilist_bp = Blueprint('apilist', __name__, url_prefix='/')
@@ -56,10 +55,10 @@ def get_user_domains():
         .outerjoin(Account, Domain.account_id == Account.id) \
         .outerjoin(AccountUser, Account.id == AccountUser.account_id) \
         .filter(
-            db.or_(
-                DomainUser.user_id == current_user.id,
-                AccountUser.user_id == current_user.id
-            )).all()
+        db.or_(
+            DomainUser.user_id == current_user.id,
+            AccountUser.user_id == current_user.id
+        )).all()
     return domains
 
 
@@ -71,10 +70,10 @@ def get_user_apikeys(domain_name=None):
         .outerjoin(Account, Domain.account_id == Account.id) \
         .outerjoin(AccountUser, Account.id == AccountUser.account_id) \
         .filter(
-            db.or_(
-                DomainUser.user_id == User.id,
-                AccountUser.user_id == User.id
-            )
+        db.or_(
+            DomainUser.user_id == User.id,
+            AccountUser.user_id == User.id
+        )
     ) \
         .filter(User.id == current_user.id)
 
@@ -167,12 +166,7 @@ def handle_request_is_not_json(err):
 def before_request():
     # Check site is in maintenance mode
     maintenance = Setting().get('maintenance')
-    if (
-        maintenance and current_user.is_authenticated and
-        current_user.role.name not in [
-            'Administrator', 'Operator'
-        ]
-    ):
+    if (maintenance and current_user.is_authenticated and current_user.role.name not in ['Administrator', 'Operator']):
         return make_response(
             jsonify({
                 "status": False,
@@ -224,14 +218,13 @@ def api_login_create_zone():
 
         history = History(msg='Add domain {0}'.format(
             data['name'].rstrip('.')),
-                          detail=json.dumps(data),
-                          created_by=current_user.username,
-                          domain_id=domain_id)
+            detail=json.dumps(data),
+            created_by=current_user.username,
+            domain_id=domain_id)
         history.add()
 
         if current_user.role.name not in ['Administrator', 'Operator']:
-            current_app.logger.debug(
-                "User is ordinary user, assigning created domain")
+            current_app.logger.debug("User is ordinary user, assigning created domain")
             domain = Domain(name=data['name'].rstrip('.'))
             domain.update()
             domain.grant_privileges([current_user.id])
@@ -299,9 +292,9 @@ def api_login_delete_zone(domain_name):
 
             history = History(msg='Delete domain {0}'.format(
                 utils.pretty_domain_name(domain_name)),
-                              detail='',
-                              created_by=current_user.username,
-                              domain_id=domain_id)
+                detail='',
+                created_by=current_user.username,
+                domain_id=domain_id)
             history.add()
 
     except Exception as e:
@@ -326,14 +319,14 @@ def api_generate_apikey():
 
     if 'domains' not in data:
         domains = []
-    elif not isinstance(data['domains'], (list, )):
+    elif not isinstance(data['domains'], (list,)):
         abort(400)
     else:
         domains = [d['name'] if isinstance(d, dict) else d for d in data['domains']]
 
     if 'accounts' not in data:
         accounts = []
-    elif not isinstance(data['accounts'], (list, )):
+    elif not isinstance(data['accounts'], (list,)):
         abort(400)
     else:
         accounts = [a['name'] if isinstance(a, dict) else a for a in data['accounts']]
@@ -385,8 +378,7 @@ def api_generate_apikey():
         user_domain_list = [item.name for item in user_domain_obj_list]
 
         current_app.logger.debug("Input domain list: {0}".format(domain_list))
-        current_app.logger.debug(
-            "User domain list: {0}".format(user_domain_list))
+        current_app.logger.debug("User domain list: {0}".format(user_domain_list))
 
         inter = set(domain_list).intersection(set(user_domain_list))
 
@@ -539,14 +531,14 @@ def api_update_apikey(apikey_id):
 
     if 'domains' not in data:
         domains = None
-    elif not isinstance(data['domains'], (list, )):
+    elif not isinstance(data['domains'], (list,)):
         abort(400)
     else:
         domains = [d['name'] if isinstance(d, dict) else d for d in data['domains']]
 
     if 'accounts' not in data:
         accounts = None
-    elif not isinstance(data['accounts'], (list, )):
+    elif not isinstance(data['accounts'], (list,)):
         abort(400)
     else:
         accounts = [a['name'] if isinstance(a, dict) else a for a in data['accounts']]
@@ -963,9 +955,7 @@ def api_delete_account(account_id):
         account = account_list[0]
     else:
         abort(404)
-    current_app.logger.debug(
-            f'Deleting Account {account.name}'
-        )
+    current_app.logger.debug(f'Deleting Account {account.name}')
 
     # Remove account association from domains first
     if len(account.domains) > 0:
@@ -1047,7 +1037,7 @@ def api_remove_account_user(account_id, user_id):
     user_list = User.query.join(AccountUser).filter(
         AccountUser.account_id == account_id,
         AccountUser.user_id == user_id,
-        ).all()
+    ).all()
     if not user_list:
         abort(404)
     if not account.remove_user(user):
@@ -1123,9 +1113,9 @@ def api_zone_forward(server_id, zone_id):
                     history = History(msg='{0} zone {1} record of {2}'.format(
                         rrset_data['changetype'].lower(), rrset_data['type'],
                         rrset_data['name'].rstrip('.')),
-                                    detail=json.dumps(data),
-                                    created_by=g.apikey.description,
-                                    domain_id=Domain().get_id_by_name(zone_id.rstrip('.')))
+                        detail=json.dumps(data),
+                        created_by=g.apikey.description,
+                        domain_id=Domain().get_id_by_name(zone_id.rstrip('.')))
                     history.add()
             elif request.method == 'DELETE':
                 history = History(msg='Deleted zone {0}'.format(zone_id.rstrip('.')),
@@ -1192,17 +1182,13 @@ def api_get_zones(server_id):
         return jsonify(domain_schema.dump(domain_obj_list)), 200
     else:
         resp = helper.forward_request()
-        if (
-            g.apikey.role.name not in ['Administrator', 'Operator']
-            and resp.status_code == 200
-        ):
+        if (g.apikey.role.name not in ['Administrator', 'Operator'] and resp.status_code == 200):
             domain_list = [d['name']
                            for d in domain_schema.dump(g.apikey.domains)]
 
             accounts_domains = [d.name for a in g.apikey.accounts for d in a.domains]
             allowed_domains = set(domain_list + accounts_domains)
-            current_app.logger.debug("Account domains: {}".format(
-                                     '/'.join(accounts_domains)))
+            current_app.logger.debug("Account domains: {}".format('/'.join(accounts_domains)))
             content = json.dumps([i for i in json.loads(resp.content)
                                   if i['name'].rstrip('.') in allowed_domains])
             return content, resp.status_code, resp.headers.items()
@@ -1223,6 +1209,7 @@ def api_server_config_forward(server_id):
     resp = helper.forward_request()
     return resp.content, resp.status_code, resp.headers.items()
 
+
 # The endpoint to synchronize Domains in background
 @api_bp.route('/sync_domains', methods=['GET'])
 @apikey_or_basic_auth
@@ -1231,6 +1218,7 @@ def sync_domains():
     domain.update()
     return 'Finished synchronization in background', 200
 
+
 @api_bp.route('/health', methods=['GET'])
 @apikey_auth
 def health():
@@ -1244,7 +1232,8 @@ def health():
     try:
         domain.get_domain_info(domain_to_query.name)
     except Exception as e:
-        current_app.logger.error("Health Check - Failed to query authoritative server for domain {}".format(domain_to_query.name))
+        current_app.logger.error(
+            "Health Check - Failed to query authoritative server for domain {}".format(domain_to_query.name))
         return make_response("Down", 503)
 
     return make_response("Up", 200)

From 0568a90ec1a3ffb2a9f25497297b6b3b31d5b7bc Mon Sep 17 00:00:00 2001
From: Vassilis Asteriou <vaster@it.auth.gr>
Date: Wed, 8 Feb 2023 15:27:45 +0200
Subject: [PATCH 13/15] Changed auto_ptr() logic to remove-then-add

---
 powerdnsadmin/models/record.py | 38 +++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/powerdnsadmin/models/record.py b/powerdnsadmin/models/record.py
index b6c3f54..ae70a9e 100644
--- a/powerdnsadmin/models/record.py
+++ b/powerdnsadmin/models/record.py
@@ -422,6 +422,25 @@ class Record(object):
                 ]
 
                 d = Domain()
+                for r in del_rrsets:
+                    for record in r['records']:
+                        # Format the reverse record name
+                        # It is the reverse of forward record's content.
+                        reverse_host_address = dns.reversename.from_address(
+                            record['content']).to_text()
+
+                        # Create the reverse domain name in PDNS
+                        domain_reverse_name = d.get_reverse_domain_name(
+                            reverse_host_address)
+                        d.create_reverse_domain(domain_name,
+                                                domain_reverse_name)
+
+                        # Delete the reverse zone
+                        self.name = reverse_host_address
+                        self.type = 'PTR'
+                        self.data = record['content']
+                        self.delete(domain_reverse_name)
+                
                 for r in new_rrsets:
                     for record in r['records']:
                         # Format the reverse record name
@@ -455,25 +474,6 @@ class Record(object):
                         # Format the rrset
                         rrset = {"rrsets": rrset_data}
                         self.add(domain_reverse_name, rrset)
-
-                for r in del_rrsets:
-                    for record in r['records']:
-                        # Format the reverse record name
-                        # It is the reverse of forward record's content.
-                        reverse_host_address = dns.reversename.from_address(
-                            record['content']).to_text()
-
-                        # Create the reverse domain name in PDNS
-                        domain_reverse_name = d.get_reverse_domain_name(
-                            reverse_host_address)
-                        d.create_reverse_domain(domain_name,
-                                                domain_reverse_name)
-
-                        # Delete the reverse zone
-                        self.name = reverse_host_address
-                        self.type = 'PTR'
-                        self.data = record['content']
-                        self.delete(domain_reverse_name)
                 return {
                     'status': 'ok',
                     'msg': 'Auto-PTR record was updated successfully'

From 7221271a7bddf4d4a5fe4852ac5f098628b9fb5b Mon Sep 17 00:00:00 2001
From: Rauno Tuul <raunz@hot.ee>
Date: Mon, 13 Feb 2023 12:08:03 +0200
Subject: [PATCH 14/15] Preserve domain records history after domain deletion.

---
 powerdnsadmin/models/domain.py  | 11 ++++++-----
 powerdnsadmin/models/setting.py |  1 +
 powerdnsadmin/routes/admin.py   |  8 ++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/powerdnsadmin/models/domain.py b/powerdnsadmin/models/domain.py
index ab154c1..a8b1023 100644
--- a/powerdnsadmin/models/domain.py
+++ b/powerdnsadmin/models/domain.py
@@ -548,11 +548,12 @@ class Domain(db.Model):
         domain.apikeys[:] = []
 
         # Remove history for domain
-        domain_history = History.query.filter(
-            History.domain_id == domain.id
-        )
-        if domain_history:
-           domain_history.delete()
+        if not Setting().get('preserve_history'):
+            domain_history = History.query.filter(
+                History.domain_id == domain.id
+            )
+            if domain_history:
+                domain_history.delete()
 
         # then remove domain
         Domain.query.filter(Domain.name == domain_name).delete()
diff --git a/powerdnsadmin/models/setting.py b/powerdnsadmin/models/setting.py
index a4016bf..d706842 100644
--- a/powerdnsadmin/models/setting.py
+++ b/powerdnsadmin/models/setting.py
@@ -31,6 +31,7 @@ class Setting(db.Model):
 	    'delete_sso_accounts': False,
         'bg_domain_updates': False,
         'enable_api_rr_history': True,
+        'preserve_history': False,
         'site_name': 'PowerDNS-Admin',
         'site_url': 'http://localhost:9191',
         'session_timeout': 10,
diff --git a/powerdnsadmin/routes/admin.py b/powerdnsadmin/routes/admin.py
index 9474503..74598f4 100644
--- a/powerdnsadmin/routes/admin.py
+++ b/powerdnsadmin/routes/admin.py
@@ -927,6 +927,13 @@ def history():
 					'msg': 'You do not have permission to remove history.'
 				}), 401)
 
+		if Setting().get('preserve_history'):
+			return make_response(
+				jsonify({
+					'status': 'error',
+					'msg': 'History removal is not allowed (toggle preserve_history in settings).'
+				}), 401)
+
 		h = History()
 		result = h.remove_all()
 		if result:
@@ -1282,6 +1289,7 @@ def setting_basic():
         'otp_field_enabled',
         'otp_force',
         'pdns_api_timeout',
+        'preserve_history',
         'pretty_ipv6_ptr',
         'record_helper',
         'record_quick_edit',

From 642fb1605d4a863977d20f1902cde0e244a784cc Mon Sep 17 00:00:00 2001
From: Rauno Tuul <raunz@hot.ee>
Date: Mon, 13 Feb 2023 14:43:22 +0200
Subject: [PATCH 15/15] Move pretty_ipv6_ptr setting retrieval out of record
 list loop

---
 powerdnsadmin/routes/domain.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/powerdnsadmin/routes/domain.py b/powerdnsadmin/routes/domain.py
index 87d0be4..9742760 100644
--- a/powerdnsadmin/routes/domain.py
+++ b/powerdnsadmin/routes/domain.py
@@ -89,14 +89,14 @@ def domain(domain_name):
     #   - Find a way to make it consistent, or
     #   - Only allow one comment for that case
     if StrictVersion(Setting().get('pdns_version')) >= StrictVersion('4.0.0'):
+        pretty_v6 = Setting().get('pretty_ipv6_ptr')
         for r in rrsets:
             if r['type'] in records_allow_to_edit:
                 r_name = r['name'].rstrip('.')
 
                 # If it is reverse zone and pretty_ipv6_ptr setting
                 # is enabled, we reformat the name for ipv6 records.
-                if Setting().get('pretty_ipv6_ptr') and r[
-                        'type'] == 'PTR' and 'ip6.arpa' in r_name and '*' not in r_name:
+                if pretty_v6 and r['type'] == 'PTR' and 'ip6.arpa' in r_name and '*' not in r_name:
                     r_name = dns.reversename.to_address(
                         dns.name.from_text(r_name))