osso 0.0.3.20 → 0.0.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc22e6537d35ba1c6a42ba2c329aa4fdd3d311b07734bc40e708048599aec6b
-  data.tar.gz: 0bcad162c393cc2f37087ecdf68f22df760d78e669af60e4fdd23ece1fd4778c
+  metadata.gz: 5929e7b3d9c9151162c5fcbf9f4e5986482c11c6a0daf6437948a3653d9bee8e
+  data.tar.gz: edc5f42f4a657afa5131cf08d722d9b8e3eddf2763d79f3156d81184f7273c45
 SHA512:
-  metadata.gz: 5a0b1a2444ab27bcf9b47afe8bcfac939a3e574bda9c423ffb02b1d657d9c737291adac011a2a4b3d003676932d81b2c4c11931302eb92b367dd6b1839ddc58b
-  data.tar.gz: d3f1a44eb09376a2abd4dee264a2efcf8bd57cd28d24854d32e578fbb85baf0837014ae54fe4cd4c5586718c51804a5923635df6cb1a384fe7a153c4546d0051
+  metadata.gz: 4fe47c5b3f22256aed4f12780db5337303c1168b8e399fc32eaa68fabcb91b8373cf25578e5d96e0f6bc58709575f471f1a7ade871c48a20dfc485798f321630
+  data.tar.gz: d2aad38f2842dfc3b0dfccd65ff3de11f644481a5cdd7bbf469cc0c55f9ed85f55f4dc4b0c08fda2684fbd8a690ea9d5b10629368defa4825fc1e04a80621f3a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osso (0.0.3.20)
+    osso (0.0.3.25)
       activesupport (>= 6.0.3.2)
       graphql
       jwt

data/lib/osso/graphql/mutations/regenerate_oauth_credentials.rb

@@ -13,7 +13,7 @@ module Osso
 
         def resolve(id:)
           oauth_client = Osso::Models::OauthClient.find(id)
-          oauth_client.generate_secrets
+          oauth_client.regenerate_secrets!
 
           return response_data(oauth_client: oauth_client) if oauth_client.save
 

data/lib/osso/models/identity_provider.rb

@@ -12,10 +12,6 @@ module Osso
 
       def name
         service.titlecase
-        # raise(
-        #   NoMethodError,
-        #   '#name must be defined on each provider specific subclass',
-        # )
       end
 
       def saml_options
@@ -29,7 +25,7 @@ module Osso
 
       def assertion_consumer_service_url
         [
-          ENV.fetch('BASE_URL'),
+          root_url,
           'auth',
           'saml',
           id,
@@ -44,6 +40,12 @@ module Osso
 
         self.status = 'CONFIGURED' if sso_url && sso_cert
       end
+
+      def root_url
+        return "https://#{ENV['HEROKU_APP_NAME']}.herokuapp.com" if ENV['HEROKU_APP_NAME']
+
+        ENV.fetch('BASE_URL')
+      end
     end
   end
 end

data/lib/osso/models/oauth_client.rb

@@ -26,6 +26,11 @@ module Osso
         self.identifier ||= SecureRandom.hex(16)
         self.secret ||= SecureRandom.hex(32)
       end
+
+      def regenerate_secrets!
+        self.identifier = SecureRandom.hex(16)
+        self.secret = SecureRandom.hex(32)
+      end
     end
   end
 end

data/lib/osso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Osso
-  VERSION = '0.0.3.20'
+  VERSION = '0.0.3.25'
 end

data/spec/models/identity_provider_spec.rb

@@ -6,13 +6,21 @@ describe Osso::Models::IdentityProvider do
   subject { create(:okta_identity_provider) }
 
   describe '#assertion_consumer_service_url' do
-    it 'returns the expected URI' do
+    it 'returns the expected URI for BASE_URL' do
       ENV['BASE_URL'] = 'https://example.com'
 
       expect(subject.assertion_consumer_service_url).to eq(
         "https://example.com/auth/saml/#{subject.id}/callback",
       )
     end
+
+    it 'returns the expected URI for HEROKU_APP_NAME' do
+      ENV['HEROKU_APP_NAME'] = 'test'
+
+      expect(subject.assertion_consumer_service_url).to eq(
+        "https://test.herokuapp.com/auth/saml/#{subject.id}/callback",
+      )
+    end
   end
 
   describe '#saml_options' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osso
 version: !ruby/object:Gem::Version
-  version: 0.0.3.20
+  version: 0.0.3.25
 platform: ruby
 authors:
 - Sam Bauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport