infinum_id 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7890955304e9d46d659e4912ed2a0db17215059091d6841f48b182a966a52b7b
-  data.tar.gz: 8599516a3f14cfa1d9df62572842167884219ce3ac10f514757d271b66fe6b38
+  metadata.gz: 67137fa0c4e6919f124afc28ddebd3b01f91ee27f25620fe99fe22cc38addfc9
+  data.tar.gz: e5288ff536d9ff6cc3af37c9078e7ea069413751dff418d8348be826a6d4bcff
 SHA512:
-  metadata.gz: 99287be6aafcbf0c0e600dbfb7bdd5fed5b37ca9eb1bb5b3f26b0ab60bb0c51dddc079f4366ab30780a1851f3d82837be702325b92ce129981de5a5d775b62c9
-  data.tar.gz: 6b0def3b8d25f851aa46b89c15a90723e9c334926e41c542489e50f7ddbb6be5dc8fee00dd06feebee18151acd87505ee0cdb6ea1ea1fa2227305b89688ea48e
+  metadata.gz: 8a5d194290db76dfbe9f1d9caffe2b509d7c064b1a1de9bfb7f12a583aa2666f45f82b99e825ff304bae472015f7740e38bab10a30b5461fa4a6e4c9cea30c43
+  data.tar.gz: e5d62e234ff27943d88499cb68421b81b091aeacce9d487e4b9ce5084a8a43687894e35e0b553f4892d202cbe6bcc79a8e9c540e08e035f2b1851f8fd481637d

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+
+## [v2.1.0](https://github.com/infinum/rails-infinum-id-engine/tree/v2.1.0) (2021-05-26)
+[Full Changelog](https://github.com/infinum/rails-infinum-id-engine/compare/v2.0.1...v2.1.0)
+
+### Enhancements
+
+- Added endpoint for updating existing users: `InfinumId::Api::WebhooksController#update_resource_callback` [\#15](https://github.com/infinum/rails-infinum-id-engine/pull/15)
+
+
+## [v2.0.1](https://github.com/infinum/rails-infinum-id-engine/tree/v2.0.1) (2020-10-01)
+[Full Changelog](https://github.com/infinum/rails-infinum-id-engine/compare/v2.0.0...v2.0.1)
+
+### Bugfixes
+
+- Fix missing provider
+
+
+## [v2.0.0](https://github.com/infinum/rails-infinum-id-engine/tree/v2.0.0) (2020-09-18)
+[Full Changelog](https://github.com/infinum/rails-infinum-id-engine/compare/v1.6.0...v2.0.0)
+
+### Breaking changes / Deprecations
+* [BREAKING] Removed `InfinumId::AfterResourceCreate` and `InfinumId::AfterResourceUpdate` classes.
+* [BREAKING] Added `InfinumId::AfterResourceUpsert` and `InfinumId::AfterResourceIntent` classes. see [Webhooks](README.md#webhooks) for more info
+* [BREAKING] Removed `/webhooks#update_resource_callback` and `/webhooks#create_resource_callback` routes.
+* [BREAKING] Added `/webhook#upsert_resource_callback` route.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    infinum_id (2.0.0)
+    infinum_id (2.1.0)
       blueprinter
       bundler
       devise
@@ -13,60 +13,77 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailbox (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      mail (>= 2.7.1)
+    actionmailer (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
+    actionpack (6.1.3.2)
+      actionview (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.3.2)
+      activesupport (= 6.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.3.2)
+      activesupport (= 6.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
-      marcel (~> 0.3.1)
-    activesupport (5.2.2)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activerecord (6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activestorage (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      marcel (~> 1.0.0)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    arel (9.0.0)
     bcrypt (3.1.16)
-    blueprinter (0.25.1)
-    builder (3.2.3)
+    blueprinter (0.25.3)
+    builder (3.2.4)
     byebug (10.0.2)
     coderay (1.1.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.8)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.4)
-    devise (4.7.2)
+    crass (1.0.6)
+    devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -76,14 +93,12 @@ GEM
     docile (1.3.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dry-configurable (0.11.6)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
-    dry-core (0.4.9)
+      dry-core (~> 0.5, >= 0.5.0)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    erubi (1.8.0)
+    erubi (1.10.0)
     factory_bot (5.0.0)
       activesupport (>= 4.2.0)
     factory_bot_rails (5.0.0)
@@ -91,9 +106,20 @@ GEM
       railties (>= 4.2.0)
     faker (1.9.1)
       i18n (>= 0.7)
-    faraday (1.0.1)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.13.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    ffi (1.15.1)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -109,44 +135,44 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    http-parser (1.2.1)
+    http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
-    i18n (1.5.3)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
-    jwt (2.2.2)
-    loofah (2.2.3)
+    jwt (2.2.3)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
     method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    mini_mime (1.0.3)
+    mini_portile2 (2.5.1)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nio4r (2.3.1)
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
+    nio4r (2.5.7)
+    nokogiri (1.11.5)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.9.1)
+    omniauth (2.0.4)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
+      rack-protection
     omniauth-infinum_id (1.2.1)
       omniauth-oauth2
-    omniauth-oauth2 (1.7.0)
+    omniauth-oauth2 (1.7.1)
       oauth2 (~> 1.4)
-      omniauth (~> 1.9)
+      omniauth (>= 1.9, < 3)
     orm_adapter (0.5.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -157,33 +183,38 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
+    racc (1.5.2)
     rack (2.2.3)
+    rack-protection (2.1.0)
+      rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
-      bundler (>= 1.3.0)
-      railties (= 5.2.2)
+    rails (6.1.3.2)
+      actioncable (= 6.1.3.2)
+      actionmailbox (= 6.1.3.2)
+      actionmailer (= 6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actiontext (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      bundler (>= 1.15.0)
+      railties (= 6.1.3.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (~> 1.0)
     rake (10.5.0)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -209,24 +240,24 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    ruby2_keywords (0.0.4)
     safe_yaml (1.0.4)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (3.7.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
@@ -236,9 +267,10 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.4)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/app/controllers/infinum_id/api/webhooks_controller.rb

@@ -9,10 +9,22 @@ module InfinumId
         render json: { resource_name.underscore => 'updated' }
       end
 
+      def update_resource_callback
+        return head :not_found if resource.blank?
+
+        intent, resource = update
+
+        InfinumId::AfterResourceUpsert.call(resource, params[:user], intent)
+
+        render json: { resource_name.underscore => 'updated' }
+      end
+
       private
 
       def user_params
-        params.require(:user).permit(InfinumId.resource_attributes)
+        params.require(:user)
+              .permit(InfinumId.resource_attributes)
+              .merge(provider: params[:provider])
       end
 
       def resource
@@ -21,12 +33,17 @@ module InfinumId
           resource_class.find_by(email: user_params[:email])
       end
 
+      def update
+        resource.update(user_params)
+        [InfinumId::AfterResourceIntent::UPDATE, resource]
+      end
+
       def upsert
         if resource
           resource.update(user_params)
           [InfinumId::AfterResourceIntent::UPDATE, resource]
         else
-          @resource = resource_class.create(user_params.merge(provider: params[:provider]))
+          @resource = resource_class.create(user_params)
 
           [InfinumId::AfterResourceIntent::CREATE, resource]
         end

data/app/services/infinum_id/resources/updater.rb

@@ -2,7 +2,7 @@ module InfinumId
   module Resources
     class Updater
       def initialize(params, resource)
-        @params = params.deep_symbolize_keys
+        @params = params.to_h.deep_symbolize_keys
         @resource = resource
       end
 

data/config/routes.rb

@@ -9,6 +9,7 @@ Rails.application.routes.draw do
     namespace :api do
       scope '/webhooks', controller: :webhooks do
         post :upsert_resource_callback
+        post :update_resource_callback
       end
     end
   end

data/lib/infinum_id/version.rb

@@ -1,3 +1,3 @@
 module InfinumId
-  VERSION = '2.0.0'
+  VERSION = '2.2.0'
 end

data/lib/infinum_id.rb

@@ -10,12 +10,12 @@ module InfinumId
   extend Dry::Configurable
 
   setting :service_name, reader: true
-  setting :resource_name, 'User', reader: true
-  setting :infinum_id_send_email, false, reader: true
-  setting :send_invite_request, true, reader: true
+  setting :resource_name, default: 'User', reader: true
+  setting :infinum_id_send_email, default: false, reader: true
+  setting :send_invite_request, default: true, reader: true
 
   setting :resource_attributes,
-          [:uid, :email, :first_name, :last_name, :deactivated_at, :employee],
+          default: [:uid, :email, :first_name, :last_name, :deactivated_at, :employee],
           reader: true
 
   def self.resource_class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infinum_id
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Dajana Jeroncic
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -301,7 +301,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
-- CHANGES.md
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.

data/CHANGES.md

@@ -1,11 +0,0 @@
-# Changelog
-
-## Version 2.0.0
-
-Released of September 18, 2020
-
-Changes:
-* [BREAKING] Removed `InfinumId::AfterResourceCreate` and `InfinumId::AfterResourceUpdate` classes.
-* [BREAKING] Added `InfinumId::AfterResourceUpsert` and `InfinumId::AfterResourceIntent` classes. see [Webhooks](README.md#webhooks) for more info
-* [BREAKING] Removed `/webhooks#update_resource_callback` and `/webhooks#create_resource_callback` routes.
-* [BREAKING] Added `/webhook#upsert_resource_callback` route.