osso 0.0.3.7 → 0.0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e43fcdb190c819ff0da0cb9ac9358152f42804f7fa116771d9dd458bf141c30
-  data.tar.gz: 65f6005798ec50a1ad4dd297c695aa08c80fb2ba8cc059eaa38cfb5f15a13dcc
+  metadata.gz: 73de8a2c5af9b7d62c94a5ed34c094455dc9b49b7345eb252308f7048e1164c0
+  data.tar.gz: c37913b5f3a857245d588ad03155ece0c5aca99c22c4c56069f50d442cb74db5
 SHA512:
-  metadata.gz: 617a3e1e5a5b476c4758476f7708e12a752d8d448a46866e37352ee319dcd5c08f2d0726d81c4ec1054e5129073840d6d76aad24ef938a1ccaf475bd72cc6d7b
-  data.tar.gz: 77f11455be71add868a54d61683be3dc9a09231a92fdbf1abbb05c685732c6469eaeb9acbbd765ff0ff894960224bdcb736525687b234c002a46a1e4d0b2dba6
+  metadata.gz: 3047a07787aa764d105e77580846d60a943d4bd859baed5c861aebd8face6fb461342f3cccc01cc58e33d66310ba0d852185605fea09eb54d21c126aa149230c
+  data.tar.gz: f61b3e5aa31946a69512762601d08ecc021be26a56df0b182fc826d53e7be0836ea019c90ad09fc6b927dc3b37ee8efbc01e6145c0c4af4ff97198b9cd89828c

data/Gemfile.lock

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

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_07_15_205801) do
+ActiveRecord::Schema.define(version: 2020_07_22_230116) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -51,17 +51,8 @@ ActiveRecord::Schema.define(version: 2020_07_15_205801) do
     t.index ["oauth_client_id"], name: "index_enterprise_accounts_on_oauth_client_id"
   end
 
-  create_table "identity_providers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.string "service"
-    t.string "domain", null: false
-    t.string "sso_url"
-    t.text "sso_cert"
-    t.uuid "enterprise_account_id"
-    t.uuid "oauth_client_id"
-    t.index ["domain"], name: "index_identity_providers_on_domain"
-    t.index ["enterprise_account_id"], name: "index_identity_providers_on_enterprise_account_id"
-    t.index ["oauth_client_id"], name: "index_identity_providers_on_oauth_client_id"
-  end
+# Could not dump table "identity_providers" because of following StandardError
+#   Unknown type 'identity_provider_status' for column 'status'
 
   create_table "oauth_access_grants", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "resource_owner_id", null: false

data/lib/osso/db/migrate/20200714223226_add_identity_provider_service_enum.rb

@@ -4,7 +4,7 @@ class AddIdentityProviderServiceEnum < ActiveRecord::Migration[6.0]
       execute <<-SQL
         CREATE TYPE identity_provider_service AS ENUM ('OKTA', 'AZURE');
       SQL
-      chnage_column :identity_providers, :service, :identity_provider_service
+      change_column :identity_providers, :service, :identity_provider_service
     end
   
     def down

data/lib/osso/db/migrate/20200722230116_add_identity_provider_status_enum_and_use_on_identity_providers.rb

@@ -0,0 +1,15 @@
+class AddIdentityProviderStatusEnumAndUseOnIdentityProviders < ActiveRecord::Migration[6.0]
+  def up
+    execute <<~SQL
+      CREATE TYPE identity_provider_status AS ENUM ('PENDING', 'CONFIGURED', 'ACTIVE', 'ERROR');
+    SQL
+    add_column :identity_providers, :status, :identity_provider_status, default: 'PENDING'
+  end
+
+  def down
+    remove_column :identity_providers, :status
+    execute <<~SQL
+      DROP TYPE identity_provider_status;
+    SQL
+  end
+end

data/lib/osso/graphql/types.rb

@@ -9,6 +9,7 @@ require_relative 'types/base_object'
 require_relative 'types/base_enum'
 require_relative 'types/base_input_object'
 require_relative 'types/identity_provider_service'
+require_relative 'types/identity_provider_status'
 require_relative 'types/identity_provider'
 require_relative 'types/enterprise_account'
 require_relative 'types/oauth_client'

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

