Merge branch 'dev' of github.com:/sweeftdigital/accounts_G2 into dev

sweeftdigital · Oct 12, 2024 · d9d2df4 · d9d2df4
2 parents cae86be + acfc4fd
commit d9d2df4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/celery.yml b/.github/workflows/celery.yml
@@ -23,7 +23,8 @@ jobs:
             cd /home/nata_tchikhinashvili/
             source venv/bin/activate
             cd /home/nata_tchikhinashvili/accounts_G2
-            git pull
+            git fetch origin
+            git reset --hard origin/dev
             git checkout dev
             pip3 install -r requirements.txt
             deactivate

diff --git a/apis/views.py b/apis/views.py
@@ -2258,9 +2258,9 @@ def store_token_in_cache(self, token):
         calculates the remaining TTL, and stores the token in Redis.
         If the token is expired, it will not be stored.
         """
-
+        
         payload = jwt.decode(
-            token, os.environ.get("RSA_PUBLIC_KEY"), algorithms=["RS256"]
+            token, os.environ.get("RSA_PUBLIC_KEY").replace("\\n", "\n"), algorithms=["RS256"]
         )
         exp = payload.get("exp", 0)
         now = int(time.time())