From f3f14fef55b03accf2e45b6f73ea71497bb4979e Mon Sep 17 00:00:00 2001
From: TUM.Apichat <tzbattleboy@gmail.com>
Date: Sun, 13 Nov 2016 23:10:35 +0700
Subject: [PATCH] add value config & fix refresh token

---
 app/controllers/home.controller.js | 6 +++---
 app/lib/index.js                   | 7 ++++---
 config/config.yml                  | 2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/controllers/home.controller.js b/app/controllers/home.controller.js
index c80e107..2af10ce 100644
--- a/app/controllers/home.controller.js
+++ b/app/controllers/home.controller.js
@@ -13,6 +13,7 @@ var lib = require('../lib')
 
 var url = config.server.url
 var port = config.server.port
+var URLCALENDAR = config.urlcalendar
 
 function rmsRes(res) {
     this._40401 = function (data) {
@@ -175,7 +176,7 @@ function oauth2callback(req, res) {
             rms._50000(err)
         } else {
 
-            res.redirect('http://localhost:8000/#!/calendar')
+            res.redirect(URLCALENDAR)
         }
     })
 }
@@ -311,7 +312,7 @@ function deleteCalendar(req, res) {
 
 function refreshToken(req, res) {
     var rms = new rmsRes(res);
-
+    var options = {};
     lib.authorize((err, auth) => {
         if (err) {
             rms._50000(err)
@@ -340,4 +341,3 @@ module.exports.createCalendar = createCalendar;
 module.exports.getCalendar = getCalendar;
 module.exports.deleteCalendar = deleteCalendar;
 module.exports.refreshToken = refreshToken;
-
diff --git a/app/lib/index.js b/app/lib/index.js
index 7bcc3db..989f1d7 100644
--- a/app/lib/index.js
+++ b/app/lib/index.js
@@ -21,6 +21,7 @@ const CALENDAR_ID = config.google.calendar_id;
 const REDIRECT_URL = config.google.redirect_url;
 const CLIENT_ID = config.google.client_id;
 const CLIENT_SECRET = config.google.client_secret;
+const EMAIL = config.email;
 
 /**
  * เรียกใช้ oauth2Client
@@ -94,7 +95,7 @@ module.exports = {
     authorize: (callback) => {
         var setToken = {} // set token from callback
         Token.findOne({
-            email: 'zentoriono@gmail.com'
+            email: EMAIL
         }, function (err, token) {
             if (err) {
                 return callback(null, null, getNewToken(oauth2Client, callback));
@@ -117,7 +118,7 @@ module.exports = {
 
     setNewToken: (code, callback) => {
         Token.findOne({
-            email: 'zentoriono@gmail.com'
+            email: EMAIL
         }, function (err, token) {
             if (token) {
                 oauth2Client.credentials = JSON.parse(token);
@@ -376,7 +377,7 @@ module.exports = {
     },
 
     refreshToken: (options, callback) => {
-        oauth2Client.setCredentials(options.auth);
+        // oauth2Client.setCredentials(options.auth);
         oauth2Client.refreshAccessToken(function(err, tokens) {
             // your access_token is now refreshed and stored in oauth2Client
             // store these new tokens in a safe place (e.g. database)
diff --git a/config/config.yml b/config/config.yml
index 5b3af15..19d5b3e 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -15,6 +15,8 @@ localhost:
         pass:
   timerecheck: '10000' #millisecond
   apitimeout: 3000 #millisecond
+  email: 'tzbattleboy@gmail.com'
+  urlcalendar: 'http://localhost:8000/#/new/calendar'
   google:
     calendar_id: 'rvmbg3kg7uqninf7n3au1ku4mc@group.calendar.google.com'
     redirect_url: 'http://localhost:3030/oauth2callback'
--
libgit2 0.21.2