omniauth-aai 0.5.2 → 0.6.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d22d4b8df0fc1f34dc64d446f0735c21cca72bfa
+  data.tar.gz: 9b68f745e51c2ae6b48b07c23823ce09324043fe
+SHA512:
+  metadata.gz: 3af83ad31bc412d7ab19bd1db0340d612152780227919626b4606742684e8c0d296bc1d2342e9694f73f7716270e9e5b4f3bc89b7b8172efa9f925df4cbe76be
+  data.tar.gz: 362cb866458401dea78518ff08e0b538f040223ece42757cbade3b97053c072eb56fbe31f3a156177abe513d2be3eb6a2dfdef270e65fd684a14dfb99e6e29a2

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'omniauth-shibboleth', :git => "git://github.com/switch-ch/omniauth-shibboleth.git"
+gem 'omniauth-shibboleth', git: "git://github.com/switch-ch/omniauth-shibboleth.git"
 
 gemspec
 

data/Gemfile.lock

@@ -1,147 +1,174 @@
 GIT
   remote: git://github.com/switch-ch/omniauth-shibboleth.git
-  revision: ea3922a8ee98b7a892f26440b8e37bd3ec3fc03d
+  revision: 84b9264cdfda3ff724a951647892fdf91427de5c
   specs:
-    omniauth-shibboleth (1.0.6)
+    omniauth-shibboleth (1.2.0)
       omniauth (>= 1.0.0)
 
 PATH
   remote: .
   specs:
