osso 0.0.3.7 → 0.0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e43fcdb190c819ff0da0cb9ac9358152f42804f7fa116771d9dd458bf141c30
-  data.tar.gz: 65f6005798ec50a1ad4dd297c695aa08c80fb2ba8cc059eaa38cfb5f15a13dcc
+  metadata.gz: 3ad3a661abfa7e2251cf7244221ad6e28899c490b732e6c9098f5bf91c903c4e
+  data.tar.gz: 3a691f8537a801d2b7302ac3f34e5ea5b74aae9a60fea18470ac50ec5569ec96
 SHA512:
-  metadata.gz: 617a3e1e5a5b476c4758476f7708e12a752d8d448a46866e37352ee319dcd5c08f2d0726d81c4ec1054e5129073840d6d76aad24ef938a1ccaf475bd72cc6d7b
-  data.tar.gz: 77f11455be71add868a54d61683be3dc9a09231a92fdbf1abbb05c685732c6469eaeb9acbbd765ff0ff894960224bdcb736525687b234c002a46a1e4d0b2dba6
+  metadata.gz: 35d25337aff8ad4fd8b6d49d34e20226f61725c8a437da30f70cb393a9078b988a4d10847911d0da10ba34f4940488c059829448c006723a5bafc6187a8c5576
+  data.tar.gz: 8011819d4ac2c59f0b8fc37470cfd9b2357f9bfeda12e6e4ea1f07c691beba99c2d409b8a2356eb7917edd02c7ae7beaf72860fa70bd3bf31ea5fc4eb6aded79

data/.buildkite/pipeline.yml

@@ -1,6 +1,8 @@
 steps:
   - name: ":rspec:"
     commands: 
-        - "bundle install"
-        - "bundle exec rake db:test:prepare"
-        - "bundle exec rspec"
+      - bundle install
+      - bundle exec rake db:drop
+      - bundle exec rake db:create
+      - RACK_ENV=test bundle exec rake db:migrate
+      - bundle exec rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osso (0.0.3.7)
+    osso (0.0.3.12)
       activesupport (>= 6.0.3.2)
       graphql
       jwt
@@ -32,6 +32,9 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.0.1)
+    annotate (3.1.1)
+      activerecord (>= 3.2, < 7.0)
+      rake (>= 10.4, < 14.0)
     ast (2.4.1)
     attr_required (1.0.1)
     backports (3.18.1)
@@ -160,6 +163,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  annotate (~> 3.1)
   bundler (~> 2.1)
   database_cleaner-active_record
   factory_bot

data/bin/annotate

@@ -0,0 +1 @@
+annotate --require osso.rb  --models --model-dir ./lib/osso/models/ --position bottom -k -i

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_23_162228) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -47,64 +47,21 @@ ActiveRecord::Schema.define(version: 2020_07_15_205801) do
     t.string "external_id"
     t.uuid "oauth_client_id"
     t.string "name", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["domain"], name: "index_enterprise_accounts_on_domain", unique: true
     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
-
-  create_table "oauth_access_grants", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.uuid "resource_owner_id", null: false
-    t.uuid "application_id", 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", default: "", null: false
-    t.index ["application_id"], name: "index_oauth_access_grants_on_application_id"
-    t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true
-  end
-
-  create_table "oauth_access_tokens", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.uuid "resource_owner_id"
-    t.uuid "application_id"
-    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", default: "", null: false
-    t.index ["application_id"], name: "index_oauth_access_tokens_on_application_id"
-    t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true
-    t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true
-  end
-
-  create_table "oauth_applications", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.string "name", null: false
-    t.string "secret", null: false
-    t.text "redirect_uri", null: false
-    t.string "scopes", default: "", null: false
-    t.boolean "confidential", default: true, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-  end
+# Could not dump table "identity_providers" because of following StandardError
+#   Unknown type 'identity_provider_status' for column 'status'
 
   create_table "oauth_clients", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "name", null: false
     t.string "secret", null: false
     t.string "identifier", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["identifier"], name: "index_oauth_clients_on_identifier", unique: true
   end
 
@@ -112,6 +69,8 @@ ActiveRecord::Schema.define(version: 2020_07_15_205801) do
     t.string "uri", null: false
     t.boolean "primary", default: false, null: false
     t.uuid "oauth_client_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["oauth_client_id"], name: "index_redirect_uris_on_oauth_client_id"
     t.index ["uri", "primary"], name: "index_redirect_uris_on_uri_and_primary", unique: true
   end
