osso 0.0.3.6 → 0.0.3.11

data/spec/graphql/mutations/create_oauth_client_spec.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Osso::GraphQL::Schema do
+  describe 'CreateOauthClient' do
+    let(:variables) do
+      {
+        input: {
+          name: Faker::Company.name,
+        },
+      }
+    end
+
+    let(:mutation) do
+      <<~GRAPHQL
+         mutation CreateOauthClient($input: CreateOauthClientInput!) {
+          createOauthClient(input: $input) {
+            oauthClient {
+              id
+              name
+              clientId
+              clientSecret
+            }
+          }
+        }
+      GRAPHQL
+    end
+
+    subject do
+      described_class.execute(
+        mutation,
+        variables: variables,
+        context: { scope: current_scope },
+      )
+    end
+
+    describe 'for an admin user' do
+      let(:current_scope) { :admin }
+      it 'creates an OauthClient' do
+        expect { subject }.to change { Osso::Models::OauthClient.count }.by(1)
+        expect(subject.dig('data', 'createOauthClient', 'oauthClient', 'clientId')).
+          to_not be_nil
+      end
+    end
+
+    describe 'for an email scoped user' do
+      let(:current_scope) { 'foo.com' }
+
+      it 'does not create an OauthClient Account' do
+        expect { subject }.to_not(change { Osso::Models::OauthClient.count })
+      end
+    end
+  end
+end

data/spec/graphql/mutations/delete_enterprise_account_spec.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Osso::GraphQL::Schema do
+  describe 'DeleteEnterpriseAccount' do
+    let(:domain) { Faker::Internet.domain_name }
+    let!(:enterprise_account) { create(:enterprise_account, domain: domain) }
+    let(:variables) do
+      {
+        input: {
+          id: enterprise_account.id,
+        },
+      }
+    end
+
+    let(:mutation) do
+      <<~GRAPHQL
+         mutation DeleteEnterpriseAccount($input: DeleteEnterpriseAccountInput!) {
+          deleteEnterpriseAccount(input: $input) {
+            enterpriseAccount {
+              id
+            }
+          }
+        }
+      GRAPHQL
+    end
+
+    subject do
+      described_class.execute(
+        mutation,
+        variables: variables,
+        context: { scope: current_scope },
+      )
+    end
+
+    describe 'for an admin user' do
+      let(:current_scope) { :admin }
+      it 'deletes an Enterprise Account' do
+        expect { subject }.to change { Osso::Models::EnterpriseAccount.count }.by(-1)
+        expect(subject.dig('data', 'createEnterpriseAccount', 'enterpriseAccount')).
+          to be_nil
+      end
+    end
+
+    describe 'for an email scoped user' do
+      let(:current_scope) { domain }
+
+      it 'deletes the Enterprise Account' do
+        expect { subject }.to change { Osso::Models::EnterpriseAccount.count }.by(-1)
+        expect(subject.dig('data', 'createEnterpriseAccount', 'enterpriseAccount')).
+          to be_nil
+      end
+    end
+    describe 'for the wrong email scoped user' do
+      let(:current_scope) { 'foo.com' }
+
+      it 'does not delete the Enterprise Account' do
+        expect { subject }.to_not(change { Osso::Models::EnterpriseAccount.count })
+      end
+    end
+  end
+end

data/spec/graphql/mutations/delete_oauth_client_spec.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Osso::GraphQL::Schema do
+  describe 'DeleteOauthClient' do
+    let!(:oauth_client) { create(:oauth_client) }
+    let(:variables) do
+      {
+        input: {
+          id: oauth_client.id,
+        },
+      }
+    end
+
+    let(:mutation) do
+      <<~GRAPHQL
+         mutation DeleteOauthClient($input: DeleteOauthClientInput!) {
+          deleteOauthClient(input: $input) {
+            oauthClient {
+              id
+            }
+          }
+        }
+      GRAPHQL
+    end
+
+    subject do
+      described_class.execute(
+        mutation,
+        variables: variables,
+        context: { scope: current_scope },
+      )
+    end
+
+    describe 'for an admin user' do
+      let(:current_scope) { :admin }
+      it 'deletes the OauthClient' do
+        expect { subject }.to change { Osso::Models::OauthClient.count }.by(-1)
+      end
+    end
+
+    describe 'for an email scoped user' do
+      let(:current_scope) { 'foo.com' }
+
+      it 'does not create an OauthClient Account' do
+        expect { subject }.to_not(change { Osso::Models::OauthClient.count })
+      end
+    end
+  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

@@ -7,37 +7,51 @@ describe Osso::GraphQL::Schema do
     describe 'for an admin user' do
       let(:current_scope) { :admin }
 
-      it 'returns Enterprise Accounts' do
-        create_list(:enterprise_account, 2)
+      it 'returns paginated Enterprise Accounts' do
+        %w[A B C].map do |name|
+          create(:enterprise_account, name: name)
+        end
 
         query = <<~GRAPHQL
-          query EnterpriseAccounts {
-            enterpriseAccounts {
-              domain
-              id
-              identityProviders {
-                id
-                service
-                domain
-                acsUrl
-                ssoCert
-                ssoUrl
-                configured
+          query EnterpriseAccounts($first: Int, $sortColumn: String, $sortOrder: String) {
+            enterpriseAccounts(first: $first, sortColumn: $sortColumn, sortOrder: $sortOrder) {
+              pageInfo {
+                hasNextPage
+                endCursor
+              }
+              totalCount
+              edges {
+                node {
+                  domain
+                  id
+                  identityProviders {
+                    id
+                    service
+                    domain
+                    acsUrl
+                    ssoCert
+                    ssoUrl
+                    status
+                  }
+                  name
+                  status
+                }
               }
-              name
-              status
             }
           }
         GRAPHQL
 
         response = described_class.execute(
           query,
-          variables: nil,
+          variables: { first: 2, sortOrder: 'descending', sortColumn: 'name' },
           context: { scope: current_scope },
         )
 
         expect(response['errors']).to be_nil
-        expect(response.dig('data', 'enterpriseAccounts').count).to eq(2)
+        expect(response.dig('data', 'enterpriseAccounts', 'edges').count).to eq(2)
+        expect(response.dig('data', 'enterpriseAccounts', 'edges', 0, 'node', 'name')).to eq('C')
+        expect(response.dig('data', 'enterpriseAccounts', 'totalCount')).to eq(3)
+        expect(response.dig('data', 'enterpriseAccounts', 'pageInfo', 'hasNextPage')).to eq(true)
       end
     end
   end

data/spec/graphql/query/identity_provider_spec.rb

@@ -5,6 +5,7 @@ require 'spec_helper'
 describe Osso::GraphQL::Schema do
   describe 'Identity Provider' do
     let(:id) { Faker::Internet.uuid }
+    let(:domain) { Faker::Internet.domain_name }
     let(:variables) { { id: id } }
     let(:query) do
       <<~GRAPHQL
@@ -16,7 +17,7 @@ describe Osso::GraphQL::Schema do
             acsUrl
             ssoCert
             ssoUrl
-            configured
+            status
           }
         }
       GRAPHQL
@@ -24,7 +25,7 @@ describe Osso::GraphQL::Schema do
 
     before do
       create(:identity_provider)
-      create(:identity_provider, id: id)
+      create(:identity_provider, id: id, domain: domain)
     end
 
     subject do
@@ -43,18 +44,20 @@ describe Osso::GraphQL::Schema do
       end
     end
 
-    xdescribe 'for an email scoped user' do
+    describe 'for an email scoped user' do
       let(:current_scope) { domain }
+
       it 'returns Enterprise Account for domain' do
         expect(subject['errors']).to be_nil
-        expect(subject.dig('data', 'enterpriseAccount', 'domain')).to eq(domain)
+        expect(subject.dig('data', 'identityProvider', 'domain')).to eq(domain)
       end
     end
 
-    xdescribe 'for the wrong email scoped user' do
+    describe 'for the wrong email scoped user' do
       let(:current_scope) { 'bar.com' }
+
       it 'returns Enterprise Account for domain' do
-        expect(subject['errors']).to be_nil
+        expect(subject['errors']).to_not be_empty
         expect(subject.dig('data', 'enterpriseAccount')).to be_nil
       end
     end

data/spec/graphql/query/{oauth_clients_account_spec.rb → oauth_clients_spec.rb}

@@ -10,6 +10,8 @@ describe Osso::GraphQL::Schema do
           oauthClients {
             name
             id
+            clientSecret
+            clientId
           }
         }
       GRAPHQL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osso
 version: !ruby/object:Gem::Version
-  version: 0.0.3.6
+  version: 0.0.3.11
 platform: ruby
 authors:
 - Sam Bauch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: annotate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -210,6 +224,7 @@ description: This gem includes the main functionality for Osso apps,
 email:
 - sbauch@gmail.com
 executables:
+- annotate
 - console
 - setup
 extensions: []
@@ -229,6 +244,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/annotate
 - bin/console
 - bin/setup
 - config/database.yml
@@ -238,7 +254,6 @@ files:
 - lib/osso/Rakefile
 - lib/osso/db/migrate/20190909230109_enable_uuid.rb
 - lib/osso/db/migrate/20200328135750_create_users.rb
-- lib/osso/db/migrate/20200328143303_create_oauth_tables.rb
 - lib/osso/db/migrate/20200328143305_create_identity_providers.rb
 - lib/osso/db/migrate/20200411184535_add_provider_id_to_users.rb
 - lib/osso/db/migrate/20200411192645_create_enterprise_accounts.rb
@@ -250,6 +265,9 @@ 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/db/migrate/20200723153750_add_missing_timestamps.rb
+- lib/osso/db/migrate/20200723162228_drop_unneeded_tables.rb
 - lib/osso/graphql/.DS_Store
 - lib/osso/graphql/mutation.rb
 - lib/osso/graphql/mutations.rb
@@ -257,7 +275,9 @@ files:
 - lib/osso/graphql/mutations/configure_identity_provider.rb
 - lib/osso/graphql/mutations/create_enterprise_account.rb
 - lib/osso/graphql/mutations/create_identity_provider.rb
-- lib/osso/graphql/mutations/set_identity_provider.rb
+- lib/osso/graphql/mutations/create_oauth_client.rb
+- lib/osso/graphql/mutations/delete_enterprise_account.rb
+- lib/osso/graphql/mutations/delete_oauth_client.rb
 - lib/osso/graphql/query.rb
 - lib/osso/graphql/resolvers.rb
 - lib/osso/graphql/resolvers/enterprise_account.rb
@@ -265,12 +285,14 @@ files:
 - lib/osso/graphql/resolvers/oauth_clients.rb
 - lib/osso/graphql/schema.rb
 - lib/osso/graphql/types.rb
+- lib/osso/graphql/types/base_connection.rb
 - lib/osso/graphql/types/base_enum.rb
 - lib/osso/graphql/types/base_input_object.rb
 - lib/osso/graphql/types/base_object.rb
 - 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
@@ -285,9 +307,6 @@ files:
 - lib/osso/models/models.rb
 - lib/osso/models/oauth_client.rb
 - lib/osso/models/redirect_uri.rb
-- lib/osso/models/saml_provider.rb
-- lib/osso/models/saml_providers/azure_saml_provider.rb
-- lib/osso/models/saml_providers/okta_saml_provider.rb
 - lib/osso/models/user.rb
 - lib/osso/rake.rb
 - lib/osso/routes/admin.rb
@@ -308,10 +327,13 @@ files:
 - spec/graphql/mutations/configure_identity_provider_spec.rb
 - spec/graphql/mutations/create_enterprise_account_spec.rb
 - spec/graphql/mutations/create_identity_provider_spec.rb
+- spec/graphql/mutations/create_oauth_client_spec.rb
+- spec/graphql/mutations/delete_enterprise_account_spec.rb
+- spec/graphql/mutations/delete_oauth_client_spec.rb
 - spec/graphql/query/enterprise_account_spec.rb
 - spec/graphql/query/enterprise_accounts_spec.rb
 - spec/graphql/query/identity_provider_spec.rb
-- spec/graphql/query/oauth_clients_account_spec.rb
+- spec/graphql/query/oauth_clients_spec.rb
 - spec/models/azure_saml_provider_spec.rb
 - spec/models/identity_provider_spec.rb
 - spec/models/okta_saml_provider_spec.rb

data/lib/osso/db/migrate/20200328143303_create_oauth_tables.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-class CreateOauthTables < ActiveRecord::Migration[6.0]
-  def change
-    create_table :oauth_applications, id: :uuid do |t|
-      t.string  :name,    null: false
-      t.string  :secret,  null: false
-      t.text    :redirect_uri, null: false
-      t.string  :scopes,       null: false, default: ''
-      t.boolean :confidential, null: false, default: true
-      t.timestamps             null: false
-    end
-
-    create_table :oauth_access_grants, id: :uuid do |t|
-      t.uuid :resource_owner_id, null: false
-      t.references :application, type: :uuid, null: false
-      t.string   :token,             null: false
-      t.integer  :expires_in,        null: false
-      t.text     :redirect_uri,      null: false
-      t.datetime :created_at,        null: false
-      t.datetime :revoked_at
-      t.string   :scopes, null: false, default: ''
-    end
-
-    add_index :oauth_access_grants, :token, unique: true
-    add_foreign_key(
-      :oauth_access_grants,
-      :oauth_applications,
-      column: :application_id
-    )
-
-    create_table :oauth_access_tokens, id: :uuid do |t|
-      t.uuid :resource_owner_id
-      t.references :application, type: :uuid
-      t.string :token, null: false
-
-      t.string   :refresh_token
-      t.integer  :expires_in
-      t.datetime :revoked_at
-      t.datetime :created_at, null: false
-      t.string   :scopes
-
-      t.string   :previous_refresh_token, null: false, default: ''
-    end
-
-    add_index :oauth_access_tokens, :token, unique: true
-    add_index :oauth_access_tokens, :refresh_token, unique: true
-    add_foreign_key(
-      :oauth_access_tokens,
-      :oauth_applications,
-      column: :application_id
-    )
-
-    add_foreign_key :oauth_access_grants, :users, column: :resource_owner_id
-    add_foreign_key :oauth_access_tokens, :users, column: :resource_owner_id
-  end
-end