move save google token file to db

TUM.Apichat
1 parent 21a1ff19
Showing 7 changed files with 100 additions and 22 deletions Show diff stats
app/controllers/home.controller.js
app/lib/index.js
app/models/tokens.model.js
config/config.yml
config/mongoose.js
package.json
server.js
@@ -110,7 +110,7 @@ function events(req, res) {
                 } else {
                     // console.info(response)
                     res.jsonp(ggToKendo(response))
-                    res.end
+                    res.end()
                 }
             })
         }
@@ -166,7 +166,7 @@ function oauth2callback(req, res) {
             res.send(err)
             res.end()
         } else {
-            res.redirect('/home')
+            res.redirect('http://localhost:8000/calendar')
         }
     })
 }
 'use strict';
  
 const google = require('googleapis');
+const plus = google.plus('v1');
 const googleAuth = require('google-auth-library');
 const calendar = google.calendar('v3');
 const fs = require('fs');
@@ -8,11 +9,15 @@ const path = require(&#39;path&#39;);
 const yamlConfig = require('node-yaml-config');
 const config = yamlConfig.load(path.join(__dirname, '/../../config/config.yml'));
 const moment = require('moment')
+const Promise = require('bluebird')
+const Mongoose = Promise.promisifyAll(require('mongoose'));
+const Token = Mongoose.model('Token');
+
 const CALENDAR_ID = config.ggapi.calendarID
 const REDIRECTURL = config.ggapi.redirectUrl
  
  
-const SCOPES = ['https://www.googleapis.com/auth/calendar'];
+const SCOPES = ['https://www.googleapis.com/auth/calendar', 'https://www.googleapis.com/auth/userinfo.email'];
 const TOKEN_DIR = (process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE) + '/.credentials/';
 const TOKEN_PATH = TOKEN_DIR + 'calendar-nodejs-quickstart.json';
  
@@ -24,8 +29,6 @@ function hasTimezone(timezone) {
     }
 }
  
