hdoc-tools 0.17.3 → 0.17.4

package/hdoc-build.js

@@ -47,7 +47,7 @@
         prod_families = {},
         prods_supported = [],
         doc_id = '',
-        git_token = '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', // Github fine-grained personal access token that has minimum read-only access to Hornbill Docs org repo content
+        git_token = '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', // Github fine-grained personal access token that has minimum read-only access to Hornbill Docs org repo content
         hdocbook_config = {},
         hdocbook_project,
         includes_found = 0,
@@ -429,7 +429,7 @@
             if (hdocbook_config.publicSource && hdocbook_config.publicSource !== '' && hdocbook_config.publicSource.includes('github.com/Hornbill-Docs')) {
 
                 const github_paths = hdoc.get_github_api_path(hdocbook_config.publicSource, file_path.relativePath);
-                const contributors = await hdoc.get_github_contributors(github_paths.api_path, git_token);
+                const contributors = await hdoc.get_github_contributors(github_paths.api_path, git_token, hdocbook_config.publicSource);
 
                 if (!contributors.success) {
                     console.log(`Error retrieving contributors from Github: ${contributors.error}`);

package/hdoc-module.js

@@ -233,7 +233,14 @@
         return '';
     };
 
-    exports.get_github_contributors = async function (github_url, github_api_token) {
+    const get_github_contributors_path = function (repo) {
+        repo = repo.endsWith('/') ? repo.slice(0, -1) : repo;
+        let github_paths = {};
+        github_paths.api_path = repo.replace('https://github.com/', 'https://api.github.com/repos/');
+        github_paths.api_path += '/contributors';
+        return github_paths;
+    };
+    exports.get_github_contributors = async function (github_url, github_api_token, repo) {
         let response = {
             success: false,
             error: '',
@@ -241,7 +248,6 @@
             contributor_count: 0,
             last_commit_date: ''
         };
-
         let contributors = {};
 
         let request_options = {
@@ -259,8 +265,12 @@
         try {
             github_response = await axios.get(github_url, request_options);
         } catch (err) {
-            response.error = err;
-            return response;
+            if (err.response.status !== 403) {
+                response.error = err;
+                return response;
+            } else {
+                github_response = err.response;
+            }
         }
 
         if (github_response.status === 200) {
@@ -291,6 +301,47 @@
                     response.contributors.push(contributors[key]);
                 }
             }
+        } else if (github_response.status === 403) {
+            // Private repo, fine-grained permissions don't yet support getting commits without content, get list from meta permissions
+            const contrib_url = get_github_contributors_path(repo).api_path;
+            try {
+                github_response = await axios.get(contrib_url, request_options);
+            } catch (err) {
+                if (err.response.status !== 200) {
+                    response.error = err;
+                    return response;
+                }
+            }
+            if (github_response.status === 200) {
+                response.success = true;
+                let commits = github_response.data;
+                commits.forEach(function (commit) {
+                    if (commit.committer && commit.committer.type && commit.committer.type.toLowerCase() === 'user' && commit.committer.login.toLowerCase() !== 'web-flow') {
+                        if (!contributors[commit.committer.id]) {
+                            response.contributor_count++;
+                            contributors[commit.committer.id] = {
+                                login: commit.committer.login,
+                                avatar_url: commit.committer.avatar_url,
+                                html_url: commit.committer.html_url,
+                                name: commit.commit.committer.name
+                            };
+                        }
+                        if (response.last_commit_date !== '') {
+                            const new_commit_date = new Date(commit.commit.committer.date);
+                            const exist_commit_date = new Date(response.last_commit_date);
+                            if (new_commit_date > exist_commit_date) response.last_commit_date = commit.commit.committer.date;
+                        } else {
+                            response.last_commit_date = commit.commit.committer.date;
+                        }
+                    }
+                });
+                for (const key in contributors) {
+                    if (contributors.hasOwnProperty(key)) {
+                        response.contributors.push(contributors[key]);
+                    }
+                }
+            }
+
         } else {
             response.error = `Unexpected Status: ${github_response.status}.`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.17.3",
+  "version": "0.17.4",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {