From 0e8b577dbe8366dabb276ae461a45d9ac212c6f1 Mon Sep 17 00:00:00 2001 From: Hendrixer Date: Wed, 26 Feb 2014 22:53:44 -0800 Subject: [PATCH 1/6] env variables --- app/coffee/config/auth.coffee | 4 ++-- app/coffee/config/mail.coffee | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/coffee/config/auth.coffee b/app/coffee/config/auth.coffee index 189d697..860cd98 100644 --- a/app/coffee/config/auth.coffee +++ b/app/coffee/config/auth.coffee @@ -9,6 +9,6 @@ url = module.exports = fitbit: - consumerKey: '6b8b28e0569a422e97a70b5ca671df32' - consumerSecret: 'b351c1fea45d48ed9955a518f4e30e72' + consumerKey: process.env.CONSUMER_KEY + consumerSecret: process.env.CONSUMER_SECRET callbackURL: url \ No newline at end of file diff --git a/app/coffee/config/mail.coffee b/app/coffee/config/mail.coffee index 528335c..ab064a7 100644 --- a/app/coffee/config/mail.coffee +++ b/app/coffee/config/mail.coffee @@ -1,12 +1,12 @@ nodemailer = require 'nodemailer' - +console.log 'process', process.env module.exports = { smtpTransport: (service) -> return nodemailer.createTransport( 'SMTP', {service: service, auth: { - user: 'willscottmoss@gmail.com' - pass: 'ballin35' + user: process.env.EMAIL + pass: process.env.PASS } } ) From 9e2e28b2532417a712d5cb2378edaddb3d59d4f8 Mon Sep 17 00:00:00 2001 From: Hendrixer Date: Wed, 26 Feb 2014 23:04:24 -0800 Subject: [PATCH 2/6] update travis with env variables --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index cbdccfe..9906afb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,3 +9,9 @@ deploy: api_key: secure: jj6SDxhprIwq8cjC4rPLVciNcfvqS3dZWG27Aa4Eg58GTN8eVdNO+n3mDgZ2KRpZJ93/mVIOmgEnq9vDwPlfob8lT/BpLVkbS07zcagZxweoEN8RdOcRxWFG3qDR301RZwHSTqSw81pZsligE+lWWY69OxFzFVvAR0jDN7dxn/s= app: still-scrubland-1948 +env: + global: + - secure: T2mWSeNczqKUecLB3s7l4hT8Zslba0Z80nhJCtK8MxosI2nc6YDxc53miNs6y7+uVt5RPX4ckZPZGu+UKw6EHjE4mvZKmx2vLFdP1vm4BTvZv2q+d/Z+yH25jnPjnixInqXUJip4Fbx8gYFEDqldsuZG66Cj6iMKRDJpkcZu9wI= + - secure: vGxqU3wvdNQAmbW/XvFa9L+I55Vib/aV2A4jo5HsUQW31qSh51G0cQsQOVRT7OdACxr3q5LzpCcGBQb1/0Vzlsh47oc+bAyzx3p//Ca2zDHvOErS80wNSx+sAWRn8ePeONOnOtq57knKNkabu4HsYhuO5KbGdS0tQN+nlfpA6Rk= + - secure: mb0S1hhIrseW4LVC6e7Btb2wukm0XOrtoFlPdUDS0K3XDoEj8DTQOYKRhNlPoVnT72Rqd2PelzkDzncWnjVHESSf2xTfpHLzR1Z+9n/4PsmY2qxN97jtxh/fEVj2saCBH+p3HUUDKfLHBZKPpv6pv9mSt5rJyvbTZ8hM1WMzUqU= + - secure: BYFtJNRt+m5iXLARRwI9XTAJA+hHnaTia6Ps6A9AWHXBMUYyV3E3haLrqCvkYSxrLBec2vfzG0yn7DoeKUtZzbO3yWTHT9EwIkn8vDgblapcSNjyD6kFEth32mWeMALUQL+SSqZxdB7NTaT8CMOp/u/1TwJediKiwef9PqfAxec= From 2bb66357abd35f86688bc67e3ef84db885274899 Mon Sep 17 00:00:00 2001 From: Hendrixer Date: Wed, 26 Feb 2014 23:28:31 -0800 Subject: [PATCH 3/6] travis fix --- .travis.yml | 8 ++++---- app/coffee/app.coffee | 3 ++- app/coffee/config/auth.coffee | 2 ++ app/coffee/config/mail.coffee | 1 - app/coffee/routes/userRoutes.coffee | 3 +++ app/coffee/server.coffee | 4 ++++ 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9906afb..be5df4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ deploy: app: still-scrubland-1948 env: global: - - secure: T2mWSeNczqKUecLB3s7l4hT8Zslba0Z80nhJCtK8MxosI2nc6YDxc53miNs6y7+uVt5RPX4ckZPZGu+UKw6EHjE4mvZKmx2vLFdP1vm4BTvZv2q+d/Z+yH25jnPjnixInqXUJip4Fbx8gYFEDqldsuZG66Cj6iMKRDJpkcZu9wI= - - secure: vGxqU3wvdNQAmbW/XvFa9L+I55Vib/aV2A4jo5HsUQW31qSh51G0cQsQOVRT7OdACxr3q5LzpCcGBQb1/0Vzlsh47oc+bAyzx3p//Ca2zDHvOErS80wNSx+sAWRn8ePeONOnOtq57knKNkabu4HsYhuO5KbGdS0tQN+nlfpA6Rk= - - secure: mb0S1hhIrseW4LVC6e7Btb2wukm0XOrtoFlPdUDS0K3XDoEj8DTQOYKRhNlPoVnT72Rqd2PelzkDzncWnjVHESSf2xTfpHLzR1Z+9n/4PsmY2qxN97jtxh/fEVj2saCBH+p3HUUDKfLHBZKPpv6pv9mSt5rJyvbTZ8hM1WMzUqU= - - secure: BYFtJNRt+m5iXLARRwI9XTAJA+hHnaTia6Ps6A9AWHXBMUYyV3E3haLrqCvkYSxrLBec2vfzG0yn7DoeKUtZzbO3yWTHT9EwIkn8vDgblapcSNjyD6kFEth32mWeMALUQL+SSqZxdB7NTaT8CMOp/u/1TwJediKiwef9PqfAxec= + - secure: shUwCgAOkc46fEi+Y8B4e0UQYhyGbkq/VFimj4HG+bYYPrti653dsrJ9xgbeX8lDnvCeeIXXlkBmYrgP2fUSk26mmT4MkrICGLO2MSXn1pWwuwRGuHKZnpM5jgTew/UNOT4VCfwxNQNkptM5UmHXusw/O/SDEFIiC9pnUtYHAxo= + - secure: pCDvwQZVN9cam73/Emh3RIPaz8I18HtyeED17378dtEaFvej+kzqmQcBCoRVPkFSSx+m0PioIxMPZwQFD74hV1QdEr6SxcG5O27dCGCnjSKezHhNzyZclhrJ+kPFfNTGfkL4qvba/PqZzyElhoa0HfGSOpKkYqcipQJ/XH204x4= + - secure: mcp4PIqGhNqPtV6hqxqidzBJZ+Zl0OtDOD2Bl3RHCF+/b9dh4x/Aq1XX58+E8WK1/fSD+hzjgHZRYXQJRWQpNuD2kt3S7T1FFxnggnMElEiHn4BE6QvWb21iaUxrGzePUmO36PcMj1L5Oo2t/TvoP31iJf4NqIXZFP+HNKpqNNQ= + - secure: D27tin0Nng3+2vpPdOG8MPJKEfF4iYmgOwarmxGgCC3plsvuV/J/e4MHLo80OOIPiX4CJcpMfnm2Znz4jYWm1C/4pSok0kWKej+aLQkTKcOtvIs8MGT7/q5Gw5DGOh1DThnnsw2pYQtHXVTJAZamE1bGmwKj91oeyChJeISpkis= diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index 025959e..e498cce 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -3,4 +3,5 @@ app = require './server' app.listen port -console.log "Listening on port #{port}" \ No newline at end of file +console.log "Listening on port #{port}" + diff --git a/app/coffee/config/auth.coffee b/app/coffee/config/auth.coffee index 860cd98..0aa7de6 100644 --- a/app/coffee/config/auth.coffee +++ b/app/coffee/config/auth.coffee @@ -1,5 +1,7 @@ # auth tokens here, will replace with env variables # will git ignore this once we all have a local copyreq + + {port} = require './serverConfig' url = if process.env.HEROKU_URL diff --git a/app/coffee/config/mail.coffee b/app/coffee/config/mail.coffee index ab064a7..4cade21 100644 --- a/app/coffee/config/mail.coffee +++ b/app/coffee/config/mail.coffee @@ -1,6 +1,5 @@ nodemailer = require 'nodemailer' -console.log 'process', process.env module.exports = { smtpTransport: (service) -> return nodemailer.createTransport( diff --git a/app/coffee/routes/userRoutes.coffee b/app/coffee/routes/userRoutes.coffee index 956bf38..6b6afc4 100644 --- a/app/coffee/routes/userRoutes.coffee +++ b/app/coffee/routes/userRoutes.coffee @@ -22,10 +22,13 @@ module.exports = (app, passport) -> app.delete '/user/delete', isLoggedIn, user.deleteUser + # this route is expecting an email app.post '/user/forgot/password', user.forgotPassword + # this is the route the is sent in the email, use clicks this app.get '/user/reset/:token', user.resetPassword + # this is the route the the new passowrd will post to app.post '/user/reset/:token', user.updatePassword app.get '/connect/fitbit', isLoggedIn, passport.authorize 'fitbit' diff --git a/app/coffee/server.coffee b/app/coffee/server.coffee index 0632961..b2ffe22 100644 --- a/app/coffee/server.coffee +++ b/app/coffee/server.coffee @@ -39,5 +39,9 @@ require('./routes/groupRoutes')(app, passport) require('./routes/mainFeedRoutes')(app) +console.log 'here!!!!!!', process.env.CONSUMER_KEY, +process.env.CONSUMER_SECRET + + module.exports = app From c2c2d05a46d3aaa97f5e3a0a41dadfc32aa2fd1e Mon Sep 17 00:00:00 2001 From: Hendrixer Date: Wed, 26 Feb 2014 23:36:24 -0800 Subject: [PATCH 4/6] travis fix --- app/coffee/test/users_spec.coffee | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/coffee/test/users_spec.coffee b/app/coffee/test/users_spec.coffee index 73afcc2..2fbb4f2 100644 --- a/app/coffee/test/users_spec.coffee +++ b/app/coffee/test/users_spec.coffee @@ -5,6 +5,9 @@ dbUrl = 'mongodb://localhost/teses' User = require '../models/user' clearDB = require('mocha-mongoose')(dbUrl) +console.log 'here!!!!!!', process.env.CONSUMER_KEY, +process.env.CONSUMER_SECRET + describe "Saving a new user", -> beforeEach (done) -> return done() if mongoose.connection.db From 541de58ede38ae2e46887bcb142e1048c89b8c67 Mon Sep 17 00:00:00 2001 From: Hendrixer Date: Wed, 26 Feb 2014 23:45:41 -0800 Subject: [PATCH 5/6] travis fix3 --- app/coffee/test/users_spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/coffee/test/users_spec.coffee b/app/coffee/test/users_spec.coffee index 2fbb4f2..c5c2849 100644 --- a/app/coffee/test/users_spec.coffee +++ b/app/coffee/test/users_spec.coffee @@ -5,7 +5,7 @@ dbUrl = 'mongodb://localhost/teses' User = require '../models/user' clearDB = require('mocha-mongoose')(dbUrl) -console.log 'here!!!!!!', process.env.CONSUMER_KEY, +console.log 'here!!!!!!!', process.env.CONSUMER_KEY, process.env.CONSUMER_SECRET describe "Saving a new user", -> From 7e0bbb0b11722007a37f31342ca87218c148ef91 Mon Sep 17 00:00:00 2001 From: Hendrixer Date: Thu, 27 Feb 2014 09:38:04 -0800 Subject: [PATCH 6/6] travis 5 --- app/coffee/test/users_spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/coffee/test/users_spec.coffee b/app/coffee/test/users_spec.coffee index c5c2849..86aebf7 100644 --- a/app/coffee/test/users_spec.coffee +++ b/app/coffee/test/users_spec.coffee @@ -5,7 +5,7 @@ dbUrl = 'mongodb://localhost/teses' User = require '../models/user' clearDB = require('mocha-mongoose')(dbUrl) -console.log 'here!!!!!!!', process.env.CONSUMER_KEY, +console.log 'here!!!!!', process.env.CONSUMER_KEY, process.env.CONSUMER_SECRET describe "Saving a new user", ->