infinum_id 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54ff7ee267e4f9e1da3da96046a0eea0bf9e78997190ef664dffbf67c97e7d8d
-  data.tar.gz: 2c24ab2ccc749c10dfc86a07499b228c8415780f15f797f9504df5d1f2ba12bf
+  metadata.gz: 7890955304e9d46d659e4912ed2a0db17215059091d6841f48b182a966a52b7b
+  data.tar.gz: 8599516a3f14cfa1d9df62572842167884219ce3ac10f514757d271b66fe6b38
 SHA512:
-  metadata.gz: 0bbca07deacd0194746befd4746c93b409027f07c5d4c7e06c734cc23b5a43c6466fe06d653d9f581b372fb77f9445876c8ee45f2367a2f8d236d6e84bdce4ae
-  data.tar.gz: 879c2d2b3ff00844d92f8569bd230fb6892f6833926ca9203b553cee8fdbf8154387ac92e6aa40d36c5d3c9d3b643302c42f76f9792fa814d7c4093baa43ff2c
+  metadata.gz: 99287be6aafcbf0c0e600dbfb7bdd5fed5b37ca9eb1bb5b3f26b0ab60bb0c51dddc079f4366ab30780a1851f3d82837be702325b92ce129981de5a5d775b62c9
+  data.tar.gz: 6b0def3b8d25f851aa46b89c15a90723e9c334926e41c542489e50f7ddbb6be5dc8fee00dd06feebee18151acd87505ee0cdb6ea1ea1fa2227305b89688ea48e

data/CHANGES.md

@@ -0,0 +1,11 @@
+# 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.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    infinum_id (1.6.0)
+    infinum_id (2.0.0)
       blueprinter
       bundler
       devise
@@ -57,8 +57,8 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     arel (9.0.0)
-    bcrypt (3.1.13)
-    blueprinter (0.23.0)
+    bcrypt (3.1.16)
+    blueprinter (0.25.1)
     builder (3.2.3)
     byebug (10.0.2)
     coderay (1.1.2)
