omniauth-scalus-oauth2 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a038498007dcbc8171616d47cf494e0e3c0142f
-  data.tar.gz: e38a4e540c91f3c2f53b36d1e71dba5eea9795de
+  metadata.gz: f286c70cbe5b4e90b35970f4b247b86762936e29
+  data.tar.gz: 3305c25d847d8bd0004830cc1e5609c53efbdd77
 SHA512:
-  metadata.gz: 5a8aa80ff17bd0706b4e11fa241b5a839ebbd3551b995bdd7aa20fa11f466235e11811b40562f3056e8edd0c002b5ad4609640744953ae810bfe24f0329b4a60
-  data.tar.gz: 5a7cdc43446f91e7649c2d83aff2f5a8fc4ed539c202845227c9c7d12a580dfef78b73795b768f893234b96babf29382f75f7eb4be19c960756fddbd8a9b9ff3
+  metadata.gz: adc08cebe25975bafefb7ddcd2b4d01d96ccfac2be70c931e0bc8503b5810492461ad9843191ea9c3816af55e7c5ce7491b3a7714e7b35854511f7c110675321
+  data.tar.gz: 366d227b168699c9d6ddc81cc15ba3baaabece1fad495b052567241ad9e4fb611bb6b767528d63187a37e07eab36a6dd9b923aae3cbf9f8d11cf7f78b3dd23d9

data/README.md

@@ -45,7 +45,7 @@ Here's an example *Authentication Hash* available in `request.env['omniauth.auth
 ```ruby
 {
   :provider => 'scalus',
-  :uid => 'example.scalus.com',
+  :uid => 'example_slug.scalus.com', # example\_slug is the organization's subdomain
   :credentials => {
     :token => 'afasd923kjh0934kf', # OAuth 2.0 access_token, which you store and use to authenticate API requests
   }

data/lib/omniauth/scalus/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Scalus
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/omniauth/strategies/scalus.rb

@@ -10,8 +10,8 @@ module OmniAuth
       CODE_EXPIRES_AFTER = 10 * MINUTE
 
       option :client_options, {
-        :authorize_url => '/admin/oauth/authorize',
-        :token_url => '/admin/oauth/access_token'
+        :authorize_url => '/oauth2/authorize',
+        :token_url => '/oauth2/access_token'
       }
 
       option :callback_url

data/omniauth-scalus-oauth2.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '~> 5.6'
   s.add_development_dependency 'fakeweb', '~> 1.3'
   s.add_development_dependency 'rake'
+  # s.add_development_dependency 'byebug'
+
 end

data/spec/omniauth/strategies/scalus_spec.rb

@@ -42,11 +42,11 @@ describe OmniAuth::Strategies::Scalus do
     end
 
     it 'has correct authorize url' do
-      subject.client.options[:authorize_url].should eq('/admin/oauth/authorize')
+      subject.client.options[:authorize_url].should eq('/oauth2/authorize')
     end
 
     it 'has correct token url' do
-      subject.client.options[:token_url].should eq('/admin/oauth/access_token')
+      subject.client.options[:token_url].should eq('/oauth2/access_token')
     end
   end
 

data/test/integration_test.rb

@@ -1,4 +1,5 @@
 require_relative 'test_helper'
+# require 'byebug'
 
 class IntegrationTest < Minitest::Test
   def setup
@@ -13,7 +14,7 @@ class IntegrationTest < Minitest::Test
   def test_authorize
     response = authorize('snowdevil.scalus.com')
     assert_equal 302, response.status
-    assert_match /\A#{Regexp.quote("https://snowdevil.scalus.com/admin/oauth/authorize?")}/, response.location
+    assert_match /\A#{Regexp.quote("https://snowdevil.scalus.com/oauth2/authorize?")}/, response.location
     redirect_params = Rack::Utils.parse_query(URI(response.location).query)
     assert_equal "123", redirect_params['client_id']
     assert_equal "https://app.example.com/auth/scalus/callback", redirect_params['redirect_uri']
@@ -27,7 +28,7 @@ class IntegrationTest < Minitest::Test
     }
 
     response = authorize('snowdevil.scalus.com')
-    assert_match /\A#{Regexp.quote("https://snowdevil.scalus.com/admin/oauth/authorize?")}/, response.location
+    assert_match /\A#{Regexp.quote("https://snowdevil.scalus.com/oauth2/authorize?")}/, response.location
   end
 
   def test_site_validation
@@ -71,7 +72,7 @@ class IntegrationTest < Minitest::Test
   def test_callback_custom_params
     access_token = SecureRandom.hex(16)
     code = SecureRandom.hex(16)
-    FakeWeb.register_uri(:post, "https://snowdevil.scalus.com/admin/oauth/access_token",
+    FakeWeb.register_uri(:post, "https://snowdevil.scalus.com/oauth2/access_token",
                          body: JSON.dump(access_token: access_token),
                          content_type: 'application/json')
 
@@ -121,7 +122,7 @@ class IntegrationTest < Minitest::Test
 
   def test_provider_options
     build_app scope: 'read_products,read_orders,write_content',
-              callback_path: '/admin/auth/legacy/callback',
+              callback_path: '/auth/legacy/callback',
               scalus_domain: 'scalus.dev:3000',
               setup: lambda { |env|
                 organization = Rack::Request.new(env).GET['organization']
@@ -131,15 +132,15 @@ class IntegrationTest < Minitest::Test
 
     response = authorize('snowdevil')
     assert_equal 302, response.status
-    assert_match /\A#{Regexp.quote("https://snowdevil.scalus.dev:3000/admin/oauth/authorize?")}/, response.location
+    assert_match /\A#{Regexp.quote("https://snowdevil.scalus.dev:3000/oauth2/authorize?")}/, response.location
     redirect_params = Rack::Utils.parse_query(URI(response.location).query)
     assert_equal 'read_products,read_orders,write_content', redirect_params['scope']
-    assert_equal 'https://app.example.com/admin/auth/legacy/callback', redirect_params['redirect_uri']
+    assert_equal 'https://app.example.com/auth/legacy/callback', redirect_params['redirect_uri']
   end
   def test_callback_with_invalid_state_fails
     access_token = SecureRandom.hex(16)
     code = SecureRandom.hex(16)
-    FakeWeb.register_uri(:post, "https://snowdevil.scalus.com/admin/oauth/access_token",
+    FakeWeb.register_uri(:post, "https://snowdevil.scalus.com/oauth2/access_token",
                          body: JSON.dump(access_token: access_token),
                          content_type: 'application/json')
 
@@ -161,7 +162,7 @@ class IntegrationTest < Minitest::Test
   end
 
   def expect_access_token_request(access_token)
-    FakeWeb.register_uri(:post, "https://snowdevil.scalus.com/admin/oauth/access_token",
+    FakeWeb.register_uri(:post, "https://snowdevil.scalus.com/oauth2/access_token",
                          body: JSON.dump(access_token: access_token),
                          content_type: 'application/json')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-scalus-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - David Henner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2