-
-
 function getNewToken(oauth2Client, callback) {
     var authUrl = oauth2Client.generateAuthUrl({
         access_type: 'offline',
@@ -47,16 +50,32 @@ function setNewToken(code) {
     })
 }
  
-function storeToken(token) {
+function storeToken(token, emails) {
+    var tokendb;
+    token.email = emails[0].value
     try {
-        fs.mkdirSync(TOKEN_DIR);
+        // ** new
+        tokendb = new Token(token);
+        // -- old
+        // fs.mkdirSync(TOKEN_DIR);
     } catch (err) {
-        if (err.code != 'EEXIST') {
-            throw err;
-        }
+        throw err;
     }
-    fs.writeFile(TOKEN_PATH, JSON.stringify(token));
-    console.log('Token stored to ' + TOKEN_PATH);
+    // ** new
+    Promise.try(function () { })
+        .then(function () {
+            tokendb.save(function (err, result) {
+                if (err) {
+                    console.error(err)
+                } else {
+                    console.log(result);
+                }
+            });
+        });
+
+    // -- old
+    // fs.writeFile(TOKEN_PATH, JSON.stringify(token));
+    // console.log('Token stored to ' + TOKEN_PATH);
 }
  
 module.exports = {
@@ -71,15 +90,28 @@ module.exports = {
             var redirectUrl = credentials.installed.redirect_uris[1];
             var auth = new googleAuth();
             var oauth2Client = new auth.OAuth2(clientId, clientSecret, REDIRECTURL);
+            var setToken = {} // set token from callback
+            Token.findOne({ email: 'tzbattleboy@gmail.com' }, function (err, token) {
  
-            fs.readFile(TOKEN_PATH, (err, token) => {
                 if (err) {
                     return callback(null, null, getNewToken(oauth2Client, callback));
-                } else {
-                    oauth2Client.credentials = JSON.parse(token);
+                } else if (token) {
+                    setToken = {
+                        access_token: token.access_token,
+                        refresh_token: token.refresh_token,
+                        token_type: token.token_type,
+                        expiry_date: token.expiry_date
+                    }
+                    // console.log(setToken)
+                    oauth2Client.credentials = setToken;
                     return callback(null, oauth2Client);
+                } else {
+                    return callback(null, null, getNewToken(oauth2Client, callback));
                 }
             });
+            // fs.readFile(TOKEN_PATH, (err, token) => {
+
+            // });
         });
  
     },
@@ -103,7 +135,16 @@ module.exports = {
                             return;
                         } else {
                             oauth2Client.credentials = token;
-                            storeToken(token);
+                            var params = { userId: 'me', fields: 'emails', auth: oauth2Client };
+
+                            plus.people.get(params, function (err, response) {
+                                if (err) {
+                                    consol.error(err)
+                                } else {
+                                    storeToken(token, response.emails);
+                                }
+                            });
+
                             return callback(null, oauth2Client);
                         }
  
@@ -0,0 +1,12 @@
+var mongoose = require('mongoose')
+var Schema = mongoose.Schema
+
+var TokenSchema = new Schema({
+    email: String,
+    access_token: String,
+    expiry_date: Number,
+    refresh_token: String,
+    token_type: String
+})
+
+mongoose.model('Token', TokenSchema)
 \ No newline at end of file
@@ -4,12 +4,12 @@ localhost:
   server:
     url: 'localhost'
     urlto: 'localhost'
-    port: 3001
+    port: 3030
     portto: 4001
   database:
     host: 'localhost'
     port: 27017
-    name: 'ss7'
+    name: 'calendar'
     options:
         user:
         pass:
@@ -17,4 +17,4 @@ localhost:
   apitimeout: 3000 #millisecond
   ggapi:
     calendarID: 'rvmbg3kg7uqninf7n3au1ku4mc@group.calendar.google.com'
-    redirectUrl: 'http://localhost:3001/oauth2callback'
 \ No newline at end of file
+    redirectUrl: 'http://localhost:3030/oauth2callback'
 \ No newline at end of file
@@ -0,0 +1,23 @@
+var mongoose = require('mongoose')
+var yaml_config = require('node-yaml-config')
+var config = yaml_config.load(__dirname + '/config.yml')
+var url = config.server.url
+var port = config.server.port
+var dbhost = config.database.host
+var dbport = config.database.port
+var dbuser = config.database.options.user
+var dbpass = config.database.options.pass
+var dbname = config.database.name
+
+module.exports = function () {
+    // mongoose.connect('mongodb://username:password@host:port/database?options...')
+    var db
+    if (dbuser && dbpass) {
+        db = mongoose.connect('mongodb://' + dbuser + ':' + dbpass + '@' + dbhost + ':' + dbport + '/' + dbname)
+    } else {
+        db = mongoose.connect('mongodb://' + dbhost + ':' + dbport + '/' + dbname)
+    }
+
+    require('../app/models/tokens.model')
+    return db
+}
 \ No newline at end of file
@@ -16,7 +16,8 @@
         "moment-timezone": "^0.5.5",
         "node-yaml-config": "0.0.4",
         "scribe-js": "^2.0.4",
-        "unirest": "^0.5.0"
+        "unirest": "^0.5.0",
+        "mongoose": "^4.6.6"
     },
     "devDependencies": {
         "bower": "^1.7.7",
@@ -4,7 +4,8 @@ var yaml_config = require(&#39;node-yaml-config&#39;)
 var busboyBodyParser = require('busboy-body-parser')
 var scribe = require('scribe-js')()
 var Async = require('async')
-
+var mongoose = require('./config/mongoose')
+var db = mongoose()
 var console = process.console
 var app = express()
 var router = express.Router()
@@ -41,6 +42,6 @@ app.use(&#39;/logs&#39;, scribe.webPanel())
 app.use(busboyBodyParser())
  
 app.listen(port)
-    // console.log('Server is running at http://'+url+':'+port+'');
+// console.log('Server is running at http://'+url+':'+port+'');
  
 console.tag('START').time().file().log('Server is running at http://' + url + ':' + port)
 \ No newline at end of file
...	...	@@ -110,7 +110,7 @@ function events(req, res) {
110	110	} else {
111	111	// console.info(response)
112	112	res.jsonp(ggToKendo(response))
113		- res.end
	113	+ res.end()
114	114	}
115	115	})
116	116	}
...	...	@@ -166,7 +166,7 @@ function oauth2callback(req, res) {
166	166	res.send(err)
167	167	res.end()
168	168	} else {
169		- res.redirect('/home')
	169	+ res.redirect('http://localhost:8000/calendar')
170	170	}
171	171	})
172	172	}
...	...
1	1	'use strict';
2	2
3	3	const google = require('googleapis');
	4	+const plus = google.plus('v1');
