Merge pull request #458 from benjagm/main

Code cleanup in the github actions for better fetch and authentication

Author: Relequestual

.github/workflows/close-completed-ocwm.yml

@@ -35,7 +35,7 @@ jobs:
           const octokit = require('@octokit/core').Octokit  
           const mygithub = new octokit({
             request: { fetch: fetch,},
-            headers: { authorization: `token ${process.env.MY_TOKEN}`}
+            auth: process.env.MY_TOKEN
           });
 
           const label = process.env.MY_LABEL;

.github/workflows/ocwm-creator.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Node 18
       uses: actions/setup-node@v2
       with:
-        node-version: 18
+        node-version: '18'
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
@@ -37,44 +37,22 @@ jobs:
         token: ${{ secrets.AUTH_TOKEN }}
 
     - name: Install dependencies
-      run: npm install @octokit/core axios
+      run: npm install @octokit/core 
 
     - name: Update Issue Body
       uses: actions/github-script@v6
       env:
         MY_TOKEN: ${{ secrets.AUTH_TOKEN }}
       with:
         script: |
-          const { Octokit } = require('@octokit/core');
-          const axios = require('axios').default;
-
-          const customFetch = async (url, options) => {
-            const res = await axios({
-              url,
-              method: options.method || 'GET',
-              headers: {
-                ...options.headers,
-                authorization: `token ${process.env.MY_TOKEN}`,
-              },
-              data: options.body,
-            });
-
-            return {
-              ok: res.status >= 200 && res.status <= 299,
-              status: res.status,
-              statusText: res.statusText,
-              json: () => res.data,
-              text: () => res.data,
-              headers: res.headers,
-            };
-          };
-
-          const mygithub = new Octokit({
-            request: {
-              fetch: customFetch,
-            },
+        
+          const octokit = require('@octokit/core').Octokit;
+          const mygithub = new octokit({
+            request: { fetch: fetch,},
+            auth: process.env.MY_TOKEN
           });
 
+          console.log("Token:" + process.env.MY_TOKEN);
           const ocwmnumber = ${{ steps.create-issue.outputs.issue-number }};
 
           const { data: ocwmissue } = await mygithub.request(`GET /repos/${context.repo.owner}/${context.repo.repo}/issues/${ ocwmnumber }`, {

.github/workflows/ocwm-issue-collector.yml

@@ -13,11 +13,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Node 18
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v2
       with:
-        node-version: 18    
+        node-version: '18'
     - name: Install dependencies
-      run: npm install @octokit/core axios
+      run: npm install @octokit/core 
     - name: Adding Issues
       uses: actions/github-script@v6
       env:
@@ -30,35 +30,12 @@ jobs:
         MY_TOKEN: ${{ secrets.AUTH_TOKEN }}
       with:
         script: |
-          const { Octokit } = require('@octokit/core');
-          const axios = require('axios').default;
-
-          const customFetch = async (url, options) => {
-            const res = await axios({
-              url,
-              method: options.method || 'GET',
-              headers: {
-                ...options.headers,
-                authorization: `token ${process.env.MY_TOKEN}`,
-              },
-              data: options.body,
-            });
 
-            return {
-              ok: res.status >= 200 && res.status <= 299,
-              status: res.status,
-              statusText: res.statusText,
-              json: () => res.data,
-              text: () => res.data,
-              headers: res.headers,
-            };
-          };
-
-          const mygithub = new Octokit({
-            request: {
-              fetch: customFetch,
-            },
-          });  
+          const octokit = require('@octokit/core').Octokit  
+          const mygithub = new octokit({
+            request: { fetch: fetch,},
+            auth: process.env.MY_TOKEN
+          });
           
           const repoNames = process.env.REPO_NAMES;
           const placeholder = process.env.PLACEHOLDER;