From 8963f77e9bfdb913f6fa50ed256133b5a9f0d2ee Mon Sep 17 00:00:00 2001
From: Manuel Silva You're not authenticated with this app. <%- linkTo('Click here to create a user account.', addUserPath) %> <%- linkTo('Click here to log in with Facebook or Twitter.', loginPath) %> <%- linkTo('Click here to log in with Facebook, Twitter or Google.', loginPath) %>Hello, stranger
You're not authenticated with this app.
{{{ linkTo 'Click here to create a user account.' addUserPath }}}
-{{{ linkTo 'Click here to log in with Facebook or Twitter.' loginPath }}}
+{{{ linkTo 'Click here to log in with Facebook, Twitter or Google.' loginPath }}}
{{/if}} diff --git a/app/views/handlebars/main/login.html.hbs b/app/views/handlebars/main/login.html.hbs index 3bfcf5a..468b3e7 100644 --- a/app/views/handlebars/main/login.html.hbs +++ b/app/views/handlebars/main/login.html.hbs @@ -35,5 +35,10 @@ href="{{ geddy.config.fullHostname }}{{ facebookPath }}%>"> Log in with Facebook + + + Log in with Google + diff --git a/app/views/jade/main/index.html.jade b/app/views/jade/main/index.html.jade index 09d784a..85a0809 100644 --- a/app/views/jade/main/index.html.jade +++ b/app/views/jade/main/index.html.jade @@ -14,4 +14,4 @@ p != linkTo('Click here to create a user account.', addUserPath) p - != linkTo('Click here to log in with Facebook or Twitter.', loginPath) + != linkTo('Click here to log in with Facebook, Twitter or Google.', loginPath) diff --git a/app/views/jade/main/login.html.jade b/app/views/jade/main/login.html.jade index a2cc832..6205dfd 100644 --- a/app/views/jade/main/login.html.jade +++ b/app/views/jade/main/login.html.jade @@ -24,6 +24,8 @@ a.btn-auth.btn-twitter.large(href="#{geddy.config.fullHostname}#{twitterPath}") Log in with Twitter | a.btn-auth.btn-facebook.large(href="#{geddy.config.fullHostname}#{facebookPath}") Log in with Facebook + | + a.btn-auth.btn-google.large(href="#{geddy.config.fullHostname}#{googlePath}") Log in with Google diff --git a/app/views/mustache/main/index.html.ms b/app/views/mustache/main/index.html.ms index d38179c..1105aba 100644 --- a/app/views/mustache/main/index.html.ms +++ b/app/views/mustache/main/index.html.ms @@ -13,6 +13,6 @@You're not authenticated with this app.
{{{ linkTo 'Click here to create a user account.' addUserPath }}}
-{{{ linkTo 'Click here to log in with Facebook or Twitter.' loginPath }}}
+{{{ linkTo 'Click here to log in with Facebook, Twitter or Google.' loginPath }}}
{{/if}} diff --git a/app/views/mustache/main/login.html.ms b/app/views/mustache/main/login.html.ms index 3bfcf5a..468b3e7 100644 --- a/app/views/mustache/main/login.html.ms +++ b/app/views/mustache/main/login.html.ms @@ -35,5 +35,10 @@ href="{{ geddy.config.fullHostname }}{{ facebookPath }}%>"> Log in with Facebook + + + Log in with Google + diff --git a/config/router.js b/config/router.js index 446020d..8824c75 100644 --- a/config/router.js +++ b/config/router.js @@ -29,6 +29,8 @@ router.get('/auth/facebook').to('Auth.facebook'); router.get('/auth/facebook/callback').to('Auth.facebookCallback'); router.get('/auth/yammer').to('Auth.yammer'); router.get('/auth/yammer/callback').to('Auth.yammerCallback'); +router.get('/auth/google').to('Auth.google'); +router.get('/auth/google/callback').to('Auth.googleCallback'); // Basic routes // router.match('/moving/pictures/:id', 'GET').to('Moving.pictures'); diff --git a/config/secrets.json.template b/config/secrets.json.template index 35cc4a9..8a3d8bf 100644 --- a/config/secrets.json.template +++ b/config/secrets.json.template @@ -12,6 +12,10 @@ "yammer":{ "clientID": "XXXXX", "clientSecret": "XXXXX" + }, + "google": { + "returnURL": "XXXXX", + "realm": "XXXXX" } } } diff --git a/package.json b/package.json index 0bd6128..0aa7f7e 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "passport-twitter": "0.1.x", "passport-facebook": "0.1.x", "passport-yammer": "0.1.x", + "passport-google": "0.2.x", "bcrypt": "0.7.x" }, "main": "./lib/passport",