@@ -121,13 +80,11 @@ ActiveRecord::Schema.define(version: 2020_07_15_205801) do
     t.string "idp_id", null: false
     t.uuid "identity_provider_id"
     t.uuid "enterprise_account_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["email", "idp_id"], name: "index_users_on_email_and_idp_id", unique: true
     t.index ["enterprise_account_id"], name: "index_users_on_enterprise_account_id"
   end
 
-  add_foreign_key "oauth_access_grants", "oauth_applications", column: "application_id"
-  add_foreign_key "oauth_access_grants", "users", column: "resource_owner_id"
-  add_foreign_key "oauth_access_tokens", "oauth_applications", column: "application_id"
-  add_foreign_key "oauth_access_tokens", "users", column: "resource_owner_id"
   add_foreign_key "users", "identity_providers"
 end

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/db/migrate/20200723153750_add_missing_timestamps.rb

@@ -0,0 +1,35 @@
+class AddMissingTimestamps < ActiveRecord::Migration[6.0]
+  def change
+    add_column :enterprise_accounts, :created_at, :timestamp
+    add_column :enterprise_accounts, :updated_at, :timestamp
+    update "UPDATE enterprise_accounts SET created_at = NOW(), updated_at = NOW()"    
+    change_column_null :enterprise_accounts, :created_at, false
+    change_column_null :enterprise_accounts, :updated_at, false
+
+
+    add_column :identity_providers, :created_at, :timestamp
+    add_column :identity_providers, :updated_at, :timestamp
+    update "UPDATE enterprise_accounts SET created_at = NOW(), updated_at = NOW()"    
+    change_column_null :enterprise_accounts, :created_at, false
+    change_column_null :enterprise_accounts, :updated_at, false
+
+    add_column :oauth_clients, :created_at, :timestamp
+    add_column :oauth_clients, :updated_at, :timestamp
+    update "UPDATE oauth_clients SET created_at = NOW(), updated_at = NOW()"    
+    change_column_null :oauth_clients, :created_at, false
+    change_column_null :oauth_clients, :updated_at, false
+
+    add_column :redirect_uris, :created_at, :timestamp
+    add_column :redirect_uris, :updated_at, :timestamp
+    update "UPDATE redirect_uris SET created_at = NOW(), updated_at = NOW()"    
+    change_column_null :redirect_uris, :created_at, false
+    change_column_null :redirect_uris, :updated_at, false
+
+    add_column :users, :created_at, :timestamp
+    add_column :users, :updated_at, :timestamp
+    update "UPDATE users SET created_at = NOW(), updated_at = NOW()"    
+    change_column_null :users, :created_at, false
+    change_column_null :users, :updated_at, false
+
+  end
+end

data/lib/osso/db/migrate/20200723162228_drop_unneeded_tables.rb

@@ -0,0 +1,9 @@
+class DropUnneededTables < ActiveRecord::Migration[6.0]
+  def change
+    drop_table(:oauth_grants, if_exists: true)
+    drop_table(:oauth_access_tokens, if_exists: true)
+    drop_table(:oauth_applications, if_exists: true)
+
+
+  end
+end

data/lib/osso/graphql/mutation.rb

@@ -6,10 +6,16 @@ module Osso
   module GraphQL
     module Types
       class MutationType < BaseObject
+        field :add_redirect_uris_to_oauth_client, mutation: Mutations::AddRedirectUrisToOauthClient, null: false
         field :configure_identity_provider, mutation: Mutations::ConfigureIdentityProvider, null: true
         field :create_identity_provider, mutation: Mutations::CreateIdentityProvider
         field :create_enterprise_account, mutation: Mutations::CreateEnterpriseAccount
-        field :set_identity_provider, mutation: Mutations::SetSamlProvider
+        field :create_oauth_client, mutation: Mutations::CreateOauthClient
+        field :delete_enterprise_account, mutation: Mutations::DeleteEnterpriseAccount
+        field :delete_oauth_client, mutation: Mutations::DeleteOauthClient
+        field :delete_redirect_uri, mutation: Mutations::DeleteRedirectUri
+        field :mark_redirect_uri_primary, mutation: Mutations::MarkRedirectUriPrimary
+        field :regenerate_oauth_credentials, mutation: Mutations::RegenerateOauthCredentials
       end
     end
   end

data/lib/osso/graphql/mutations.rb

@@ -6,7 +6,13 @@ module Osso
 end
 
 require_relative 'mutations/base_mutation'
+require_relative 'mutations/add_redirect_uris_to_oauth_client'
 require_relative 'mutations/configure_identity_provider'
 require_relative 'mutations/create_identity_provider'
 require_relative 'mutations/create_enterprise_account'
