osso 0.0.5.pre.theta → 0.0.5.pre.zeta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80defe1af30691a237f560c7cbdaed6ad25dddc62aaa55c42e317ce6fb47e5f6
-  data.tar.gz: bf4205e1e2bfb2cc50af764e094a504a78753427669efe78f7414a67f176156b
+  metadata.gz: eb48ae64d0aa5fb579751215755503e9140506ba9b75b87436fa824d7a2a18f6
+  data.tar.gz: e9a47f808971ce6e6e36d0f189643fb970e82656507a3de474968e3368e16c29
 SHA512:
-  metadata.gz: 1b13b109aafee1913e18fc9acaf64f7876a0468ab7477c4666bf002fcde298edd3d2b72e58121998e2a7ddd93b54673e0739781f5ec57c56423369223d5550a5
-  data.tar.gz: 2d37d7a3fb5a8d19feb6efb3a5c45e84023b8abcb5448b0ba884dddb05112dc06f5a5d91773587e80b6530b7c94b03eef03cf96020f07ad84824b273c00c4af9
+  metadata.gz: 49c911667a8eacb8b90958988dd7a8c6625b8d219e6ed24612ac9a6aa5bfe6ee975f8bf0813588379a769d0314d69ee358d3d572a1f6b80ba823dd79b6505047
+  data.tar.gz: 03bb1c60447df03e088a40e6fbdcabeb14625ec3cd5c8944929cf0626b1e2000a057eb4daa7db77a1a0c4e79fb02c2f3efed61d4be64255a03e3d22b19dfebbe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osso (0.0.5.pre.eta)
+    osso (0.0.5.pre.zeta)
       activesupport (>= 6.0.3.2)
       graphql
       jwt
@@ -18,12 +18,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activerecord (6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activesupport (6.0.3.3)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -39,23 +39,24 @@ GEM
     attr_required (1.0.1)
     bindata (2.4.8)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    crack (0.4.4)
+    concurrent-ruby (1.1.6)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     database_cleaner (1.8.5)
     database_cleaner-active_record (1.8.0)
       activerecord
       database_cleaner (~> 1.8.0)
     diff-lcs (1.4.4)
     docile (1.3.2)
-    factory_bot (6.1.0)
+    factory_bot (6.0.2)
       activesupport (>= 5.0.0)
-    faker (2.14.0)
+    faker (2.13.0)
       i18n (>= 1.6, < 2)
     graphql (1.11.4)
     hashdiff (1.0.1)
     hashie (4.1.0)
     httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     json (2.3.1)
     json-jwt (1.13.0)
@@ -65,7 +66,7 @@ GEM
     jwt (2.2.2)
     method_source (1.0.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    minitest (5.14.1)
     multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
@@ -86,7 +87,7 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.5)
     rack (2.2.3)
     rack-contrib (2.2.0)
       rack (~> 2.0)
@@ -102,7 +103,7 @@ GEM
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.8.0)
+    regexp_parser (1.7.1)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -117,21 +118,22 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.91.0)
+    rubocop (0.86.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.4.0, < 1.0)
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.2)
-      parser (>= 2.7.1.4)
+    rubocop-ast (0.1.0)
+      parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
     ruby-saml (1.11.0)
       nokogiri (>= 1.5.10)
     ruby2_keywords (0.0.2)
+    safe_yaml (1.0.5)
     simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -156,11 +158,11 @@ GEM
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    webmock (3.9.1)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.0)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby

data/lib/osso/graphql/types/identity_provider.rb

@@ -16,7 +16,6 @@ module Osso
         field :sso_url, String, null: true
         field :sso_cert, String, null: true
         field :status, Types::IdentityProviderStatus, null: false
-        field :acs_url_validator, String, null: false
       end
     end
   end

data/lib/osso/helpers/auth.rb

@@ -66,7 +66,7 @@ module Osso
       end
 
       def token
