Skip to content

Commit

Permalink
[Serverless] Update auth0 api from version 9 to 11. #7
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomoyuki-nakabayashi
tomoyuki-nakabayashi committed Jul 15, 2018
1 parent 919c99b commit c4aeec9
Show file tree
Hide file tree
Showing 3 changed files with 160 additions and 110 deletions.
225 changes: 133 additions & 92 deletions Serverless/24-hour-video/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,107 +2,148 @@
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang=""> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang=""> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9" lang=""> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang=""> <!--<![endif]-->
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="apple-touch-icon" href="apple-touch-icon.png">

<link rel="stylesheet" href="css/bootstrap.min.css">
<style>
body {
padding-top: 50px;
padding-bottom: 20px;
}
</style>
<link rel="stylesheet" href="css/bootstrap-theme.min.css">
<link rel="stylesheet" href="css/main.css">

<script src="js/vendor/modernizr-2.8.3-respond-1.4.2.min.js"></script>
</head>
<body>
<!--[if lt IE 8]>
<!--[if gt IE 8]><!-->
<html class="no-js" lang="">
<!--<![endif]-->

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="apple-touch-icon" href="apple-touch-icon.png">

<link rel="stylesheet" href="css/bootstrap.min.css">
<style>
body {
padding-top: 50px;
padding-bottom: 20px;
}
</style>
<link rel="stylesheet" href="css/bootstrap-theme.min.css">
<link rel="stylesheet" href="css/main.css">

<script src="js/vendor/modernizr-2.8.3-respond-1.4.2.min.js"></script>
</head>

<body>
<!--[if lt IE 8]>
<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Project name</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<div class="navbar-form navbar-right">
<button id="user-profile" class="btn btn-default">
<img id="profilepicture" />&nbsp;<span id="profilename"></span>
</button>
<a class="navbar-brand" href="#">Project name</a>

<button id="auth0-login" class="btn btn-success">Sign in</button>
<button id="auth0-logout" class="btn btn-success">Sign Out</button>
</div>
<div id="navbar" class="navbar-collapse collapse">
<div class="navbar-form navbar-right">
<button id="user-profile" class="btn btn-default">
<img id="profilepicture" />&nbsp;<span id="profilename"></span>
</button>

<button id="auth0-login" class="btn btn-success">Sign in</button>
<button id="auth0-logout" class="btn btn-success">Sign Out</button>
</div>
</div><!--/.navbar-collapse -->
</div>
</nav>

<!-- Main jumbotron for a primary marketing message or call to action -->
<div class="jumbotron">
<div class="container">
<h1>Hello, world!</h1>
<p>This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
<p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more &raquo;</a></p>
</div>
<!--/.navbar-collapse -->
</div>
</nav>

<!-- Main jumbotron for a primary marketing message or call to action -->
<div class="jumbotron">
<div class="container">
<!-- Example row of columns -->
<div class="row">
<div class="col-md-4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
<h1>Hello, world!</h1>
<p>This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
<p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more &raquo;</a></p>
</div>
</div>

<div class="container">
<!-- Example row of columns -->
<div class="row">
<div class="col-md-4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
</div>
<div class="col-md-4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
</div>
<div class="col-md-4">
<h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
</div>
</div>

<hr>

<footer>
<p>&copy; Company 2016</p>
</footer>
</div>
<!-- /container -->

<div id="user-profile-modal" class="modal fade" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">User Profile Information (from Auth0 via Lambda)</h4>
</div>
<div class="modal-body">
<b>Raw JSON from Auth0:</b>
<pre id="user-profile-raw-json"></pre>
</div>
<div class="col-md-4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
</div>
<div class="col-md-4">
<h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<!-- /.modal -->


<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script>
window.jQuery || document.write('<script src="js/vendor/jquery-1.11.2.min.js"><\/script>')
</script>

<script src="js/vendor/bootstrap.min.js"></script>
<script src="https://cdn.auth0.com/js/lock/11.7.2/lock.min.js"></script>

