omniauth-mydigipass 1.0.0 → 1.1.0

data/.gitignore

@@ -16,3 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 .idea
+.rvmrc
+.ruby-version

data/Gemfile

@@ -1,5 +1,4 @@
 source 'http://rubygems.org'
 
 # Specify your gem's dependencies in omniauth-mydigipass.gemspec
-gemspec
-
+gemspec

data/README.md

@@ -1,82 +1,191 @@
-# OmniAuth Mydigipass.com
+# OmniAuth Mydigipass
 
 This is an OmniAuth strategy for authenticating with MYDIGIPASS.COM.
 
 If you want to integrate your website with MYDIGIPASS.COM, you will need to
-sign up on http://developer.mydigipass.com and connect your site there.
-There you will get a `client_id` and `client_secret` you need to fill in here.
+sign up on [developer.mydigipass.com](http://developer.mydigipass.com) and
+connect your site there. Then you will get a `client_id` and `client_secret`
+you need to fill in here.
+
+It is recommended to use the OAuth `state` parameter to prevent CSRF
+attacks. Omniauth actually enables this behaviour by default. Usage of the
+state parameter is illustrated in the example app.
 
 
 ## Basic Usage
 
-If you are testing your application in the sandbox environment, write
+If you are testing your application in the sandbox environment, initialize
+the strategy as follows:
 
-    use OmniAuth::Builder do
-      provider :mydigipass, ENV['MYDIGIPASS_CLIENT_ID'], ENV['MYDIGIPASS_CLIENT_SECRET'],
-                            :client_options => OmniAuth::Strategies::Mydigipass.default_client_urls(:sandbox => true)
-    end
+```ruby
+use OmniAuth::Builder do
+  provider :mydigipass, ENV['MYDIGIPASS_CLIENT_ID'], ENV['MYDIGIPASS_CLIENT_SECRET'],
+                        :client_options => OmniAuth::Strategies::Mydigipass.default_client_urls(:sandbox => true)
+end
+```
 
 Once your application goes in production, you can just write:
 
-    use OmniAuth::Builder do
-      provider :mydigipass, ENV['MYDIGIPASS_CLIENT_ID'], ENV['MYDIGIPASS_CLIENT_SECRET']
-    end
+```ruby
+use OmniAuth::Builder do
+  provider :mydigipass, ENV['MYDIGIPASS_CLIENT_ID'], ENV['MYDIGIPASS_CLIENT_SECRET']
+end
+```
 
-## Example Application
 
-I have added a small working example application, check it out how it should work. To integrate into rails you should
+## Example Integrating with Rails
 
-* add the
+Add an initializer `mydigipass.rb` containing your application specific configuration:
 
-## Example Integrating with Rails
+```ruby
+# MYDIGIPASS.COM OAuth configuration
+
+MDP_JS_SRC="https://static.mydigipass.com/en/dp_connect.js"
+
+if Rails.env.production?
+  MDP_CLIENT_ID="<your-production-client-id>"
+  MDP_CLIENT_SECRET="<your-production-client-secret>"
+  MDP_CALLBACK_URL="<your-production-base-url>/auth/mydigipass/callback"
+  MDP_ORIGIN="https://www.mydigipass.com"
+else
+  MDP_CLIENT_ID="<your-sandbox-client-id>"
+  MDP_CLIENT_SECRET="<your-sandbox-client-secret>"
+  MDP_CALLBACK_URL="http://localhost:3000/auth/mydigipass/callback"
+  MDP_ORIGIN="https://sandbox.mydigipass.com"
+end
+```
 
 Inside your `config/application.rb` add the following (e.g. at the bottom, inside the configuration block) :
 
-    # enable omniauth strategies
-    Rails.application.config.middleware.use OmniAuth::Builder do
-      provider :mydigipass, APP_CONFIG[:client_id], APP_CONFIG[:client_secret]
-    end
+```ruby
+# enable omniauth strategies
+Rails.application.config.middleware.use OmniAuth::Builder do
+  if Rails.env.production?
+    provider :mydigipass, MDP_CLIENT_ID, MDP_CLIENT_SECRET
+  else
+    provider :mydigipass, MDP_CLIENT_ID, MDP_CLIENT_SECRET,
+             :client_options => OmniAuth::Strategies::Mydigipass.default_client_urls(:sandbox => true)
+  end
+end
+```
 
 And then you just have to make sure you have something listening at `/auth/:provider/callback`.
 Suppose you add the following routes:
 
-  match '/auth/:provider/callback', :to => 'home#auth_create'
-  match '/auth/failure', :to => 'home#auth_failure'
+```ruby
+match '/auth/:provider/callback', :to => 'home#auth_create'
+match '/auth/failure', :to => 'home#auth_failure'
+```
+
+
+### Rendering the button
+
+On the login page and/or signup page, you can show the MYDIGIPASS.COM button
+as follows:
+
+```ruby
+= link_to("connect with mydigipass.com", "#", :class => "dpplus-connect",
+                                              :"data-origin" => MDP_ORIGIN,
+                                              :"data-client-id" => MDP_CLIENT_ID,
+                                              :"data-redirect-uri" => MDP_CALLBACK_URL,
+                                              :"data-state" => @state)
+```
+
+and also include the `dp_connect.js` Javascript file:
+
+```ruby
+%script{:type => 'text/javascript', :src => MDP_JS_SRC}
+```
+
+Since you can potentially link a MYDIGIPASS.COM account to an
+existing account on your site, you have to protect against CSRF attacks.
+For this reason, every time you render a view with the above link,
+you have to generate a new random CSRF-protection `state` token.
+This token must be stored in two places:
+
+1. in the `data-state` attribute of the link itself (see above code),
+2. in the `omniauth.state` session variable.
+
+To generate a suitable token, you can put the following code in the
+controller action or even in the view itself:
+
+```ruby
+@state = session['omniauth.state'] = SecureRandom.hex(24)
+```
+
+When Omniauth is processing the OAuth call, it will compare the
+`state` parameter passed back in by MIDIGPASS.COM to the `omniauth.state`
+parameter stored in the user's session. If the tokens do not match, Omniauth
+will conclude that the authentication was originally initiated in another
+browser session and abort the remainder of the flow.
+
+> Note: If you use the `state` parameter for CSRF protection, you must
+> register a separate autoconnect URL (which is usually the URL of the
+> login page of your application) with MYDIGIPASS.COM to enable users to
+> sign in from our launchpad.
+
+
+### Handling the callback
+
+To handle the actual callback, you can use something like the following
+`auth_create` implementation inside your `HomeController`:
+
+```ruby
+def auth_failure
+  set_flash_message(:notice, "OAuth error: #{params[:message]}")
+  redirect_to root_path
+end
+
+def auth_create
+  user = User.find_or_create_from_auth_hash(request.env['omniauth.auth'].with_indifferent_access)
+  logger.debug "Found or created user: #{user.email} [#{user.id}]"
+  if user.sign_in_count == 0
+    set_flash_message(:notice, "Welcome #{user.email}, thank you for signing up using your dP+ account!")
+  else
+    set_flash_message(:notice, "Succesfully logged in!")
+  end
+  sign_in(:user, user, :bypass => true)
+  redirect_to dashboard_path
+end
+```
+
+When a user signs in through MYDIGIPASS.COM, it could be a new user
+(signing up), or an existing user. The function `find_or_create_from_auth_hash`
+handles that for me:
+
+```ruby
+def self.find_or_create_from_auth_hash(auth_hash)
+  logger.debug "User.find_or_create_from_auth_hash: auth_hash = #{auth_hash.inspect} "
+  received_uuid = auth_hash[:extra][:raw_info][:uuid]
+  received_email = auth_hash[:extra][:raw_info][:email]
+
+  user = User.find_by_uuid(received_uuid) || User.find_by_email(received_email)
+  user = user.nil? ? create_from_auth_hash(received_uuid, received_email) : prevent_login_with_normal_password(user, received_uuid)
+end
+```
+
+I try to find the user, by `uuid` or `email`. If I find the user by `uuid`,
+she has logged on before with MYDIGIPASS.COM If I find a matching mail,
+link the uuid to that user. If I do not find a user, create one with the
+given `email` and `uuid`. I also made sure that users can then only login
+with their MYDIGIPASS.COM and no longer normally, but that is optional
+of course.
 
-Then, inside your `HomeController` you could write:
 
-    def auth_failure
-      set_flash_message(:notice, "OAuth error: #{params[:message]}")
-      redirect_to root_path
-    end
+## Example Application
 
-    def auth_create
-      user = User.find_or_create_from_auth_hash(request.env['omniauth.auth'].with_indifferent_access)
-      logger.debug "Found or created user: #{user.email} [#{user.id}]"
-      if user.sign_in_count == 0
-        set_flash_message(:notice, "Welcome #{user.email}, thank you for signing up using your dP+ account!")
-      else
-        set_flash_message(:notice, "Succesfully logged in!")
-      end
-      sign_in(:user, user, :bypass => true)
-      redirect_to dashboard_path
-    end
+I have added a small working example application, using Sinatra. Check it out
+in the `example` folder. To make it work just type `rackup` in the folder.
 
-When a user signs in through MYDIGIPASS.COM, it could be a new user (signing up), or an existing user.
-The function `find_or_create_from_auth_hash` handles that for me:
+Aside from signing in with MYDIGIPASS.COM, the example application also
+shows how to use the Connect API through a simple HTTParty wrapper that can
+be found in `lib/mydigipass/connect_api.rb`.
 
-    def self.from_auth_hash(auth_hash)
-      logger.debug "User.from_auth_hash: auth_hash = #{auth_hash.inspect} "
-      received_uuid = auth_hash[:extra][:raw_info][:uuid]
-      received_email = auth_hash[:extra][:raw_info][:email]
+The Connect API and its purpose is described in more detail in the
+[MDP Developer documentation](https://developer.mydigipass.com/).
 
-      user = User.find_by_uuid(received_uuid) || User.find_by_email(received_email)
-      user = user.nil? ? create_from_auth_hash(received_uuid, received_email) : prevent_login_with_normal_password(user, received_uuid)
-    end
+Hope this helps.
 
-I try to find the user, by `uuid` or `email`. If I find the user by `uuid`, she has logged on before with MYDIGIPASS.COM
-If I find a matching mail, link the uuid to that user. If I do not find a user, create one with the given `email` and `uuid`.
-I also made sure that users can then only login with their MYDIGIPASS.COM and no longer normally, but that is optional of course.
 
 ## License
 
@@ -86,4 +195,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 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.
+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/example/config.ru

@@ -2,33 +2,61 @@ require 'bundler/setup'
 require 'sinatra'
 require 'omniauth'
 require 'omniauth-mydigipass'
+require 'mydigipass'
 
+# Replace these with your own credentials.
+CLIENT_ID = '5o67b0giz20pttdcjenjtyyj5'
+CLIENT_SECRET = '39fcfebcwfegu1sqedxq8f8vt'
+
+OMNIAUTH_CLIENT_OPTIONS = OmniAuth::Strategies::Mydigipass.default_client_urls(:sandbox => true)
+CONNECT_API_OPTIONS = { :client_id => CLIENT_ID, :client_secret => CLIENT_SECRET, :sandbox => true }
 
 class App < Sinatra::Base
   get '/' do
-    content_type 'text/html'
-    <<-HTML
-      <h1>Test OAuth2 with MYDIGIPASS.COM</h1>
-      <script  type="text/javascript" src="https://sandbox.mydigipass.com/dp_connect.js"></script>
-      <a class="dpplus-connect" data-client-id="2z4z3zn6ezuov82e4dfu73q3z" data-redirect-uri="http://localhost:3002/auth/mydigipass/callback" href="#">connect with mydigipass.com</a>
-    HTML
+    @auth = session['auth']
+    if @auth.nil?
+      redirect '/signin'
+    else
+      @users = Mydigipass::ConnectApi.new(CONNECT_API_OPTIONS).all_connected
+      erb :index
+    end
+  end
+
+  get '/signin' do
+    @state = session['omniauth.state'] = SecureRandom.hex(24)
+    erb :signin
+  end
+
+  get '/signout' do
+    session['auth'] = nil
+    redirect '/signin'
   end
 
   get '/auth/:name/callback' do
-    @auth = request.env['omniauth.auth']
-    erb :callback
+    session['auth'] = request.env['omniauth.auth']
+    redirect '/'
   end
 
   get '/auth/failure' do
+    session['auth'] = nil
     @request = request
     erb :failure
   end
+
+  get '/connect/:uuid' do
+    Mydigipass::ConnectApi.new(CONNECT_API_OPTIONS).connected(params[:uuid])
+    redirect '/'
+  end
+
+  get '/disconnect/:uuid' do
+    Mydigipass::ConnectApi.new(CONNECT_API_OPTIONS).disconnected(params[:uuid])
+    redirect '/'
+  end
 end
 
 use Rack::Session::Cookie
 use OmniAuth::Builder do
-  provider :mydigipass, '2z4z3zn6ezuov82e4dfu73q3z', '1mcskxim7nomrafvfg7s36pjv',
-           :client_options => OmniAuth::Strategies::Mydigipass.default_client_urls(:sandbox => true)
+  provider :mydigipass, CLIENT_ID, CLIENT_SECRET, :client_options => OMNIAUTH_CLIENT_OPTIONS
 end
 
 run App.new

data/example/views/index.erb

@@ -0,0 +1,31 @@
+<html>
+  <body>
+    <h1>Authenticated via provider '<%= @auth.provider %>'</h1>
+    <h2>Info</h2>
+    <ul>
+      <%- @auth.info.each do |key, value| %>
+        <li><strong><%= key %>:</strong> <%= value.inspect %></li>
+      <% end %>
+    </ul>
+
+    <a href="/signout" class="dpplus-logout" data-origin="<%= OMNIAUTH_CLIENT_OPTIONS[:site] %>" data-client-id="<%= CLIENT_ID %>">Sign out</a>
+
+    <h2>Raw auth information</h2>
+    <pre style="white-space: pre-wrap"><%= Rack::Utils.escape_html @auth.inspect %></pre>
+
+    <h2>Connected users</h2>
+    <p>
+      Users connected to your application:
+    </p>
+    <ul>
+      <% if @users.empty? %>
+        <li>No users connected</li>
+      <% else %>
+        <% @users.each do |user| %>
+          <li><b><%= user %></b> (<a href="/disconnect/<%= user %>">disconnect</a>)</li>
+        <% end %>
+      <% end %>
+    </ul>
+    <a href='/connect/<%= @auth.uid %>'>Connect the current user (<b><%= @auth.uid %></b>)</a>
+  </body>
+</html>

data/example/views/signin.erb

@@ -0,0 +1,7 @@
+<html>
+  <body>
+    <h1>Test OAuth2 with MYDIGIPASS.COM</h1>
+    <script  type="text/javascript" src="https://static.mydigipass.com/en/dp_connect.js"></script>
+    <a class="dpplus-connect" data-origin="<%= OMNIAUTH_CLIENT_OPTIONS[:site] %>" data-client-id="<%= CLIENT_ID %>" data-redirect-uri="http://localhost:9292/auth/mydigipass/callback" data-state="<%= @state %>" href="#">connect with mydigipass.com</a>
+  </body>
+</html>

data/lib/mydigipass.rb

@@ -0,0 +1,2 @@
+require 'mydigipass/tools'
+require 'mydigipass/connect_api'

data/lib/mydigipass/connect_api.rb

@@ -0,0 +1,24 @@
+require 'httparty'
+require 'mydigipass/tools'
+
+module Mydigipass
+  class ConnectApi
+    def initialize(options)
+      @base_uri = Mydigipass::Tools.extract_base_uri_from_options(options)
+      @auth = { :username => options[:client_id], :password => options[:client_secret] }
+    end
+
+    def all_connected
+      response = HTTParty.get("#{@base_uri}/api/uuids/connected", { :basic_auth => @auth })
+      response['uuids'] || [ ]
+    end
+
+    def connected(uuid)
+      HTTParty.post("#{@base_uri}/api/uuids/connected", { :body => { :uuids => [ uuid ] }, :basic_auth => @auth })
+    end
+
+    def disconnected(uuid)
+      HTTParty.post("#{@base_uri}/api/uuids/disconnected", { :body => { :uuids => [ uuid ] }, :basic_auth => @auth })
+    end
+  end
+end

data/lib/mydigipass/tools.rb

@@ -0,0 +1,13 @@
+module Mydigipass
+  module Tools
+    def self.extract_base_uri_from_options(options = { })
+      if options.has_key? :base_uri
+        options[:base_uri]
+      elsif options.has_key? :sandbox
+        'https://sandbox.mydigipass.com'
+      else
+        'https://www.mydigipass.com'
+      end
+    end
+  end
+end

data/lib/omniauth-mydigipass.rb

@@ -1,2 +1,2 @@
-require "omniauth-mydigipass/version"
+require 'omniauth-mydigipass/version'
 require 'omniauth/strategies/mydigipass'

data/lib/omniauth-mydigipass/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Mydigipass
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/omniauth/strategies/mydigipass.rb

@@ -1,34 +1,21 @@
 require 'omniauth-oauth2'
+require 'mydigipass/tools'
 
 module OmniAuth
   module Strategies
     class Mydigipass < OmniAuth::Strategies::OAuth2
-
-      def self.default_client_urls(options = {})
-        local_base_uri = options[:sandbox] ? 'https://sandbox.mydigipass.com' : 'https://mydigipass.com'
+      def self.default_client_urls(options = { })
+        base_uri = ::Mydigipass::Tools.extract_base_uri_from_options(options)
         {
-          :site          => local_base_uri,
-          :authorize_url => local_base_uri + '/oauth/authenticate',
-          :token_url     => local_base_uri + '/oauth/token'
+          :site          => base_uri,
+          :authorize_url => base_uri + '/oauth/authenticate',
+          :token_url     => base_uri + '/oauth/token'
         }
       end
 
-
-      # Give your strategy a name.
-      option :name, "mydigipass"
-
-      # for the sandbox environment, use http://sandbox.mydigipass.com
-      option :base_uri, "https://mydigipass.com"
-
-      #option :client_options, {
-      #          :site          => base_uri,
-      #          :authorize_url => base_uri + '/oauth/authenticate',
-      #          :token_url     => base_uri + '/oauth/token'
-      #        }
-
+      option :name, 'mydigipass'
       option :client_options, default_client_urls
 
-
       # These are called after authentication has succeeded.
       uid { raw_info['uuid'] }
 
@@ -44,18 +31,12 @@ module OmniAuth
       end
 
       extra do
-        {'raw_info' => raw_info}
+        { 'raw_info' => raw_info }
       end
 
       def raw_info
         @raw_info ||= access_token.get('/oauth/user_data').parsed
       end
-
-      def base_uri
-        default_options[:base_uri]
-      end
-
-
     end
   end
-end
+end

data/omniauth-mydigipass.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = OmniAuth::Mydigipass::VERSION
 
-  gem.add_dependency 'omniauth', '~> 1.0'
-  gem.add_dependency 'omniauth-oauth2', '~> 1.0'
+  gem.add_dependency 'httparty'
+  gem.add_dependency 'omniauth', '~> 1.1'
+  gem.add_dependency 'omniauth-oauth2', '~> 1.1'
   gem.add_development_dependency 'rspec', '~> 2.7'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'simplecov'

data/spec/mydigipass/connect_api_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'mydigipass/connect_api'
+
+describe Mydigipass::ConnectApi do
+  let(:client_id) { 'abc' }
+  let(:client_secret) { 'def' }
+  let(:uuid) { 'ghi' }
+
+  let(:basic_auth) { { :username => client_id, :password => client_secret } }
+
+  before :each do
+    @api = Mydigipass::ConnectApi.new(:client_id => client_id, :client_secret => client_secret, :base_uri => 'https://www.foo.com')
+    HTTParty.stub(:get)
+    HTTParty.stub(:post)
+  end
+
+  describe '#all_connected' do
+    it 'performs GET and returns array' do
+      params = { :basic_auth => basic_auth }
+      HTTParty.should_receive(:get).with('https://www.foo.com/api/uuids/connected', params).and_return({ 'uuids' => [ '123', '456' ] })
+      @api.all_connected.should == [ '123', '456' ]
+    end
+  end
+
+  describe '#connected' do
+    it 'performs POST' do
+      params = { :body => { :uuids => [ uuid ] }, :basic_auth => basic_auth }
+      HTTParty.should_receive(:post).with('https://www.foo.com/api/uuids/connected', params)
+      @api.connected(uuid)
+    end
+  end
+
+  describe '#disconnected' do
+    it 'performs POST' do
+      params = { :body => { :uuids => [ uuid ] }, :basic_auth => basic_auth }
+      HTTParty.should_receive(:post).with('https://www.foo.com/api/uuids/disconnected', params)
+      @api.disconnected(uuid)
+    end
+  end
+end

data/spec/mydigipass/tools_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'mydigipass/tools'
+
+describe Mydigipass::Tools do
+  describe '.extract_base_uri_from_options' do
+    context 'with no options parameter' do
+      Mydigipass::Tools.extract_base_uri_from_options().should == 'https://www.mydigipass.com'
+    end
+
+    context 'with empty hash' do
+      Mydigipass::Tools.extract_base_uri_from_options({}).should == 'https://www.mydigipass.com'
+    end
+
+    context 'with explicit base_uri' do
+      Mydigipass::Tools.extract_base_uri_from_options({ :base_uri => 'https://www.foo.com', :sandbox => true }).should == 'https://www.foo.com'
+    end
+
+    context 'with sandbox option' do
+      Mydigipass::Tools.extract_base_uri_from_options({ :sandbox => true }).should == 'https://sandbox.mydigipass.com'
+    end
+  end
+end

data/spec/omniauth/strategies/mydigipass_spec.rb

@@ -3,22 +3,30 @@ require 'omniauth-mydigipass'
 
 describe OmniAuth::Strategies::Mydigipass do
   subject do
-    OmniAuth::Strategies::Mydigipass.new(nil, @options || {})
+    OmniAuth::Strategies::Mydigipass.new('abc', 'def', @options || {})
+  end
+
+  before do
+    OmniAuth.config.test_mode = true
+  end
+
+  after do
+    OmniAuth.config.test_mode = false
   end
 
   it_should_behave_like 'an oauth2 strategy'
 
   describe '#client' do
     it 'should have the correct mydigipass.com site' do
-      subject.client.site.should eq("https://mydigipass.com")
+      subject.client.site.should == 'https://www.mydigipass.com'
     end
 
     it 'should have the correct authorization url' do
-      subject.client.options[:authorize_url].should eq("https://mydigipass.com/oauth/authenticate")
+      subject.client.options[:authorize_url].should == 'https://www.mydigipass.com/oauth/authenticate'
     end
 
     it 'should have the correct token url' do
-      subject.client.options[:token_url].should eq('https://mydigipass.com/oauth/token')
+      subject.client.options[:token_url].should == 'https://www.mydigipass.com/oauth/token'
     end
   end
 
@@ -28,11 +36,10 @@ describe OmniAuth::Strategies::Mydigipass do
     end
   end
 
-  context "when connecting to the sandbox" do
+  context 'when connecting to the sandbox' do
     it 'should have the correct mydigipass.com site' do
       @options = { :client_options => OmniAuth::Strategies::Mydigipass.default_client_urls(:sandbox => true) }
-      subject.client.site.should eq("https://sandbox.mydigipass.com")
+      subject.client.site.should == 'https://sandbox.mydigipass.com'
     end
-
   end
 end

data/spec/support/shared_examples.rb

@@ -12,28 +12,28 @@ shared_examples 'an oauth2 strategy' do
   describe '#authorize_params' do
     it 'should include any authorize params passed in the :authorize_params option' do
       @options = { :authorize_params => { :foo => 'bar', :baz => 'zip' } }
-      subject.authorize_params['foo'].should eq('bar')
-      subject.authorize_params['baz'].should eq('zip')
+      subject.authorize_params['foo'].should == 'bar'
+      subject.authorize_params['baz'].should == 'zip'
     end
 
     it 'should include top-level options that are marked as :authorize_options' do
       @options = { :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
-      subject.authorize_params['scope'].should eq('bar')
-      subject.authorize_params['foo'].should eq('baz')
+      subject.authorize_params['scope'].should == 'bar'
+      subject.authorize_params['foo'].should == 'baz'
     end
   end
 
   describe '#token_params' do
     it 'should include any token params passed in the :token_params option' do
       @options = { :token_params => { :foo => 'bar', :baz => 'zip' } }
-      subject.token_params['foo'].should eq('bar')
-      subject.token_params['baz'].should eq('zip')
+      subject.token_params['foo'].should == 'bar'
+      subject.token_params['baz'].should == 'zip'
     end
 
     it 'should include top-level options that are marked as :token_options' do
       @options = { :token_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
-      subject.token_params['scope'].should eq('bar')
-      subject.token_params['foo'].should eq('baz')
+      subject.token_params['scope'].should == 'bar'
+      subject.token_params['foo'].should == 'baz'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mydigipass
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,59 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-10 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &15842580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *15842580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &15842000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *15842000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15841420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +69,15 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *15841420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &15840960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15840960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &15840420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15840420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OmniAuth strategy for MYDIGIPASS.COM, which can be used for sandbox or
   production
 email:
@@ -81,12 +122,18 @@ files:
 - Rakefile
 - example/Gemfile
 - example/config.ru
-- example/views/callback.erb
 - example/views/failure.erb
+- example/views/index.erb
+- example/views/signin.erb
+- lib/mydigipass.rb
+- lib/mydigipass/connect_api.rb
+- lib/mydigipass/tools.rb
 - lib/omniauth-mydigipass.rb
 - lib/omniauth-mydigipass/version.rb
 - lib/omniauth/strategies/mydigipass.rb
 - omniauth-mydigipass.gemspec
+- spec/mydigipass/connect_api_spec.rb
+- spec/mydigipass/tools_spec.rb
 - spec/omniauth/strategies/mydigipass_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
@@ -110,8 +157,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: OmniAuth strategy for MYDIGIPASS.COM
-test_files: []
+test_files:
+- spec/mydigipass/connect_api_spec.rb
+- spec/mydigipass/tools_spec.rb
+- spec/omniauth/strategies/mydigipass_spec.rb
+- spec/spec_helper.rb
+- spec/support/shared_examples.rb

data/example/views/callback.erb

@@ -1,14 +0,0 @@
-<html>
-  <body>
-    <h1>Authentication Successfull via <%= @auth.provider %></h1>
-    <h2>info:</h2>
-    <ul>
-      <%- @auth.info.each do |key, value| %>
-        <li><strong><%= key %>:</strong> <%= value.inspect %></li>
-      <% end %>
-    </ul>
-    <a href='/'>Sign out</a>
-    <h2>raw auth:</h2>
-    <pre style="white-space: pre-wrap"><%= Rack::Utils.escape_html @auth.inspect %></pre>
-  </body>
-</html>