-        session['admin_token'] || request.env['HTTP_AUTHORIZATION'] || request.params['admin_token']
+        request.env['admin_token'] || session['admin_token'] || request['admin_token']
       end
 
       def chomp_token

data/lib/osso/lib/route_map.rb

@@ -6,7 +6,6 @@ module Osso
   module RouteMap
     def self.included(klass)
       klass.class_eval do
-
         use Osso::Admin
         use Osso::Auth
         use Osso::Oauth

data/lib/osso/models/identity_provider.rb

@@ -40,10 +40,6 @@ module Osso
 
       alias acs_url assertion_consumer_service_url
 
-      def acs_url_validator
-        Regexp.escape(acs_url)
-      end
-
       def set_status
         self.status = 'configured' if sso_url && sso_cert && pending?
       end

data/lib/osso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Osso
-  VERSION = '0.0.5-theta'
+  VERSION = '0.0.5-zeta'
 end

data/spec/graphql/query/identity_provider_spec.rb

@@ -15,7 +15,6 @@ describe Osso::GraphQL::Schema do
             service
             domain
             acsUrl
-            acsUrlValidator
             ssoCert
             ssoUrl
             status

data/spec/helpers/auth_spec.rb

@@ -8,21 +8,13 @@ describe Osso::Helpers::Auth do
   end
 
   subject(:app) do
-    Class.new { 
-      include Osso::Helpers::Auth
-    }
+    Class.new { include Osso::Helpers::Auth }
   end
 
   describe 'with the token as a header' do
     before do
       allow_any_instance_of(subject).to receive(:request) do
-        double('Request', env: { 'HTTP_AUTHORIZATION' => token }, post?: false)
-      end
-
-      allow_any_instance_of(subject).to receive(:session) do
-        {
-          admin_token: nil
-        }
+        double('Request', env: { 'admin_token' => token }, post?: false)
       end
 
       allow_any_instance_of(subject).to receive(:redirect) do
@@ -95,170 +87,6 @@ describe Osso::Helpers::Auth do
     end
   end
 
