slthcore 0.5.2__tar.gz → 0.5.4__tar.gz

{slthcore-0.5.2/slthcore.egg-info → slthcore-0.5.4}/PKG-INFO

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

{slthcore-0.5.2 → slthcore-0.5.4}/setup.py

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

{slthcore-0.5.2 → slthcore-0.5.4}/slth/components.py

@@ -183,6 +183,40 @@ class TemplateContent(dict):
         self["autoreload"] = autoreload * 1000 if autoreload else None
 
 
+class GeoMap(dict):
+    
+    def __init__(self, lat=0, long=0, zoom=10, min_zoom=None, max_zoom=None, title=None):
+        self["type"] = "geomap"
+        self["title"] = title
+        self["lat"] = lat
+        self["long"] = long
+        self["zoom"] = zoom
+        self["min_zoom"] = min_zoom or zoom
+        self["max_zoom"] = max_zoom or zoom
+        self["polygons"] = []
+        self["points"] = []
+
+    def add_polygon(self, coordinates, info=None, color="#0b2353"):
+        feature = { "type": "Feature", "properties": { "info": str(info) }, "geometry": { "type": "Polygon", "coordinates": coordinates} }
+        return self.add_polygon_feature(feature, color=color)
+
+    def add_polygon_feature(self, feature, color="#0b2353"):
+        style = dict(weight=2, color="#999", opacity=1, fillColor=color, fillOpacity=0.8)
+        feature['properties']['style'] = style
+        self["polygons"].append(feature)
+        return feature
+
+    def add_point(self, lat, long, info=None):
+        feature = {"geometry": {"type": "Point", "coordinates": [lat, long]}, "type": "Feature", "properties": {"info": str(info)}}
+        return self.add_point_feature(feature)
+
+    def add_point_feature(self, feature, color="red"):
+        style = dict(radius=5, fillColor=color, color=color, weight=1, opacity=1, fillOpacity=0.8)
+        feature['properties']['style'] = style
+        self["points"].append(feature)
+        return feature
+    
+
 class Banner(dict):
     def __init__(self, src):
         self["type"] = "banner"

{slthcore-0.5.2 → slthcore-0.5.4}/slth/endpoints/__init__.py

@@ -92,7 +92,7 @@ class Endpoint(metaclass=EnpointMetaclass):
         return self.formfactory().fields(*fields) if fields else {}
 
     def post(self):
-        redirect = '.' if 'only' in self.request.GET else self.form._redirect
+        redirect = '.' if 'only' in self.request.GET else (self.form and self.form._redirect or None)
         return Response(message="Ação realizada com sucesso", redirect=redirect)
 
     def check_permission(self):
@@ -163,7 +163,7 @@ class Endpoint(metaclass=EnpointMetaclass):
                     else:
                         self.cleaned_data = self.form.submit()
                         if self.form._message or self.form._redirect or self.form._dispose:
-                            redirect = '.' if 'only' in self.request.GET else self.form._redirect
+                            redirect = '.' if 'only' in self.request.GET else (self.form and self.form._redirect or None)
                             return Response(self.form._message, redirect, dispose=self.form._dispose)
                         else:
                             return self.post()

{slthcore-0.5.2 → slthcore-0.5.4}/slth/endpoints/auth.py

@@ -41,9 +41,12 @@ class Login(PublicEndpoint):
     def get(self):
         code = self.request.GET.get("code")
         if code:
-            user = oauth.authenticate(code)
-            if user:
-                return login_response(user)
+            try:
+                user = oauth.authenticate(code)
+                if user:
+                    return login_response(user)
+            except ValidationError:
+                self.redirect('/api/auth/login/')
         return self.formfactory().fields("username", "password")
 
     def post(self):

{slthcore-0.5.2 → slthcore-0.5.4}/slth/forms.py

@@ -28,7 +28,7 @@ MASKS = dict(
     cpf="999.999.999-99",
     cnpj="99.999.999/9999-99",
     telefone="(99) 99999-9999",
-    cep='99.999-990',
+    cep='99.999-999',
     cpf_cnpj="999.999.999-99|99.999.999/9999-99",
 )
 

{slthcore-0.5.2 → slthcore-0.5.4}/slth/models.py

@@ -388,10 +388,10 @@ class WhatsappNotification(models.Model):
         verbose_name = 'Whatsapp Notification'
         verbose_name_plural = 'Whatsapp Notifications'
 
-    objects = PushNotificationQuerySet()
+    objects = WhatsappNotificationQuerySet()
 
     def __str__(self):
-        return f'Push Notification {self.title} to {self.to}'
+        return f'Whatsapp Notification {self.title} to {self.to}'
 
     def send(self, preview=False):
         self.attempt = self.attempt + 1

{slthcore-0.5.2 → slthcore-0.5.4}/slth/oauth.py

@@ -18,7 +18,7 @@ def authenticate(code):
             client_id=provider['client_id'], client_secret=client_secret
         )
         response = requests.post(provider['access_token_url'], data=access_token_request_data, verify=False)
-        print(response.text)
+        # print(response.text)
         if response.status_code == 200:
             data = json.loads(response.text)
             headers = {
@@ -26,11 +26,10 @@ def authenticate(code):
                 'x-api-key': client_secret
             }
             if provider.get('user_data_method', 'GET').upper() == 'POST':
-                response = requests.post(provider['user_data_url'], data={'scope': data.get('scope')}, headers=headers)
+                response = requests.post(provider['user_data_url'], data={'scope': data.get('scope')}, headers=headers, verify=False)
             else:
-                response = requests.get(provider['user_data_url'], data={'scope': data.get('scope')}, headers=headers)
-            print(response.text)
-            breakpoint()
+                response = requests.get(provider['user_data_url'], data={'scope': data.get('scope')}, headers=headers, verify=False)
+            # print(response.text)
             if response.status_code == 200:
                 data = json.loads(response.text)
                 username = data[provider['user_username']]

{slthcore-0.5.2 → slthcore-0.5.4}/slth/serializer.py

@@ -250,7 +250,7 @@ class Serializer:
         return self.request.user.is_superuser or not names or Role.objects.filter(username=self.request.user.username, name__in=names).exists()
 
     def to_dict(self, debug=False):
-        base_url = absolute_url(self.request)
+        base_url = absolute_url(self.request).replace('?only=actions', '')
         if self.request is None and self.serializer:
             self.request = self.serializer.request
         if self.ignore_only:
@@ -378,7 +378,7 @@ class Serializer:
                                 data = serialize(returned)
                                 if lazy:
                                     data['title'] = endpoint.get_verbose_name()
-                            if isinstance(data, dict):
+                            if isinstance(data, dict) and data.get('type') is None:
                                 data['url'] = absolute_url(self.request, 'only={}'.format('__'.join(path)))
                             if leaf: raise JsonResponseException(data)