osso 0.0.8 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e32f4645ca2763467c9558a6bf103cc5695de99b191e0e2a763e9d1be189e984
-  data.tar.gz: ca9c4d902553eee5132fc41c98a458441b20c6aa645bc8a33b48601c80e83392
+  metadata.gz: 59118bc5190af82cb537d0e2bd6446651382fe049554a9ec284c10d227a8e2bc
+  data.tar.gz: 6388744bb74e905ac5c742aba1062edf6f9d2b518bc7484dc017286632ceb317
 SHA512:
-  metadata.gz: 1c58936f2fa400fb36955405512522bb1fb25ca3c6d8c3436b157d7d915e4db662070b93e1f6f6c7cb523d6f90043426b7bb8b6320967e09aac3be536587c840
-  data.tar.gz: '0359da56b5e70537d496a770d6f4e90a1ec248bc786e48b7a7f13dd3860729cb5d1a76de43a9666a486ad4727f3c032c22bdf0a4c0257ee3416d5d41164295c3'
+  metadata.gz: a14dd7a884f56ce1a420ee85bd04690f933538f9c5a9cad5c89a925f955130e27d29b6007e9670e9252f445d8fc6d104f97a80394ada11827accce8334b2d449
+  data.tar.gz: b9168f801d70b7d78cb7c4495a69a702fe5ca05689eb093442396db46f6877c935f621907bfddea4ad5770b220c135bb4f0f3620ff0e2c2d8e790402eb268c46

data/.buildkite/pipeline.yml

@@ -12,6 +12,7 @@ steps:
       - coverage/*
   
   - name: ":codeclimate:"
+    soft_fail: true
     plugins:
       - jobready/codeclimate-test-reporter#v2.0:
           artifact: "coverage/.resultset.json"

data/.rubocop.yml

@@ -1,25 +1,10 @@
 AllCops:
+  NewCops: enable
   TargetRubyVersion: 2.6.0
   Exclude:
     - db/**/*
     - lib/osso/db/**/*
 
-# New rules must be explicitly opted into / out of
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Style/HashEachMethods:
-  Enabled: true
-Style/HashTransformKeys:
-  Enabled: true
-Style/HashTransformValues:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-Style/ExponentialNotation:
-  Enabled: true
-
 Style/TrailingCommaInArguments:
   Description: "Checks for trailing comma in argument lists."
   StyleGuide: "https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas"
@@ -50,6 +35,9 @@ Style/TrailingCommaInHashLiteral:
     - no_comma
   Enabled: true
 
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 

data/Gemfile

@@ -12,8 +12,8 @@ group :test do
   gem 'rack-test'
   gem 'rspec', '~> 3.10'
   gem 'rubocop'
-  gem 'simplecov', '= 0.17', require: false
-  gem 'webmock', '~> 3.10'
+  gem 'simplecov', '0.21.2', require: false
+  gem 'webmock', '~> 3.11'
 end
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osso (0.0.8)
+    osso (0.1.2)
       activesupport (>= 6.0.3.2)
       bcrypt (~> 3.1.13)
       graphql
@@ -9,26 +9,28 @@ PATH
       mail (~> 2.7.1)
       omniauth-multi-provider
       omniauth-saml
+      posthog-ruby
       rack (>= 2.1.4)
       rack-contrib
       rack-oauth2
+      rack-protection (~> 2.1.0)
       rake
-      rodauth (~> 2.6.0)
-      sequel (>= 5.37, < 5.40)
+      rodauth (~> 2.9)
+      sequel (~> 5.40)
       sequel-activerecord_connection (>= 0.3, < 2.0)
       sinatra
-      sinatra-activerecord
+      sinatra-activerecord (>= 2.0.22)
       sinatra-contrib
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.0)
-      activesupport (= 6.1.0)
-    activerecord (6.1.0)
-      activemodel (= 6.1.0)
-      activesupport (= 6.1.0)
-    activesupport (6.1.0)
+    activemodel (6.1.1)
+      activesupport (= 6.1.1)
+    activerecord (6.1.1)
+      activemodel (= 6.1.1)
+      activesupport (= 6.1.1)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -42,30 +44,30 @@ GEM
     annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
-    ast (2.4.1)
+    ast (2.4.2)
     attr_required (1.0.1)
     bcrypt (3.1.16)
     bindata (2.4.8)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    crack (0.4.4)
