infrastructure/blender-id
0
4
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity

User session tracking #93587

Merged
Oleg-Komarov merged 18 commits from user-session into main 2024-08-02 16:04:09 +02:00
Conversation 0 Commits 18 Files Changed 14 -6
4 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e48b15c7c9 - Show all commits

1
bid_main/migrations/0046_usersession.py
View File

@ -27,7 +27,6 @@ class Migration(migrations.Migration):
to=settings.AUTH_USER_MODEL, to=settings.AUTH_USER_MODEL,
), ),
), ),
('agent_is_trusted', models.BooleanField(default=False)),
('ip', models.GenericIPAddressField(blank=True, null=True)), ('ip', models.GenericIPAddressField(blank=True, null=True)),
( (
'session', 'session',

2
bid_main/models.py
View File

@ -654,7 +654,6 @@ class UserNote(models.Model):
class UserSession(models.Model): class UserSession(models.Model):
id = models.BigAutoField(primary_key=True) id = models.BigAutoField(primary_key=True)
agent_is_trusted = models.BooleanField(default=False, null=False)
created_at = models.DateTimeField(auto_now_add=True) created_at = models.DateTimeField(auto_now_add=True)
last_active_at = models.DateTimeField() last_active_at = models.DateTimeField()
ip = models.GenericIPAddressField(null=True, blank=True) ip = models.GenericIPAddressField(null=True, blank=True)
@ -674,7 +673,6 @@ class UserSession(models.Model):
return cls.objects.update_or_create( return cls.objects.update_or_create(
session_id=request.session.session_key, session_id=request.session.session_key,
defaults={ defaults={
'agent_is_trusted': hasattr(request, 'agent') and request.agent.is_trusted,
'ip': bid_main.utils.get_client_ip(request), 'ip': bid_main.utils.get_client_ip(request),
'user': user, 'user': user,
'last_active_at': timezone.now(), 'last_active_at': timezone.now(),

2
blenderid/settings.py
View File

@ -65,7 +65,6 @@ INSTALLED_APPS = [
"bid_api", "bid_api",
"bid_addon_support", "bid_addon_support",
"background_task", "background_task",
"django_agent_trust",
] ]
MIDDLEWARE = [ MIDDLEWARE = [
@ -74,7 +73,6 @@ MIDDLEWARE = [
"django.middleware.common.CommonMiddleware", "django.middleware.common.CommonMiddleware",
"django.middleware.csrf.CsrfViewMiddleware", "django.middleware.csrf.CsrfViewMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware", "django.contrib.auth.middleware.AuthenticationMiddleware",
"django_agent_trust.middleware.AgentMiddleware",
"bid_main.middleware.user_session_middleware", "bid_main.middleware.user_session_middleware",
"django.contrib.messages.middleware.MessageMiddleware", "django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware",

1
requirements.txt
View File

@ -10,7 +10,6 @@ csscompressor==0.9.5 ; python_version >= "3.8" and python_version < "4"
deprecated==1.2.14 ; python_version >= "3.8" and python_version < "4" deprecated==1.2.14 ; python_version >= "3.8" and python_version < "4"
dj-database-url==2.2.0 dj-database-url==2.2.0
django-admin-select2==1.0.1 ; python_version >= "3.8" and python_version < "4" django-admin-select2==1.0.1 ; python_version >= "3.8" and python_version < "4"
django-agent-trust==1.1.0
django-background-tasks-updated @ git+https://projects.blender.org/infrastructure/django-background-tasks.git@1.2.10 django-background-tasks-updated @ git+https://projects.blender.org/infrastructure/django-background-tasks.git@1.2.10
django-compat==1.0.15 ; python_version >= "3.8" and python_version < "4" django-compat==1.0.15 ; python_version >= "3.8" and python_version < "4"
django-loginas==0.3.11 ; python_version >= "3.8" and python_version < "4" django-loginas==0.3.11 ; python_version >= "3.8" and python_version < "4"