From 522dd6b829ad2d448efe0934ec5c91f5ca6a3175 Mon Sep 17 00:00:00 2001 From: Federico Capoano Date: Wed, 1 Jul 2026 15:41:27 -0300 Subject: [PATCH 1/2] [tests:fix] Added ApiKey proxy model and permissions to sample users --- .../0002_default_groups_and_permissions.py | 4 ++++ ...er_expiration_date_user_user_active_expiry_idx.py | 12 ++++++++++++ tests/openwisp2/sample_users/models.py | 3 ++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/openwisp2/sample_users/migrations/0002_default_groups_and_permissions.py b/tests/openwisp2/sample_users/migrations/0002_default_groups_and_permissions.py index 227b108..3d0597b 100644 --- a/tests/openwisp2/sample_users/migrations/0002_default_groups_and_permissions.py +++ b/tests/openwisp2/sample_users/migrations/0002_default_groups_and_permissions.py @@ -3,6 +3,7 @@ import swapper from django.db import migrations from openwisp_users.migrations import ( + add_api_key_permissions_to_admins, allow_admins_change_organization, create_default_groups, set_default_organization_uuid, @@ -30,4 +31,7 @@ class Migration(migrations.Migration): migrations.RunPython( allow_admins_change_organization, reverse_code=migrations.RunPython.noop ), + migrations.RunPython( + add_api_key_permissions_to_admins, reverse_code=migrations.RunPython.noop + ), ] diff --git a/tests/openwisp2/sample_users/migrations/0003_user_expiration_date_user_user_active_expiry_idx.py b/tests/openwisp2/sample_users/migrations/0003_user_expiration_date_user_user_active_expiry_idx.py index 7f02772..f405b18 100644 --- a/tests/openwisp2/sample_users/migrations/0003_user_expiration_date_user_user_active_expiry_idx.py +++ b/tests/openwisp2/sample_users/migrations/0003_user_expiration_date_user_user_active_expiry_idx.py @@ -21,6 +21,18 @@ class Migration(migrations.Migration): verbose_name="expiration date", ), ), + migrations.CreateModel( + name="ApiKey", + fields=[], + options={ + "verbose_name": "API key", + "verbose_name_plural": "API keys", + "proxy": True, + "indexes": [], + "constraints": [], + }, + bases=("authtoken.token",), + ), migrations.AddIndex( model_name="user", index=models.Index( diff --git a/tests/openwisp2/sample_users/models.py b/tests/openwisp2/sample_users/models.py index 35ac324..421ef22 100644 --- a/tests/openwisp2/sample_users/models.py +++ b/tests/openwisp2/sample_users/models.py @@ -1,8 +1,9 @@ from django.contrib.auth.models import Group as AbstractGroup from django.core.validators import RegexValidator from django.db import models -from openwisp_users.base.models import ( +from openwisp_users.base.models import ( # noqa: F401 AbstractUser, + ApiKey, BaseGroup, BaseOrganization, BaseOrganizationOwner, From f1032de121ae71bf1c61b0d65c37bf55d6231475 Mon Sep 17 00:00:00 2001 From: Federico Capoano Date: Wed, 1 Jul 2026 16:14:21 -0300 Subject: [PATCH 2/2] [chores:fix] Added authtoken dependency to ApiKey migration --- ...0003_user_expiration_date_user_user_active_expiry_idx.py | 1 + tests/openwisp2/sample_users/models.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/openwisp2/sample_users/migrations/0003_user_expiration_date_user_user_active_expiry_idx.py b/tests/openwisp2/sample_users/migrations/0003_user_expiration_date_user_user_active_expiry_idx.py index f405b18..a51f5ad 100644 --- a/tests/openwisp2/sample_users/migrations/0003_user_expiration_date_user_user_active_expiry_idx.py +++ b/tests/openwisp2/sample_users/migrations/0003_user_expiration_date_user_user_active_expiry_idx.py @@ -7,6 +7,7 @@ class Migration(migrations.Migration): dependencies = [ ("auth", "0012_alter_user_first_name_max_length"), + ("authtoken", "0001_initial"), ("sample_users", "0002_default_groups_and_permissions"), ] diff --git a/tests/openwisp2/sample_users/models.py b/tests/openwisp2/sample_users/models.py index 421ef22..5f1d721 100644 --- a/tests/openwisp2/sample_users/models.py +++ b/tests/openwisp2/sample_users/models.py @@ -1,9 +1,8 @@ from django.contrib.auth.models import Group as AbstractGroup from django.core.validators import RegexValidator from django.db import models -from openwisp_users.base.models import ( # noqa: F401 +from openwisp_users.base.models import ( AbstractUser, - ApiKey, BaseGroup, BaseOrganization, BaseOrganizationOwner, @@ -48,3 +47,6 @@ class OrganizationInvitation(AbstractOrganizationInvitation): class Group(BaseGroup, AbstractGroup): pass + + +from openwisp_users.base.models import ApiKey # noqa