osso 0.0.3.4 → 0.0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da5a91a5eda62f96a11772d72afc0e1477e586218233466d2dcd37a89e2aabf
-  data.tar.gz: 839e333e245142b6fc29738242293f205bae28a4e768e9f35b87d0572708f9f4
+  metadata.gz: 3f0c8535a6ba6dd39ada0f3ba0aa0617ff96bd880ef6985149c0ecbeca57bc1a
+  data.tar.gz: da6bec63d5e071b1c0520e42cd67c3971851445bfad8ec597f1b9d1aef0759d8
 SHA512:
-  metadata.gz: 8ede35265fed16afeb20d28608c8b74053ed5e5f11e6a393df87395f5d0ec30f7a58a84834a99bd6c8a16cbe21eaee5f22a4fdec4c0bbf3a7e5d49a760b53f85
-  data.tar.gz: 3c37e0256ee1758ce915c25ce3d7b83e070ef2cadba85c41649c13b3ede1fa0371eeb10757ce990e47a8669edc3b65424749cf62b5fa8d46f21a132285302e08
+  metadata.gz: 3e3938abd7b541d6e272cb1b1420e9f4dc75738edd763cc1c35e82db4b315852c125f268ad8ed36528373252c23bdea79b7ac865711abb1c52159cae709c47c5
+  data.tar.gz: fa63314128c1833ddd1136ea1cdacee8e8f4cbfb92a6eaffc0c8ae8dfc0ccb93b62effcac55e0cf916033a32cd1941e5ea915959f032ed6a983133711f4610e0

data/.buildkite/pipeline.yml

@@ -1,3 +1,8 @@
 steps:
   - name: ":rspec:"
-    command: "bundle install --path vendor/bundle --with development test && RACK_ENV=test bundle exec rake db:migrate && bundle exec rspec"
+    commands: 
+      - bundle install
+      - bundle exec rake db:drop
+      - bundle exec rake db:create
+      - RACK_ENV=test bundle exec rake db:migrate
+      - bundle exec rspec

data/.rubocop.yml

@@ -1,8 +1,7 @@
 AllCops:
   Exclude:
-    - client/**/*
     - db/**/*
-    - node_modules/**/*
+    - lib/osso/db/**/*
 
 # New rules must be explicitly opted into / out of
 Lint/RaiseException:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osso (0.0.3.4)
+    osso (0.0.3.9)
       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/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "osso"
+require 'bundler/setup'
+require 'osso'
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/config/database.yml

@@ -2,13 +2,13 @@ development:
   adapter: postgresql
   encoding: unicode
   pool: 5
-  database: osso
+  database: ossorb-development
   host: ''
   port: 5432
 test:
   adapter: postgresql
   encoding: unicode
   pool: 5
-  database: osso-test
+  database: ossorb-test
   host: ''
   port: 5432

data/db/schema.rb

@@ -1 +1,90 @@
-# frozen_string_literal: true
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
+#
+# It's strongly recommended that you check this file into your version control system.
+
+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"
+  enable_extension "plpgsql"
+
+  create_table "access_tokens", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "token"
+    t.datetime "expires_at"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.uuid "user_id"
+    t.uuid "oauth_client_id"
+    t.index ["oauth_client_id"], name: "index_access_tokens_on_oauth_client_id"
+    t.index ["user_id"], name: "index_access_tokens_on_user_id"
+  end
+
+  create_table "authorization_codes", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "token"
+    t.string "redirect_uri"
+    t.datetime "expires_at"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.uuid "user_id"
+    t.uuid "oauth_client_id"
+    t.index ["oauth_client_id"], name: "index_authorization_codes_on_oauth_client_id"
+    t.index ["token"], name: "index_authorization_codes_on_token", unique: true
+    t.index ["user_id"], name: "index_authorization_codes_on_user_id"
+  end
+
+  create_table "enterprise_accounts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "domain", null: false
+    t.uuid "external_uuid"
+    t.integer "external_int_id"
+    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
+
+# 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
+
+  create_table "redirect_uris", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    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
+
+  create_table "users", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "email", null: false
+    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 "users", "identity_providers"
+end

data/lib/osso.rb

@@ -4,6 +4,7 @@ module Osso
   require_relative 'osso/helpers/helpers'
   require_relative 'osso/lib/app_config'
   require_relative 'osso/lib/oauth2_token'
+  require_relative 'osso/lib/route_map'
   require_relative 'osso/models/models'
   require_relative 'osso/routes/routes'
   require_relative 'osso/graphql/schema'

data/lib/osso/db/migrate/20200328143305_create_identity_providers.rb

@@ -0,0 +1,12 @@
+class CreateIdentityProviders < ActiveRecord::Migration[6.0]
+  def change
+    create_table :identity_providers, id: :uuid do |t|
+      t.string  :service
+      t.string  :domain, null: false
+      t.string :idp_sso_target_url
+      t.text :idp_cert
+    end
+
+    add_index :identity_providers, :domain
+  end
+end

data/lib/osso/db/migrate/20200411184535_add_provider_id_to_users.rb

@@ -1,7 +1,7 @@
 class AddProviderIdToUsers < ActiveRecord::Migration[6.0]
   def change
-    add_column :users, :saml_provider_id, :uuid
+    add_column :users, :identity_provider_id, :uuid
 
-    add_foreign_key :users, :saml_providers
+    add_foreign_key :users, :identity_providers
   end
 end

data/lib/osso/db/migrate/20200411192645_create_enterprise_accounts.rb

@@ -9,7 +9,7 @@ class CreateEnterpriseAccounts < ActiveRecord::Migration[6.0]
 
     add_index :enterprise_accounts, :domain, unique: true
 
-    add_reference :saml_providers, :enterprise_account, type: :uuid, index: true    
+    add_reference :identity_providers, :enterprise_account, type: :uuid, index: true    
     add_reference :users, :enterprise_account, type: :uuid, index: true
   end
 end

data/lib/osso/db/migrate/20200502135008_add_oauth_client_id_to_enterprise_accounts_and_identity_providers.rb

@@ -0,0 +1,6 @@
+class AddOauthClientIdToEnterpriseAccountsAndIdentityProviders < ActiveRecord::Migration[6.0]
+  def change
+    add_reference :enterprise_accounts, :oauth_client, type: :uuid, index: true
+    add_reference :identity_providers, :oauth_client, type: :uuid, index: true
+  end
+end

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

@@ -0,0 +1,17 @@
+class AddIdentityProviderServiceEnum < ActiveRecord::Migration[6.0]
+  def change
+    def up
+      execute <<-SQL
+        CREATE TYPE identity_provider_service AS ENUM ('OKTA', 'AZURE');
+      SQL
+      change_column :identity_providers, :service, :identity_provider_service
+    end
+  
+    def down
+      chnage_column :identity_providers, :service, :text
+      execute <<-SQL
+        DROP TYPE identity_provider_service;
+      SQL
+    end
+  end
+end

data/lib/osso/db/migrate/20200715154211_rename_idp_fields_on_identity_provider_to_sso.rb

@@ -0,0 +1,6 @@
+class RenameIdpFieldsOnIdentityProviderToSso < ActiveRecord::Migration[6.0]
+  def change
+    rename_column :identity_providers, :idp_cert, :sso_cert
+    rename_column :identity_providers, :idp_sso_target_url, :sso_url
+  end
+end

data/lib/osso/db/migrate/20200715205801_add_name_to_enterprise_account.rb

@@ -0,0 +1,5 @@
+class AddNameToEnterpriseAccount < ActiveRecord::Migration[6.0]
+  def change
+    add_column :enterprise_accounts, :name, :string, null: false
+  end
+end

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,9 +6,12 @@ module Osso
   module GraphQL
     module Types
       class MutationType < BaseObject
-        field :configure_identity_provider, mutation: Mutations::ConfigureIdentityProvider
+        field :configure_identity_provider, mutation: Mutations::ConfigureIdentityProvider, null: true
         field :create_identity_provider, mutation: Mutations::CreateIdentityProvider
