fix: move myauth module from toplevel to under etebase_server

This is in preparation for creating a python package, which should only
occupy the "etebase_server" name in the global module namespace.

django_etebase/token_auth/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 from django.utils import timezone
 from django.utils.crypto import get_random_string
-from myauth.models import get_typed_user_model
+from etebase_server.myauth.models import get_typed_user_model
 
 User = get_typed_user_model()
 

django_etebase/utils.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 
 from django.db.models import QuerySet
 from django.core.exceptions import PermissionDenied
-from myauth.models import UserType, get_typed_user_model
+from etebase_server.myauth.models import UserType, get_typed_user_model
 
 from . import app_settings
 

etebase_server/fastapi/dependencies.py

@@ -8,7 +8,7 @@ from django.db.models import QuerySet
 
 from django_etebase import models
 from django_etebase.token_auth.models import AuthToken, get_default_expiry
-from myauth.models import UserType, get_typed_user_model
+from etebase_server.myauth.models import UserType, get_typed_user_model
 from .exceptions import AuthenticationFailed
 from .utils import get_object_or_404
 from .db_hack import django_db_cleanup_decorator

etebase_server/fastapi/routers/authentication.py

@@ -19,7 +19,7 @@ from django_etebase.token_auth.models import AuthToken
 from django_etebase.models import UserInfo
 from django_etebase.signals import user_signed_up
 from django_etebase.utils import create_user, get_user_queryset, CallbackContext
-from myauth.models import UserType, get_typed_user_model
+from etebase_server.myauth.models import UserType, get_typed_user_model
 from ..exceptions import AuthenticationFailed, transform_validation_error, HttpError
 from ..msgpack import MsgpackRoute
 from ..utils import BaseModel, permission_responses, msgpack_encode, msgpack_decode, get_user_username_email_kwargs

etebase_server/fastapi/routers/collection.py

@@ -8,7 +8,7 @@ from django.db.models import Q, QuerySet
 from fastapi import APIRouter, Depends, status, Request, BackgroundTasks
 
 from django_etebase import models
-from myauth.models import UserType
+from etebase_server.myauth.models import UserType
 from .authentication import get_authenticated_user
 from .websocket import get_ticket, TicketRequest, TicketOut
 from ..exceptions import HttpError, transform_validation_error, PermissionDenied, ValidationError

etebase_server/fastapi/routers/invitation.py

@@ -6,7 +6,7 @@ from fastapi import APIRouter, Depends, status, Request
 
 from django_etebase import models
 from django_etebase.utils import get_user_queryset, CallbackContext
-from myauth.models import UserType, get_typed_user_model
+from etebase_server.myauth.models import UserType, get_typed_user_model
 from .authentication import get_authenticated_user
 from ..exceptions import HttpError, PermissionDenied
 from ..msgpack import MsgpackRoute

etebase_server/fastapi/routers/member.py

@@ -5,7 +5,7 @@ from django.db.models import QuerySet
 from fastapi import APIRouter, Depends, status
 
 from django_etebase import models
-from myauth.models import UserType, get_typed_user_model
+from etebase_server.myauth.models import UserType, get_typed_user_model
 from .authentication import get_authenticated_user
 from ..msgpack import MsgpackRoute
 from ..utils import get_object_or_404, BaseModel, permission_responses, PERMISSIONS_READ, PERMISSIONS_READWRITE

etebase_server/fastapi/routers/test_reset_view.py

@@ -7,7 +7,7 @@ from django_etebase.utils import get_user_queryset, CallbackContext
 from .authentication import SignupIn, signup_save
 from ..msgpack import MsgpackRoute
 from ..exceptions import HttpError
-from myauth.models import get_typed_user_model
+from etebase_server.myauth.models import get_typed_user_model
 
 test_reset_view_router = APIRouter(route_class=MsgpackRoute, tags=["test helpers"])
 User = get_typed_user_model()

etebase_server/fastapi/routers/websocket.py

@@ -10,7 +10,7 @@ import nacl.utils
 
 from django_etebase import models
 from django_etebase.utils import CallbackContext, get_user_queryset
-from myauth.models import UserType, get_typed_user_model
+from etebase_server.myauth.models import UserType, get_typed_user_model
 
 from ..dependencies import get_collection_queryset, get_item_queryset
 from ..exceptions import NotSupported

etebase_server/fastapi/utils.py

@@ -12,7 +12,7 @@ from django.core.exceptions import ObjectDoesNotExist
 
 from django_etebase import app_settings
 from django_etebase.models import AccessLevels
-from myauth.models import UserType, get_typed_user_model
+from etebase_server.myauth.models import UserType, get_typed_user_model
 
 from .exceptions import HttpError, HttpErrorOut
 

etebase_server/myauth/apps.py

@@ -2,4 +2,5 @@ from django.apps import AppConfig
 
 
 class MyauthConfig(AppConfig):
-    name = "myauth"
+    name = "etebase_server.myauth"
+    label = "myauth"

etebase_server/myauth/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.contrib.auth.forms import UsernameField
-from myauth.models import get_typed_user_model
+from etebase_server.myauth.models import get_typed_user_model
 
 User = get_typed_user_model()
 

etebase_server/myauth/migrations/0002_auto_20200515_0801.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.0.3 on 2020-05-15 08:01
 
 from django.db import migrations, models
-import myauth.models
+import etebase_server.myauth.models as myauth_models
 
 
 class Migration(migrations.Migration):
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
                 help_text="Required. 150 characters or fewer. Letters, digits and ./+/-/_ only.",
                 max_length=150,
                 unique=True,
-                validators=[myauth.models.UnicodeUsernameValidator()],
+                validators=[myauth_models.UnicodeUsernameValidator()],
                 verbose_name="username",
             ),
         ),

etebase_server/myauth/migrations/0003_auto_20201119_0810.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.1 on 2020-11-19 08:10
 
 from django.db import migrations, models
-import myauth.models
+import etebase_server.myauth.models as myauth_models
 
 
 class Migration(migrations.Migration):
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterModelManagers(
             name="user",
             managers=[
-                ("objects", myauth.models.UserManager()),
+                ("objects", myauth_models.UserManager()),
             ],
         ),
         migrations.AlterField(
@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
                 help_text="Required. 150 characters or fewer. Letters, digits and ./-/_ only.",
                 max_length=150,
                 unique=True,
-                validators=[myauth.models.UnicodeUsernameValidator()],
+                validators=[myauth_models.UnicodeUsernameValidator()],
                 verbose_name="username",
             ),
         ),

etebase_server/settings.py

@@ -54,7 +54,7 @@ INSTALLED_APPS = [
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    "myauth.apps.MyauthConfig",
+    "etebase_server.myauth.apps.MyauthConfig",
     "django_etebase.apps.DjangoEtebaseConfig",
     "django_etebase.token_auth.apps.TokenAuthConfig",
 ]