Merge branch 'release/1.0.1'

.editorconfig

@@ -4,7 +4,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 trim_trailing_whitespace = true
 insert_final_newline = true
 charset = utf-8

.github/workflows/code-quality.yml

@@ -2,7 +2,7 @@ name: Code Quality
 
 on:
   schedule:
-    - cron: '00 6 * * 2'
+    - cron: "00 6 * * 2"
 
 jobs:
   build:
@@ -11,10 +11,12 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
+
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
           languages: python
           config-file: ./.github/codeql-config.yml
+
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v2

.github/workflows/functional.yml

@@ -1,8 +1,9 @@
 name: Functional tests
 
 on:
+  workflow_dispatch:
   schedule:
-    - cron: '00 6 * * 2'
+    - cron: "00 6 * * 2"
 
 jobs:
   functional:
@@ -13,17 +14,19 @@ jobs:
         network:
           - twitter
           - facebook
-          - instagram
           - linkedin
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
+
       - name: Set up Python 3.10
         uses: actions/[email protected]
         with:
           python-version: 3.10
+
       - name: Installing dependencies
         run: |
           sudo pip install -r requirements.txt -r requirements-dev.txt
+
       - run: |
           bash test.sh ${{ matrix.network }}

.github/workflows/pr.yml

@@ -26,21 +26,27 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/[email protected]
         with:
           python-version: ${{ matrix.python-version }}
+
       - name: Installing dependencies
         run: |
           sudo apt-get install libxml2-dev libxslt-dev
           sudo pip install -r requirements.txt -r requirements-dev.txt
+
       - name: Measuring coverage
         env:
           TOXENV: ${{ matrix.toxenv }}
           PYTHON_VERSION: ${{ matrix.python-version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           tox -e ${TOXENV}
+
       - name: Coveralls Parallel
         uses: coverallsapp/github-action@master
         with:
@@ -54,11 +60,11 @@ jobs:
     runs-on: ubuntu-22.04
     needs: unit
     steps:
-    - name: Coveralls Finished
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        parallel-finished: true
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
 
   approve:
     name: Approve pull request
@@ -84,4 +90,4 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               pull_number: context.payload.pull_request.number
-            })
+            })

.github/workflows/push.yml

@@ -22,21 +22,25 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/[email protected]
         with:
           python-version: ${{ matrix.python-version }}
+
       - name: Installing dependencies
         run: |
           sudo apt-get install libxml2-dev libxslt-dev
           sudo pip install -r requirements.txt -r requirements-dev.txt