-  describe 'with the token as a parameter' do
-    before do
-      allow_any_instance_of(subject).to receive(:request) do
-        double('Request', env: {}, params: { 'admin_token' => token }, post?: false)
-      end
-
-      allow_any_instance_of(subject).to receive(:session) do
-        {
-          admin_token: nil
-        }
-      end
-
-      allow_any_instance_of(subject).to receive(:redirect) do
-        false
-      end
-    end
-
-    describe 'with an admin token' do
-      let(:token) { encode({ scope: 'admin' }) }
-
-      it 'allows #token_protected! methods' do
-        expect(subject.new.token_protected!).to_not be(false)
-      end
-
-      it 'allows #enterprise_protected! methods' do
-        expect(subject.new.enterprise_protected!).to_not be(false)
-      end
-
-      it 'allows #internal_protected! methods' do
-        expect(subject.new.internal_protected!).to_not be(false)
-      end
-
-      it 'allows #admin_protected! methods' do
-        expect(subject.new.admin_protected!).to_not be(false)
-      end
-    end
-
-    describe 'with an internal token' do
-      let(:token) { encode({ scope: 'internal' }) }
-
-      it 'allows #token_protected! methods' do
-        expect(subject.new.token_protected!).to_not be(false)
-      end
-
-      it 'allows #enterprise_protected! methods' do
-        expect(subject.new.enterprise_protected!).to_not be(false)
-      end
-
-      it 'allows #internal_protected! methods' do
-        expect(subject.new.internal_protected!).to_not be(false)
-      end
-
-      it 'allows #admin_protected! methods' do
-        expect(subject.new.admin_protected!).to be(false)
-      end
-    end
-
-    describe 'with an end-user token' do
-      let(:token) { encode({ scope: 'end-user', email: 'user@example.com' }) }
-
-      it 'allows #token_protected! methods' do
-        expect(subject.new.token_protected!).to_not be(false)
-      end
-
-      it 'allows #enterprise_protected! methods for the scoped domain' do
-        expect(subject.new.enterprise_protected!('example.com')).to_not be(false)
-      end
-
-      it 'halts #enterprise_protected! methods for the wrong scoped domain' do
-        expect(subject.new.enterprise_protected!('foo.com')).to be(false)
-      end
-
-      it 'halts #internal_protected! methods' do
-        expect(subject.new.internal_protected!).to be(false)
-      end
-
-      it 'halts #admin_protected! methods' do
-        expect(subject.new.admin_protected!).to be(false)
-      end
-    end
-  end
-
-  describe 'with the token in session' do
-    before do
-      allow_any_instance_of(subject).to receive(:request) do
-        double('Request', env: {}, params: {}, post?: false)
-      end
-    
-      allow_any_instance_of(subject).to receive(:redirect) do
-        false
-      end
-
-      allow_any_instance_of(subject).to receive(:session).and_return(
-        {admin_token: token}.with_indifferent_access
-      )
-
-    end
-
-    describe 'with an admin token' do
-      let(:token) { encode({ scope: 'admin' }) }
-      
-
-      it 'allows #token_protected! methods' do
-        expect(subject.new.token_protected!).to_not be(false)
-      end
-
-      it 'allows #enterprise_protected! methods' do
-        expect(subject.new.enterprise_protected!).to_not be(false)
-      end
-
-      it 'allows #internal_protected! methods' do
-        expect(subject.new.internal_protected!).to_not be(false)
-      end
-
-      it 'allows #admin_protected! methods' do
-        expect(subject.new.admin_protected!).to_not be(false)
-      end
-    end
-
-    describe 'with an internal token' do
-      let(:token) { encode({ scope: 'internal' }) }
-
-      it 'allows #token_protected! methods' do
-        expect(subject.new.token_protected!).to_not be(false)
-      end
-
-      it 'allows #enterprise_protected! methods' do
-        expect(subject.new.enterprise_protected!).to_not be(false)
-      end
-
-      it 'allows #internal_protected! methods' do
-        expect(subject.new.internal_protected!).to_not be(false)
-      end
-
-      it 'allows #admin_protected! methods' do
-        expect(subject.new.admin_protected!).to be(false)
-      end
-    end
-
-    describe 'with an end-user token' do
-      let(:token) { encode({ scope: 'end-user', email: 'user@example.com' }) }
-
-      it 'allows #token_protected! methods' do
-        expect(subject.new.token_protected!).to_not be(false)
-      end
-
-      it 'allows #enterprise_protected! methods for the scoped domain' do
-        expect(subject.new.enterprise_protected!('example.com')).to_not be(false)
-      end
-
-      it 'halts #enterprise_protected! methods for the wrong scoped domain' do
-        expect(subject.new.enterprise_protected!('foo.com')).to be(false)
-      end
-
-      it 'halts #internal_protected! methods' do
-        expect(subject.new.internal_protected!).to be(false)
-      end
-
-      it 'halts #admin_protected! methods' do
-        expect(subject.new.admin_protected!).to be(false)
-      end
-    end
-  end
-
   def encode(payload)
     JWT.encode(
       payload,

data/spec/models/identity_provider_spec.rb

@@ -24,19 +24,6 @@ describe Osso::Models::IdentityProvider do
     end
   end
 
-  describe '#acs_url_validator' do
-    it 'returns a regex escaped string' do
-      allow(subject).to receive(:acs_url).and_return(
-        'https://foo.com/auth/saml/callback'
-      )
-
-      expect(subject.acs_url_validator).to eq(
-        'https://foo\\.com/auth/saml/callback'
-      )
-    end
-  end
-
-
   describe '#saml_options' do
     it 'returns the required args' do
       expect(subject.saml_options).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osso
 version: !ruby/object:Gem::Version
-  version: 0.0.5.pre.theta
+  version: 0.0.5.pre.zeta
 platform: ruby
 authors:
 - Sam Bauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport