omniauth-aitu-passport 0.1.19 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19734302ba90f22720d1ac98ca0326957c9b14f8869b814a4c4207edb1525006
-  data.tar.gz: 0c86d74212ba4beec518bd9416e93f328e56049714294cc8b3a006e16a7aec7f
+  metadata.gz: e92c64e77c4f3de63c2aff68dcbadfe6dda5156dc980ceffab4237a7724b59da
+  data.tar.gz: c6ad628463a5f8b94fd9d5aed018a8a0a7e2ffdcbf1e7a65be7ed7e8ae47c684
 SHA512:
-  metadata.gz: b9ba98957c9adaee2eebbf1c9134cabad788e8a40bffeb1bc7b633b36a21d2aac323ce12d26a0295b0702e6f77ce8dbdcef614e5fb22f59c830f8ce68b1b401f
-  data.tar.gz: b5d6e28853356a1ca56031ddea26cf8c69ea3d7958d0cd9d2dcbaf7e5ff5abc91cc3951230bf8c424bd9119ec8395a42a629ef5d46acb76de8574b3bfd1b280a
+  metadata.gz: 476c648beb600866d42140573a23df270c6487b4088b86456f963a90b1b5443e923e3a5169c81d96d2deb9589e000df85be6123ed7bfd3f96a2e0b0c1373f3ac
+  data.tar.gz: 0e4a5f660903eab42f3392705737b1478c4e9a88572f8e3cc80e3635e9daacf48ce25b7d5d5150a1f483fd0e4eaa880e1a3e37ef79b3366b06a11e544dd14571

data/CHANGELOG.md

@@ -1,15 +1,34 @@
-# v 0.1.6
+# v 0.1.21
+Added:
+- session_id added to auth link according to 
+  https://docs.passport.aitu.io/#tag/Poluchenie-identifikatora-oauth-sessii
+- PASSPORT_STAGING env option
 
-Added: 
-- Scope filtered to avoid malformed_scope errors
+Removed:
+- setup binaries 
 
-Removed: 
-- None
+# v 0.1.9
+Fixed:
+- possible NoMethod error in guard clause
+
+Added:
+- Base test cases
+- Rubocop inspections
 
 # v 0.1.8
 
 Added:
 - redirect_uri accepted once in :options
 
+Removed:
+- None
+
+
+# v 0.1.6
+
+Added: 
+- Scope filtered to avoid malformed_scope errors
+
 Removed: 
-- None
+- None
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth-aitu-passport (0.1.19)
+    omniauth-aitu-passport (0.1.21)
       oauth2 (~> 1.4.7)
       omniauth (~> 1)
       omniauth-oauth2 (~> 1)

data/README.md

@@ -43,12 +43,15 @@ Rails.application.config.middleware.use OmniAuth::Builder do
   provider :aitu_passport,
            ENV['PASSPORT_KEY'],
            ENV['PASSPORT_SECRET'],
-           { 
+           {
              scope: 'phone first_name middle_name last_name gender openid',
              response_type: 'code',
              client_id: ENV['PASSPORT_KEY'],
              provider_ignores_state: Rails.env == 'production' ? false : true,
-             redirect_uri: ENV['PASSPORT_REDIRECT_URI']
+             redirect_uri: ENV['PASSPORT_REDIRECT_URI'],
+             token_params: {
+               redirect_uri: ENV['PASSPORT_REDIRECT_URI']
+             }
            }
 end
 
@@ -57,6 +60,17 @@ OmniAuth.config.logger = Rails.logger
 ```
 using the keys you receive and URI you provided when registered the app
 
+Please note :redirect_uri param under :token_params is mandatory option.
+
+Also, you can use 
+
+```yaml
+ENV['PASSPORT_STAGING']: true
+```
+
+option in your environment to send auth requests to staging AituPassport server, 
+e.g. https://passport.stage.supreme-team.tech
+
 4. Use it in your sessions controller on your own, assuming the following envs to store the data you need
 
 ```ruby
@@ -70,8 +84,6 @@ using the keys you receive and URI you provided when registered the app
 
 ## Development
 
-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.
-
 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 the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing

data/lib/omniauth/aitu_passport/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module AituPassport
-    VERSION = '0.1.19'
+    VERSION = '0.1.22'
   end
 end

data/lib/omniauth/strategies/aitu_passport.rb

@@ -12,12 +12,13 @@ module OmniAuth
 
       option :client_options, {
         site: 'https://passport.aitu.io',
-        token_url: '/oauth2/token',
+        token_url: '/api/v1/oauth/token',
         authorize_url: '/oauth2/auth',
+        session_url: '/api/v1/oauth/session',
         auth_scheme: :basic_auth
       }
 
-      option :pkce, false
+      option :pkce, true
 
       AVAILABLE_SCOPE_OPTIONS = %w[
         openid
@@ -67,6 +68,8 @@ module OmniAuth
         super.tap do
           # Raising up an error if redirect_uri is missing
           raise ArgumentError, 'Wrong options: redirect_uri option is missing.' unless options[:redirect_uri]
+
+          options[:client_options][:site] = 'https://passport.stage.supreme-team.tech' if ENV['PASSPORT_STAGING']
         end
       end
 
@@ -75,6 +78,7 @@ module OmniAuth
         super.tap do |params|
           params[:scope] = filter_scope(params)
           params[:redirect_uri] = options[:redirect_uri]
+          params[:session_id] = get_session_id
         end
       end
 
@@ -84,6 +88,21 @@ module OmniAuth
 
       private
 
+      def get_session_id
+        params = ::OAuth2::Authenticator.new(client.id, client.secret, client.options[:auth_scheme]).apply({})
+        res = client.request(:post, session_url, params)
+        case res.status
+        when 200
+          JSON.parse(res.body).dig('sessionId')
+        else
+          raise NoSessionError, 'No session ID received, sorry.'
+        end
+      end
+
+      def session_url
+        options[:client_options][:site] + options[:client_options][:session_url]
+      end
+
       def filter_scope(params)
         return DEFAULT_SCOPE unless params[:scope]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-aitu-passport
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.22
 platform: ruby
 authors:
 - Yaroslav Shevchenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -112,8 +112,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - lib/omniauth-aitu-passport.rb
 - lib/omniauth/aitu_passport.rb
 - lib/omniauth/aitu_passport/version.rb

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'omniauth/aitu/passport'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here