backend-manager 3.2.63 → 3.2.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.2.63",
+  "version": "3.2.65",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {

package/src/manager/functions/core/actions/api/admin/create-post.js

@@ -21,19 +21,32 @@ Module.prototype.main = function () {
       return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
+    // Get repo info
     const repoInfo = assistant.parseRepo(get(self.Manager.config, 'github.repo_website'));
-
     const poster = new Poster();
 
+    assistant.log(`main(): Creating post...`, repoInfo);
+
+    // Set defaults
+    const githubUser = get(self.Manager.config, 'github.user');
+    const githubKey = get(self.Manager.config, 'github.key');
+    const filePath = poster.removeDirDot(finalPost.path);
+    const fileContent = finalPost.content;
+
     // Save to disk OR commit
     poster.onDownload = function (meta) {
       return new Promise(async function(resolve, reject) {
         const tempPath = (meta.tempPath);
         const finalPath = poster.removeDirDot(meta.finalPath);
 
+        // Log
+        assistant.log(`onDownload(): tempPath`, tempPath);
+        assistant.log(`onDownload(): finalPath`, finalPath);
+
+        // Save to disk
         poster.readImage(tempPath)
           .then(image => {
-            createFile(get(self.Manager.config, 'github.user'), repoInfo.user, repoInfo.name, get(self.Manager.config, 'github.key'), finalPath, image)
+            self.createFile(githubUser, repoInfo.user, repoInfo.name, githubKey, finalPath, image)
               .then(() => {resolve()})
               .catch((e) => {reject(e)})
           })
@@ -42,8 +55,8 @@ Module.prototype.main = function () {
       });
     }
 
+    // Create post
     const finalPost = await poster.create(payload.data).catch(e => e);
-
     if (finalPost instanceof Error) {
       return reject(assistant.errorify(`Failed to post: ${finalPost}`, {code: 500}));
     }
@@ -64,7 +77,7 @@ Module.prototype.main = function () {
     // }
 
     // Save post OR commit
-    await createFile(get(self.Manager.config, 'github.user'), repoInfo.user, repoInfo.name, get(self.Manager.config, 'github.key'), poster.removeDirDot(finalPost.path), finalPost.content)
+    await self.createFile(githubUser, repoInfo.user, repoInfo.name, githubKey, filePath, fileContent)
     .then(() => {
       return resolve({data: finalPost});
     })
@@ -77,19 +90,30 @@ Module.prototype.main = function () {
 };
 
 // HELPERS //
-async function createFile(user, repoUser, repoName, key, path, contents) {
-  let fileParsed = pathApi.parse(path);
+Module.prototype.createFile = function (user, repoUser, repoName, key, path, contents) {
+  const self = this;
+  const Manager = self.Manager;
+  const Api = self.Api;
+  const assistant = self.assistant;
+  const payload = self.payload;
 
-  let base64Data = Buffer.from(contents).toString('base64');
-  // base64Data = contents;
-  // console.log('--------base64Data', base64Data);
   return new Promise(async (resolve, reject) => {
+    let fileParsed = pathApi.parse(path);
+    let base64Data = Buffer.from(contents).toString('base64');
     let sha;
-    try {
 
-      let branch = (repoName === 'ultimate-jekyll') ? 'template' : 'master';
+    // Log
+    assistant.log(`createFile(): Writing file to ${repoUser}/${repoName}/${path}`);
 
+    // Try to get sha
+    try {
+      let branch = repoName === 'ultimate-jekyll' ? 'template' : 'master';
       let pathGet = `https://api.github.com/repos/${repoUser}/${repoName}/git/trees/${branch}:${encodeURIComponent(pathApi.dirname(path))}`;
+
+      // Log
+      assistant.log(`createFile(): pathGet`, pathGet);
+
+      // Make request
       await makeRequest({
         method: 'GET',
         url: pathGet,
@@ -116,8 +140,7 @@ async function createFile(user, repoUser, repoName, key, path, contents) {
   }
 
   let pathPut = `https://api.github.com/repos/${repoUser}/${repoName}/contents/${path}`;
-  let writeRequest =
-  {
+  let writeRequest = {
     // url: `https://api.github.com/repos/:owner/:repo/contents/:path`,
     method: 'PUT',
     url: pathPut,
@@ -133,10 +156,16 @@ async function createFile(user, repoUser, repoName, key, path, contents) {
       'Authorization': `Basic ${Buffer.from(user + ':' + key).toString('base64')}`,
     }
   }
+
+  // Log
+  assistant.log(`createFile(): pathPut`, pathPut);
+
+  // Add sha if it exists
   if (sha) {
     writeRequest.body.sha = sha;
   }
-  // console.log('--------PUT', pathPut);
+
+  // Make request
   await makeRequest(writeRequest)
   .then((json) => {
     if (!json || (json.message && (json.message === 'Not Found' || json.message.includes('Invalid request'))) ) {