@@ -66,7 +66,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
-    devise (4.7.1)
+    devise (4.7.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -76,7 +76,7 @@ GEM
     docile (1.3.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dry-configurable (0.11.1)
+    dry-configurable (0.11.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
@@ -91,30 +91,30 @@ GEM
       railties (>= 4.2.0)
     faker (1.9.1)
       i18n (>= 0.7)
-    faraday (1.0.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
+    ffi (1.13.1)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashdiff (0.3.8)
-    hashie (3.6.0)
-    http (4.3.0)
+    hashie (4.1.0)
+    http (4.4.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
       http-parser (~> 1.2.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.2.0)
+    http-form_data (2.3.0)
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
     i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
-    jwt (2.2.1)
+    jwt (2.2.2)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -127,7 +127,7 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.3.1)
@@ -139,13 +139,13 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-infinum_id (1.1.0)
+    omniauth-infinum_id (1.2.1)
       omniauth-oauth2
-    omniauth-oauth2 (1.6.0)
-      oauth2 (~> 1.1)
+    omniauth-oauth2 (1.7.0)
+      oauth2 (~> 1.4)
       omniauth (~> 1.9)
     orm_adapter (0.5.0)
     pry (0.12.2)
@@ -157,7 +157,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
-    rack (2.0.6)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.2)
@@ -185,7 +185,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (10.5.0)
-    responders (3.0.0)
+    responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     rspec (3.8.0)
@@ -229,9 +229,9 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    warden (1.2.8)
-      rack (>= 2.0.6)
+    unf_ext (0.0.7.7)
+    warden (1.2.9)
+      rack (>= 2.0.9)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -260,4 +260,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -51,7 +51,7 @@ module InfinumId
   class ResourceBlueprint < Blueprinter::Base
     identifier :email
 
-    fields :first_name, :last_name
+    fields :first_name, :last_name, :employee
 
     field :slack_username
     field :avatar_url, as: :avatar_remote_url
@@ -80,7 +80,7 @@ InfinumId.configure do |config|
   config.service_name = 'Revisor'
   config.resource_name = 'User'
   config.send_invite_request = !Rails.env.test? # to disable in tests
-  config.resource_attributes = [:uid, :email, :first_name, :last_name, :deactivated_at, :time_zone, :avatar_url, :slack_username]
+  config.resource_attributes = [:uid, :email, :first_name, :last_name, :deactivated_at, :time_zone, :avatar_url, :slack_username, :employee]
 end
 ```
 
@@ -135,20 +135,22 @@ end
 ## Features
 
 <details>
-<summary><big><b>Webhooks</b></big></summary>
+<summary><big><b id="webhooks">Webhooks</b></big></summary>
 <hr />
-In engine there are two webhooks: UpdateResourceCallback & CreateResourceCallback.
+In engine there are two webhooks: `UpdateResourceCallback` & `CreateResourceCallback`.
 
 When user is created or updated on InfinumID these webhooks are called and then resource is created or updated accordingly.
 
-After resource is created or updated methods InfinumId::AfterResourceCreate/InfinumId::AfterResourceUpdate are called. So if resource can't be created before setting role, you can override those methods and set role that way.
+After resource is created or updated methods `InfinumId::AfterResourceUpsert` is called. So if resource can't be created before setting role, you can override this class and set role that way.
+
+`intent` is one of `InfinumId::AfterResourceIntent::CREATE` or `InfinumId::AfterResourceIntent::UPDATE.`
 
 ```ruby
 # app/services/infinum_id/after_resource_create.rb
 
 module InfinumId
-  class AfterResourceCreate
-    def self.call(person, params=nil)
+  class AfterResourceUpsert
+    def self.call(person, _params = nil, _intent = nil)
       person.update(employee: true)
     end
   end

data/app/blueprints/infinum_id/resource_blueprint.rb

@@ -2,7 +2,7 @@ module InfinumId
   class ResourceBlueprint < Blueprinter::Base
     identifier :email
 
-    fields :first_name, :last_name
+    fields :first_name, :last_name, :employee
 
     # field :slack_username
     # field :avatar_url, as: :avatar_remote_url

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

@@ -1,24 +1,14 @@
 module InfinumId
   module Api
     class WebhooksController < Api::BaseController
-      def update_resource_callback
-        return render_not_found unless resource
+      def upsert_resource_callback
+        intent, resource = upsert
 
-        resource.update(user_params)
-        InfinumId::AfterResourceUpdate.call(resource, params[:user])
+        InfinumId::AfterResourceUpsert.call(resource, params[:user], intent)
 
         render json: { resource_name.underscore => 'updated' }
       end
 
-      def create_resource_callback
-        return render_already_exists if resource
-
-        resource = resource_class.create(user_params.merge(provider: params[:provider]))
-        InfinumId::AfterResourceCreate.call(resource, params[:user])
-
-        render json: { resource_name.underscore => 'created' }
-      end
-
       private
 
       def user_params
@@ -26,17 +16,20 @@ module InfinumId
       end
 
       def resource
-        @resource ||= 
+        @resource ||=
           resource_class.find_by(uid: user_params[:uid], provider: params[:provider]) ||
           resource_class.find_by(email: user_params[:email])
       end
 
-      def render_not_found
-        render json: { resource_name.underscore => 'not found' }, status: :not_found
-      end
+      def upsert
+        if resource
+          resource.update(user_params)
+          [InfinumId::AfterResourceIntent::UPDATE, resource]
+        else
+          @resource = resource_class.create(user_params.merge(provider: params[:provider]))
 
-      def render_already_exists
-        render json: { resource_name.underscore => 'already exists' }, status: :unprocessable_entity
+          [InfinumId::AfterResourceIntent::CREATE, resource]
+        end
       end
     end
   end

data/app/services/infinum_id/after_resource_intent.rb

@@ -0,0 +1,6 @@
+module InfinumId
+  class AfterResourceIntent
+    CREATE = :create
+    UPDATE = :update
+  end
+end

data/app/services/infinum_id/after_resource_upsert.rb

@@ -0,0 +1,5 @@
+module InfinumId
+  class AfterResourceUpsert
+    def self.call(resource, params, intent); end
+  end
+end

data/app/services/infinum_id/requests/invite_sender.rb

@@ -39,7 +39,11 @@ module InfinumId
 
       def update_resource
         resource.update(user_params.merge(provider: 'infinum_id'))
-        InfinumId::AfterResourceUpdate.call(resource, params[:user])
+        InfinumId::AfterResourceUpsert.call(
+          resource,
+          params[:user],
+          InfinumId::AfterResourceIntent::UPDATE
+        )
       end
 
       def send_email

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

@@ -12,7 +12,11 @@ module InfinumId
 
       def call
         update_resource
-        InfinumId::AfterResourceUpdate.call(resource, @params)
+        InfinumId::AfterResourceUpsert.call(
+          resource,
+          @params,
+          InfinumId::AfterResourceIntent::UPDATE
+        )
       end
 
       private

data/config/routes.rb

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

data/lib/generators/templates/migration.rb

@@ -5,6 +5,7 @@ class CreateUsers < ActiveRecord::Migration<%= migration_version %>
 
       t.string :first_name
       t.string :last_name
+      t.boolean :employee
 
       t.string :slack_username
       t.string :time_zone

data/lib/generators/templates/user.rb

@@ -13,6 +13,7 @@ class User < ApplicationRecord
       first_name: first_name,
       last_name: last_name,
       slack_username: slack_username,
+      employee: employee,
       time_zone: time_zone
     }
   end

data/lib/infinum_id.rb

@@ -14,8 +14,9 @@ module InfinumId
   setting :infinum_id_send_email, false, reader: true
   setting :send_invite_request, true, reader: true
 
-  setting :resource_attributes, [:uid, :email, :first_name, :last_name, :deactivated_at],
-                                 reader: true
+  setting :resource_attributes,
+          [:uid, :email, :first_name, :last_name, :deactivated_at, :employee],
+          reader: true
 
   def self.resource_class
     resource_name.constantize

data/lib/infinum_id/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infinum_id
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Dajana Jeroncic
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -301,6 +301,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGES.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -317,8 +318,8 @@ files:
 - app/mailers/infinum_id/application_mailer.rb
 - app/mailers/infinum_id/mailer.rb
 - app/models/infinum_id/application_record.rb
-- app/services/infinum_id/after_resource_create.rb
-- app/services/infinum_id/after_resource_update.rb
+- app/services/infinum_id/after_resource_intent.rb
+- app/services/infinum_id/after_resource_upsert.rb
 - app/services/infinum_id/requests/invite_sender.rb
 - app/services/infinum_id/resources/finder.rb
 - app/services/infinum_id/resources/invite.rb
@@ -343,7 +344,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -358,9 +359,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.
 test_files: []

data/app/services/infinum_id/after_resource_create.rb

@@ -1,5 +0,0 @@
-module InfinumId
-  class AfterResourceCreate
-    def self.call(resource, params=nil); end
-  end
-end

data/app/services/infinum_id/after_resource_update.rb

@@ -1,5 +0,0 @@
-module InfinumId
-  class AfterResourceUpdate
-    def self.call(resource, params=nil); end
-  end
-end