osso 0.0.5.pre.lambda → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f54c05ff3a991d49e4a47e036573d65f0bb2222371d73b10e665d02169d4a891
-  data.tar.gz: 24c4ea3adf0e1c599c315c48cb9700b7ae3d0e8b3c782c564c71692f5287e858
+  metadata.gz: ed87e1642f9d6b504f2b6642d50f694f5fb63d82c49deb9088aa0d6964f876f5
+  data.tar.gz: 20e3006e7367070fd0bc67d72ee7c55fe9c1948a31a58baad439561d41b698f3
 SHA512:
-  metadata.gz: abd1565c7e9cdea79782176a8fde22e71a734c78fba6bde102066a5913eec4e97207295c1f1fe5dd1acfb2bc91bdb8842a72ec0cbea15a90faf3187e216a366d
-  data.tar.gz: 43e39d4a5738b59187a4ff9dc583292450815c0ceb6d4bfae29becc7ee0de9d8ddc4d34cd4b2c1e3d577a19690fbda81c5d0dff6f2aaf71527e3b9f9d9578dd8
+  metadata.gz: b3301fe48bf416b152b174bdbfb6180084849f3f9fc2bd50d6382a31dece3dd7c556a47e54bd73b677ac69225ea645c98a9bfca9484425944c09f2b6f5ea8cbd
+  data.tar.gz: 7d40c2972213a5981abcf4d5213ff4f2518a4f5ea320bdad2b866e48ae64dfcc422d7c42679dc35429d4091c196f05e1ed84a45f8d14541e8032aeaa4caf336c

data/.buildkite/pipeline.yml

@@ -2,8 +2,10 @@ steps:
   - name: ":rspec:"
     commands: 
       - bundle install
-      - bundle exec rake db:drop
-      - bundle exec rake db:create
+      - dropdb ossorb-development --if-exists
+      - dropdb ossorb-test --if-exists
+      - createdb ossorb-development
+      - createdb ossorb-test
       - RACK_ENV=test bundle exec rake db:migrate
       - bundle exec rspec
     artifact_paths:
@@ -17,8 +19,8 @@ steps:
           prefix: '/var/lib/buildkite-agent/builds/enterprise-oss-bk-1/enterpriseoss/osso-rb/'
   
   - block: ":rubygems: Publish :red_button:"
-    branches: "main"
+    if: build.tag != null
   
   - name: "Push :rubygems:"
     commands: "./bin/publish"
-    branches: "main"
+    if: build.tag != null

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  labels:
+    - "dependencies"

data/.github/workflows/automerge.yml

@@ -0,0 +1,19 @@
+name: auto-merge
+
+on:
+  pull_request:
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ahmadnassri/action-dependabot-auto-merge@v2
+        with:
+          target: minor
+          github-token: ${{ secrets.TOKEN }}
+      - uses: hmarr/auto-approve-action@v2.0.0
+        if: github.actor == 'dependabot[bot]'
+        with:
+          github-token: "${{ secrets.TOKEN }}"
+      

data/.rubocop.yml

@@ -79,4 +79,7 @@ Style/Documentation:
   Enabled: false
   Exclude:
     - 'spec/**/*'
-    - 'db/**.*'
+    - 'db/**.*'
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/Gemfile

@@ -13,7 +13,7 @@ group :test do
   gem 'rspec', '~> 3.2'
   gem 'rubocop'
   gem 'simplecov', '= 0.17', require: false
-  gem 'webmock', '~> 3.0'
+  gem 'webmock', '~> 3.10'
 end
 
 gemspec

data/Gemfile.lock

@@ -1,16 +1,21 @@
 PATH
   remote: .
   specs:
-    osso (0.0.5.pre.lambda)
+    osso (0.0.6.alpha)
       activesupport (>= 6.0.3.2)
+      bcrypt (~> 3.1.13)
       graphql
       jwt
+      mail (~> 2.7.1)
       omniauth-multi-provider
       omniauth-saml
       rack (>= 2.1.4)
       rack-contrib
       rack-oauth2
       rake
+      rodauth (~> 2.6.0)
+      sequel (~> 5.37.0)
+      sequel-activerecord_connection (>= 0.3, < 2.0)
       sinatra
       sinatra-activerecord
       sinatra-contrib
@@ -18,12 +23,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activerecord (6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activesupport (6.0.3.3)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -32,11 +37,14 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.1.0)
+    after_commit_everywhere (0.1.5)
+      activerecord (>= 4.2)
     annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.1)
     attr_required (1.0.1)