-        field :set_saml_provider, mutation: Mutations::SetSamlProvider
+        field :create_enterprise_account, mutation: Mutations::CreateEnterpriseAccount
+        field :create_oauth_client, mutation: Mutations::CreateOauthClient
+        field :delete_enterprise_account, mutation: Mutations::DeleteEnterpriseAccount
+        field :delete_oauth_client, mutation: Mutations::DeleteOauthClient
       end
     end
   end

data/lib/osso/graphql/mutations.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Osso
   module Mutations
   end
@@ -7,4 +8,7 @@ end
 require_relative 'mutations/base_mutation'
 require_relative 'mutations/configure_identity_provider'
 require_relative 'mutations/create_identity_provider'
-require_relative 'mutations/set_saml_provider'
+require_relative 'mutations/create_enterprise_account'
+require_relative 'mutations/create_oauth_client'
+require_relative 'mutations/delete_enterprise_account'
+require_relative 'mutations/delete_oauth_client'

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

@@ -4,20 +4,37 @@ module Osso
   module GraphQL
     module Mutations
       class BaseMutation < ::GraphQL::Schema::RelayClassicMutation
-        # This is used for generating payload types
         object_class Types::BaseObject
-        # # This is used for return fields on the mutation's payload
-        # field_class Types::BaseField
-        # # This is used for generating the `input: { ... }` object type
-        # input_object_class Types::BaseInputObject
+        input_object_class Types::BaseInputObject
 
-        def return_data(data)
+        def response_data(data)
           data.merge(errors: [])
         end
 
-        def return_error(error)
+        def response_error(error)
           error.merge(data: nil)
         end
+
+        def ready?(enterprise_account_id: nil, domain: nil, identity_provider_id: nil, **args)
+          return true if context[:scope] == :admin
+
+          domain ||= account_domain(enterprise_account_id) || provider_domain(identity_provider_id)
+          return true if domain == context[:scope]
+
+          raise ::GraphQL::ExecutionError, "This user lacks the scope to mutate records belonging to #{args[:domain]}"
+        end
+
+        def account_domain(id)
+          return false unless id
+
+          Osso::Models::EnterpriseAccount.find(id)&.domain
+        end
+
+        def provider_domain(id)
+          return false unless id
+
+          Osso::Models::IdentityProvider.find(id)&.domain
+        end
       end
     end
   end

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

@@ -6,23 +6,29 @@ module Osso
       class ConfigureIdentityProvider < BaseMutation
         null false
         argument :id, ID, required: true
-        argument :service, Types::IdentityProviderService, required: true
-        argument :sso_url, String, required: true
-        argument :sso_cert, String, required: true
+        argument :service, Types::IdentityProviderService, required: false
+        argument :sso_url, String, required: false
+        argument :sso_cert, String, required: false
 
-        field :identity_provider, Types::IdentityProvider, null: true
+        field :identity_provider, Types::IdentityProvider, null: false
         field :errors, [String], null: false
 
-        def resolve(id:, sso_url:, sso_cert:, service:)
-          provider = Osso::Models::SamlProvider.find(id)
-          provider.update(
-            idp_cert: sso_cert,
-            idp_sso_target_url: sso_url,
-          )
+        def resolve(id:, **args)
+          provider = Osso::Models::IdentityProvider.find(id)
 
-          return_data(identity_provider: provider)
-          # rescue StandardError => e
-          #   return_error(errors: e.full_message)
+          return response_data(identity_provider: provider) if provider.update(args)
+
+          response_error(errors: provder.errors.messages)
+        end
+
+        def ready?(id:, **_args)
+          return true if context[:scope] == :admin
+
+          domain = Osso::Models::IdentityProvider.find(id)&.domain
+
+          return true if domain == context[:scope]
+
+          raise ::GraphQL::ExecutionError, "This user lacks the scope to mutate records belonging to #{domain}"
         end
       end
     end