ESLint cleanup and .env fix and ip fix

Author: Aavild

.env.example

@@ -30,7 +30,5 @@ MAIL_PASSWORD=123
 MAIL_KEY=1a2b3c
 
 # Github
-GITHUB_INSTALLATION_ID=
 GITHUB_APP_ID=
-GITHUB_APP_CLIENT_ID=
 GITHUB_APP_SECRET=

public/scripts/githubAuth.js

@@ -3,12 +3,12 @@ window.onload = () => {
     const url = new URL(window.location)
     const code = url.searchParams.get('code') // SUysVwZaIztTpdkvVzNe6RCZn3fRqC
     const state = url.searchParams.get('state')
-    
+
     // before auth
     if (!code) {
         const randomString = generateRandomString()
         localStorage.setItem('oauth-state', randomString)
-        
+
         document.getElementById('login').href += `&state=${btoa(randomString)}`
         document.getElementById('login').style.display = 'block'
         return
@@ -20,15 +20,15 @@ window.onload = () => {
         return
     }
     document.getElementById('info').innerText = 'Github account linked'
-    
+
     function generateRandomString () {
         let randomString = ''
         const randomNumber = Math.floor(Math.random() * 10)
-        
+
         for (let i = 0; i < 20 + randomNumber; i++) {
             randomString += String.fromCharCode(33 + Math.floor(Math.random() * 94))
         }
-        
+
         return randomString
     }
 }

src/app/Http/GithubController.js

@@ -1,19 +1,14 @@
-const fetch = require('node-fetch')
 const User = require('../Models/User')
 const Project = require('../Models/Project')
 const gitHub = require('../../github/githubApi')
-const { request } = require("@octokit/request");
-const { Octokit } = require('octokit');
 const authLink = 'https://github.com/login/oauth/authorize?client_id=7864fe4bf9aed444e764&scope=repo'
 const TEMP_currentproject = '627380b04dd41fde76c9bf66' // TODO: use URL instead
 
 async function page (req, res) {
-    if (req.session.user)
-    {
+    if (req.session.user) {
         if (req.query.code) await handleAuth(req, res)
         const project = await Project.findById(TEMP_currentproject)
-        if (project.categories.development.services && project.categories.development.services.github)
-        {
+        if (project.categories.development.services && project.categories.development.services.github) {
             const github = project.categories.development.services.github
             res.render('project/githubtemp', {
                 githubName: github.name,
@@ -23,47 +18,45 @@ async function page (req, res) {
             return
         }
     }
-    res.render('project/githubtemp', {AuthLink: authLink})
+    res.render('project/githubtemp', { AuthLink: authLink })
 }
-async function webHookReceiver(req) {
+async function webHookReceiver (req) {
     try {
         // TODO: implement security for github webhook
         const push = JSON.parse(req.body.read)
         console.log(push)
-        const project = await Project.findOne({services: {github: push.repository_id}})
+        const project = await Project.findOne({ services: { github: push.repository_id } })
         if (project) {
-            project.categories.development.services.github.hookMessages.push({ event: push.event, action: push.action})
-            if (project.categories.development.services.github.hookMessages.length > 10)
-                project.categories.development.services.github.hookMessages.shift()
+            project.categories.development.services.github.hookMessages.push({ event: push.event, action: push.action })
+            if (project.categories.development.services.github.hookMessages.length > 10) { project.categories.development.services.github.hookMessages.shift() }
             project.markModified('categories.development.services')
             project.save()
         } else console.log("Couldn't find a project with " + push.repository_id)
-    }
-    catch (e) {
-        console.log("Webhook error: " + e)
+    } catch (e) {
+        console.log('Webhook error: ' + e)
     }
 }
-async function handleAuth(req, res) {
+async function handleAuth (req, res) {
     try {
         const userAuth = await gitHub.auth({
-            type: "oauth-user",
+            type: 'oauth-user',
             code: req.query.code,
-            state: req.query.state,
-        });
+            state: req.query.state
+        })
         console.log(userAuth)
         await putUserInDB(userAuth, req.session.user.username)
         await gitHub.setupProject(userAuth, req.session.user, TEMP_currentproject)
         // TODO: Handle case where project with that name exists
-    }
-    catch (e) {
-        console.log("Failed discord auth: " + e)
+    } catch (e) {
+        console.log('Failed discord auth: ' + e)
     }
 }
 
-async function putUserInDB(auth, username) {
+async function putUserInDB (auth, username) {
     const user = await User.findOne({ username: username })
-    user.services = { ...user.services,
-        github: {clientId: auth.clientId, clientSecret: auth.clientSecret, token: auth.token}
+    user.services = {
+        ...user.services,
+        github: { clientId: auth.clientId, clientSecret: auth.clientSecret, token: auth.token }
     }
     await user.save()
     console.log(`Sucessfully linked ${username} with github account ${auth.clientId}`)

src/github/githubApi.js

@@ -2,26 +2,16 @@ const path = require('path')
 require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
 const appID = process.env.GITHUB_APP_ID
 const appSecret = process.env.GITHUB_APP_SECRET
-const { Octokit, App } = require("octokit");
+const { Octokit } = require('octokit')
 const Project = require('../app/Models/Project')
-const { createAppAuth } = require("@octokit/auth-app");
-const { createOAuthAppAuth } = require("@octokit/auth-oauth-app");
-const User = require('../app/Models/User');
-const { request } = require('@octokit/request');
+const { createOAuthAppAuth } = require('@octokit/auth-oauth-app')
 const auth = createOAuthAppAuth({
-    clientType: "oauth-app",
+    clientType: 'oauth-app',
     clientId: appID,
-    clientSecret: appSecret,
-});
+    clientSecret: appSecret
+})
 
-/*start()
-async function start() {
-    
-    const appAuthentication = await auth({
-        type: "oauth-app",
-    });
-}*/
-async function setupProject(userAuthenticationFromWebFlow, user, projectID) {
+async function setupProject (userAuthenticationFromWebFlow, user, projectID) {
     const project = await Project.findById(projectID)
     const octokit = new Octokit({
         auth: userAuthenticationFromWebFlow.token
@@ -36,10 +26,9 @@ async function setupProject(userAuthenticationFromWebFlow, user, projectID) {
         has_wiki: true
     })
     console.log(resp.data)
-    // await createWebHook(resp.data.hooks_url, octokit) //TODO: CANT BE LOCALHOST!!!
     await putGitHubInDB(project, resp.data)
 }
-async function putGitHubInDB(project, data) {
+async function putGitHubInDB (project, data) {
     const github = {
         id: data.id,
         name: data.name,
@@ -53,19 +42,18 @@ async function putGitHubInDB(project, data) {
     project.markModified('categories.development.services')
     project.save()
 }
-async function createWebHook(hookUrl, octokit) {
-    await octokit.request('POST ' + hookUrl.split("com")[1], {
+async function createWebHook (hookUrl, octokit) {
+    await octokit.request('POST ' + hookUrl.split('com')[1], {
         active: true,
         events: [
             'push',
             'pull_request'
         ],
         config: {
-            url: 'https://localhost:4000/api/github/webhook', // TODO: THIS CANT BE LOCALHOST!!!
+            url: 'http://178.128.202.47/api/github/webhook',
             content_type: 'json',
             insecure_ssl: '0'
         }
     })
 }
-module.exports = { auth, setupProject };
-
+module.exports = { auth, setupProject }