refactor(service): use octokit

Author: wildan3105

public/js/chart.js

@@ -1,8 +1,6 @@
 /* eslint-disable no-useless-escape */
 /* eslint-disable no-undef */
 /* eslint-disable no-unused-vars */
-const { MAX_REPOS_PER_CHART } = require('../../src/config');
-
 const sum = (array) => {
     if (array.length === 0) {
         return 0;
@@ -58,7 +56,7 @@ const chart = ({ limit, singleColor }) => {
     }
     const labels = keys.slice(0, limit);
     const data = values.slice(0, limit);
-    if (keys.length > MAX_REPOS_PER_CHART) {
+    if (keys.length > 20) {
         const valueOthers = sum(values.slice(limit, keys.length));
         labels.push('Others');
         data.push(valueOthers);
@@ -135,7 +133,7 @@ const chart = ({ limit, singleColor }) => {
 const toggleColor = () => {
     window.chart.destroy();
     // eslint-disable-next-line no-undef
-    singleColor = chart({ limit: MAX_REPOS_PER_CHART, singleColor: !singleColor });
+    singleColor = chart({ limit: 20, singleColor: !singleColor });
     const btn = document.getElementById('btn-toggle');
 
     btn.classList.toggle('active');

src/api/controller.js

@@ -5,33 +5,31 @@ const axios = require('axios');
 
 // config related variables
 const {
-    GITHUB_API_URL,
-    CLIENT_ID_AND_CLIENT_SECRET_MISSING_ERROR_MESSAGE,
     REPOS_PER_PAGE,
     MAX_REPOS_PER_CHART,
     RANDOM_STATEMENTS,
-    MISTERY_STATEMENTS
+    MISTERY_STATEMENTS,
+    TOKEN_MISSING_ERROR_MESSAGE
 } = require('../config');
 
 // load utils
 const { emojiGenerator } = require('../utils/emoji-generator');
 const { getColorsForLanguages } =require('../utils/language-colors-generator');
 
 
-const client_id = process.env.CLIENT_ID || false;
-const client_secret = process.env.CLIENT_SECRET || false;
-if (!(client_id && client_secret)) {
-    throw CLIENT_ID_AND_CLIENT_SECRET_MISSING_ERROR_MESSAGE;
+const token = process.env.TOKEN || false;
+if (!token) {
+    throw TOKEN_MISSING_ERROR_MESSAGE;
 }
 
-// load service
-const GithubService = require('./service');
-const githubService = new GithubService(GITHUB_API_URL, client_id, client_secret);
+// initialize service
+const OctokitService = require('./octokit');
+const octokitService = new OctokitService(token);
 
 const reqRepos = async (username, numberOfPages) => {
     const requests = [];
     for (let i = 1; i <= numberOfPages; i++) {
-        requests.push(await githubService.getReposForUser(username, i));
+        requests.push(await octokitService.getReposForUser(username, i));
     }
     return requests;
 };
@@ -63,9 +61,9 @@ exports.index = async (req, res) => {
         return;
     }
 
-    await githubService.getUser(username)
+    await octokitService.getUser(username)
         .then(async (user) => {
-            const userData = user.data;
+            const userData = user;
             const numberOfRepos = userData.public_repos;
             const fetchedRenderValue = {
                 avatar: userData.avatar_url,

src/api/octokit.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const { Octokit } = require('octokit');
+const { REPOS_PER_PAGE } = require('../config');
+
+class OctokitService {
+    constructor(token) {
+        this.token = token,
+        this.octokit = new Octokit({
+            auth: this.token
+        });
+    }
+
+    async getUser(username) {
+        try {
+            const { data } = await this.octokit.request(`GET /users/${username}`);
+            return data;
+        } catch (e) {
+            throw e;
+        }
+    }
+
+    async getReposForUser(username, page) {
+        try {
+            const data = await this.octokit.request(`GET /users/${username}/repos?per_page=${REPOS_PER_PAGE}&page=${page}`);
+            return data;
+        } catch (e) {
+            throw e;
+        }
+    }
+}
+
+module.exports = OctokitService;

src/api/service.js

@@ -1,10 +1,8 @@
-const GITHUB_API_URL = 'https://api.github.com';
-
 const REPOS_PER_PAGE = 100;
 const MAX_REPOS_PER_CHART = 20;
 
 const ENV_MISSING_ERROR_MESSAGE = 'Missing ENV environment variables';
-const CLIENT_ID_AND_CLIENT_SECRET_MISSING_ERROR_MESSAGE = 'Missing CLIENT_ID and CLIENT_SECRET environment variables';
+const TOKEN_MISSING_ERROR_MESSAGE = 'Missing token';
 
 const RANDOM_STATEMENTS = [
     'You\'ve got skills on',
@@ -22,11 +20,10 @@ const MISTERY_STATEMENTS = [
 ];
 
 module.exports = {
-    GITHUB_API_URL,
     REPOS_PER_PAGE,
     MAX_REPOS_PER_CHART,
     ENV_MISSING_ERROR_MESSAGE,
-    CLIENT_ID_AND_CLIENT_SECRET_MISSING_ERROR_MESSAGE,
+    TOKEN_MISSING_ERROR_MESSAGE,
     RANDOM_STATEMENTS,
     MISTERY_STATEMENTS
 };