osso 0.0.3.4 → 0.0.3.9

data/spec/routes/oauth_spec.rb

@@ -35,7 +35,7 @@ describe Osso::Oauth do
             redirect_uri: client.redirect_uri_values.sample,
           )
 
-          provider_id = enterprise.saml_providers.first.id
+          provider_id = enterprise.identity_providers.first.id
 
           expect(last_response).to be_redirect
           follow_redirect!

data/spec/spec_helper.rb

@@ -11,18 +11,17 @@ require 'webmock/rspec'
 
 ENV['RACK_ENV'] = 'test'
 ENV['SESSION_SECRET'] = 'supersecret'
+ENV['BASE_URL'] = 'https://example.com'
 
 require File.expand_path '../lib/osso.rb', __dir__
 
+require File.expand_path 'support/spec_app', __dir__
+
 module RSpecMixin
   include Rack::Test::Methods
 
   def app
-    Rack::URLMap.new(
-      '/admin' => Osso::Admin,
-      '/auth' => Osso::Auth,
-      '/oauth' => Osso::Oauth,
-    )
+    SpecApp
   end
 
   def mock_saml_omniauth(email: 'user@enterprise.com', id: SecureRandom.uuid)

data/spec/support/spec_app.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class SpecApp < Sinatra::Base
+  include Osso::RouteMap
+
+  get '/health' do
+    'ok'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osso
 version: !ruby/object:Gem::Version
-  version: 0.0.3.4
+  version: 0.0.3.9
 platform: ruby
 authors:
 - Sam Bauch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-07-24 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,27 +254,30 @@ 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/20200411144528_create_saml_providers.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
 - lib/osso/db/migrate/20200413132407_add_oauth_clients.rb
 - lib/osso/db/migrate/20200413142511_create_authorization_codes.rb
-- lib/osso/db/migrate/20200413153029_add_oauth_client_reference_to_saml_providers.rb
 - lib/osso/db/migrate/20200413163451_create_access_tokens.rb
-- lib/osso/db/migrate/20200501203026_drop_null_constraints_from_saml_provider.rb
-- lib/osso/db/migrate/20200501204047_drop_acs_url.rb
 - lib/osso/db/migrate/20200502120616_create_redirect_uris_and_drop_from_oauth_clients.rb
-- lib/osso/db/migrate/20200502135008_add_oauth_client_id_to_enterprise_account.rb
-- lib/osso/db/migrate/20200601131227_drop_null_constraint_from_saml_providers_provider.rb
-- lib/osso/db/schema.rb
+- lib/osso/db/migrate/20200502135008_add_oauth_client_id_to_enterprise_accounts_and_identity_providers.rb
+- 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
 - lib/osso/graphql/mutations/base_mutation.rb
 - 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_saml_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
@@ -267,25 +286,26 @@ files:
 - lib/osso/graphql/schema.rb
 - lib/osso/graphql/types.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
 - lib/osso/helpers/helpers.rb
 - lib/osso/lib/app_config.rb
 - lib/osso/lib/oauth2_token.rb
+- lib/osso/lib/route_map.rb
 - lib/osso/models/access_token.rb
 - lib/osso/models/authorization_code.rb
 - lib/osso/models/enterprise_account.rb
+- lib/osso/models/identity_provider.rb
 - 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
@@ -299,18 +319,29 @@ files:
 - osso-rb.gemspec
 - spec/factories/authorization_code.rb
 - spec/factories/enterprise_account.rb
+- spec/factories/identity_providers.rb
 - spec/factories/oauth_client.rb
 - spec/factories/redirect_uri.rb
-- spec/factories/saml_providers.rb
 - spec/factories/user.rb
+- 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_spec.rb
 - spec/models/azure_saml_provider_spec.rb
+- spec/models/identity_provider_spec.rb
 - spec/models/okta_saml_provider_spec.rb
-- spec/models/saml_provider_spec.rb
 - spec/routes/admin_spec.rb
 - spec/routes/app_spec.rb
 - spec/routes/auth_spec.rb
 - spec/routes/oauth_spec.rb
 - spec/spec_helper.rb
+- spec/support/spec_app.rb
 - spec/support/views/admin.erb
 homepage: https://github.com/enterprise-oss/osso-rb
 licenses:

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

data/lib/osso/db/migrate/20200411144528_create_saml_providers.rb

@@ -1,13 +0,0 @@
-class CreateSamlProviders < ActiveRecord::Migration[6.0]
-  def change
-    create_table :saml_providers, id: :uuid do |t|
-      t.string  :provider,  null: false
-      t.string  :domain, null: false
-      t.string :idp_sso_target_url, null: false
-      t.text :idp_cert, null: false
-      t.string :assertion_consumer_service_url
-    end
-
-    add_index :saml_providers, [:domain, :provider], unique: true
-  end
-end

data/lib/osso/db/migrate/20200413153029_add_oauth_client_reference_to_saml_providers.rb

@@ -1,5 +0,0 @@
-class AddOauthClientReferenceToSamlProviders < ActiveRecord::Migration[6.0]
-  def change
-    add_reference :saml_providers, :oauth_client, type: :uuid, index: true
-  end
-end

data/lib/osso/db/migrate/20200501203026_drop_null_constraints_from_saml_provider.rb

@@ -1,7 +0,0 @@
-class DropNullConstraintsFromSamlProvider < ActiveRecord::Migration[6.0]
-  def change
-    change_column :saml_providers, :idp_sso_target_url, :string, null: true
-    change_column :saml_providers, :idp_cert, :text, null: true
-    change_column :saml_providers, :assertion_consumer_service_url, :string, null: false
-  end
-end

data/lib/osso/db/migrate/20200501204047_drop_acs_url.rb

@@ -1,5 +0,0 @@
-class DropAcsUrl < ActiveRecord::Migration[6.0]
-  def change
-    remove_column :saml_providers, :assertion_consumer_service_url
-  end
-end

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

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

data/lib/osso/db/migrate/20200601131227_drop_null_constraint_from_saml_providers_provider.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class DropNullConstraintFromSamlProvidersProvider < ActiveRecord::Migration[6.0]
-  def change
-    change_column :saml_providers, :provider, :string, null: true
-  end
-end

data/lib/osso/db/schema.rb

@@ -1,132 +0,0 @@
-# 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_05_02_135008) 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.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 "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.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.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 "saml_providers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.string "provider", null: false
-    t.string "domain", null: false
-    t.string "idp_sso_target_url"
-    t.text "idp_cert"
-    t.uuid "enterprise_account_id"
-    t.uuid "oauth_client_id"
-    t.index ["domain", "provider"], name: "index_saml_providers_on_domain_and_provider", unique: true
-    t.index ["enterprise_account_id"], name: "index_saml_providers_on_enterprise_account_id"
-    t.index ["oauth_client_id"], name: "index_saml_providers_on_oauth_client_id"
-  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 "saml_provider_id"
-    t.uuid "enterprise_account_id"
-    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", "saml_providers"
-end

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

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Osso
-  module GraphQL
-    module Mutations
-      class SetSamlProvider < BaseMutation
-        null false
-
-        argument :provider, Types::IdentityProviderService, required: true
-        argument :id, ID, required: true
-
-        field :identity_provider, Types::IdentityProvider, null: false
-        field :errors, [String], null: false
-
-        def resolve(provider:, id:)
-          saml_provider = Osso::Models::SamlProvider.find(id)
-          saml_provider.provider = provider
-          saml_provider.save!
-          {
-            saml_provider: saml_provider,
-            errors: [],
-          }
-        end
-      end
-    end
-  end
-end