Merge pull request #67 from alexwohlbruck/develop

Develop

app/config/passport.js

@@ -1,17 +1,15 @@
-var keys = require.main.require('./app/config/keys');
-var GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;
-var User = require.main.require('./app/models/user');
-var google = require('googleapis');
-var googleConfig = require.main.require('./app/config/google');
-var OAuth2 = google.auth.OAuth2;
+const keys = require.main.require('./app/config/keys');
+const GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;
+const User = require.main.require('./app/models/user');
+const strings = require.main.require('./app/config/strings');
 
-module.exports = function(passport) {
-	passport.serializeUser(function(user, done) {
+module.exports = passport => {
+	passport.serializeUser((user, done) => {
 		done(null, user);
 	});
 
-	passport.deserializeUser(function(user, done) {
-		User.findById(user._id).then(function(user) {
+	passport.deserializeUser((user, done) => {
+		User.findById(user._id).then(user => {
 			done(null, user);
 		});
 	});
@@ -22,36 +20,51 @@ module.exports = function(passport) {
 		callbackURL: "/auth/google/callback",
 		accessType: 'offline',
 		proxy: true,
-		includeGrantedScopes: true
+		includeGrantedScopes: true,
+		passReqToCallback: true
 	},
-	function(accessToken, refreshToken, profile, done) {
+	(req, accessToken, refreshToken, profile, done) => {
 
-		User.findOne({'google.id': profile.id}, function(err, user) {
+		User.findOne({'google.id': profile.id}, (err, user) => {
+
+			const name = {
+				first: profile.name.givenName,
+				last: profile.name.familyName
+			},
+			email = profile.emails[0].value,
+			photo = profile.photos[0] && !profile._json.image.isDefault
+					? profile.photos[0].value.replace("?sz=50", "?sz=200")
+					: strings.userPhotoUrl,
+
+			google = {
+				id: profile.id,
+				accessToken: User.encryptAccessToken(accessToken),
+				refreshToken
+			},
+			ip = req.clientIp;
+
 			if (err) return done(err);
+
 			if (!user) {
-				user = new User({
-					name: {
-						first: profile.name.givenName,
-						last: profile.name.familyName
-					},
-					photo: profile.photos[0] && !profile._json.image.isDefault ? profile.photos[0].value.replace("?sz=50", "?sz=200") : undefined,
-					email: profile.emails[0].value,
-					google: {
-						id: profile.id,
-						accessToken: User.encryptAccessToken(accessToken),
-						refreshToken: refreshToken
-					}
-				});
-				user.save(function(err) {
+
+				user = new User({name, photo, email, google, ip});
+				user.save(err => {
 					if (err) console.log(err);
 					return done(err, user);
 				});
+
 			} else {
+
 				User.findByIdAndUpdate(user._id, {
 					'google.accessToken': User.encryptAccessToken(accessToken),
-					'google.refreshToken': refreshToken
-				}).then(function(user) {
+					'google.refreshToken': refreshToken,
+					ip,
+					photo
+				})
+
+				.then(user => {
 					user.google.accessToken = User.decryptAccessToken(user.google.accessToken);
+
 					return done(err, user);
 				});
 			}

app/config/strings.js

@@ -9,5 +9,6 @@ module.exports = {
     recipient: {
         exists: "That person is already being facted."
     },
-    invalidNumber: "That phone number is invalid!"
+    invalidNumber: "That phone number is invalid!",
+    userPhotoUrl: "https://cat-fact.herokuapp.com/img/res/avatars/user-face.png"
 };

app/models/user.js

@@ -3,14 +3,15 @@ var Schema = mongoose.Schema;
 var crypto = require('crypto');
 
 var keys = require.main.require('./app/config/keys');
+var strings = require.main.require('./app/config/strings');
 
 var UserSchema = new Schema({
     name: {
         first:  {type: String, required: true},
         last:   {type: String, required: true}
     },
     email:      {type: String, required: true, unique: true},
-    photo:      {type: String},
+    photo:      {type: String, default: strings.userPhotoUrl},
     google: {
         id:           {type: String},
         accessToken:  {type: String},
@@ -24,7 +25,8 @@ var UserSchema = new Schema({
             enum: ['light', 'dark'],
             default: 'light'
         }
-    }
+    },
+    ip: String
 }, {
     timestamps: true
 });

app/routes/auth.routes.js

@@ -74,4 +74,9 @@ router.get('/google/contacts/callback', (req, res, next) => {
 	});
 });
 
+router.get('/signout', (req, res) => {
+	req.logout();
+	res.status(200).send();
+});
+
 module.exports = router;

package.json

@@ -32,6 +32,7 @@
     "passport-google-oauth": "^1.0.0",
     "path": "^0.12.7",
     "request": "^2.83.0",
+    "request-ip": "^2.0.2",
     "request-promise": "^4.2.2",
     "socket.io": "^1.4.8",
     "twitter": "^1.7.1"

public/css/style.css

@@ -13,6 +13,11 @@ md-toolbar md-nav-bar .md-button.md-accent {
 	color: #fff;
 }
 
+.sign-out-button {
+	padding: 0 !important;
+	margin-right: 10px !important;
+}
+
 .md-icon-button-small {
 	transform: scale(.8);
 }
@@ -62,6 +67,9 @@ message .row-reverse .message-bubble {
 	width: 40px;
     border-radius: 50%;
 }
+.avatar.small {
+	width: 35px;
+}
 
 .row-reverse {
 	flex-direction: row-reverse !important;

public/index.html

@@ -53,6 +53,28 @@ <h3>
 				<md-tooltip md-direction="bottom">About Cat Facts</md-tooltip>
 				<md-icon class="material-icons grey">info</md-icon>
 			</md-button>
+
+			<md-menu md-position-mode="target-right target" ng-if="authenticatedUser">
+				<md-button ng-click="$mdOpenMenu($event)" aria-label="Profile" class="md-icon-button sign-out-button">
+					<md-tooltip md-direction="bottom">Profile</md-tooltip>
+
+					<img
+						ng-src="{{authenticatedUser.photo}}"
+						class="avatar small md-whiteframe-1dp"
+						alt="{{authenticatedUser.email}}"
+					/>
+				</md-button>
+
+				<md-menu-content>
+					<md-menu-item>
+						<md-button ng-click="ApiService.signOut()">
+							Sign out
+						</md-button>
+					</md-menu-item>
+				</md-menu-content>
+			</md-menu>
+
+
 		</div>
 
 		<md-nav-bar md-selected-nav-item="startingState" nav-bar-aria-label="Navigation" ng-if="$state.current.data.showInNavigation">

public/js/app.js

@@ -88,8 +88,8 @@ app.config(['$mdThemingProvider', function($mdThemingProvider) {
 	$mdThemingProvider.alwaysWatchTheme(true);
 }]);
 
-app.run(['$rootScope', '$state', '$window', '$location', '$mdToast', 'ApiService', '$mdMedia',
-	function($rootScope, $state, $window, $location, $mdToast, ApiService, $mdMedia) {
+app.run(['$rootScope', '$state', '$window', '$location', '$mdToast', 'ApiService', 'AuthService', '$mdMedia',
+	function($rootScope, $state, $window, $location, $mdToast, ApiService, AuthService, $mdMedia) {
 
 	$rootScope.authenticatedUser = null;
 	$rootScope.$mdMedia = $mdMedia;

public/js/controllers/main.js

@@ -12,6 +12,8 @@ app.controller('MainCtrl', ['$scope', '$rootScope', '$mdSidenav', '$mdToast', '$
 		}
 	};
 
+	$scope.ApiService = ApiService;
+
 	$rootScope.showToast = function(message) {
 		return $mdToast.show(
 			$mdToast.simple()

public/js/services/api.service.js

@@ -1,7 +1,7 @@
 /* global angular */
 var app = angular.module('catfacts');
 
-app.service('ApiService', ['$rootScope', '$http', function($rootScope, $http) {
+app.service('ApiService', ['$rootScope', '$http', '$location', function($rootScope, $http, $location) {
 
     // User
 
@@ -12,6 +12,13 @@ app.service('ApiService', ['$rootScope', '$http', function($rootScope, $http) {
     this.updateUserSettings = function(data) {
         return $http.put('/users/me/settings', data).then(data => console.log(data), err => console.log(err));
     };
+
+    this.signOut = function() {
+        return $http.get('/auth/signout').then(() => {
+            $rootScope.authenticatedUser = null;
+            $location.path('/');
+        });
+    };
 
     // Fact
 
@@ -33,8 +40,7 @@ app.service('ApiService', ['$rootScope', '$http', function($rootScope, $http) {
 
     this.getFact = function(amount) {
         return $http.get('/facts/random', {
-            params: { amount
-            }
+            params: { amount }
         });
     };
 

public/views/facts.html

@@ -44,7 +44,7 @@ <h4 class="white md-body-2 accent-links margin-0 center-text">
 						<table md-table ng-model="selected" md-progress="promise">
 							<thead md-head>
 								<tr md-row md-row-select="false">
-									<th md-column><span>Name</span></th>
+									<th md-column><span>Added by</span></th>
 									<th md-column><span>Fact</span></th>
 									<th md-column md-numeric style="padding-right: 90px !important">Votes</th>
 								</tr>

server.js

@@ -6,6 +6,7 @@ const cookieParser = require('cookie-parser');
 const bodyParser = require('body-parser');
 const methodOverride = require('method-override');
 const session = require('express-session');
+const requestIp = require('request-ip');
 const MongoStore = require('connect-mongo')(session);
 const server = require('http').Server(app);
 const io = require('socket.io').listen(server);
@@ -28,6 +29,7 @@ app.use(bodyParser.json({ type: 'application/vnd.api+json' }));
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use(methodOverride('X-HTTP-Method-Override'));
 app.use(express.static(__dirname + '/public'));
+app.use(requestIp.mw());
 
 const mongoStore = new MongoStore({url: keys.database.url()});
 const sessionMiddleware = session({