Update oc_id gems

src/oc-id/Gemfile

@@ -11,13 +11,13 @@ gem 'sass-rails', '>= 4.0.3'
 gem 'turbolinks', '~> 2.2.1'
 gem 'unicorn-rails', '~> 1.1.0'
 gem 'omniauth', '~> 1.3.2'
-gem 'nokogiri', '~> 1.8.0'
-gem 'pg'
+gem 'nokogiri', '= 1.8.1' # PIN because 1.8.4 doesn't seem to be building in omnibus...
+gem 'pg', '~> 0.15' # active_record 4.2.8 pins this but doesn't manifest this in the gemspec for some reason
 gem 'mixlib-authentication', '~> 1.3'
 gem 'sentry-raven'
 gem 'responders', '~> 2.0'
 gem 'newrelic_rpm'
-gem 'doorkeeper', '~> 1.4.0'
+gem 'doorkeeper', '~> 4.0'
 
 gem 'veil', git: 'https://github.com/chef/chef_secrets'
 gem 'omniauth-chef', git: 'https://github.com/chef/omniauth-chef'

src/oc-id/Gemfile.lock

@@ -83,25 +83,25 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     arel (6.0.4)
     awesome_print (1.8.0)
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     better_errors (2.4.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
-    binding_of_caller (0.7.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.1.0)
+    byebug (10.0.2)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chef (12.21.31)
+    chef (12.22.5)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.21.31)
+      chef-config (= 12.22.5)
       chef-zero (>= 4.8, < 13)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -127,7 +127,7 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (12.21.31)
+    chef-config (12.22.5)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -138,9 +138,9 @@ GEM
       mixlib-log (~> 1.3)
       rack (< 2)
       uuidtools (~> 2.1)
-    childprocess (0.8.0)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.3.8)
+    chunky_png (1.3.10)
     coderay (1.1.2)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -168,14 +168,14 @@ GEM
     concurrent-ruby (1.0.5)
     coolline (0.5.0)
       unicode_utils (~> 1.4)
-    crass (1.0.3)
+    crass (1.0.4)
     daemons (1.2.6)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    diffy (3.2.0)
-    doorkeeper (1.4.2)
-      railties (>= 3.1)
-    erubi (1.7.0)
+    diffy (3.2.1)
+    doorkeeper (4.3.2)
+      railties (>= 4.2)
+    erubi (1.7.1)
     erubis (2.7.0)
     eventmachine (1.0.9.1)
     execjs (2.7.0)
@@ -184,9 +184,9 @@ GEM
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    faraday (0.13.1)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
+    ffi (1.9.25)
     ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     foundation-rails (5.5.1.1)
@@ -195,30 +195,29 @@ GEM
     fuzzyurl (0.9.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
+    grit (2.0.0)
+      diff-lcs (>= 1.1.2)
+      mime-types (>= 1.15)
     hashie (3.5.7)
     highline (1.7.10)
     hike (1.2.3)
     hirb (0.7.3)
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     iniparse (1.4.4)
     ipaddress (0.8.3)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jquery-rails (4.3.1)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.6)
+    json (2.1.0)
     jwt (2.1.0)
-    kgio (2.11.1)
+    kgio (2.11.2)
     libyajl2 (1.2.0)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
@@ -232,18 +231,21 @@ GEM
       sqlite3 (~> 1.3)
       thin (~> 1.5.0)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
-    mixlib-archive (0.4.1)
+    minitest (5.11.3)
+    mixlib-archive (0.4.8)
       mixlib-log
     mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
-    mixlib-config (2.2.4)
+    mixlib-config (2.2.12)
+      tomlrb
     mixlib-log (1.7.1)
     mixlib-shellout (2.3.2)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -256,10 +258,10 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
-    newrelic_rpm (4.7.1.340)
+    newrelic_rpm (5.2.0.345)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
-    ohai (8.25.1)
+    ohai (8.26.1)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -277,14 +279,13 @@ GEM
     pbkdf2 (0.1.0)
     pg (0.21.0)
     plist (3.4.0)
-    posix-spawn (0.3.13)
     proxifier (1.0.3)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.5.1)
-      byebug (~> 9.1)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
       pry (~> 0.10)
     pry-doc (0.4.6)
       pry (>= 0.9)
@@ -301,11 +302,11 @@ GEM
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.0.1)
+    public_suffix (3.0.2)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.8)
-    rack-protection (1.5.3)
+    rack (1.6.10)
+    rack-protection (1.5.5)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -326,8 +327,8 @@ GEM
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails_config (0.4.2)
       activesupport (>= 3.0)
     railties (4.2.8)
