osso 0.0.3.8 → 0.0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73de8a2c5af9b7d62c94a5ed34c094455dc9b49b7345eb252308f7048e1164c0
-  data.tar.gz: c37913b5f3a857245d588ad03155ece0c5aca99c22c4c56069f50d442cb74db5
+  metadata.gz: 4f73668d92fba6a919487f77d474b948af28e79b33d60a1c1e2cec8104b0dcff
+  data.tar.gz: f736cdc806facf653635a037f8b9abb8202cda2e811b3b75a2dc52332b12ddab
 SHA512:
-  metadata.gz: 3047a07787aa764d105e77580846d60a943d4bd859baed5c861aebd8face6fb461342f3cccc01cc58e33d66310ba0d852185605fea09eb54d21c126aa149230c
-  data.tar.gz: f61b3e5aa31946a69512762601d08ecc021be26a56df0b182fc826d53e7be0836ea019c90ad09fc6b927dc3b37ee8efbc01e6145c0c4af4ff97198b9cd89828c
+  metadata.gz: 3ea4d47b42b9d2e0ac48833e37ed3375d41d60eefac31166ba81dd86ae3b38f059518beeae625324af095f9c4da4433c83aefd92cb7038cc5e924293e26956e4
+  data.tar.gz: 36969b24b9047a0ab3920e206590697083a314618765dbe7352a5563b4bd93aaca7b50524f442eb994052db594393500a4a157a527d483049f49765367495b39

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.8)
+    osso (0.0.3.13)
       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_22_230116) 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,6 +47,8 @@ ActiveRecord::Schema.define(version: 2020_07_22_230116) 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
@@ -54,48 +56,12 @@ ActiveRecord::Schema.define(version: 2020_07_22_230116) do
 # 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
-    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
-
   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
 
@@ -103,6 +69,8 @@ ActiveRecord::Schema.define(version: 2020_07_22_230116) 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
@@ -112,13 +80,11 @@ ActiveRecord::Schema.define(version: 2020_07_22_230116) 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/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 :set_redirect_uris, mutation: Mutations::SetRedirectUris
+        field :regenerate_oauth_credentials, mutation: Mutations::RegenerateOauthCredentials
       end
     end
   end

data/lib/osso/graphql/mutations.rb

@@ -9,4 +9,8 @@ require_relative 'mutations/base_mutation'
 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/regenerate_oauth_credentials'
+require_relative 'mutations/set_redirect_uris'

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/regenerate_oauth_credentials.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Osso
+  module GraphQL
+    module Mutations
+      class RegenerateOauthCredentials < BaseMutation
+        null false
+
+        argument :id, ID, required: true
+
+        field :oauth_client, Types::OauthClient, null: false
+        field :errors, [String], null: false
+
+        def resolve(id:)
+          oauth_client = Osso::Models::OauthClient.find(id)
+          oauth_client.generate_secrets
+
+          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/set_redirect_uris.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Osso
+  module GraphQL
+    module Mutations
+      class SetRedirectUris < BaseMutation
+        null false
+
+        argument :id, ID, required: true
+        argument :redirect_uris, [Types::RedirectUrisInput], required: true
+
+        field :oauth_client, Types::OauthClient, null: true
+        field :errors, [String], null: false
+
+        def resolve(id:, redirect_uris:)
+          oauth_client = Osso::Models::OauthClient.find(id)
+
+          update_existing(oauth_client, redirect_uris)
+          create_new(oauth_client, redirect_uris)
+
+          response_data(oauth_client: oauth_client.reload)
+        rescue StandardError => e
+          response_error(errors: e)
+        end
+
+        def ready?(*)
+          return true if context[:scope] == :admin
+
+          raise ::GraphQL::ExecutionError, 'Only admin users may mutate OauthClients'
+        end
+
+        def update_existing(oauth_client, redirect_uris)
+          oauth_client.redirect_uris.each do |redirect|
+            updating_index = redirect_uris.index{ |incoming| incoming[:id] == redirect.id }
+
+            if updating_index
+              updating = redirect_uris.delete_at(updating_index)
+              redirect.update(updating.to_h)
+              next
+            end
+
+            redirect.destroy
+          end
+        end
+
+        def create_new(oauth_client, redirect_uris)
+          redirect_uris.map do |uri|
+            oauth_client.redirect_uris.create(uri.to_h.without(:id))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/osso/graphql/query.rb

@@ -4,13 +4,17 @@ module Osso
   module GraphQL
     module Types
       class QueryType < ::GraphQL::Schema::Object
-        field :enterprise_accounts, null: true, resolver: Resolvers::EnterpriseAccounts
-        field :oauth_clients, null: true, resolver: Resolvers::OAuthClients
+        field :enterprise_accounts, null: true, resolver: Resolvers::EnterpriseAccounts do
+          argument :sort_column, String, required: false
+          argument :sort_order, String, required: false
+        end
 
         field :enterprise_account, null: true, resolver: Resolvers::EnterpriseAccount do
           argument :domain, String, required: true
         end
 
+        field :oauth_clients, null: true, resolver: Resolvers::OAuthClients
+
         field(
           :identity_provider,
           Types::IdentityProvider,
@@ -19,6 +23,15 @@ module Osso
         ) do
           argument :id, ID, required: true
         end
+
+        field(
+          :oauth_client,
+          Types::OauthClient,
+          null: true,
+          resolve: ->(_obj, args, _context) { Osso::Models::OauthClient.find(args[:id]) },
+        ) do
+          argument :id, ID, required: true
+        end
       end
     end
   end