4	5	const googleAuth = require('google-auth-library');
5	6	const calendar = google.calendar('v3');
6	7	const fs = require('fs');
...	...	@@ -8,11 +9,15 @@ const path = require('path');
8	9	const yamlConfig = require('node-yaml-config');
9	10	const config = yamlConfig.load(path.join(__dirname, '/../../config/config.yml'));
10	11	const moment = require('moment')
	12	+const Promise = require('bluebird')
	13	+const Mongoose = Promise.promisifyAll(require('mongoose'));
	14	+const Token = Mongoose.model('Token');
	15	+
11	16	const CALENDAR_ID = config.ggapi.calendarID
12	17	const REDIRECTURL = config.ggapi.redirectUrl
13	18
14	19
15		-const SCOPES = ['https://www.googleapis.com/auth/calendar'];
	20	+const SCOPES = ['https://www.googleapis.com/auth/calendar', 'https://www.googleapis.com/auth/userinfo.email'];
16	21	const TOKEN_DIR = (process.env.HOME \|\| process.env.HOMEPATH \|\| process.env.USERPROFILE) + '/.credentials/';
17	22	const TOKEN_PATH = TOKEN_DIR + 'calendar-nodejs-quickstart.json';
18	23
...	...	@@ -24,8 +29,6 @@ function hasTimezone(timezone) {
24	29	}
25	30	}
26	31
27		-
28		-
29	32	function getNewToken(oauth2Client, callback) {
30	33	var authUrl = oauth2Client.generateAuthUrl({
31	34	access_type: 'offline',
...	...	@@ -47,16 +50,32 @@ function setNewToken(code) {
47	50	})
48	51	}
49	52
50		-function storeToken(token) {
	53	+function storeToken(token, emails) {
	54	+ var tokendb;
	55	+ token.email = emails[0].value
51	56	try {
52		- fs.mkdirSync(TOKEN_DIR);
	57	+ // ** new
	58	+ tokendb = new Token(token);
	59	+ // -- old
	60	+ // fs.mkdirSync(TOKEN_DIR);
53	61	} catch (err) {
54		- if (err.code != 'EEXIST') {
55		- throw err;
56		- }
	62	+ throw err;
57	63	}
58		- fs.writeFile(TOKEN_PATH, JSON.stringify(token));
59		- console.log('Token stored to ' + TOKEN_PATH);
	64	+ // ** new
	65	+ Promise.try(function () { })
	66	+ .then(function () {
	67	+ tokendb.save(function (err, result) {
	68	+ if (err) {
	69	+ console.error(err)
	70	+ } else {
	71	+ console.log(result);
	72	+ }
	73	+ });
	74	+ });
	75	+
	76	+ // -- old
	77	+ // fs.writeFile(TOKEN_PATH, JSON.stringify(token));
	78	+ // console.log('Token stored to ' + TOKEN_PATH);
60	79	}
61	80
62	81	module.exports = {
...	...	@@ -71,15 +90,28 @@ module.exports = {
71	90	var redirectUrl = credentials.installed.redirect_uris[1];
72	91	var auth = new googleAuth();
73	92	var oauth2Client = new auth.OAuth2(clientId, clientSecret, REDIRECTURL);
	93	+ var setToken = {} // set token from callback
	94	+ Token.findOne({ email: 'tzbattleboy@gmail.com' }, function (err, token) {
74	95
75		- fs.readFile(TOKEN_PATH, (err, token) => {
76	96	if (err) {
77	97	return callback(null, null, getNewToken(oauth2Client, callback));
78		- } else {
79		- oauth2Client.credentials = JSON.parse(token);
	98	+ } else if (token) {
	99	+ setToken = {
	100	+ access_token: token.access_token,
	101	+ refresh_token: token.refresh_token,
	102	+ token_type: token.token_type,
	103	+ expiry_date: token.expiry_date
	104	+ }
	105	+ // console.log(setToken)
	106	+ oauth2Client.credentials = setToken;
80	107	return callback(null, oauth2Client);
	108	+ } else {
	109	+ return callback(null, null, getNewToken(oauth2Client, callback));
81	110	}
82	111	});
	112	+ // fs.readFile(TOKEN_PATH, (err, token) => {
	113	+
	114	+ // });
83	115	});
84	116
85	117	},
...	...	@@ -103,7 +135,16 @@ module.exports = {
103	135	return;
104	136	} else {
105	137	oauth2Client.credentials = token;
106		- storeToken(token);
	138	+ var params = { userId: 'me', fields: 'emails', auth: oauth2Client };
	139	+
	140	+ plus.people.get(params, function (err, response) {
	141	+ if (err) {
	142	+ consol.error(err)
	143	+ } else {
	144	+ storeToken(token, response.emails);
	145	+ }
	146	+ });
	147	+
107	148	return callback(null, oauth2Client);
108	149	}
109	150
...	...
...	...	@@ -0,0 +1,12 @@
	1	+var mongoose = require('mongoose')
	2	+var Schema = mongoose.Schema
	3	+
	4	+var TokenSchema = new Schema({
	5	+ email: String,
	6	+ access_token: String,
	7	+ expiry_date: Number,
	8	+ refresh_token: String,
	9	+ token_type: String
	10	+})
	11	+
	12	+mongoose.model('Token', TokenSchema)
0	13	\ No newline at end of file
...	...
...	...	@@ -4,12 +4,12 @@ localhost:
4	4	server:
5	5	url: 'localhost'
6	6	urlto: 'localhost'
7		- port: 3001
	7	+ port: 3030
8	8	portto: 4001
9	9	database:
10	10	host: 'localhost'
11	11	port: 27017
12		- name: 'ss7'
	12	+ name: 'calendar'
13	13	options:
14	14	user:
15	15	pass:
...	...	@@ -17,4 +17,4 @@ localhost:
17	17	apitimeout: 3000 #millisecond
18	18	ggapi:
19	19	calendarID: 'rvmbg3kg7uqninf7n3au1ku4mc@group.calendar.google.com'
20		- redirectUrl: 'http://localhost:3001/oauth2callback'
21	20	\ No newline at end of file
	21	+ redirectUrl: 'http://localhost:3030/oauth2callback'
22	22	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,23 @@
	1	+var mongoose = require('mongoose')
	2	+var yaml_config = require('node-yaml-config')
	3	+var config = yaml_config.load(__dirname + '/config.yml')
	4	+var url = config.server.url
	5	+var port = config.server.port
	6	+var dbhost = config.database.host
	7	+var dbport = config.database.port
	8	+var dbuser = config.database.options.user
	9	+var dbpass = config.database.options.pass
	10	+var dbname = config.database.name
	11	+
	12	+module.exports = function () {
	13	+ // mongoose.connect('mongodb://username:password@host:port/database?options...')
	14	+ var db
	15	+ if (dbuser && dbpass) {
	16	+ db = mongoose.connect('mongodb://' + dbuser + ':' + dbpass + '@' + dbhost + ':' + dbport + '/' + dbname)
	17	+ } else {
	18	+ db = mongoose.connect('mongodb://' + dbhost + ':' + dbport + '/' + dbname)
	19	+ }
	20	+
	21	+ require('../app/models/tokens.model')
	22	+ return db
	23	+}
0	24	\ No newline at end of file
...	...
...	...	@@ -16,7 +16,8 @@
16	16	"moment-timezone": "^0.5.5",
17	17	"node-yaml-config": "0.0.4",
18	18	"scribe-js": "^2.0.4",
19		- "unirest": "^0.5.0"
	19	+ "unirest": "^0.5.0",
	20	+ "mongoose": "^4.6.6"
20	21	},
21	22	"devDependencies": {
22	23	"bower": "^1.7.7",
...	...
...	...	@@ -4,7 +4,8 @@ var yaml_config = require('node-yaml-config')
4	4	var busboyBodyParser = require('busboy-body-parser')
5	5	var scribe = require('scribe-js')()
6	6	var Async = require('async')
7		-
	7	+var mongoose = require('./config/mongoose')
	8	+var db = mongoose()
8	9	var console = process.console
9	10	var app = express()
10	11	var router = express.Router()
...	...	@@ -41,6 +42,6 @@ app.use('/logs', scribe.webPanel())
41	42	app.use(busboyBodyParser())
42	43
43	44	app.listen(port)
44		- // console.log('Server is running at http://'+url+':'+port+'');
	45	+// console.log('Server is running at http://'+url+':'+port+'');
45	46
46	47	console.tag('START').time().file().log('Server is running at http://' + url + ':' + port)
47	48	\ No newline at end of file
...	...