-    omniauth-aai (0.5.2)
+    omniauth-aai (0.6.2)
       omniauth-shibboleth
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    capybara (2.0.1)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    coderay (1.0.8)
-    diff-lcs (1.1.3)
+      xpath (~> 2.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    ffi (1.2.0)
-    guard (1.5.4)
-      listen (>= 0.4.2)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (2.2.0)
-      guard (>= 1.1)
-      rspec (~> 2.11)
-    hashie (1.2.0)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.5)
-    libwebsocket (0.1.6.1)
-      websocket
-    listen (0.6.0)
-    lumberjack (1.0.2)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    method_source (0.8.1)
-    mime-types (1.19)
-    multi_json (1.3.7)
-    nokogiri (1.5.5)
-    omniauth (1.1.1)
-      hashie (~> 1.2)
-      rack
-    polyglot (0.3.3)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.2)
+    ffi (1.9.8)
+    formatador (0.2.5)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
+    guard (2.12.5)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.5.1)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    hashie (3.4.1)
+    hitimes (1.2.2)
+    i18n (0.7.0)
+    json (1.8.3)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
+    lumberjack (1.0.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    nenv (0.2.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    notiffany (0.0.6)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
+      rack (~> 1.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.1)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
-      bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
-      rack-ssl (~> 1.3.2)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    rubyzip (0.9.9)
-    selenium-webdriver (2.26.0)
-      childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
-    slop (3.3.3)
-    sprockets (2.2.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    rb-fsevent (0.9.5)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    shellany (0.0.1)
+    slop (3.6.0)
+    sprockets (3.1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-    websocket (1.0.4)
-    xpath (1.0.0)
+    sprockets-rails (2.3.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -155,4 +182,7 @@ DEPENDENCIES
   rack-test
   rails
   rake
-  rspec (~> 2.8)
+  rspec (~> 3.2)
+
+BUNDLED WITH
+   1.10.3

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 SWITCH, Zurich
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -19,16 +19,14 @@ Install as a gem via Gemfile or with
 
 ### Generator
 
-    rails generate aai:install
+    rails generate aai:setup
 
 This will generate some basic authenthication objects for rails:
 
-* config/omniauth.rb
+* config/initializers/omniauth.rb
 * app/controller/session_controller.rb
 * app/models/user.rb
-* db/migrate/create_users_adapt_and_copy_to_migration.rb
-
-You'll need to configure at least the 'db/migrate/create_users_adapt_and_copy_to_migration.rb' file. Just run 'rails g migration createUsersTable' copy the content of 'create_users_adapt_and_copy_to_migration.rb' and delete it.
+* db/migrate/create_aai_user.rb
 
 You can run it with '--persist false' if you don't want to persist the user to the local db.
 
@@ -50,7 +48,7 @@ By default, you will get all the standard SWITCHaai values, or you can configure
     Rails.application.config.middleware.use OmniAuth::Builder do
       provider :aai,{
         :uid_field => :'persistent-id',
-        :fields => [:name, :email, :swiss_ep_uid],
+        :fields => [:name, :email, :unique_id],
         :extra_fields => [:'Shib-Authentication-Instant']# See lib/omniauth/strategies/aai.rb for full list.
       }
 ```
@@ -74,9 +72,9 @@ In development/local mode or in cases where you don't have a SWITCHaai Service P
     Rails.application.config.middleware.use OmniAuth::Builder do
       if Rails.env.development?
         provider :developer, {
-          :uid_field => :'persistent-id',
-          :fields => OmniAuth::Strategies::Aai::DEFAULT_FIELDS,
-          :extra_fields => OmniAuth::Strategies::Aai::DEFAULT_EXTRA_FIELDS
+          uid_field: :'persistent-id',
+          fields: [:name, :email, :persistent_id, :unique_id],
+          extra_fields: OmniAuth::Strategies::Aai::DEFAULT_EXTRA_FIELDS
         }
       end
     end
@@ -95,7 +93,7 @@ When you deploy a new application, you may want to confirm the assumed attribute
 
 ### Current User
 
-If you want to use the build in User object and the 'current_user' functionality, you can use the magic call 'has_current_user'
+If you want to use the build in User object and the 'current_user' functionality, you can include the has_current_user method to concerned ActionController or the ApplicationController if you want to have the functionality available globally.
 
 ```ruby
     class ApplicationController < ActionController::Base
@@ -103,26 +101,3 @@ If you want to use the build in User object and the 'current_user' functionality
       has_current_user
     end
 ```
-
-
-## License (MIT License)
-
-Copyright (C) SWITCH, Zurich, original copyright (omniauth-shibboleth) 2011 by Toyokazu Akiyama.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/lib/generators/aai/setup_generator.rb

@@ -0,0 +1,44 @@
+module Aai
+  class SetupGenerator < Rails::Generators::Base
+    include Rails::Generators::Migration
+
+    source_root File.expand_path("../templates", __FILE__)
+
+    desc "Generate Config Files / User / Session and Routes"
+
+    class_option :persist, type: :boolean, default: true, desc: "Set to false if you don't want persistent User"
+
+    # def self.source_root
+    #   @source_root ||= File.join(File.dirname(__FILE__), 'templates')
+    # end
+
+    def copy_initializer_file
+      copy_file "omniauth.rb", "config/initializers/omniauth.rb"
+    end
+
+    def copy_session_controller_file
+      if true
+        copy_file "session_controller.rb", "app/controllers/session_controller.rb"
+        inject_into_class "app/controllers/application_controller.rb", ApplicationController, "  has_current_user\n"
+        route("post '/auth/:provider/callback', to: 'session#create', as: 'auth_callback'")
+        route("get '/auth/failure', to: 'session#failure', as: 'auth_failure'")
+        route("get '/auth/logout',  to: 'session#destroy', as: 'logout'")
+      end
+    end
+
+    def copy_user_file
+      template "user.rb", "app/models/user.rb"
+      migration_template "migration.rb", "db/migrate/create_aai_user.rb" if options[:persist]
+      rake "db:migrate"
+    end
+
+    def self.next_migration_number(path)
+      unless @prev_migration_nr
+        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+      else
+        @prev_migration_nr += 1
+      end
+      @prev_migration_nr.to_s
+    end
+  end
+end