osso 0.0.3.19 → 0.0.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 995be763d7567651350cc953d6d800a8bbd86e3de1eda57f7ab673869ffbb6dc
-  data.tar.gz: 01aa99f9fc68465df111624a22175ce2d5d110e94e2389d128a1c94cb0466494
+  metadata.gz: 5d48075518d12201e52ee12e25f7db5de43ef13e3fc04e8902ba27787aabbd4a
+  data.tar.gz: f511a13be8a898cf863e00966fc551b3d5a3f4bb5999f534ccb3bf0d1de7004e
 SHA512:
-  metadata.gz: e4f45a4c188da6bf0adce208bec4b32ad76850136bed6af4ca221f0f5ccf94c6547b19a8486b92b1e05c57f0224389b25b7f8efd5f0c3a9c260a4a745cb2687c
-  data.tar.gz: 7df17b8bd2726c59a828d4ceb6f04e2246eeb9ac651f12a6f7956f0c65a9b45e5dcc4c2266d55eec3816f64ae635f9fbf70a37cb57eb0f4efc94c1b49803499c
+  metadata.gz: ee6f360d04918e40109a8349a5f8230d79069cd8399731ab98be4cf11d52a1979ca6cdcb5d2f18d2b20f9af1e0bb8d7b1310d30a43ef8dbe9e7835d7e3663b4f
+  data.tar.gz: d23ba69bfa85ea6174df1789aadad1edc53fcaaffe93cd7f1773d923687bd492d65abe6aba0cd680813c66d84f8410d3b985d1d9453ac0bd2406d416c8e01a1a

data/Gemfile.lock

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

data/lib/osso/graphql/mutations.rb

@@ -15,4 +15,3 @@ require_relative 'mutations/delete_oauth_client'
 require_relative 'mutations/regenerate_oauth_credentials'
 require_relative 'mutations/set_redirect_uris'
 require_relative 'mutations/update_app_config'
-

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

@@ -10,14 +10,13 @@ module Osso
         argument :logo_url, String, required: false
         argument :contact_email, String, required: false
 
-
         field :app_config, Types::AppConfig, null: true
         field :errors, [String], null: false
 
         def resolve(**args)
           app_config = Osso::Models::AppConfig.find
           return response_data(app_config: app_config) if app_config.update(**args)
-          
+
           response_error(errors: e)
         end
 

data/lib/osso/graphql/resolvers/base_resolver.rb

@@ -15,6 +15,10 @@ module Osso
         def enterprise_authorized?(domain)
           context[:scope] == domain
         end
+
+        def context_domain
+          context[:email].split('@')[1]
+        end
       end
     end
   end

data/lib/osso/graphql/resolvers/enterprise_accounts.rb

@@ -7,7 +7,7 @@ module Osso
         type Types::EnterpriseAccount.connection_type, null: true
 
         def resolve(sort_column: nil, sort_order: nil)
-          return Array(Osso::Models::EnterpriseAccount.find_by(domain: context[:scope])) unless internal_authorized?
+          return Array(Osso::Models::EnterpriseAccount.find_by(domain: context_domain)) unless internal_authorized?
 
           accounts = Osso::Models::EnterpriseAccount
 

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

@@ -23,8 +23,8 @@ module Osso
       end
 
       def generate_secrets
-        self.identifier = SecureRandom.hex(16)
-        self.secret = SecureRandom.hex(32)
+        self.identifier ||= SecureRandom.hex(16)
+        self.secret ||= SecureRandom.hex(32)
       end
     end
   end

data/lib/osso/routes/admin.rb

@@ -13,6 +13,12 @@ module Osso
     end
 
     namespace '/admin' do
+      get '/login' do
+        token_protected!
+
+        erb :admin
+      end
+
       get '' do
         internal_protected!
 
@@ -20,7 +26,7 @@ module Osso
       end
 
       get '/enterprise' do
-        internal_protected!
+        token_protected!
 
         erb :admin
       end

data/lib/osso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Osso
-  VERSION = '0.0.3.19'
+  VERSION = '0.0.3.24'
 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.19
+  version: 0.0.3.24
 platform: ruby
 authors:
 - Sam Bauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport