From 3e75f62c54840ba95ba09455e3581e029b1efa37 Mon Sep 17 00:00:00 2001 From: Daesub Kim Date: Wed, 16 Aug 2017 23:35:28 +0900 Subject: [PATCH 1/3] Change the apiway words to whatsit --- static/login.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/static/login.html b/static/login.html index 5669a2a..0ae0f65 100644 --- a/static/login.html +++ b/static/login.html @@ -6,11 +6,11 @@ - + - + - APIWAY - Sign in + WHATSIT - Sign in @@ -26,7 +26,7 @@
-

apiway

+

whatsit

@@ -42,7 +42,7 @@

apiway

Privacy Cookies From c5546ad83a3402dc57d986697dc920ab41ef8ad4 Mon Sep 17 00:00:00 2001 From: Daesub Kim Date: Thu, 17 Aug 2017 16:11:01 +0900 Subject: [PATCH 2/3] Resolved [WHATSIT-58] : Add the login provider on response param. --- routes/passport/github/githubCallback.js | 2 +- routes/passport/google/googleCallback.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/routes/passport/github/githubCallback.js b/routes/passport/github/githubCallback.js index 9d29fa3..a8dde15 100644 --- a/routes/passport/github/githubCallback.js +++ b/routes/passport/github/githubCallback.js @@ -15,7 +15,7 @@ router.get('/', var redirectUrl = process.env.GITHUB_REDIRECTURL //var redirectUrl = config.github.callbackURL - res.redirect(redirectUrl + '/?accessToken=' + accessToken); + res.redirect(redirectUrl + '/?provider=github&accessToken=' + accessToken); }); module.exports = router; \ No newline at end of file diff --git a/routes/passport/google/googleCallback.js b/routes/passport/google/googleCallback.js index 82c3b3d..c80fb0a 100644 --- a/routes/passport/google/googleCallback.js +++ b/routes/passport/google/googleCallback.js @@ -13,7 +13,7 @@ router.get('/', console.log(res) var redirectUrl = process.env.GOOGLE_REDIRECTURL - res.redirect(redirectUrl + '/?accessToken=' + accessToken); + res.redirect(redirectUrl + '/?provider=google&accessToken=' + accessToken); }); module.exports = router; \ No newline at end of file From 1991bec1f02b354fc6e8fe5ab500502da505aed6 Mon Sep 17 00:00:00 2001 From: Daesub Kim Date: Thu, 17 Aug 2017 20:12:05 +0900 Subject: [PATCH 3/3] Added the config.template.json file for google provider login --- config.template.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config.template.json b/config.template.json index 9e37def..41ec85d 100644 --- a/config.template.json +++ b/config.template.json @@ -4,5 +4,11 @@ "clientSecret": "", "callbackURL": "", "accessToken": "" + }, + "google": { + "clientID": "", + "clientSecret": "", + "callbackURL": "", + "accessToken": "" } } \ No newline at end of file