-require_relative 'mutations/set_identity_provider'
+require_relative 'mutations/create_oauth_client'
+require_relative 'mutations/delete_enterprise_account'
+require_relative 'mutations/delete_oauth_client'
+require_relative 'mutations/delete_redirect_uri'
+require_relative 'mutations/mark_redirect_uri_primary'
+require_relative 'mutations/regenerate_oauth_credentials'

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Osso
+  module GraphQL
+    module Mutations
+      class AddRedirectUrisToOauthClient < BaseMutation
+        null false
+
+        argument :oauth_client_id, ID, required: true
+        argument :uris, [String], required: true
+
+        field :oauth_client, Types::OauthClient, null: true
+        field :errors, [String], null: false
+
+        def resolve(oauth_client_id:, uris:)
+          oauth_client = Osso::Models::OauthClient.find(oauth_client_id)
+
+          uris.each do |uri|
+            oauth_client.redirect_uris.create(uri: uri)
+          end
+
+          unless oauth_client.primary_redirect_uri
+            oauth_client.reload.redirect_uris.first.update(primary: true)
+          end
+
+          response_data(oauth_client: oauth_client.reload)
+        rescue StandardError => e
+          response_error(errors: e.message)
+        end
+
+        def ready?(*)
+          return true if context[:scope] == :admin
+
+          raise ::GraphQL::ExecutionError, 'Only admin users may mutate OauthClients'
+        end
+      end
+    end
+  end
+end

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

@@ -21,7 +21,7 @@ module Osso
           response_error(errors: provder.errors.messages)
         end
 
-        def ready?(id:, **args)
+        def ready?(id:, **_args)
           return true if context[:scope] == :admin
 
           domain = Osso::Models::IdentityProvider.find(id)&.domain

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Osso
+  module GraphQL
+    module Mutations
+      class CreateOauthClient < BaseMutation
+        null false
+
+        argument :name, String, required: true
+
+        field :oauth_client, Types::OauthClient, null: false
+        field :errors, [String], null: false
+
+        def resolve(**args)
+          oauth_client = Osso::Models::OauthClient.new(args)
+
+          return response_data(oauth_client: oauth_client) if oauth_client.save
+
+          response_error(errors: oauth_client.errors.full_messages)
+        end
+
+        def ready?(*)
+          return true if context[:scope] == :admin
+
+          raise ::GraphQL::ExecutionError, 'Only admin users may mutate OauthClients'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Osso
+  module GraphQL
+    module Mutations
+      class DeleteEnterpriseAccount < BaseMutation
+        null false
+
+        argument :id, ID, required: true
+
+        field :enterprise_account, Types::EnterpriseAccount, null: true
+        field :errors, [String], null: false
+
+        def resolve(id:)
+          enterprise_account = Osso::Models::EnterpriseAccount.find(id)
+
+          return response_data(enterprise_account: nil) if enterprise_account.destroy
+
+          response_error(errors: enterprise_account.errors.full_messages)
+        end
+
+        def ready?(id:)
+          return true if context[:scope] == :admin
+
+          domain = account_domain(id)
+
+          return true if domain == context[:scope]
+
+          raise ::GraphQL::ExecutionError, "This user lacks the scope to mutate records belonging to #{domain}"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Osso
+  module GraphQL
+    module Mutations
+      class DeleteOauthClient < BaseMutation
+        null false
+
+        argument :id, ID, required: true
+
+        field :oauth_client, Types::OauthClient, null: true
+        field :errors, [String], null: false
+
+        def resolve(id:)
+          oauth_client = Osso::Models::OauthClient.find(id)
+
+          return response_data(oauth_client: nil) if oauth_client.destroy
+
+          response_error(errors: oauth_client.errors.full_messages)
+        end
+
+        def ready?(*)
+          return true if context[:scope] == :admin
+
+          raise ::GraphQL::ExecutionError, 'Only admin users may mutate OauthClients'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Osso
+  module GraphQL
+    module Mutations
+      class DeleteRedirectUri < BaseMutation
+        null false
+
+        argument :id, ID, required: true
+
+        field :oauth_client, Types::OauthClient, null: true
+        field :errors, [String], null: false
+
+        def resolve(id:)
+          redirect_uri = Osso::Models::RedirectUri.find(id)
+
+          oauth_client = redirect_uri.oauth_client
+
+          redirect_uri.destroy
+
+          if redirect_uri.primary
+            oauth_client.redirect_uris.first&.update(primary: true)
+          end
+
+          return response_data(oauth_client: oauth_client.reload) if redirect_uri.destroy
+
+          response_error(errors: redirect_uri.errors.full_messages)
+        end
+
+        def ready?(*)
+          return true if context[:scope] == :admin
+
+          raise ::GraphQL::ExecutionError, 'Only admin users may mutate OauthClients'
+        end
+      end
+    end
+  end
+end