Merge branch 'main' into patch-1

Author: DhanushNehru

.github/workflows/tryhackme-badge-action-workflow

@@ -7,8 +7,7 @@ on:
 
 jobs:
   update-badge:
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
@@ -22,6 +21,5 @@ jobs:
       uses: DhanushNehru/[email protected]
       with:
         image_path: './assets/tryhackme-badge.png'
-        username: 'thm username'
-        user_id: 'github user.id'
+        user_id: 'your_tryhackme_user_id'
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -14,8 +14,7 @@ This is a GitHub Action that fetches your latest TryHackMe badge, downloads it,
 - Configure the action with the following inputs:
     - GITHUB_TOKEN: Your GitHub Personal Access Token (required, set as a secret).
     - image_path: The path to store the downloaded badge image (defaults to ./assets/tryhackme-badge.png).
-    - username: Your TryHackMe username (defaults to the value in a secret named THM_USERNAME).
-    - user_id: Your TryHackMe user ID (defaults to the value in a secret named THM_USER_ID).
+    - user_id: Your TryHackMe user ID (defaults to the value in a secret named THM_USER_ID). Eg) 1995656
 
 ```
 name: Update TryHackMe Badge
@@ -27,7 +26,7 @@ on:
 
 jobs:
   update-badge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout repository
@@ -37,7 +36,6 @@ jobs:
       uses: DhanushNehru/[email protected]
       with:
         image_path: './assets/tryhackme-badge.png'
-        username: 'your_tryhackme_username'
         user_id: 'your_tryhackme_user_id'
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-```
+```

index.js

@@ -5,7 +5,7 @@ const fs = require("fs");
 
 const GITHUB_TOKEN = core.getInput("GITHUB_TOKEN");
 const FILE_PATH = core.getInput("image_path") || "./assets/tryhackme-badge.png";
-const THM_USERNAME = core.getInput("username") || "dhanushnehru";
+// const THM_USERNAME = core.getInput("username") || "dhanushnehru";
 const THM_USER_ID = core.getInput("user_id") || "1995656";
 
 /*
@@ -15,6 +15,7 @@ const THM_USER_ID = core.getInput("user_id") || "1995656";
  * @param options {Object} extra options
  * @return {Promise<Object>}
  */
+
 const executeCommand = (cmd, args = [], options = {}) =>
   new Promise((resolve, reject) => {
     let outputData = "";
@@ -61,10 +62,10 @@ const refreshBadge = async (userId) => {
   }
 };
 
-const downloadAndCommitBadge = async (githubToken, filePath, username) => {
+const downloadAndCommitBadge = async (githubToken, filePath, userID) => {
   await refreshBadge(THM_USER_ID);
   try {
-    const url = `https://tryhackme-badges.s3.amazonaws.com/${username}.png`;
+    const url = `https://tryhackme.com/api/v2/badges/public-profile?userPublicId=${userID}`
     const path = filePath;
     const committerUsername = core.getInput("committer_username");
     const commitMessage = core.getInput("commit_message") || "Updated THM profile badge using action workflow by Dhanush Nehru";
@@ -101,4 +102,4 @@ const downloadAndCommitBadge = async (githubToken, filePath, username) => {
   }
 };
 
-downloadAndCommitBadge(GITHUB_TOKEN, FILE_PATH, THM_USERNAME);
+downloadAndCommitBadge(GITHUB_TOKEN, FILE_PATH, THM_USER_ID);