Update files to authenticate with request headers

Author: Swapnil-2001

server/scripts/examples-gg-latest.js

@@ -114,12 +114,11 @@ function getCodePackage() {
     // url: 'https://api.github.com/repos/generative-design/Code-Package-p5.js/contents',
     url: `https://api.github.com/repos/generative-design/Code-Package-p5.js/contents${branchRef}`,
     // url: 'https://api.github.com/repos/generative-design/Code-Package-p5.js/contents?ref=pre-release',
-    qs: {
-      client_id: clientId,
-      client_secret: clientSecret
-    },
     method: 'GET',
-    headers,
+    headers: {
+      ...headers,
+      Authorization: `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`
+    },
     json: true
   };
 
@@ -144,12 +143,11 @@ function getSketchDirectories(sketchRootList) {
     // console.log(sketches)
     const options = {
       url: `https://api.github.com/repos/generative-design/Code-Package-p5.js/contents/${sketches.path}${branchRef}`,
-      qs: {
-        client_id: clientId,
-        client_secret: clientSecret
-      },
       method: 'GET',
-      headers,
+      headers: {
+        ...headers,
+        Authorization: `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`
+      },
       json: true
     };
 
@@ -179,12 +177,11 @@ function appendSketchItemLinks(sketchList) {
     const options = {
       // url: `${sketches.url}?client_id=${clientId}&client_secret=${clientSecret}`,
       url: `https://api.github.com/repos/generative-design/Code-Package-p5.js/contents/${sketches.path}${branchRef}`,
-      qs: {
-        client_id: clientId,
-        client_secret: clientSecret
-      },
       method: 'GET',
-      headers,
+      headers: {
+        ...headers,
+        Authorization: `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`
+      },
       json: true
     };
 
@@ -205,12 +202,11 @@ function getSketchItems(sketchList) {
     if (item.name === 'data') {
       const options = {
         url: `https://api.github.com/repos/generative-design/Code-Package-p5.js/contents/${item.path}${branchRef}`,
-        qs: {
-          client_id: clientId,
-          client_secret: clientSecret
-        },
         method: 'GET',
-        headers,
+        headers: {
+          ...headers,
+          Authorization: `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`
+        },
         json: true
       };
 
@@ -409,12 +405,11 @@ function getAllSketchContent(newProjectList) {
     ) {
       const options = {
         url: newProject.files[i].content,
-        qs: {
-          client_id: clientId,
-          client_secret: clientSecret
-        },
         method: 'GET',
-        headers
+        headers: {
+          ...headers,
+          Authorization: `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`
+        }
       };
 
       // console.log("CONVERT ME!")

server/scripts/examples-ml5.js

@@ -25,12 +25,11 @@ ok(editorApiUrl, 'EDITOR_API_URL is required');
 //
 const githubRequestOptions = {
   url: baseUrl,
-  qs: {
-    client_id: clientId,
-    client_secret: clientSecret
-  },
   method: 'GET',
-  headers,
+  headers: {
+    ...headers,
+    Authorization: `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`
+  },
   json: true
 };
 

server/scripts/examples.js

@@ -49,10 +49,12 @@ mongoose.connection.on('error', () => {
 function getCategories() {
   const categories = [];
   const options = {
-    url: `https://api.github.com/repos/processing/p5.js-website/contents/src/data/examples/en?client_id=${
-      clientId}&client_secret=${clientSecret}`,
+    url: 'https://api.github.com/repos/processing/p5.js-website/contents/src/data/examples/en',
     method: 'GET',
-    headers,
+    headers: {
+      ...headers,
+      Authorization: `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`
+    },
     json: true
   };
   return rp(options).then((res) => {
@@ -73,9 +75,12 @@ function getCategories() {
 function getSketchesInCategories(categories) {
   return Q.all(categories.map((category) => {
     const options = {
-      url: `${category.url.replace('?ref=main', '')}?client_id=${clientId}&client_secret=${clientSecret}`,
+      url: `${category.url.replace('?ref=main', '')}`,
       method: 'GET',
-      headers,
+      headers: {
+        ...headers,
+        Authorization: `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`
+      },
       json: true
     };
 
@@ -107,9 +112,12 @@ function getSketchesInCategories(categories) {
 function getSketchContent(projectsInAllCategories) {
   return Q.all(projectsInAllCategories.map(projectsInOneCategory => Q.all(projectsInOneCategory.map((project) => {
     const options = {
-      url: `${project.sketchUrl.replace('?ref=main', '')}?client_id=${clientId}&client_secret=${clientSecret}`,
+      url: `${project.sketchUrl.replace('?ref=main', '')}`,
       method: 'GET',
-      headers
+      headers: {
+        ...headers,
+        Authorization: `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`
+      }
     };
 
     return rp(options).then((res) => {
@@ -134,10 +142,12 @@ function getSketchContent(projectsInAllCategories) {
 
 function createProjectsInP5user(projectsInAllCategories) {
   const options = {
-    url: `https://api.github.com/repos/processing/p5.js-website/contents/src/data/examples/assets?client_id=${
-      clientId}&client_secret=${clientSecret}`,
+    url: 'https://api.github.com/repos/processing/p5.js-website/contents/src/data/examples/assets',
     method: 'GET',
-    headers,
+    headers: {
+      ...headers,
+      Authorization: `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`
+    },
     json: true
   };