Skip to content

Dani #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yashnevatia wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dani #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92317b0
meeting partially work
danhuiZ Jul 23, 2017
80565e3
Need to solve Promise issues in validate.js line 165 and 255
danhuiZ Jul 23, 2017
1339556
changes to validate.js
danhuiZ Jul 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
'use strict';


var mongoose = require('mongoose');
mongoose.connect(process.env.MONGODB_URI);
var {web, rtm} = require('./bot');
var {User, Reminder, Meeting} = require('./models');
var {User, Reminder, Meeting} = require('./models');

//extras

Expand All @@ -25,18 +24,10 @@ app.use(bodyParser.urlencoded({extended: false}));
//google

var google = require('googleapis');
var OAuth2 = google.auth.OAuth2;
function getGoogleAuth() {
return new OAuth2(
process.env.GOOGLE_CLIENT_ID,
process.env.GOOGLE_CLIENT_SECRET,
process.env.DOMAIN + '/connect/callback'
);
}

// functions

var {clearState, taskPath} = require('./functions.js');
var {clearState, taskPath, meetingPath, getGoogleAuth} = require('./functions.js');

app.get('/connect', function(req, res){
var userId = req.query.auth_id;
Expand Down Expand Up @@ -90,7 +81,9 @@ app.get('/connect/callback', function(req, res){
return User.findById(req.query.state);
})
.then(function(mongoUser) {
console.log("CHECK googleUser IN APP.JS", googleUser);
mongoUser.googleAccount = tokens;
mongoUser.googleAccount.email = googleUser.emails[0].value;
mongoUser.googleAccount.profile_ID = googleUser.id;
mongoUser.googleAccount.profile_name = googleUser.displayName;
return mongoUser.save();
Expand Down
Loading