@@ -17,13 +17,9 @@ module Osso
         field :acs_url, String, null: false
         field :sso_url, String, null: true
         field :sso_cert, String, null: true
-        field :configured, Boolean, null: false
+        field :status, Types::IdentityProviderStatus, null: false
         field :documentation_pdf_url, String, null: true
 
-        def configured
-          !!(@object.sso_url && @object.sso_cert)
-        end
-
         def documentation_pdf_url
           ENV['BASE_URL'] + '/identity_provider/documentation/' + @object.id
         end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Osso
+  module GraphQL
+    module Types
+      class IdentityProviderStatus < BaseEnum
+        value('Pending', value: 'PENDING')
+        value('Configured', value: 'CONFIGURED')
+        value('Active', value: 'ACTIVE')
+        value('Error', value: 'ERROR')
+      end
+    end
+  end
+end

data/lib/osso/models/identity_provider.rb

@@ -8,6 +8,8 @@ module Osso
       belongs_to :enterprise_account
       belongs_to :oauth_client
       has_many :users
+      before_save :set_status
+
 
       def name
         service.titlecase
@@ -43,6 +45,12 @@ module Osso
       end
 
       alias acs_url assertion_consumer_service_url
+
+      def set_status
+        return if status != 'PENDING'
+
+        self.status = 'CONFIGURED' if sso_url && sso_cert
+      end
     end
   end
 end

data/lib/osso/version.rb

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

data/spec/graphql/mutations/configure_identity_provider_spec.rb

@@ -23,7 +23,7 @@ describe Osso::GraphQL::Schema do
             identityProvider {
               id
               domain
-              configured
+              status
               enterpriseAccountId
               service
               acsUrl
@@ -46,8 +46,8 @@ describe Osso::GraphQL::Schema do
     describe 'for an admin user' do
       let(:current_scope) { :admin }
       it 'configures an identity provider' do
-        expect(subject.dig('data', 'configureIdentityProvider', 'identityProvider', 'configured')).
-          to be true
+        expect(subject.dig('data', 'configureIdentityProvider', 'identityProvider', 'status')).
+          to eq('configured')
       end
     end
 

data/spec/graphql/query/enterprise_account_spec.rb

@@ -19,7 +19,7 @@ describe Osso::GraphQL::Schema do
                 acsUrl
                 ssoCert
                 ssoUrl
-                configured
+                status
               }
               name
               status

data/spec/graphql/query/enterprise_accounts_spec.rb

@@ -22,7 +22,7 @@ describe Osso::GraphQL::Schema do
                 acsUrl
                 ssoCert
                 ssoUrl
-                configured
+                status
               }
               name
               status

data/spec/graphql/query/identity_provider_spec.rb

@@ -17,7 +17,7 @@ describe Osso::GraphQL::Schema do
             acsUrl
             ssoCert
             ssoUrl
-            configured
+            status
           }
         }
       GRAPHQL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osso
 version: !ruby/object:Gem::Version
-  version: 0.0.3.7
+  version: 0.0.3.8
 platform: ruby
 authors:
 - Sam Bauch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -250,6 +250,7 @@ files:
 - lib/osso/db/migrate/20200714223226_add_identity_provider_service_enum.rb
 - lib/osso/db/migrate/20200715154211_rename_idp_fields_on_identity_provider_to_sso.rb
 - lib/osso/db/migrate/20200715205801_add_name_to_enterprise_account.rb
+- lib/osso/db/migrate/20200722230116_add_identity_provider_status_enum_and_use_on_identity_providers.rb
 - lib/osso/graphql/.DS_Store
 - lib/osso/graphql/mutation.rb
 - lib/osso/graphql/mutations.rb
@@ -271,6 +272,7 @@ files:
 - lib/osso/graphql/types/enterprise_account.rb
 - lib/osso/graphql/types/identity_provider.rb
 - lib/osso/graphql/types/identity_provider_service.rb
+- lib/osso/graphql/types/identity_provider_status.rb
 - lib/osso/graphql/types/oauth_client.rb
 - lib/osso/graphql/types/user.rb
 - lib/osso/helpers/auth.rb