+    bcrypt (3.1.16)
     bindata (2.4.8)
     coderay (1.1.3)
     concurrent-ruby (1.1.7)
@@ -49,9 +57,9 @@ GEM
     docile (1.3.2)
     factory_bot (6.1.0)
       activesupport (>= 5.0.0)
-    faker (2.14.0)
+    faker (2.15.0)
       i18n (>= 1.6, < 2)
-    graphql (1.11.5)
+    graphql (1.11.6)
     hashdiff (1.0.1)
     hashie (4.1.0)
     httpclient (2.8.3)
@@ -63,7 +71,10 @@ GEM
       aes_key_wrap
       bindata
     jwt (2.2.2)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
     method_source (1.0.0)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.2)
     multi_json (1.15.0)
@@ -76,11 +87,11 @@ GEM
       rack (>= 1.6.2, < 3)
     omniauth-multi-provider (0.2.1)
       omniauth
-    omniauth-saml (1.10.2)
+    omniauth-saml (1.10.3)
       omniauth (~> 1.3, >= 1.3.2)
       ruby-saml (~> 1.9)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.1)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     pg (1.2.3)
     pry (0.13.1)
@@ -102,36 +113,46 @@ GEM
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.8.0)
+    regexp_parser (1.8.2)
     rexml (3.2.4)
