merged with dev

Author: b-angelov

izpitnik/accounts/api/views.py

@@ -21,7 +21,7 @@ def get_token(cls, user):
         token = super().get_token(user)
 
         token['is_admin'] = user.is_staff
-        token['roles'] = [role.name for role in user.groups.all()]
+        # token['roles'] = [role.name for role in user.groups.all()]
         token['is_superuser'] = user.is_superuser
 
         return token
@@ -38,9 +38,8 @@ def post(self, request, *args, **kwargs):
         samesite = False
 
         if ENV == "production":
-            pass
-            # secure = True
-            # samesite = 'Strict'
+            secure = True
+            samesite = 'Strict'
 
         if refresh:
             response.set_cookie(

izpitnik/settings.py

@@ -235,7 +235,7 @@
     'fixtures'
 ]
 
-if config("ENV") == "production":
+if False and config("ENV") == "production":
     CSRF_COOKIE_SECURE = True  # If using HTTPS
     SESSION_COOKIE_SECURE = True  # If using HTTPS
     SECURE_SSL_REDIRECT = True  # Force HTTPS