-    database_cleaner (1.8.5)
-    database_cleaner-active_record (1.8.0)
-      activerecord
-      database_cleaner (~> 1.8.0)
+    concurrent-ruby (1.1.8)
+    crack (0.4.5)
+      rexml
+    database_cleaner-active_record (2.0.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.0)
     diff-lcs (1.4.4)
-    docile (1.3.2)
+    docile (1.3.5)
     factory_bot (6.1.0)
       activesupport (>= 5.0.0)
     faker (2.15.1)
       i18n (>= 1.6, < 2)
-    graphql (1.11.6)
+    graphql (1.12.3)
     hashdiff (1.0.1)
     hashie (4.1.0)
     httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    json (2.3.1)
     json-jwt (1.13.0)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -75,29 +77,31 @@ GEM
       mini_mime (>= 0.1.1)
     method_source (1.0.0)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    minitest (5.14.3)
     multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    omniauth (1.9.1)
+    nokogiri (1.11.1-x86_64-darwin)
+      racc (~> 1.4)
+    omniauth (2.0.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
+      rack-protection
     omniauth-multi-provider (0.2.1)
       omniauth
-    omniauth-saml (1.10.3)
-      omniauth (~> 1.3, >= 1.3.2)
+    omniauth-saml (2.0.0)
+      omniauth (~> 2.0)
       ruby-saml (~> 1.9)
     parallel (1.20.1)
-    parser (2.7.2.0)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     pg (1.2.3)
+    posthog-ruby (1.1.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
+    racc (1.5.2)
     rack (2.2.3)
     rack-contrib (2.3.0)
       rack (~> 2.0)
@@ -112,58 +116,59 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (2.0.0)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
-    roda (3.38.0)
+    roda (3.40.0)
       rack
-    rodauth (2.6.0)
+    rodauth (2.9.0)
       roda (>= 2.6.0)
       sequel (>= 4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (1.6.1)
+    rspec-support (3.10.1)
+    rubocop (1.9.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     ruby-saml (1.11.0)
       nokogiri (>= 1.5.10)
-    ruby2_keywords (0.0.2)
-    sequel (5.39.0)
-    sequel-activerecord_connection (1.2.0)
+    ruby2_keywords (0.0.4)
+    sequel (5.40.0)
+    sequel-activerecord_connection (1.2.2)
       activerecord (>= 4.2, < 7)
       after_commit_everywhere (~> 0.1.5)
       sequel (~> 5.16)
-    simplecov (0.17.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    sinatra-activerecord (2.0.21)
+    sinatra-activerecord (2.0.22)
       activerecord (>= 4.1)
       sinatra (>= 1.0)
     sinatra-contrib (2.1.0)
@@ -173,10 +178,10 @@ GEM
       sinatra (= 2.1.0)
       tilt (~> 2.0)
     tilt (2.0.10)
-    tzinfo (2.0.3)
+    tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
-    webmock (3.10.0)
+    unicode-display_width (2.0.0)
+    webmock (3.11.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -197,8 +202,8 @@ DEPENDENCIES
   rack-test
   rspec (~> 3.10)
   rubocop
-  simplecov (= 0.17)
-  webmock (~> 3.10)
+  simplecov (= 0.21.2)
+  webmock (~> 3.11)
 
 BUNDLED WITH
    2.1.4

data/Rakefile

@@ -5,6 +5,7 @@
 # schema and migrations
 
 ENV['SESSION_SECRET'] ||= 'rake-secret'
+ENV['BASE_URL'] ||= 'https://example.com'
 
 require 'bundler/gem_tasks'
 require 'sinatra/activerecord/rake'

data/bin/console

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+ENV['SESSION_SECRET'] ||= 'irb-secret'
+ENV['BASE_URL'] ||= 'https://example.com'
+
 require 'bundler/setup'
 require 'osso'
 

data/db/schema.rb

@@ -2,15 +2,15 @@
 # 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
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/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_11_25_143501) do
+ActiveRecord::Schema.define(version: 2021_02_01_220556) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "citext"
@@ -57,7 +57,7 @@ ActiveRecord::Schema.define(version: 2020_11_25_143501) do
     t.citext "email", null: false
     t.integer "status_id", default: 1, null: false
     t.string "role", default: "admin", null: false
-    t.string "oauth_client_id"
+    t.uuid "oauth_client_id"
     t.index ["email"], name: "index_accounts_on_email", unique: true, where: "(status_id = ANY (ARRAY[1, 2]))"
     t.index ["oauth_client_id"], name: "index_accounts_on_oauth_client_id"
   end

data/lib/osso.rb

@@ -2,6 +2,7 @@
 
 module Osso
   require_relative 'osso/error/error'
+  require_relative 'osso/lib/analytics'
   require_relative 'osso/lib/app_config'
   require_relative 'osso/lib/oauth2_token'
   require_relative 'osso/lib/route_map'

data/lib/osso/db/migrate/20210201220556_add_generic_saml_to_provider_service_enum.rb

@@ -0,0 +1,28 @@
+class AddGenericSamlToProviderServiceEnum < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    execute <<-SQL
+      ALTER TYPE identity_provider_service ADD VALUE 'OTHER';
+    SQL
+  end
+  
+  def down
+    execute <<~SQL
+      CREATE TYPE identity_provider_service_new AS ENUM ('AZURE', 'OKTA', 'ONELOGIN', 'GOOGLE', 'PING', 'SALESFORCE');
+
+      -- Remove values that won't be compatible with new definition
+      DELETE FROM identity_providers WHERE service = 'OTHER';
+      
+      -- Convert to new type, casting via text representation
+      ALTER TABLE identity_providers 
+        ALTER COLUMN service TYPE identity_provider_service_new 
+          USING (service::text::identity_provider_service_new);
+      
+      -- and swap the types
+      DROP TYPE identity_provider_service;
+      
+      ALTER TYPE identity_provider_service_new RENAME TO identity_provider_service;
+    SQL
+  end
+end

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

@@ -15,7 +15,10 @@ module Osso
         def resolve(**args)
           provider = identity_provider(**args)
 
-          return response_data(identity_provider: provider) if provider.update(args)
+          if provider.update(args)
+            Osso::Analytics.capture(email: context[:email], event: self.class.name.demodulize, properties: args)
+            return response_data(identity_provider: provider)
+          end
 
           response_error(provider.errors)
         end

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

@@ -15,7 +15,10 @@ module Osso
         def resolve(**args)
           enterprise_account = Osso::Models::EnterpriseAccount.new(args)
 
-          return response_data(enterprise_account: enterprise_account) if enterprise_account.save
+          if enterprise_account.save
+            Osso::Analytics.capture(email: context[:email], event: self.class.name.demodulize, properties: args)
+            return response_data(enterprise_account: enterprise_account)
+          end
 
           response_error(enterprise_account.errors)
         end

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

@@ -13,7 +13,7 @@ module Osso
         field :identity_provider, Types::IdentityProvider, null: false
         field :errors, [String], null: false
 
-        def resolve(service: nil, enterprise_account_id:, oauth_client_id:)
+        def resolve(enterprise_account_id:, oauth_client_id:, service: nil)
           customer = enterprise_account(enterprise_account_id: enterprise_account_id)
 
           identity_provider = customer.identity_providers.build(
@@ -22,12 +22,17 @@ module Osso
             oauth_client_id: oauth_client_id,
           )
 
-          return response_data(identity_provider: identity_provider) if identity_provider.save
+          if identity_provider.save
+            Osso::Analytics.capture(email: context[:email], event: self.class.name.demodulize, properties: {
+              service: service, enterprise_account_id: enterprise_account_id, oauth_client_id: oauth_client_id
+            })
+            return response_data(identity_provider: identity_provider)
+          end
 
           response_error(identity_provider.errors)
         end
 
-        def domain(enterprise_account_id:, **args)
+        def domain(enterprise_account_id:, **_args)
           enterprise_account(enterprise_account_id: enterprise_account_id)&.domain
         end
 

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

@@ -14,7 +14,10 @@ module Osso
         def resolve(**args)
           oauth_client = Osso::Models::OauthClient.new(args)
 
-          return response_data(oauth_client: oauth_client) if oauth_client.save
+          if oauth_client.save
+            Osso::Analytics.capture(email: context[:email], event: self.class.name.demodulize, properties: args)
+            return response_data(oauth_client: oauth_client)
+          end
 
           response_error(oauth_client.errors)
         end