From d1017aac761f06c2e2f7a36c2768da0bdd0edc7a Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 16 Jun 2020 17:12:44 +0300 Subject: [PATCH] Rename django_etesync to django_etebase. --- {django_etesync => django_etebase}/__init__.py | 0 {django_etesync => django_etebase}/admin.py | 0 .../app_settings.py | 2 +- django_etebase/apps.py | 5 +++++ .../migrations/0001_initial.py | 16 ++++++++-------- .../migrations/0002_userinfo.py | 2 +- .../migrations/0003_collectioninvitation.py | 4 ++-- .../0004_collectioninvitation_version.py | 2 +- .../migrations/0005_auto_20200526_1021.py | 2 +- .../migrations/0006_auto_20200526_1040.py | 2 +- .../migrations/0007_auto_20200526_1336.py | 2 +- .../migrations/0008_auto_20200526_1535.py | 8 ++++---- .../migrations/0009_auto_20200526_1535.py | 6 +++--- .../migrations/0010_auto_20200526_1539.py | 4 ++-- .../migrations/0011_collectionmember_stoken.py | 4 ++-- .../migrations/0012_auto_20200527_0743.py | 6 +++--- .../migrations/0013_collectionmemberremoved.py | 6 +++--- .../migrations/0014_auto_20200602_1558.py | 2 +- .../0015_collectionitemrevision_salt.py | 2 +- .../migrations/__init__.py | 0 {django_etesync => django_etebase}/models.py | 0 .../permissions.py | 2 +- .../serializers.py | 0 {django_etesync => django_etebase}/tests.py | 0 .../token_auth/__init__.py | 0 .../token_auth/admin.py | 0 .../token_auth/apps.py | 2 +- .../token_auth/authentication.py | 0 .../token_auth/migrations/0001_initial.py | 2 +- .../token_auth/migrations/__init__.py | 0 .../token_auth/models.py | 0 {django_etesync => django_etebase}/views.py | 2 +- django_etesync/apps.py | 5 ----- 33 files changed, 44 insertions(+), 44 deletions(-) rename {django_etesync => django_etebase}/__init__.py (100%) rename {django_etesync => django_etebase}/admin.py (100%) rename {django_etesync => django_etebase}/app_settings.py (97%) create mode 100644 django_etebase/apps.py rename {django_etesync => django_etebase}/migrations/0001_initial.py (93%) rename {django_etesync => django_etebase}/migrations/0002_userinfo.py (94%) rename {django_etesync => django_etebase}/migrations/0003_collectioninvitation.py (92%) rename {django_etesync => django_etebase}/migrations/0004_collectioninvitation_version.py (86%) rename {django_etesync => django_etebase}/migrations/0005_auto_20200526_1021.py (83%) rename {django_etesync => django_etebase}/migrations/0006_auto_20200526_1040.py (91%) rename {django_etesync => django_etebase}/migrations/0007_auto_20200526_1336.py (96%) rename {django_etesync => django_etebase}/migrations/0008_auto_20200526_1535.py (80%) rename {django_etesync => django_etebase}/migrations/0009_auto_20200526_1535.py (69%) rename {django_etesync => django_etebase}/migrations/0010_auto_20200526_1539.py (79%) rename {django_etesync => django_etebase}/migrations/0011_collectionmember_stoken.py (77%) rename {django_etesync => django_etebase}/migrations/0012_auto_20200527_0743.py (68%) rename {django_etesync => django_etebase}/migrations/0013_collectionmemberremoved.py (86%) rename {django_etesync => django_etebase}/migrations/0014_auto_20200602_1558.py (84%) rename {django_etesync => django_etebase}/migrations/0015_collectionitemrevision_salt.py (86%) rename {django_etesync => django_etebase}/migrations/__init__.py (100%) rename {django_etesync => django_etebase}/models.py (100%) rename {django_etesync => django_etebase}/permissions.py (98%) rename {django_etesync => django_etebase}/serializers.py (100%) rename {django_etesync => django_etebase}/tests.py (100%) rename {django_etesync => django_etebase}/token_auth/__init__.py (100%) rename {django_etesync => django_etebase}/token_auth/admin.py (100%) rename {django_etesync => django_etebase}/token_auth/apps.py (64%) rename {django_etesync => django_etebase}/token_auth/authentication.py (100%) rename {django_etesync => django_etebase}/token_auth/migrations/0001_initial.py (94%) rename {django_etesync => django_etebase}/token_auth/migrations/__init__.py (100%) rename {django_etesync => django_etebase}/token_auth/models.py (100%) rename {django_etesync => django_etebase}/views.py (99%) delete mode 100644 django_etesync/apps.py diff --git a/django_etesync/__init__.py b/django_etebase/__init__.py similarity index 100% rename from django_etesync/__init__.py rename to django_etebase/__init__.py diff --git a/django_etesync/admin.py b/django_etebase/admin.py similarity index 100% rename from django_etesync/admin.py rename to django_etebase/admin.py diff --git a/django_etesync/app_settings.py b/django_etebase/app_settings.py similarity index 97% rename from django_etesync/app_settings.py rename to django_etebase/app_settings.py index 89b38f7..b1fb4c3 100644 --- a/django_etesync/app_settings.py +++ b/django_etebase/app_settings.py @@ -51,4 +51,4 @@ class AppSettings: return self._setting("CHALLENGE_VALID_SECONDS", 60) -app_settings = AppSettings('ETESYNC_') +app_settings = AppSettings('ETEBASE_') diff --git a/django_etebase/apps.py b/django_etebase/apps.py new file mode 100644 index 0000000..286a708 --- /dev/null +++ b/django_etebase/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class DjangoEtebaseConfig(AppConfig): + name = 'django_etebase' diff --git a/django_etesync/migrations/0001_initial.py b/django_etebase/migrations/0001_initial.py similarity index 93% rename from django_etesync/migrations/0001_initial.py rename to django_etebase/migrations/0001_initial.py index dc3a2ff..69a9a91 100644 --- a/django_etesync/migrations/0001_initial.py +++ b/django_etebase/migrations/0001_initial.py @@ -4,7 +4,7 @@ from django.conf import settings import django.core.validators from django.db import migrations, models import django.db.models.deletion -import django_etesync.models +import django_etebase.models class Migration(migrations.Migration): @@ -35,7 +35,7 @@ class Migration(migrations.Migration): ('uid', models.CharField(db_index=True, max_length=44, null=True, validators=[django.core.validators.RegexValidator(message='Not a valid UID', regex='[a-zA-Z0-9]')])), ('version', models.PositiveSmallIntegerField()), ('encryptionKey', models.BinaryField(editable=True, null=True)), - ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='django_etesync.Collection')), + ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='django_etebase.Collection')), ], options={ 'unique_together': {('uid', 'collection')}, @@ -46,8 +46,8 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('uid', models.CharField(db_index=True, max_length=44, validators=[django.core.validators.RegexValidator(message='Expected a 256bit base64url.', regex='^[a-zA-Z0-9\\-_]{43}$')])), - ('chunkFile', models.FileField(max_length=150, unique=True, upload_to=django_etesync.models.chunk_directory_path)), - ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='chunks', to='django_etesync.CollectionItem')), + ('chunkFile', models.FileField(max_length=150, unique=True, upload_to=django_etebase.models.chunk_directory_path)), + ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='chunks', to='django_etebase.CollectionItem')), ], ), migrations.CreateModel( @@ -58,7 +58,7 @@ class Migration(migrations.Migration): ('meta', models.BinaryField(editable=True)), ('current', models.BooleanField(db_index=True, default=True, null=True)), ('deleted', models.BooleanField(default=False)), - ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='revisions', to='django_etesync.CollectionItem')), + ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='revisions', to='django_etebase.CollectionItem')), ], options={ 'unique_together': {('item', 'current')}, @@ -68,8 +68,8 @@ class Migration(migrations.Migration): name='RevisionChunkRelation', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('chunk', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='revisions_relation', to='django_etesync.CollectionItemChunk')), - ('revision', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='chunks_relation', to='django_etesync.CollectionItemRevision')), + ('chunk', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='revisions_relation', to='django_etebase.CollectionItemChunk')), + ('revision', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='chunks_relation', to='django_etebase.CollectionItemRevision')), ], options={ 'ordering': ('id',), @@ -81,7 +81,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('encryptionKey', models.BinaryField(editable=True)), ('accessLevel', models.CharField(choices=[('adm', 'Admin'), ('rw', 'Read Write'), ('ro', 'Read Only')], default='ro', max_length=3)), - ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='members', to='django_etesync.Collection')), + ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='members', to='django_etebase.Collection')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], options={ diff --git a/django_etesync/migrations/0002_userinfo.py b/django_etebase/migrations/0002_userinfo.py similarity index 94% rename from django_etesync/migrations/0002_userinfo.py rename to django_etebase/migrations/0002_userinfo.py index ad7018a..6da0bb8 100644 --- a/django_etesync/migrations/0002_userinfo.py +++ b/django_etebase/migrations/0002_userinfo.py @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ ('myauth', '0001_initial'), - ('django_etesync', '0001_initial'), + ('django_etebase', '0001_initial'), ] operations = [ diff --git a/django_etesync/migrations/0003_collectioninvitation.py b/django_etebase/migrations/0003_collectioninvitation.py similarity index 92% rename from django_etesync/migrations/0003_collectioninvitation.py rename to django_etebase/migrations/0003_collectioninvitation.py index 3880a63..8fd2066 100644 --- a/django_etesync/migrations/0003_collectioninvitation.py +++ b/django_etebase/migrations/0003_collectioninvitation.py @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('django_etesync', '0002_userinfo'), + ('django_etebase', '0002_userinfo'), ] operations = [ @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('uid', models.CharField(db_index=True, max_length=44, validators=[django.core.validators.RegexValidator(message='Expected a 256bit base64url.', regex='^[a-zA-Z0-9\\-_]{43}$')])), ('signedEncryptionKey', models.BinaryField()), ('accessLevel', models.CharField(choices=[('adm', 'Admin'), ('rw', 'Read Write'), ('ro', 'Read Only')], default='ro', max_length=3)), - ('fromMember', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='django_etesync.CollectionMember')), + ('fromMember', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='django_etebase.CollectionMember')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='incoming_invitations', to=settings.AUTH_USER_MODEL)), ], options={ diff --git a/django_etesync/migrations/0004_collectioninvitation_version.py b/django_etebase/migrations/0004_collectioninvitation_version.py similarity index 86% rename from django_etesync/migrations/0004_collectioninvitation_version.py rename to django_etebase/migrations/0004_collectioninvitation_version.py index 3fbaed9..4052116 100644 --- a/django_etesync/migrations/0004_collectioninvitation_version.py +++ b/django_etebase/migrations/0004_collectioninvitation_version.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('django_etesync', '0003_collectioninvitation'), + ('django_etebase', '0003_collectioninvitation'), ] operations = [ diff --git a/django_etesync/migrations/0005_auto_20200526_1021.py b/django_etebase/migrations/0005_auto_20200526_1021.py similarity index 83% rename from django_etesync/migrations/0005_auto_20200526_1021.py rename to django_etebase/migrations/0005_auto_20200526_1021.py index 470556b..da0dc33 100644 --- a/django_etesync/migrations/0005_auto_20200526_1021.py +++ b/django_etebase/migrations/0005_auto_20200526_1021.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('django_etesync', '0004_collectioninvitation_version'), + ('django_etebase', '0004_collectioninvitation_version'), ] operations = [ diff --git a/django_etesync/migrations/0006_auto_20200526_1040.py b/django_etebase/migrations/0006_auto_20200526_1040.py similarity index 91% rename from django_etesync/migrations/0006_auto_20200526_1040.py rename to django_etebase/migrations/0006_auto_20200526_1040.py index 84e8fa3..b86a996 100644 --- a/django_etesync/migrations/0006_auto_20200526_1040.py +++ b/django_etebase/migrations/0006_auto_20200526_1040.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('django_etesync', '0005_auto_20200526_1021'), + ('django_etebase', '0005_auto_20200526_1021'), ] operations = [ diff --git a/django_etesync/migrations/0007_auto_20200526_1336.py b/django_etebase/migrations/0007_auto_20200526_1336.py similarity index 96% rename from django_etesync/migrations/0007_auto_20200526_1336.py rename to django_etebase/migrations/0007_auto_20200526_1336.py index 37e31ac..79978c7 100644 --- a/django_etesync/migrations/0007_auto_20200526_1336.py +++ b/django_etebase/migrations/0007_auto_20200526_1336.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('django_etesync', '0006_auto_20200526_1040'), + ('django_etebase', '0006_auto_20200526_1040'), ] operations = [ diff --git a/django_etesync/migrations/0008_auto_20200526_1535.py b/django_etebase/migrations/0008_auto_20200526_1535.py similarity index 80% rename from django_etesync/migrations/0008_auto_20200526_1535.py rename to django_etebase/migrations/0008_auto_20200526_1535.py index e544bdd..12656c0 100644 --- a/django_etesync/migrations/0008_auto_20200526_1535.py +++ b/django_etebase/migrations/0008_auto_20200526_1535.py @@ -3,13 +3,13 @@ import django.core.validators from django.db import migrations, models import django.db.models.deletion -import django_etesync.models +import django_etebase.models class Migration(migrations.Migration): dependencies = [ - ('django_etesync', '0007_auto_20200526_1336'), + ('django_etebase', '0007_auto_20200526_1336'), ] operations = [ @@ -17,12 +17,12 @@ class Migration(migrations.Migration): name='Stoken', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('uid', models.CharField(db_index=True, default=django_etesync.models.generate_stoken_uid, max_length=43, unique=True, validators=[django.core.validators.RegexValidator(message='Expected a base64url.', regex='^[a-zA-Z0-9\\-_]{42,43}$')])), + ('uid', models.CharField(db_index=True, default=django_etebase.models.generate_stoken_uid, max_length=43, unique=True, validators=[django.core.validators.RegexValidator(message='Expected a base64url.', regex='^[a-zA-Z0-9\\-_]{42,43}$')])), ], ), migrations.AddField( model_name='collectionitemrevision', name='stoken', - field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.PROTECT, to='django_etesync.Stoken'), + field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.PROTECT, to='django_etebase.Stoken'), ), ] diff --git a/django_etesync/migrations/0009_auto_20200526_1535.py b/django_etebase/migrations/0009_auto_20200526_1535.py similarity index 69% rename from django_etesync/migrations/0009_auto_20200526_1535.py rename to django_etebase/migrations/0009_auto_20200526_1535.py index 53100b3..a6ff498 100644 --- a/django_etesync/migrations/0009_auto_20200526_1535.py +++ b/django_etebase/migrations/0009_auto_20200526_1535.py @@ -4,8 +4,8 @@ from django.db import migrations def create_stokens(apps, schema_editor): - Stoken = apps.get_model('django_etesync', 'Stoken') - CollectionItemRevision = apps.get_model('django_etesync', 'CollectionItemRevision') + Stoken = apps.get_model('django_etebase', 'Stoken') + CollectionItemRevision = apps.get_model('django_etebase', 'CollectionItemRevision') for rev in CollectionItemRevision.objects.all(): rev.stoken = Stoken.objects.create() @@ -15,7 +15,7 @@ def create_stokens(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('django_etesync', '0008_auto_20200526_1535'), + ('django_etebase', '0008_auto_20200526_1535'), ] operations = [ diff --git a/django_etesync/migrations/0010_auto_20200526_1539.py b/django_etebase/migrations/0010_auto_20200526_1539.py similarity index 79% rename from django_etesync/migrations/0010_auto_20200526_1539.py rename to django_etebase/migrations/0010_auto_20200526_1539.py index c894fd2..7ef0eca 100644 --- a/django_etesync/migrations/0010_auto_20200526_1539.py +++ b/django_etebase/migrations/0010_auto_20200526_1539.py @@ -7,13 +7,13 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('django_etesync', '0009_auto_20200526_1535'), + ('django_etebase', '0009_auto_20200526_1535'), ] operations = [ migrations.AlterField( model_name='collectionitemrevision', name='stoken', - field=models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, to='django_etesync.Stoken'), + field=models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, to='django_etebase.Stoken'), ), ] diff --git a/django_etesync/migrations/0011_collectionmember_stoken.py b/django_etebase/migrations/0011_collectionmember_stoken.py similarity index 77% rename from django_etesync/migrations/0011_collectionmember_stoken.py rename to django_etebase/migrations/0011_collectionmember_stoken.py index 6b79bf6..bafaea7 100644 --- a/django_etesync/migrations/0011_collectionmember_stoken.py +++ b/django_etebase/migrations/0011_collectionmember_stoken.py @@ -7,13 +7,13 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('django_etesync', '0010_auto_20200526_1539'), + ('django_etebase', '0010_auto_20200526_1539'), ] operations = [ migrations.AddField( model_name='collectionmember', name='stoken', - field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.PROTECT, to='django_etesync.Stoken'), + field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.PROTECT, to='django_etebase.Stoken'), ), ] diff --git a/django_etesync/migrations/0012_auto_20200527_0743.py b/django_etebase/migrations/0012_auto_20200527_0743.py similarity index 68% rename from django_etesync/migrations/0012_auto_20200527_0743.py rename to django_etebase/migrations/0012_auto_20200527_0743.py index 28b8745..ab6adbc 100644 --- a/django_etesync/migrations/0012_auto_20200527_0743.py +++ b/django_etebase/migrations/0012_auto_20200527_0743.py @@ -4,8 +4,8 @@ from django.db import migrations def create_stokens(apps, schema_editor): - Stoken = apps.get_model('django_etesync', 'Stoken') - CollectionMember = apps.get_model('django_etesync', 'CollectionMember') + Stoken = apps.get_model('django_etebase', 'Stoken') + CollectionMember = apps.get_model('django_etebase', 'CollectionMember') for member in CollectionMember.objects.all(): member.stoken = Stoken.objects.create() @@ -15,7 +15,7 @@ def create_stokens(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('django_etesync', '0011_collectionmember_stoken'), + ('django_etebase', '0011_collectionmember_stoken'), ] operations = [ diff --git a/django_etesync/migrations/0013_collectionmemberremoved.py b/django_etebase/migrations/0013_collectionmemberremoved.py similarity index 86% rename from django_etesync/migrations/0013_collectionmemberremoved.py rename to django_etebase/migrations/0013_collectionmemberremoved.py index e796232..2641c03 100644 --- a/django_etesync/migrations/0013_collectionmemberremoved.py +++ b/django_etebase/migrations/0013_collectionmemberremoved.py @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('django_etesync', '0012_auto_20200527_0743'), + ('django_etebase', '0012_auto_20200527_0743'), ] operations = [ @@ -17,8 +17,8 @@ class Migration(migrations.Migration): name='CollectionMemberRemoved', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='removed_members', to='django_etesync.Collection')), - ('stoken', models.OneToOneField(null=True, on_delete=django.db.models.deletion.PROTECT, to='django_etesync.Stoken')), + ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='removed_members', to='django_etebase.Collection')), + ('stoken', models.OneToOneField(null=True, on_delete=django.db.models.deletion.PROTECT, to='django_etebase.Stoken')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], options={ diff --git a/django_etesync/migrations/0014_auto_20200602_1558.py b/django_etebase/migrations/0014_auto_20200602_1558.py similarity index 84% rename from django_etesync/migrations/0014_auto_20200602_1558.py rename to django_etebase/migrations/0014_auto_20200602_1558.py index e226360..d1a555d 100644 --- a/django_etesync/migrations/0014_auto_20200602_1558.py +++ b/django_etebase/migrations/0014_auto_20200602_1558.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('django_etesync', '0013_collectionmemberremoved'), + ('django_etebase', '0013_collectionmemberremoved'), ] operations = [ diff --git a/django_etesync/migrations/0015_collectionitemrevision_salt.py b/django_etebase/migrations/0015_collectionitemrevision_salt.py similarity index 86% rename from django_etesync/migrations/0015_collectionitemrevision_salt.py rename to django_etebase/migrations/0015_collectionitemrevision_salt.py index f5553c9..7f3dd71 100644 --- a/django_etesync/migrations/0015_collectionitemrevision_salt.py +++ b/django_etebase/migrations/0015_collectionitemrevision_salt.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('django_etesync', '0014_auto_20200602_1558'), + ('django_etebase', '0014_auto_20200602_1558'), ] operations = [ diff --git a/django_etesync/migrations/__init__.py b/django_etebase/migrations/__init__.py similarity index 100% rename from django_etesync/migrations/__init__.py rename to django_etebase/migrations/__init__.py diff --git a/django_etesync/models.py b/django_etebase/models.py similarity index 100% rename from django_etesync/models.py rename to django_etebase/models.py diff --git a/django_etesync/permissions.py b/django_etebase/permissions.py similarity index 98% rename from django_etesync/permissions.py rename to django_etebase/permissions.py index 611977b..a4217a8 100644 --- a/django_etesync/permissions.py +++ b/django_etebase/permissions.py @@ -13,7 +13,7 @@ # along with this program. If not, see . from rest_framework import permissions -from django_etesync.models import Collection, AccessLevels +from django_etebase.models import Collection, AccessLevels def is_collection_admin(collection, user): diff --git a/django_etesync/serializers.py b/django_etebase/serializers.py similarity index 100% rename from django_etesync/serializers.py rename to django_etebase/serializers.py diff --git a/django_etesync/tests.py b/django_etebase/tests.py similarity index 100% rename from django_etesync/tests.py rename to django_etebase/tests.py diff --git a/django_etesync/token_auth/__init__.py b/django_etebase/token_auth/__init__.py similarity index 100% rename from django_etesync/token_auth/__init__.py rename to django_etebase/token_auth/__init__.py diff --git a/django_etesync/token_auth/admin.py b/django_etebase/token_auth/admin.py similarity index 100% rename from django_etesync/token_auth/admin.py rename to django_etebase/token_auth/admin.py diff --git a/django_etesync/token_auth/apps.py b/django_etebase/token_auth/apps.py similarity index 64% rename from django_etesync/token_auth/apps.py rename to django_etebase/token_auth/apps.py index dc793f2..118b872 100644 --- a/django_etesync/token_auth/apps.py +++ b/django_etebase/token_auth/apps.py @@ -2,4 +2,4 @@ from django.apps import AppConfig class TokenAuthConfig(AppConfig): - name = 'django_etesync.token_auth' + name = 'django_etebase.token_auth' diff --git a/django_etesync/token_auth/authentication.py b/django_etebase/token_auth/authentication.py similarity index 100% rename from django_etesync/token_auth/authentication.py rename to django_etebase/token_auth/authentication.py diff --git a/django_etesync/token_auth/migrations/0001_initial.py b/django_etebase/token_auth/migrations/0001_initial.py similarity index 94% rename from django_etesync/token_auth/migrations/0001_initial.py rename to django_etebase/token_auth/migrations/0001_initial.py index f2024e3..5a47366 100644 --- a/django_etesync/token_auth/migrations/0001_initial.py +++ b/django_etebase/token_auth/migrations/0001_initial.py @@ -3,7 +3,7 @@ from django.conf import settings from django.db import migrations, models import django.db.models.deletion -from django_etesync.token_auth import models as token_auth_models +from django_etebase.token_auth import models as token_auth_models class Migration(migrations.Migration): diff --git a/django_etesync/token_auth/migrations/__init__.py b/django_etebase/token_auth/migrations/__init__.py similarity index 100% rename from django_etesync/token_auth/migrations/__init__.py rename to django_etebase/token_auth/migrations/__init__.py diff --git a/django_etesync/token_auth/models.py b/django_etebase/token_auth/models.py similarity index 100% rename from django_etesync/token_auth/models.py rename to django_etebase/token_auth/models.py diff --git a/django_etesync/views.py b/django_etebase/views.py similarity index 99% rename from django_etesync/views.py rename to django_etebase/views.py index 1d29ae1..59fcaa2 100644 --- a/django_etesync/views.py +++ b/django_etebase/views.py @@ -534,7 +534,7 @@ class AuthenticationViewSet(viewsets.ViewSet): def get_encryption_key(self, salt): key = nacl.hash.blake2b(settings.SECRET_KEY.encode(), encoder=nacl.encoding.RawEncoder) - return nacl.hash.blake2b(b'', key=key, salt=salt[:nacl.hash.BLAKE2B_SALTBYTES], person=b'etesync-auth', + return nacl.hash.blake2b(b'', key=key, salt=salt[:nacl.hash.BLAKE2B_SALTBYTES], person=b'etebase-auth', encoder=nacl.encoding.RawEncoder) def get_queryset(self): diff --git a/django_etesync/apps.py b/django_etesync/apps.py deleted file mode 100644 index adb8f96..0000000 --- a/django_etesync/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class DjangoEtesyncConfig(AppConfig): - name = 'django_etesync'