From 846967fe0e4cc7a350b25a92cbac0bf501e83253 Mon Sep 17 00:00:00 2001 From: Vlad Date: Mon, 20 Jun 2016 21:28:03 +0300 Subject: [PATCH 1/4] dependencies updated at example project --- examples/ruby-on-rails-webapp/Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/ruby-on-rails-webapp/Gemfile b/examples/ruby-on-rails-webapp/Gemfile index ebb4538..4482a0d 100644 --- a/examples/ruby-on-rails-webapp/Gemfile +++ b/examples/ruby-on-rails-webapp/Gemfile @@ -8,11 +8,11 @@ gem 'sqlite3', group: :development gem 'pry', group: :development gem 'pg' # Use SCSS for stylesheets -gem 'sass-rails', '~> 4.0.5' +gem 'sass-rails', '~> 5.0.4' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 2.7.2' # Use CoffeeScript for .js.coffee assets and views -gem 'coffee-rails', '~> 4.0.0' +gem 'coffee-rails', '~> 4.1.1' # See https://github.com/sstephenson/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby @@ -33,7 +33,7 @@ gem 'spring', group: :development gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' -gem 'dotenv', '~> 0.11.1', group: :development +gem 'dotenv', '~> 2.1.0', group: :development # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' From 9bc023d11605792da90d93563e0685015f73c857 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 7 Jul 2016 20:33:52 +0300 Subject: [PATCH 2/4] lock v10 update, dependencies update --- .../app/assets/javascripts/home.js.erb | 14 ++++++++------ .../app/views/layouts/application.html.erb | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/examples/ruby-on-rails-webapp/app/assets/javascripts/home.js.erb b/examples/ruby-on-rails-webapp/app/assets/javascripts/home.js.erb index 9e693f2..0713a3e 100644 --- a/examples/ruby-on-rails-webapp/app/assets/javascripts/home.js.erb +++ b/examples/ruby-on-rails-webapp/app/assets/javascripts/home.js.erb @@ -1,10 +1,12 @@ -var lock = new Auth0Lock('<%= Rails.application.secrets.auth0_client_id %>', '<%= Rails.application.secrets.auth0_domain %>'); -function signin() { - lock.show({ - callbackURL: 'http://localhost:3000/auth/auth0/callback', // use this in production '<%= Rails.application.secrets.auth0_callback_url %>' +var lock = new Auth0Lock('<%= Rails.application.secrets.auth0_client_id %>', '<%= Rails.application.secrets.auth0_domain %>', { + auth: { + redirectUrl: 'http://localhost:3000/auth/auth0/callback', // use this in production '<%= Rails.application.secrets.auth0_callback_url %>' responseType: 'code', - authParams: { + params: { scope: 'openid name email picture' } - }); + } +}); +function signin() { + lock.show(); } diff --git a/examples/ruby-on-rails-webapp/app/views/layouts/application.html.erb b/examples/ruby-on-rails-webapp/app/views/layouts/application.html.erb index e32f12b..c7b11e8 100644 --- a/examples/ruby-on-rails-webapp/app/views/layouts/application.html.erb +++ b/examples/ruby-on-rails-webapp/app/views/layouts/application.html.erb @@ -4,9 +4,9 @@ RubyOnRailsWebapp <%= yield :cdn_code %> - <%= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css' %> - <%= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css' %> - <%= javascript_include_tag '//cdn.auth0.com/js/lock-9.0.min.js' %> + <%= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css' %> + <%= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css' %> + <%= javascript_include_tag '//cdn.auth0.com/js/lock/10.0.0-rc.2/lock.min.js' %> <%= javascript_include_tag '//use.typekit.net/iws6ohy.js' %> From 618d454fec39ea1fa73a69b83bf0fb8472086eae Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 12 Jul 2016 22:08:16 +0300 Subject: [PATCH 3/4] fixed travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cc65821..a97a36f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: ruby rvm: - - 2.1.0 \ No newline at end of file + - 2.2.2 \ No newline at end of file From 6fa9781ab9cd0553d90ecb38dda5595ee6b3cf17 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 21 Jul 2016 18:20:49 +0300 Subject: [PATCH 4/4] lock version updated --- .../ruby-on-rails-webapp/app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ruby-on-rails-webapp/app/views/layouts/application.html.erb b/examples/ruby-on-rails-webapp/app/views/layouts/application.html.erb index c7b11e8..8226aef 100644 --- a/examples/ruby-on-rails-webapp/app/views/layouts/application.html.erb +++ b/examples/ruby-on-rails-webapp/app/views/layouts/application.html.erb @@ -6,7 +6,7 @@ <%= yield :cdn_code %> <%= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css' %> <%= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css' %> - <%= javascript_include_tag '//cdn.auth0.com/js/lock/10.0.0-rc.2/lock.min.js' %> + <%= javascript_include_tag '//cdn.auth0.com/js/lock/10.0/lock.min.js' %> <%= javascript_include_tag '//use.typekit.net/iws6ohy.js' %>