infinum_id 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94991c5e07d98bc97b0e6e186543f2b8bd85e7aae2815fe4fa4c07d54d5e7d51
-  data.tar.gz: 5ab48ab777bc530957c2e2a5024f5f610737461d8a0730c4097c7cb874d9b6d7
+  metadata.gz: 5e62591afc2dcf87b83746e0cfbfa6ce4e1490f252e4f120dcd46bc44bbacc2c
+  data.tar.gz: 6bd93953e12d36d8c1bc068286b7a772ceb380d2a8d4f89f693ef7e85605a12e
 SHA512:
-  metadata.gz: d984b11b2dab25a90593c2d7bb6f1b92b2b7d81b54a60f80e5b0f71b93f38978edfc2a4dec01c72dad6f0f7040d17ef8e9585f8e85834ab782cb169dc2c71d03
-  data.tar.gz: 9755508548f7eab822cd91fb50056f1ced318d9da8ffd5ecaf51e161faf0a91bc5dae24f47e94fdf26324035d6800e57e7aedb8f73823161ce505db7b2b11b97
+  metadata.gz: a5084163467986c28e70a91922302dc7eb22e2e363a71cbda47ea3abf36d9e070a258e81505705c1c80c8f6317adeaef7205b8581cbdb9787c0d7d1287cc5db5
+  data.tar.gz: 8d998e72deeb6b77dd268a168522aad5842975c3b9455f4f047cd021e6cab7076bd381ba6162ca3c7a775a2b48aa95ce1e0c771211090e0dd4b3dde0fd550ecd

data/Gemfile.lock

@@ -1,17 +1,14 @@
 PATH
   remote: .
   specs:
-    infinum_id (1.4.2)
+    infinum_id (1.5.0)
       blueprinter
       bundler
       devise
       dry-configurable
       http
       omniauth-infinum_id
-      redis
-      redis-namespace
       responders
-      sidekiq
 
 GEM
   remote: https://rubygems.org/
@@ -61,29 +58,28 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     arel (9.0.0)
     bcrypt (3.1.13)
-    blueprinter (0.19.0)
+    blueprinter (0.22.0)
     builder (3.2.3)
     byebug (10.0.2)
     coderay (1.1.2)
     concurrent-ruby (1.1.4)
-    connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
-    devise (4.6.2)
+    devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
+      railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
     docile (1.3.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dry-configurable (0.8.3)
+    dry-configurable (0.9.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
-    dry-core (0.4.8)
+    dry-core (0.4.9)
       concurrent-ruby (~> 1.0)
     erubi (1.8.0)
     factory_bot (5.0.0)
@@ -93,21 +89,26 @@ GEM
       railties (>= 4.2.0)
     faker (1.9.1)
       i18n (>= 0.7)
-    faraday (0.15.4)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
+    ffi (1.11.3)
+    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.1.1)
+    http (4.3.0)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.1.1)
-    http_parser.rb (0.6.0)
+    http-form_data (2.2.0)
+    http-parser (1.2.1)
+      ffi-compiler (>= 1.0, < 2.0)
     i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
@@ -124,14 +125,14 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     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.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.2)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
@@ -155,8 +156,6 @@ GEM
       pry (>= 0.10.4)
     public_suffix (3.0.3)
     rack (2.0.6)
-    rack-protection (2.0.5)
-      rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.2)
@@ -184,9 +183,6 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (10.5.0)
-    redis (4.1.2)
-    redis-namespace (1.6.0)
-      redis (>= 3.0.4)
     responders (3.0.0)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -212,11 +208,6 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     safe_yaml (1.0.4)
-    sidekiq (5.2.7)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)

data/README.md

