ew

Author: Jiaping Zeng

.gitignore

@@ -19,3 +19,5 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
+
+config

auth.js

@@ -1,12 +1,17 @@
-//All requirements for this file
+//Dependencies
 var passport = require('passport')
 var Auth0Strategy = require('passport-auth0')
+var config = require('config')
+
+var domain = process.env.domain ? process.env.domain : config.get('domain')
+var cID = process.env.cID ? process.env.cID : config.get('cID')
+var cS = process.env.cS ? process.env.cS : config.get('cS')
 
 //Instance information needed for authentication
 var strategy = new Auth0Strategy({
-    domain: process.env.domain,
-    clientID: process.env.cID,
-    clientSecret: process.env.cS,
+    domain: domain,
+    clientID: cID,
+    clientSecret: cS,
     callbackURL: 'https://motilate.herokuapp.com/user/callback'
 }, (accessToken, refreshToken, extraParams, profile, done) => {
     return done(null, profile)

package-lock.json

@@ -6,7 +6,7 @@
     "start": "node server.js"
   },
   "dependencies": {
-    "cli-color": "^1.4.0",
+    "config": "^2.0.1",
     "ejs": "^2.6.1",
     "express": "^4.16.4",
     "express-session": "^1.15.6",

package.json

@@ -1,7 +1,6 @@
 var express = require('express')
 var router = express.Router()
 
-//Makes urls look nice but does not work (if thats what is supposed to do if not JP please change this comment)
 router.get('/', (req, res) => {
     res.redirect('/user/login')
 })

routes/index.js

@@ -1,20 +1,16 @@
-//All of the requirements for the file
+//Dependencies
 var express = require('express')
 var bodyParser = require('body-parser')
 var path = require('path')
 var fs = require('fs')
-var https = require('https')
-  //For passport
+//passport
 var session = require('express-session')
 var passport = require('passport')
 var userInView = require('./lib/middleware/userInView')
 var index = require('./routes/index')
 var event = require('./routes/event')
 var user = require('./routes/user')
 require('./auth.js')
-  //For console colors
-var color = require("cli-color");
-
 
 var app = express()
 var port = process.env.PORT || 3000
@@ -43,10 +39,13 @@ app.use('/', index) //Routs default page to index route
 app.use('/event', event) //Routs event to event route
 app.use('/user', user) // Touts user to user route
 
+app.listen(port)
 //Creates the https server
+/*
 https.createServer({
   key: fs.readFileSync('server.key'), //Gets the key for certification 
   cert: fs.readFileSync('server.cert')
 }, app).listen(port, function () {
-console.log(color.green.bold('The server has started on port: ') +  `${port}`)
-})
+  console.log(color.green.bold('The server has started on port: ') + `${port}`)
+})
+*/