+    roda (3.38.0)
+      rack
+    rodauth (2.6.0)
+      roda (>= 2.6.0)
+      sequel (>= 4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
+    rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec-expectations (3.9.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.91.0)
+    rspec-support (3.9.4)
+    rubocop (1.4.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.4.0, < 1.0)
+      rubocop-ast (>= 1.1.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.2)
-      parser (>= 2.7.1.4)
+    rubocop-ast (1.2.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     ruby-saml (1.11.0)
       nokogiri (>= 1.5.10)
     ruby2_keywords (0.0.2)
+    sequel (5.37.0)
+    sequel-activerecord_connection (1.2.0)
+      activerecord (>= 4.2, < 7)
+      after_commit_everywhere (~> 0.1.5)
+      sequel (~> 5.16)
     simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -142,7 +163,7 @@ GEM
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    sinatra-activerecord (2.0.18)
+    sinatra-activerecord (2.0.21)
       activerecord (>= 4.1)
       sinatra (>= 1.0)
     sinatra-contrib (2.1.0)
@@ -153,14 +174,14 @@ GEM
       tilt (~> 2.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    webmock (3.9.1)
+    webmock (3.10.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
@@ -178,7 +199,7 @@ DEPENDENCIES
   rspec (~> 3.2)
   rubocop
   simplecov (= 0.17)
-  webmock (~> 3.0)
+  webmock (~> 3.10)
 
 BUNDLED WITH
    2.1.4

data/bin/annotate

@@ -1 +1,3 @@
-annotate --require osso.rb  --models --model-dir ./lib/osso/models/ --position bottom -k -i
+#!/bin/sh
+
+annotate --require osso.rb  --models --model-dir=./lib/osso/models/ --position bottom -k -i

data/db/schema.rb

@@ -10,9 +10,10 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_09_29_154117) do
+ActiveRecord::Schema.define(version: 2020_11_12_160120) do
 
   # These are extensions that must be enabled in order to support this database
+  enable_extension "citext"
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
 
@@ -23,10 +24,44 @@ ActiveRecord::Schema.define(version: 2020_09_29_154117) do
     t.datetime "updated_at", precision: 6, null: false
     t.uuid "user_id"
     t.uuid "oauth_client_id"
+    t.jsonb "requested", default: {}
     t.index ["oauth_client_id"], name: "index_access_tokens_on_oauth_client_id"
+    t.index ["token", "expires_at"], name: "index_access_tokens_on_token_and_expires_at", unique: true
     t.index ["user_id"], name: "index_access_tokens_on_user_id"
   end
 
+  create_table "account_password_hashes", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "password_hash", null: false
+  end
+
+  create_table "account_password_reset_keys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "key", null: false
+    t.datetime "deadline", null: false
+    t.datetime "email_last_sent", default: -> { "CURRENT_TIMESTAMP" }, null: false
+  end
+
+  create_table "account_remember_keys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "key", null: false
+    t.datetime "deadline", null: false
+  end
+
+  create_table "account_verification_keys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "key", null: false
+    t.datetime "requested_at", default: -> { "CURRENT_TIMESTAMP" }, null: false
+    t.datetime "email_last_sent", default: -> { "CURRENT_TIMESTAMP" }, null: false
+    t.uuid "account_id"
+    t.index ["account_id"], name: "index_account_verification_keys_on_account_id"
+  end
+
+  create_table "accounts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.citext "email", null: false
+    t.integer "status_id", default: 1, null: false
+    t.string "role", default: "admin", null: false
+    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
+
   create_table "app_configs", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "contact_email"
     t.string "logo_url"
@@ -43,6 +78,7 @@ ActiveRecord::Schema.define(version: 2020_09_29_154117) do
     t.datetime "updated_at", precision: 6, null: false
     t.uuid "user_id"
     t.uuid "oauth_client_id"
+    t.jsonb "requested", default: {}
     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"
@@ -53,13 +89,11 @@ ActiveRecord::Schema.define(version: 2020_09_29_154117) do
     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.integer "users_count", default: 0
     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
@@ -95,5 +129,8 @@ ActiveRecord::Schema.define(version: 2020_09_29_154117) do
     t.index ["enterprise_account_id"], name: "index_users_on_enterprise_account_id"
   end
 
+  add_foreign_key "account_password_hashes", "accounts", column: "id"
+  add_foreign_key "account_password_reset_keys", "accounts", column: "id"
+  add_foreign_key "account_remember_keys", "accounts", column: "id"
   add_foreign_key "users", "identity_providers"
 end

data/lib/osso.rb

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

data/lib/osso/db/migrate/20201023142158_add_rodauth_tables.rb

@@ -0,0 +1,47 @@
+require 'rodauth/migrations'
+
+class AddRodauthTables < ActiveRecord::Migration[6.0]
+  DB = Sequel.postgres(extensions: :activerecord_connection)
+
+  def change
+    enable_extension "citext"
+
+    create_table :accounts, id: :uuid do |t|
+      t.citext :email, null: false, index: { unique: true, where: "status_id IN (1, 2)" }
+      t.integer :status_id, null: false, default: 1
+      t.string :role, null: false, default: 'admin'
+      t.string :oauth_client_id, null: true, index: true
+    end
+
+    create_table :account_password_hashes, id: :uuid do |t|
+      t.foreign_key :accounts, column: :id
+      t.string :password_hash, null: false
+    end
+
+    Rodauth.create_database_authentication_functions(DB, table_name: "account_password_hashes")
+
+    # Used by the password reset feature
+    create_table :account_password_reset_keys, id: :uuid do |t|
+      t.foreign_key :accounts, column: :id
+      t.string :key, null: false
+      t.datetime :deadline, null: false
+      t.datetime :email_last_sent, null: false, default: -> { "CURRENT_TIMESTAMP" }
+    end
+
+    # Used by the account verification feature
+    create_table :account_verification_keys, id: :uuid do |t|
+      t.string :key, null: false
+      t.datetime :requested_at, null: false, default: -> { "CURRENT_TIMESTAMP" }
+      t.datetime :email_last_sent, null: false, default: -> { "CURRENT_TIMESTAMP" }
+    end
+
+    add_reference :account_verification_keys, :account, type: :uuid, index: true
+
+    # Used by the remember me feature
+    create_table :account_remember_keys, id: :uuid do |t|
+      t.foreign_key :accounts, column: :id
+      t.string :key, null: false
+      t.datetime :deadline, null: false
+    end
+  end
+end

data/lib/osso/db/migrate/20201105122026_add_token_index_to_access_tokens.rb

@@ -0,0 +1,5 @@
+class AddTokenIndexToAccessTokens < ActiveRecord::Migration[6.0]
+  def change
+    add_index :access_tokens, [:token, :expires_at], unique: true
+  end
+end

data/lib/osso/db/migrate/20201106154936_add_requested_to_authorization_codes_and_access_tokens.rb

@@ -0,0 +1,6 @@
+class AddRequestedToAuthorizationCodesAndAccessTokens < ActiveRecord::Migration[6.0]
+  def change
+    add_column :access_tokens, :requested, :jsonb, default: {}
+    add_column :authorization_codes, :requested, :jsonb, default: {}
+  end
+end

data/lib/osso/db/migrate/20201109160851_add_sso_issuer_to_identity_providers.rb

@@ -0,0 +1,12 @@
+class AddSsoIssuerToIdentityProviders < ActiveRecord::Migration[6.0]
+  def change
+    add_column :identity_providers, :sso_issuer, :string
+
+    Osso::Models::IdentityProvider.all.each do |idp|
+      idp.sso_issuer = idp.root_url + "/" + idp.domain
+      idp.save
+    end
+
+    change_column_null :identity_providers, :sso_issuer, false
+  end
+end