@@ -336,20 +337,20 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.19.0)
-    rake (12.3.0)
-    rb-fsevent (0.10.2)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rb-readline (0.5.5)
-    rdoc (4.3.0)
+    rdoc (6.0.4)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
+    rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -368,7 +369,7 @@ GEM
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+    rspec-support (3.7.1)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
@@ -380,15 +381,14 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sdoc (0.4.2)
-      json (~> 1.7, >= 1.7.7)
-      rdoc (~> 4.0)
+    sdoc (1.0.0)
+      rdoc (>= 5.0)
     selenium-webdriver (2.35.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip (< 1.0.0)
       websocket (~> 1.0.4)
-    sentry-raven (2.7.1)
+    sentry-raven (2.7.4)
       faraday (>= 0.7.6, < 1.0)
     serverspec (2.41.3)
       multi_json
@@ -404,7 +404,7 @@ GEM
       eventmachine (~> 1.0.0)
       thin (>= 1.5, < 1.7)
     slop (3.6.0)
-    specinfra (2.73.0)
+    specinfra (2.74.0)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
@@ -413,7 +413,7 @@ GEM
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (2.12.4)
+    sprockets (2.12.5)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -433,9 +433,10 @@ GEM
     thread_safe (0.3.6)
     tilt (1.4.1)
     timecop (0.9.1)
+    tomlrb (1.2.7)
     turbolinks (2.2.3)
       coffee-rails
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (2.4.0)
       execjs (>= 0.3.0)
@@ -452,7 +453,7 @@ GEM
     wmi-lite (1.0.0)
     xpath (2.1.0)
       nokogiri (~> 1.3)
-    yard (0.9.12)
+    yard (0.9.14)
 
 PLATFORMS
   ruby
@@ -464,7 +465,7 @@ DEPENDENCIES
   chef (~> 12)
   chef-web-core!
   coffee-rails (~> 4.0.0)
-  doorkeeper (~> 1.4.0)
+  doorkeeper (~> 4.0)
   factory_girl_rails (~> 4.4.0)
   jazz_hands!
   jbuilder (~> 1.2)
@@ -473,10 +474,10 @@ DEPENDENCIES
   mailcatcher
   mixlib-authentication (~> 1.3)
   newrelic_rpm
-  nokogiri (~> 1.8.0)
+  nokogiri (= 1.8.1)
   omniauth (~> 1.3.2)
   omniauth-chef!
-  pg
+  pg (~> 0.15)
   pry-byebug
   quiet_assets
   rails (= 4.2.8)
@@ -498,4 +499,4 @@ DEPENDENCIES
   veil!
 
 BUNDLED WITH
-   1.15.3
+   1.16.2

src/oc-id/app/controllers/v1/users_controller.rb

@@ -1,6 +1,6 @@
 module V1
   class UsersController < ApplicationController
-    doorkeeper_for :all, except: :show
+    before_action :doorkeeper_authorize!, except: :show
 
     respond_to :json
 

src/oc-id/app/views/doorkeeper/applications/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([:oauth, application], 'data-abide' => '') do |f| %>
+<%= form_for(application, url: url, 'data-abide' => '') do |f| %>
   <% if application.errors.any? %>
     <div class="alert-box radius alert" data-alert><p>Whoops! Check your form for possible errors</p></div>
   <% end %>

src/oc-id/app/views/doorkeeper/applications/edit.html.erb

@@ -2,4 +2,4 @@
   <h1>Edit application</h1>
 </div>
 
-<%= render 'form', :application => @application %>
+<%= render 'form', application: @application, url: oauth_application_path(@application) %>

src/oc-id/app/views/doorkeeper/applications/index.html.erb

@@ -16,10 +16,10 @@
   <tbody>
   <% @applications.each do |application| %>
     <tr id="application_<%= application.id %>">
-      <td><%= link_to application.name, [:oauth, application] %></td>
+      <td><%= link_to application.name, oauth_application_path(application) %></td>
       <td><%= application.redirect_uri %></td>
       <td><%= link_to 'Edit', edit_oauth_application_path(application), class: 'button' %></td>
-      <td><%= delete_button('Destroy', [:oauth, application]) %></td>
+      <td><%= delete_button('Destroy', oauth_application_path(application)) %></td>
     </tr>
   <% end %>
   </tbody>

src/oc-id/app/views/doorkeeper/applications/new.html.erb

@@ -2,4 +2,4 @@
   <h1>New application</h1>
 </div>
 
-<%= render 'form', :application => @application %>
+<%= render 'form', application: @application, url: oauth_applications_path %>

src/oc-id/app/views/doorkeeper/applications/show.html.erb

@@ -25,6 +25,6 @@
 
   <div class="medium-4">
     <%= link_to 'Edit', edit_oauth_application_path(@application), class: 'button' %>
-    <%= delete_button('Destroy', [:oauth, @application]) %>
+    <%= delete_button('Destroy', oauth_application_path(@application)) %>
   </div>
 </div>