From 605058c72ae579eb1208f411ce598e0c9294f001 Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Thu, 9 Nov 2023 00:15:08 -0800 Subject: [PATCH] Allow null user profile picture from Google OAuth in DB - Fix width of generated profile picture generated for user - Ignore unused Stripe webhook events --- .../migrations/0014_alter_googleuser_picture.py | 17 +++++++++++++++++ src/database/models/__init__.py | 2 +- src/khoj/interface/web/base_config.html | 8 ++++++-- src/khoj/routers/subscription.py | 1 - 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 src/database/migrations/0014_alter_googleuser_picture.py diff --git a/src/database/migrations/0014_alter_googleuser_picture.py b/src/database/migrations/0014_alter_googleuser_picture.py new file mode 100644 index 00000000..a3d2ce05 --- /dev/null +++ b/src/database/migrations/0014_alter_googleuser_picture.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.5 on 2023-11-09 08:11 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("database", "0013_subscription"), + ] + + operations = [ + migrations.AlterField( + model_name="googleuser", + name="picture", + field=models.CharField(default=None, max_length=200, null=True), + ), + ] diff --git a/src/database/models/__init__.py b/src/database/models/__init__.py index 28f8cd2a..73f19c36 100644 --- a/src/database/models/__init__.py +++ b/src/database/models/__init__.py @@ -30,7 +30,7 @@ class GoogleUser(models.Model): name = models.CharField(max_length=200) given_name = models.CharField(max_length=200) family_name = models.CharField(max_length=200) - picture = models.CharField(max_length=200) + picture = models.CharField(max_length=200, null=True, default=None) locale = models.CharField(max_length=200) def __str__(self): diff --git a/src/khoj/interface/web/base_config.html b/src/khoj/interface/web/base_config.html index 001ebef8..8114e7f3 100644 --- a/src/khoj/interface/web/base_config.html +++ b/src/khoj/interface/web/base_config.html @@ -39,8 +39,12 @@ grid-template-columns: 1fr min(70vw, 100%) 1fr; } .circle { - width: 51px; - height: 51px; + width: 52px; + height: 52px; + } + .user-initial { + width: 40px; + height: 40px; } .page { diff --git a/src/khoj/routers/subscription.py b/src/khoj/routers/subscription.py index 3457b671..62e50d72 100644 --- a/src/khoj/routers/subscription.py +++ b/src/khoj/routers/subscription.py @@ -40,7 +40,6 @@ async def subscribe(request: Request): "invoice.paid", "customer.subscription.updated", "customer.subscription.deleted", - "subscription_schedule.canceled", }: logger.warn(f"Unhandled Stripe event type: {event['type']}") return {"success": False}