Merge pull request #71 from Amialc/popupchange
Changed popup to redirect mode, updated dependencies
This commit is contained in:
		| @@ -7,9 +7,9 @@ | ||||
|   "license": "MIT", | ||||
|   "dependencies": { | ||||
|     "dotenv": "^1.2.0", | ||||
|     "express": "^4.10.2", | ||||
|     "express": "^4.13.3", | ||||
|     "jade": "^1.11.0", | ||||
|     "socket.io": "^1.3.6", | ||||
|     "socketio-jwt": "^4.3.1" | ||||
|     "socket.io": "^1.3.7", | ||||
|     "socketio-jwt": "^4.3.3" | ||||
|   } | ||||
| } | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| extends layout | ||||
|  | ||||
| block content | ||||
| 	script(src="https://cdn.auth0.com/js/lock-7.12.js") | ||||
|     script(src="https://cdn.auth0.com/js/lock-8.1.1.js") | ||||
|     script(src="/socket.io/socket.io.js") | ||||
| 	script(src="http://code.jquery.com/jquery-1.11.1.js") | ||||
|     script(src="http://code.jquery.com/jquery-1.11.3.js") | ||||
|  | ||||
|  | ||||
|     div#login | ||||
| @@ -18,30 +18,32 @@ block content | ||||
|         var userProfile; | ||||
|         var userToken; | ||||
|         var lock = new Auth0Lock('#{env.AUTH0_CLIENT_ID}', '#{env.AUTH0_DOMAIN}'); | ||||
|         var hash = lock.parseHash(); | ||||
|         $('#chat').hide(); | ||||
|         $('#login button').click(function (e) { | ||||
|             e.preventDefault(); | ||||
| 			lock.show(function(err, profile, token) { | ||||
| 				if (err) { | ||||
| 					//Error callback | ||||
| 					alert('There was an error'); | ||||
| 					alert(err); | ||||
| 				} else { | ||||
| 				console.log('connected and authenticated'); | ||||
| 					//Success callback | ||||
| 					userToken = token; | ||||
|  | ||||
| 					//Save the JWT token | ||||
| 					localStorage.setItem('userToken', token); | ||||
|  | ||||
| 					//Save the profile | ||||
| 					userProfile = profile; | ||||
|  | ||||
| 					openChat(); | ||||
| 				} | ||||
| 			}) | ||||
|             lock.show(); | ||||
|         }); | ||||
|  | ||||
|         if (hash) { | ||||
|             if (hash.error) { | ||||
|                 console.log("There was an error logging in", hash.error); | ||||
|             } | ||||
|             else { | ||||
|                 lock.getProfile(hash.id_token, function (err, profile) { | ||||
|                     if (err) { | ||||
|                         console.log('Cannot get user', err); | ||||
|                         return; | ||||
|                     } | ||||
|                     console.log('connected and authenticated'); | ||||
|                     userProfile = profile; | ||||
|                     localStorage.setItem('userToken', hash.id_token); | ||||
|                     userToken = hash.id_token; | ||||
|                     openChat(); | ||||
|                 }); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         function openChat() { | ||||
|             var socket = io(); | ||||
|             socket.on('connect', function () { | ||||
| @@ -58,8 +60,7 @@ block content | ||||
|                         console.log("msg"); | ||||
|                         $('#messages').append($('<li>').text(msg)); | ||||
|                     }); | ||||
| 				}) | ||||
| 				.emit('authenticate', {token: userToken}); // send the jwt | ||||
|                 }).emit('authenticate', {token: userToken}); // send the jwt | ||||
|             }) | ||||
|         }; | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user