+
       - name: Measuring coverage
         env:
           TOXENV: ${{ matrix.toxenv }}
           PYTHON_VERSION: ${{ matrix.python-version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           tox -e ${TOXENV}
+
       - name: Coveralls Parallel
         uses: coverallsapp/github-action@master
         with:
@@ -50,8 +54,8 @@ jobs:
     runs-on: ubuntu-22.04
     needs: build
     steps:
-    - name: Coveralls Finished
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        parallel-finished: true
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true

HISTORY.rst

@@ -2,6 +2,17 @@ Changelog
 ============
 
 
+1.0.1 (2023-08-30)
+------------
+
+Other
+~~~~~~~~~~~~
+
+* `[REF]` Improving linkedin authentication. [Luis Alejandro Martínez Faneyth]
+
+* `[REF]` Fixing test. [Luis Alejandro Martínez Faneyth]
+
+
 1.0.0 (2023-08-29)
 ------------
 

Makefile

@@ -82,7 +82,7 @@ servedocs: docs start
 	@$(exec_on_docker) watchmedo shell-command -p '*.rst' -c 'make -C docs html' -R -D .
 
 release: clean start dist
-	@$(exec_on_docker) twine upload -s -i [email protected] dist/*
+	@$(exec_on_docker) twine upload dist/*
 
 dist: clean start
 	@$(exec_on_docker) python3 -m build

README.rst

@@ -42,7 +42,7 @@
 .. _GitHub actions: https://github.com/LuisAlejandro/agoras-actions
 .. _full documentation: https://agoras.readthedocs.org
 
-Current version: 1.0.0
+Current version: 1.0.1
 
 Agoras is a python utility that helps publish and delete posts on the most 
 popular social networks (twitter, facebook, instagram and linkedin).

README.short.rst

@@ -42,12 +42,12 @@
 .. _GitHub actions: https://github.com/LuisAlejandro/agoras-actions
 .. _full documentation: https://agoras.readthedocs.org
 
-Current version: 0.1.0
+Current version: 1.0.1
 
 Agoras is a python utility that helps publish and delete posts on the most 
 popular social networks (twitter, facebook, instagram and linkedin).
 
-This repository stores the application. There's also `GitHub actions`_ that you can
-incorporate into your workflows.
+This repository stores the application. There's also `GitHub actions`_
+that you can incorporate into your workflows.
 
 For more information, please read the `full documentation`_.

agoras/__init__.py

@@ -21,7 +21,7 @@
 
 __author__ = 'Luis Alejandro Martínez Faneyth'
 __email__ = '[email protected]'
-__version__ = '1.0.0'
+__version__ = '1.0.1'
 __url__ = 'https://github.com/LuisAlejandro/agoras'
 __description__ = ('A command line python utility to manage your social'
                    ' networks (Twitter, Facebook, LinkedIn and Instagram)')

agoras/core/facebook.py

@@ -278,7 +278,7 @@ def schedule(client, facebook_object_id, google_sheets_id,
     worksheet.clear()
 
     for row in newcontent:
-        worksheet.append_row(row)
+        worksheet.append_row(row, table_range='A1')
 
 
 def main(kwargs):

agoras/core/instagram.py

@@ -278,7 +278,7 @@ def schedule(client, instagram_object_id, google_sheets_id,
     worksheet.clear()
 
     for row in newcontent:
-        worksheet.append_row(row)
+        worksheet.append_row(row, table_range='A1')
 
 
 def main(kwargs):

agoras/core/linkedin.py

@@ -23,20 +23,37 @@
 import tempfile
 import time
 from html import unescape
+from typing import cast
 from urllib.parse import quote
 from urllib.request import Request, urlopen
 
 import filetype
 import gspread
+import requests
 from atoma import parse_rss_bytes
+from bs4 import BeautifulSoup
+from bs4.element import Tag
 from dateutil import parser
 from google.oauth2.service_account import Credentials
 from linkedin_api import Linkedin
+from linkedin_api.client import ChallengeException
 
 from agoras import __version__
 from agoras.core.utils import add_url_timestamp
 
-api_url_host = 'https://www.linkedin.com/voyager'
+
+ui_url_host = 'https://www.linkedin.com'
+api_url_host = f'{ui_url_host}/voyager'
+
+ui_login_endpoint = (
+    f'{ui_url_host}'
+    '/checkpoint/lg/login-submit'
+)
+ui_seed_endpoint = (
+    f'{ui_url_host}'
+    '/uas/login'
+)
+
 media_upload_endpoint = (
     f'{api_url_host}'
     '/api/voyagerVideoDashMediaUploadMetadata?action=upload')
@@ -334,7 +351,24 @@ def schedule(client, google_sheets_id,
     worksheet.clear()
 
     for row in newcontent:
-        worksheet.append_row(row)
+        worksheet.append_row(row, table_range='A1')
+
+
+def prime_linkedin_login(linkedin_username, linkedin_password):
+
+    session = requests.Session()
+
+    login_session = session.get(ui_seed_endpoint)
+    soup = BeautifulSoup(login_session.text, 'html.parser')
+    csrf = cast(Tag, soup.find('input', {'name': 'loginCsrfParam'}))
+
+    payload = {
+        'session_key': linkedin_username,
+        'session_password': linkedin_password,
+        'loginCsrfParam': csrf.get('value')
+    }
+
+    session.post(ui_login_endpoint, data=payload)
 
 
 def main(kwargs):
@@ -384,7 +418,19 @@ def main(kwargs):
         google_sheets_private_key.replace('\\n', '\n') \
         if google_sheets_private_key else ''
 
-    client = Linkedin(linkedin_username, linkedin_password)
+    try:
+        client = Linkedin(linkedin_username, linkedin_password)
+    except ChallengeException:
+        try:
+            prime_linkedin_login(linkedin_username, linkedin_password)
+        except Exception:
+            pass
+        try:
+            client = Linkedin(linkedin_username, linkedin_password)
+        except ChallengeException:
+            raise Exception('LinkedIn ChallengeException: '
+                            'This is a known issue. Please login to '
+                            'your LinkedIn account and try again.')
 
     if action == 'post':
         post(client, status_text,

agoras/core/twitter.py

@@ -252,7 +252,7 @@ def schedule(client, clientv1, google_sheets_id, google_sheets_name,
     worksheet.clear()
 
     for row in newcontent:
-        worksheet.append_row(row)
+        worksheet.append_row(row, table_range='A1')
 
 
 def main(kwargs):

docs/instagram.rst

@@ -24,7 +24,7 @@ Then click on submit and you'll see a response like this::
 
 "ZZZZZZZ" is your Instagram aacount ID.
 
-.. image:: images/instagram-2.png
+.. image:: credentials/images/instagram-2.png
 
 How to get google spreadsheets credentials
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

requirements.txt

@@ -6,3 +6,5 @@ google-auth==2.22.0
 linkedin-api==2.0.1
 python-dateutil==2.8.2
 filetype==1.2.0
+requests==2.31.0
+beautifulsoup4==4.8.2

setup.cfg

@@ -1,18 +1,19 @@
 [bumpversion]
-current_version = 0.1.0
+current_version = 1.0.1
 tag_name = {new_version}
 commit = True
 tag = True
 
+[bumpversion:file:README.rst]
+
+[bumpversion:file:README.short.rst]
+
+[bumpversion:file:agoras/__init__.py]
+
 [flake8]
 max-line-length = 120
-max-complexity = 12
+max-complexity = 15
 doctests = True
 
 [bdist_wheel]
 universal = 1
-
-[bumpversion:file:README.rst]
-
-[bumpversion:file:agoras/__init__.py]
-