Merge pull request #9 from truehostcloud/dev

Fix/ Get AutoLogin Links

Author: willymwai

.github/workflows/coverage.yml

@@ -5,9 +5,9 @@ name: Test Coverage With Deepsource
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
@@ -16,23 +16,24 @@ jobs:
       matrix:
         python-version: [3.8]
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install pytest pytest-cov requests responses
-    - name: Generate coverage report
-      run: |
-        pytest --cov=./ --cov-report xml
-    - name: Install deepsource CLI
-      run: |
-        curl https://deepsource.io/cli | sh
-    - name: Run the report coverage
-      run: |
-        ./bin/deepsource report --analyzer test-coverage --key python --value-file ./coverage.xml
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pytest pytest-cov requests responses
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+      - name: Generate coverage report
+        run: |
+          DJANGO_SETTINGS_MODULE=olittwhmcs.settings pytest --cov=./ --cov-report xml
+      - name: Install deepsource CLI
+        run: |
+          curl https://deepsource.io/cli | sh
+      - name: Run the report coverage
+        run: |
+          ./bin/deepsource report --analyzer test-coverage --key python --value-file ./coverage.xml
     env:
       DEEPSOURCE_DSN: ${{ secrets.DEEPSOURCE_DSN }}

.github/workflows/run_tests.yml

@@ -5,35 +5,34 @@ name: Run Tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: [3.8]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest requests responses
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: |
-        pytest
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8 pytest requests responses
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+      - name: Lint with flake8
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+      - name: Test with pytest
+        run: |
+          DJANGO_SETTINGS_MODULE=olittwhmcs.settings pytest

.gitignore

@@ -3,6 +3,8 @@ venv
 build
 dist
 .pytest_cache
+__pycache__
 tests/__pycache__
 olittwhmcs/__pycache__
-olittwhmcs.egg-info
+olittwhmcs.egg-info
+pyproject.toml

olittwhmcs/network.py

@@ -1,6 +1,7 @@
 """This module contains the functions that make networks requests to whmcs."""
 
 import requests
+from django.conf import settings
 from requests.exceptions import RequestException
 
 from olittwhmcs.exceptions import WhmcsConnectionError
@@ -16,7 +17,7 @@ def get_whmcs_response(parameters):
     try:
         response = make_whmcs_network_request(parameters)
         response_data = get_response_data(response)
-        result = response_data.get('result')
+        result = response_data.get("result")
         if response.ok and result == "success":
             return True, response_data
         error = get_error_message(response_data)
@@ -33,8 +34,11 @@ def make_whmcs_network_request(parameters):
     :rtype: requests.Response
     :raises WhmcsConnectionError: If the network request fails.
     """
-    # ToDo: Read this url from consumers or settings.py (or from env variables if not possible)
-    url = "https://www.olitt.com/billing/includes/api.php"
+    url = (
+        f"{settings.WHMCS_BASE_URL}/includes/api.php"
+        if settings.WHMCS_BASE_URL
+        else "https://www.olitt.com/billing/includes/api.php"
+    )
     try:
         return requests.post(url=url, data=parameters)
     except RequestException:
@@ -57,13 +61,14 @@ def get_response_data(response):
 def get_error_message(response_data):
     """
     Extract an error message from whmcs response data.
-    :param response_data: Dictionary, data received from whmcs from which to extract the message.
+    :param response_data: Dictionary, data received from
+                            whmcs from which to extract the message.
     :return: Error message in the whmcs response data.
     :rtype: String or None
     """
     if type(response_data) is dict:
-        result = response_data.get('result', None)
-        error = response_data.get('message', None)
+        result = response_data.get("result", None)
+        error = response_data.get("message", None)
         if result == "error":
             return error
     return None

olittwhmcs/settings.py

@@ -0,0 +1,4 @@
+import os
+
+WHMCS_BASE_URL = os.environ.get("WHMCS_BASE_URL", "https://www.olitt.com/billing")
+SECRET_KEY = "foobar"