slthcore 0.6.1__tar.gz → 0.6.3__tar.gz

{slthcore-0.6.1/slthcore.egg-info → slthcore-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slthcore
-Version: 0.6.1
+Version: 0.6.3
 Summary: API generator based on yml file
 Home-page: https://github.com/brenokcc
 Author: Breno Silva

{slthcore-0.6.1 → slthcore-0.6.3}/setup.py

@@ -4,7 +4,7 @@ install_requires = []
 
 setup(
     name='slthcore',
-    version='0.6.1',
+    version='0.6.3',
     packages=find_packages(),
     install_requires=install_requires,
     include_package_data=True,

{slthcore-0.6.1 → slthcore-0.6.3}/slth/application.py

@@ -201,11 +201,12 @@ class Application(metaclass=ApplicationMetaclass):
         logo = build_url(request, self.brand or self.logo)
         title = self.title if self.brand is None else None
         if request.user.is_authenticated:
+            name = request.user.first_name
             user = request.user.username.split()[0].split("@")[0]
             profile = apps.get_model("slth", "profile").objects.filter(user=request.user).first()
             photo = profile and profile.photo and build_url(request, profile.photo.url) or None
         else:
-            user = profile = photo = None
+            name = user = profile = photo = None
         
         def contribute(endpoint_list, endpoint_name):
             cls = ENDPOINTS[endpoint_name]
@@ -230,7 +231,7 @@ class Application(metaclass=ApplicationMetaclass):
             type="application",
             icon=icon,
             navbar=dict(
-                type="navbar", title=title, subtitle=self.subtitle, logo=logo, user=user, **endpoints
+                type="navbar", title=title, subtitle=self.subtitle, logo=logo, user=user, name=name, **endpoints
             ),
             menu=dict(
                 type="menu", items=self.menu.process(request), user=user, image=photo

{slthcore-0.6.1 → slthcore-0.6.3}/slth/endpoints/auth.py

@@ -10,6 +10,7 @@ from . import PublicEndpoint, Endpoint, ChildInstanceEndpoint
 from django.utils import timezone
 
 def login_response(user, redirect='/api/dashboard/'):
+    Token.objects.filter(user=user).delete()
     token = Token.objects.create(user=user)
     current_timezone = timezone.get_current_timezone()
     current_timezone_name = current_timezone.__str__()

{slthcore-0.6.1 → slthcore-0.6.3}/slth/forms.py

@@ -397,9 +397,14 @@ class FormMixin:
                             self.request, f"choices={fname}"
                         ))
             if ftype == "boolean":
-                data.update(choices=[
-                    {"id": "true", "value": "Sim"}, {"id": "false", "value": "Não"}, {"id": "null", "value": "Não Informado"}
-                ])
+                if isinstance(field, NullBooleanField):
+                    data.update(choices=[
+                        {"id": "true", "value": "Sim"}, {"id": "false", "value": "Não"}, {"id": "null", "value": "Não Informado"}
+                    ])
+                else:
+                    data.update(choices=[
+                        {"id": "true", "value": "Sim"}, {"id": "false", "value": "Não"}
+                    ])
 
         attr_name = f"on_{prefix}__{name}_change" if prefix else f"on_{name}_change"
         on_change_name = f"{prefix}__{name}" if prefix else name

{slthcore-0.6.1 → slthcore-0.6.3}/slth/management/commands/sync.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import os
-
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.management import call_command
+from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.management.base import BaseCommand
 from django.utils import termcolors
 
@@ -34,3 +33,6 @@ class Command(BaseCommand):
             user.set_password(password)
             user.save()
             print('Superuser "admin" with password "{}" was created.'.format(password))
+
+        if getattr(settings, 'USE_S3'):
+            staticfiles_storage.collectstatic()

{slthcore-0.6.1 → slthcore-0.6.3}/slth/models.py

@@ -523,6 +523,21 @@ class Token(models.Model):
 
     def __str__(self):
         return self.key
+    
+    def is_valid(self):
+        seconds =  (datetime.now() - self.created).seconds
+        life_time = getattr(settings, 'TOKEN_LIFE_TIME', 15)
+        refresh_time = getattr(settings, 'TOKEN_REFRESH_TIME', 5)
+        if seconds > life_time * 60:
+            # print(f'Token {self.key} for {self.user} created at {self.created.isoformat()} is expired.')
+            return False
+        elif seconds > refresh_time * 60:
+            # print(f'Refreshing token {self.key} for {self.user} created at {self.created.isoformat()}...')
+            Token.objects.filter(pk=self.pk).update(created=datetime.now())
+            return True
+        else:
+            # print(f'Token {self.key} for {self.user} created at {self.created.isoformat()} is still valid.')
+            return True
 
 
 class LogQuerySet(models.QuerySet):

{slthcore-0.6.1 → slthcore-0.6.3}/slth/queryset.py

@@ -452,10 +452,15 @@ class QuerySet(models.QuerySet):
         options = filter.choices(self)
         value = self.parameter(name)
         if isinstance(options, list) or isinstance(options, tuple):
+            add_null = False
             field_type = 'choice'
             choices = [{'id': '', 'value':''}]
-            choices.extend([{'id': k, 'value': v} for k, v in options])
-            choices.append({'id': 'null', 'value':'Nulo'})
+            for k, v in options:
+                choices.append({'id': k, 'value': v})
+                if k == 'null':
+                    add_null = False
+            if add_null:
+                choices.append({'id': 'null', 'value':'Nulo'})
         else:
             field_type = 'choice'
             choices = append_url(base_url, f'choices={name}')
@@ -484,8 +489,6 @@ class QuerySet(models.QuerySet):
             elif isinstance(field, models.BooleanField):
                 field_type = 'choice'
                 value = self.parameter(name)
-                if value:
-                    value = value == 'true'
                 choices = [dict(id='', value=''), dict(id='true', value='Sim'), dict(id='false', value='Não'), dict(id='null', value='Nulo')]
             elif isinstance(field, models.DateField):
                 field_type = 'text' if suffix in ('year', 'month') else 'date'
@@ -505,10 +508,15 @@ class QuerySet(models.QuerySet):
                 field_type = 'choice'
                 choices = append_url(base_url, f'choices={name}')
             if getattr(field, 'choices'):
+                add_null = False
                 field_type = 'choice'
                 choices = [{'id': '', 'value':''}]
-                choices.extend([{'id': k, 'value': v} for k, v in field.choices])
-                choices.append({'id': 'null', 'value':'Nulo'})
+                for k, v in field.choices:
+                    choices.append({'id': k, 'value': v})
+                    if k == 'null':
+                        add_null = False
+                if add_null:
+                    choices.append({'id': 'null', 'value':'Nulo'})
             label = label or str(field.verbose_name).title()
             symbol = symbols.get(suffix) if suffix else None
             label = label + symbol if symbol else label