<script src="js/user-controller.js"></script>
<script src="js/config.js"></script>
<script src="js/main.js"></script>

<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
<script>
(function(b, o, i, l, e, r) {
b.GoogleAnalyticsObject = l;
b[l] || (b[l] =
function() {
(b[l].q = b[l].q || []).push(arguments)
});
b[l].l = +new Date;
e = o.createElement(i);
r = o.getElementsByTagName(i)[0];
e.src = '//www.google-analytics.com/analytics.js';
r.parentNode.insertBefore(e, r)
}(window, document, 'script', 'ga'));
ga('create', 'UA-XXXXX-X', 'auto');
ga('send', 'pageview');
</script>
</body>

<hr>

<footer>
<p>&copy; Company 2015</p>
</footer>
</div> <!-- /container --> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.11.2.min.js"><\/script>')</script>

<script src="js/vendor/bootstrap.min.js"></script>

<script src="https://cdn.auth0.com/js/lock/11.7.2/lock.min.js"></script>
<script src="js/user-controller.js"></script>
<script src="js/config.js"></script>
<script src="js/main.js"></script>

<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
<script>
(function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
e=o.createElement(i);r=o.getElementsByTagName(i)[0];
e.src='//www.google-analytics.com/analytics.js';
r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
ga('create','UA-XXXXX-X','auto');ga('send','pageview');
</script>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion Serverless/24-hour-video/js/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ var configConstants = {
domain: 't-nakabayashi.auth0.com',
clientId: 'XT8qlbyX4sKkJpjb8QMvprEZmuQ345T5'
},
apiBaseUrl: 'https://cmgp9xvqtk.execute-api.us-east-1.amazonaws.com/devs'
apiBaseUrl: 'https://cmgp9xvqtk.execute-api.us-east-1.amazonaws.com/dev'
};
43 changes: 26 additions & 17 deletions Serverless/24-hour-video/js/user-controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,21 @@ var userController = {
this.uiElements.profileImage = $('#profilepicture');

this.data.config = config;
this.data.auth0Lock = new Auth0Lock(config.auth0.clientId, config.auth0.domain);
this.data.auth0Lock = new Auth0Lock(config.auth0.clientId, config.auth0.domain, {
auth: {
redirectUrl: 'http://127.0.0.1:8000',
responseType: 'code',
params: {
scope: 'openid email user_metadata picture' // Learn about scopes: https://auth0.com/docs/scopes
}
}
});

var idToken = localStorage.getItem('userToken');

if (idToken) {
this.configureAuthenticatedRequests();
this.data.auth0Lock.getProfile(idToken, function(err, profile) {
this.data.auth0Lock.getUserInfo(idToken, function(err, profile) {
if (err) {
return alert('There was an error getting the profile: ' + err.message);
}
Expand Down Expand Up @@ -58,22 +66,23 @@ var userController = {
wireEvents: function() {
var that = this;

this.uiElements.loginButton.click(function(e) {
var params = {
authParams: {
scope: 'openid email user_metadata picture'
}
};
this.data.auth0Lock.on("authenticated", function(authResult) {
that.data.auth0Lock.getUserInfo(authResult.accessToken, function(error, profile) {
that.data.auth0Lock.hide();
if (error) return alert("Auth0 error:" + error);

that.data.auth0Lock.show(params, function(err, profile, token) {
if (err) {
// Error callback
alert('There was an error');
} else {
// Save the JWT token.
localStorage.setItem('userToken', token);
that.configureAuthenticatedRequests();
that.showUserAuthenticationDetails(profile);
localStorage.setItem("userToken", authResult.accessToken);
that.configureAuthenticatedRequests();
that.showUserAuthenticationDetails(profile);
})
});

this.uiElements.loginButton.click(function(e) {
that.data.auth0Lock.show({
auth: {
params: {
responseType: 'id_token token'
}
}
});
});
Expand Down

0 comments on commit c4aeec9

Please sign in to comment.