@@ -1,8 +1,15 @@
-# InfinumId
+# InfinumId Engine
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/infinum_id`. To experiment with that code, run `bin/console` for an interactive prompt.
+InfinumId Engine is gem for resource authentication with [InfinumID](https://github.com/infinum/rails-infinum-id) server.
 
-TODO: Delete this and the text above, and describe your gem
+## Table of Contents
+- [Installation](#installation)
+- [Dependencies](#dependencies)
+- [Configuration](#configuration)
+  * [InfinumID](#infinumid)
+  * [Secrets](#secrets)
+- [Usage](#usage)
+- [Features](#features)
 
 ## Installation
 
@@ -20,24 +27,168 @@ Or install it yourself as:
 
     $ gem install infinum_id
 
+## Dependencies
+
+* [Blueprinter](https://github.com/procore/blueprinter)
+* [Devise](https://github.com/plataformatec/devise)
+* [Dry configurable](https://github.com/dry-rb/dry-configurable)
+* [Http](https://github.com/httprb/http)
+* [Omniauth::InfinumId](https://github.com/infinum/ruby-infinum-id-omniauth)
+* [Redis](https://github.com/antirez/redis)
+
+<details>
+<summary><big><b>Blueprinter</b></big></summary>
+<hr />
+When new user is being created in application, info of that user is being sent to InfinumID to create user there as well.
+Model of user in application might not be the same as on in InfinumID. So parametars need to be changed to match one on InfinumID.
+
+For example, url to profile picture in application is called avatar_remote_url and in InfinumID it's called avatar_url.
+
+```ruby
+# app/blueprints/infinum_id/resource_blueprint.rb
+
+module InfinumId
+  class ResourceBlueprint < Blueprinter::Base
+    identifier :email
+
+    fields :first_name, :last_name
+
+    field :slack_username
+    field :avatar_url, as: :avatar_remote_url
+  end
+end
+```
+
+Default serializator is given, but it can be overridden.
+</details>
+
+<details>
+<summary><big><b>Devise</b></big></summary>
+<hr />
+Devise is used like middleware for authentication that uses Omniauth with infinum_id strategy. Devise should be configured inside model that will be authenticated. When configured all methods of devise can be used (e.g. current_user)
+<br/><br/>
+</details>
+
+## Configuration
+
+### InfinumID
+
+```ruby
+# config/initializers/infinum_id.rb
+
+InfinumId.configure do |config|
+  config.service_name = 'Revisor'
+  config.resource_name = 'User'
+  config.infinum_id_send_email = false
+  config.resource_attributes = [:uid, :email, :first_name, :last_name, :deactivated_at, :time_zone, :avatar_url, :slack_username]
+end
+```
+
+Configuration options:
+* Service name - name of application
+* Resource name - name of resource on whom authentication is being done
+* InfinumID send email - toggle if InfinumID should send invite email or application (false for InfinumID)
+* Resource attributes - list of resource attributes that will be send to InfinumID when new user is created
+
+### Secrets
+
+Needed secrets:
+
+```ruby
+# config/secrets.yml
+
+infinum_id:
+  client_id: 'client_id_from_InfinumID'
+  client_secret: 'client_secret_from_InfinumID'
+  url: 'InfinumID_url'
+redis_server_url: 'redis_server_url'
+redis_client_url: 'redis_client_url'
+```
+
 ## Usage
 
-TODO: Write usage instructions here
+1. Add columns to resource via migration.
 
-## Development
+    <b>Required columns:</b> email, uid, provider and deactivated_at. <br />
+    <b>Optional columns:</b> first_name, last_name, avatar_url, slack_username, time_zone
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+2. Set same columns in resource attribute config of infinum_id engine
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+3. Add following rows to resource model:
 
-## Contributing
+```ruby
+devise :omniauthable, omniauth_providers: [:infinum_id]
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/infinum_id. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+def active_for_authentication?
+  super && !deactivated_at
+end
+```
 
-## License
+4. Create AuthenticatedController and inherit it in all controllers that needs to be protected with authentication
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+```ruby
+class AuthenticatedController < ApplicationController
+  before_action :authenticate_user!
+end
+```
+
+## Features
 
-## Code of Conduct
+<details>
+<summary><big><b>Webhooks</b></big></summary>
+<hr />
+In engine there are two webhooks: UpdateResourceCallback & CreateResourceCallback.
 
-Everyone interacting in the InfinumId project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/infinum_id/blob/master/CODE_OF_CONDUCT.md).
+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.
+
+```ruby
+# app/services/infinum_id/after_resource_create.rb
+
+module InfinumId
+  class AfterResourceCreate
+    def self.call(person, params=nil)
+      person.update(employee: true)
+    end
+  end
+end
+```
+</details>
+
+<details>
+<summary><big><b>infinum_id_profile_edit_path</b></big></summary>
+<hr />
+Path to InfinumID profile of currently logged in user.
+<br /><br />
+</details>
+
+<details>
+<summary><big><b>Resource::Invite</b></big></summary>
+<hr />
+
+Resource::Invite calls creates new user by given user parameters and sends request to InfinumID server. If user does not exist on InfinumID server user will be created there. If user existed on InfinumID Welcome email will be sent, if not Invite email with link to InfinumID server will be sent where user can finish his account creation.
+
+```ruby
+# app/controllers/users_controller.rb
+
+user = InfinumId::Resources::Invite.call(user_params, current_user)
+```
+
+</details>
+
+<details>
+<summary><big><b>Mailer</b></big></summary>
+<hr />
+
+There are two mailer: WelcomeMailer & InviteMailer.
+
+WelcomeMailer is being used when user exists on InfinumID and we just invited him to application.
+
+InviteMailer is being used when user doesn't exist on InfinumID and account was just created there and in mail invitation link is sent to finish account creation.
+
+</details>
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

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

@@ -22,7 +22,7 @@ module InfinumId
       attr_reader :current_resource, :resource
 
       def send_invite_request
-        InfinumId::Resources::InviteWorker.perform_async(@resource.id, current_resource.uid)
+        InfinumId::Requests::InviteSender.call(@resource.id, current_resource.uid)
       end
     end
   end

data/infinum_id.gemspec

@@ -49,10 +49,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'devise'
   spec.add_dependency 'http'
   spec.add_dependency 'omniauth-infinum_id'
-  spec.add_dependency 'redis'
-  spec.add_dependency 'redis-namespace'
   spec.add_dependency 'responders'
-  spec.add_dependency 'sidekiq'
   spec.add_dependency 'dry-configurable'
   spec.add_dependency 'blueprinter'
 end

data/lib/generators/infinum_id/install_generator.rb

@@ -45,8 +45,6 @@ RUBY
 
       def secrets_template
 <<RUBY
-  redis_server_url: <%= Figaro.env.redis_server_url %>
-  redis_client_url: <%= Figaro.env.redis_client_url %>
   infinum_id:
     client_id: <%= Figaro.env.infinum_id_client_id %>
     client_secret: <%= Figaro.env.infinum_id_client_secret %>

data/lib/infinum_id/version.rb

@@ -1,3 +1,3 @@
 module InfinumId
-  VERSION = '1.4.2'
+  VERSION = '1.5.0'
 end

data/lib/infinum_id.rb

@@ -4,7 +4,6 @@ require 'infinum_id/engine'
 require 'dry-configurable'
 require 'blueprinter'
 require 'devise'
-require 'sidekiq'
 require 'http'
 
 module InfinumId

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infinum_id
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Dajana Jeroncic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -248,34 +248,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redis-namespace
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -290,20 +262,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
@@ -369,11 +327,9 @@ files:
 - app/views/infinum_id/mailer/invite_email.text.erb
 - app/views/infinum_id/mailer/welcome_email.html.erb
 - app/views/infinum_id/mailer/welcome_email.text.erb
-- app/workers/infinum_id/resources/invite_worker.rb
 - bin/console
 - bin/setup
 - config/initializers/devise.rb
-- config/initializers/sidekiq.rb
 - config/routes.rb
 - infinum_id.gemspec
 - lib/generators/infinum_id/install_generator.rb
@@ -402,7 +358,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.

data/app/workers/infinum_id/resources/invite_worker.rb

@@ -1,11 +0,0 @@
-module InfinumId
-  module Resources
-    class InviteWorker
-      include Sidekiq::Worker
-
-      def perform(resource_id, current_resource_uid)
-        InfinumId::Requests::InviteSender.call(resource_id, current_resource_uid)
-      end
-    end
-  end
-end

data/config/initializers/sidekiq.rb

@@ -1,7 +0,0 @@
-Sidekiq.configure_server do |config|
-  config.redis = { url: Rails.application.secrets[:redis_server_url] }
-end
-
-Sidekiq.configure_client do |config|
-  config.redis = { url: Rails.application.secrets[:redis_client_url] }
-end