Fixed OTP recognition

Added balance check to SMS providers

core/classes/sms.py

@@ -21,7 +21,11 @@ class BaseSMSProvider:
 
     @property
     def get_edit_url(self):
-        return
+        return False
+
+    @property
+    def get_balance(self):
+        return False
 
     def sendSMS(self, recipients: Union[str, list], message: str):
         '''Send an SMS message to one or more recipients

core/modules/sms.py

@@ -18,20 +18,21 @@ for module in settings.EXPEPHALON_MODULES:
     except (AttributeError, ModuleNotFoundError):
         continue
 
-def get_sms_provider_by_name(name):
+def get_sms_provider_by_name(name, active=False):
     for provider in providers:
-        if provider.name == name:
+        if provider.get_name == name and (provider.is_active or not active):
             return provider
 
 def get_default_sms_provider_name():
     return getValue("core.sms.default", False)
 
 def get_default_sms_provider():
-    name = get_default_sms_provider_name()
+    provider = get_sms_provider_by_name(get_default_sms_provider_name(), True)
-    if name:
+    if provider:
-        for provider in providers:
+        return provider
-            if provider.name == name and provider.is_active:
+
-                return provider
     for provider in providers:
         if provider.is_active:
-            return provider
+            return provider
+
+    raise RuntimeError("No SMS provider is currently active")

kumisms/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

kumisms/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class KumismsConfig(AppConfig):
+    name = 'kumisms'

kumisms/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

kumisms/sms.py

@@ -0,0 +1,70 @@
+from core.classes.sms import BaseSMSProvider, SMSNotSent
+
+from dbsettings.functions import getValue
+
+from urllib.parse import urlencode
+from urllib.request import urlopen, Request
+from typing import Union
+
+import json
+
+# Create your models here.
+
+class KumiSMSServer(BaseSMSProvider):
+    @property
+    def is_active(self):
+        return bool(self.get_balance)
+    
+    @property
+    def get_name(self):
+        return "Kumi SMS"
+
+    @property
+    def get_key(self):
+        return getValue("kumisms.apikey")
+
+    @staticmethod
+    def getError(status):
+        if "error" in status.keys():
+            return status["error"]
+
+    def sendSMS(self, recipients: Union[str, list], message: str):
+        '''Send an SMS message to one or more recipients
+
+        :param recipients: Recipient phone number as a string, or a list of multiple phone number strings
+        :param message: Message to be sent as a string
+        '''
+
+        if isinstance(recipients, str):
+            recipients = [recipients]
+
+        url = 'https://kumisms.com/api/v1/send/'
+
+        for recipient in recipients:
+            vars = {"key": self.get_key, "text": message, "recipient": recipient}
+
+            request = Request(url, urlencode(vars).encode())
+            response = urlopen(request)
+
+            status = json.loads(response.read().decode())
+
+            error = KumiSMSServer.getError(status)
+
+            if error:
+                raise SMSNotSent(f'An error occurred trying to send the SMS: {error}')
+
+    @property
+    def get_balance(self):
+        url = 'https://kumisms.com/api/v1/balance/'
+
+        vars = {"key": self.get_key}
+
+        request = Request(url, urlencode(vars).encode())
+        response = urlopen(request)
+
+        status = json.loads(response.read().decode())
+
+        if not KumiSMSServer.getError(status):
+            return status["balance"]
+
+SMSPROVIDERS = [KumiSMSServer()]

kumisms/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

kumisms/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

playsms/models.py

@@ -12,7 +12,7 @@ import json
 # Create your models here.
 
 class PlaySMSServer(Model, BaseSMSProvider):
-    name = CharField(max_length=255)
+    name = CharField(max_length=255, unique=True)
     logo = CharField(max_length=255)
     https = BooleanField(default=True)
     host = CharField(max_length=255)
@@ -23,6 +23,10 @@ class PlaySMSServer(Model, BaseSMSProvider):
     def is_active(self):
         return True
 
+    @property
+    def get_name(self):
+        return self.name
+
     @staticmethod
     def getError(status):
         if status["error_string"]:
@@ -45,11 +49,9 @@ class PlaySMSServer(Model, BaseSMSProvider):
 
         url = 'http%s://%s/index.php?app=ws&u=%s&h=%s&op=pv&to=%s&msg=%s' % ("s" if self.https else "", self.host, self.username, self.token, recipients, quote_plus(message))
 
-        print(url)
         response = urlopen(url)
 
         status = json.loads(response.read().decode())
-        print(status)
 
         error = PlaySMSServer.getError(status)
 

smsotp/models.py

@@ -23,4 +23,4 @@ class OTPToken(Model):
 
         provider = get_default_sms_provider()
 
-        provider.sendSMS(number, text)
+        provider.sendSMS(str(number), text)

templates/backend/auth/otp_selector.html

@@ -4,7 +4,7 @@
 <div class="mx-auto app-login-box col-sm-12 col-md-10 col-lg-9">
     <div class="app-logo"></div>
     <h4 class="mb-0">
-        <span class="d-block">Welcome back,</span>
+        <span class="d-block">Welcome back {{ request.user.first_name }},</span>
         <span>Please select your Two-Factor Authentication provider</span></h4>
     {% bootstrap_messages %}
     <div class="divider row"></div>

templates/backend/auth/otp_verifier.html

@@ -4,7 +4,7 @@
 <div class="mx-auto app-login-box col-sm-12 col-md-10 col-lg-9">
     <div class="app-logo"></div>
     <h4 class="mb-0">
-        <span class="d-block">Welcome back,</span>
+        <span class="d-block">Welcome back {{ request.user.first_name }},</span>
         <span>Please enter your OTP Token</span></h4>
     {% bootstrap_messages %}
     <div class="divider row"></div>