omniauth-swoop 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e47bff27db8dc603f3c30e2983518c1a6695266e4c7a29d3404d5895843c3f58
-  data.tar.gz: 89cfc14d41e10aa4611071b311be486d1ae71a7abadf3d114fa9a5febf9f70da
+  metadata.gz: 73289db6ed53654d18e2f9eb61170635d3ca3bb44c11d25903a103e1049a05c0
+  data.tar.gz: 92183a1d64ff7e7b4dd32032aab0f3de7032bbd29332a87cc036e475919c7738
 SHA512:
-  metadata.gz: 30bd54de5fd21232fd1a9bc6d062481c2b16144d2f174c3b6891df94953642fc17b80ea844281fe8e65e32c0a14e702a3de282256e25cc8ce39494922bc1573a
-  data.tar.gz: ed33d1c2df631ab694e3655bf874a141d2ed18a9733d7a9e1e948d853111e7351452fb4f1215e92a1474fbbaa17b2655e7ec42d0a43726b729a37119c3584764
+  metadata.gz: efe3a6374645bd7f625a1296499d0c9f8dba510a2bc08dfcd415c48d19ca1fd889fe0a55a44b905f2107511e0fe06cc864e5619f2316c37f451b0667189b444b
+  data.tar.gz: 9d96523bb978624ac5060586f98b207c63f758f1f1f623cc3b2e1108c38268adc6aa9674bb41e062ac921607e06176941fb97424bab6c771a4fa275165098ec1

data/lib/omniauth-swoop.rb

@@ -1,2 +1,2 @@
 require 'omniauth/strategies/swoop'
-require 'omniauth/swoop-version'
+require 'omniauth-swoop/version'

data/lib/{omniauth/swoop-version.rb → omniauth-swoop/version.rb}

@@ -1,5 +1,5 @@
 module OmniAuth
   module Swoop
-    VERSION = "0.1.5"
+    VERSION = "0.1.7".freeze
   end
 end

data/lib/omniauth/strategies/swoop.rb

@@ -1,11 +1,9 @@
 require 'omniauth-oauth2'
+require 'jwt'
 
 module OmniAuth
   module Strategies
     class Swoop < OmniAuth::Strategies::OAuth2
-
-      include OmniAuth::Strategy
-
       option :name, "swoop"
 
       option :client_options, {
@@ -14,12 +12,7 @@ module OmniAuth
         user_info_url: '/oauth2/profile'
       }
 
-      option :user_response_structure, {
-        attributes: {
-          email: 'email',
-          uid: 'sub'
-        }
-      }
+      option :pkce, true
 
       option :authorize_params, {
           scope: 'email'
@@ -28,15 +21,16 @@ module OmniAuth
       option :redirect_url
 
       uid do
-        fetch_user_info(user_paths[:id_path]).to_s
+        info["uid"]
       end
 
       info do
-        user_paths[:attributes].inject({}) do |user_hash, (field, path)|
-          value = fetch_user_info(path)
-          user_hash[field] = value if value
-          user_hash
-        end
+      {
+        :uid => raw_info['sub'],
+        :email => raw_info['email'],
+        :user_meta => raw_info['user_meta']
+      }
+
       end
 
       extra do
@@ -45,26 +39,52 @@ module OmniAuth
 
       def raw_info
         @raw_info ||= access_token.get(options.client_options[:user_info_url]).parsed
-        @raw_info["id_token"] = access_token.params["id_token"]
+        id_token = access_token.params["id_token"]
+
+        decoded_token = JWT.decode id_token, options.client_secret, true, { algorithm: 'HS256' }
+
+        if(decoded_token[0].key?("user_meta"))
+          @raw_info["user_meta"] = decoded_token[0]["user_meta"]
+        end
+
+        @raw_info["id_token"] = id_token
+        @raw_info
       end
 
       def authorize_params
         params = super
-        Hash[params.map { |k, v| [k, v.respond_to?(:call) ? v.call(request) : v] }]
-      end
+        p = Hash[params.map { |k, v| [k, v.respond_to?(:call) ? v.call(request) : v] }]
 
-      private
+        request_params = request.params
+        property_meta = {}
+        if request_params.key?("property_method")
+          property_meta["method"] = request_params["property_method"]
+          request_params.delete("property_method")
+        end
+        if request_params.key?("property_name")
+          property_meta["name"] = request_params["property_name"]
+          request_params.delete("property_name")
+        end
+        if request_params.key?("property_logo_url")
+          property_meta["logo_url"] = request_params["property_logo_url"]
+          request_params.delete("property_logo_url")
+        end
+        if request_params.key?("property_primary_color")
+          property_meta["primary_color"] = request_params["property_primary_color"]
+          request_params.delete("property_primary_color")
+        end
 
-      def user_paths
-        options.user_response_structure
-      end
+        if property_meta.length > 0
+          property_meta = JWT.encode property_meta, options.client_secret, 'HS256'
+          p["property_meta"] = property_meta
+        end
 
-      def fetch_user_info(path)
-        return nil unless path
-        full_path = path.is_a?(Array) ? path : Array(user_paths[:root_path]) + [path]
-        full_path.inject(raw_info) { |info, key| info[key] rescue nil }
+        p = p.merge(request_params)
+        p
       end
 
+      private
+
       def callback_url
         options.redirect_url || (full_host + script_name + callback_path)
       end

data/omniauth-swoop.gemspec

@@ -1,8 +1,12 @@
 # -*- encoding: utf-8 -*-
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "omniauth-swoop/version"
+
 Gem::Specification.new do |s|
   s.name        = 'omniauth-swoop'
-  s.version     = '0.1.5'
-  s.date        = '2021-01-19'
+  s.version     = OmniAuth::Swoop::VERSION
+  s.date        = '2021-01-21'
   s.homepage    = "https://github.com/swoop-password-free/omniauth-swoop"
   s.description = %q{OmniAuth strategy for Swoop passwordless authentication}
   s.summary     = s.description
@@ -14,5 +18,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
   s.add_dependency 'omniauth-oauth2', '~> 1.7.1'
+  s.add_dependency 'jwt', '~> 2.2.2'
   s.add_development_dependency 'bundler', '~> 1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-swoop
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Brandon Trebitowski
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.1
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -48,8 +62,8 @@ files:
 - ".gitignore"
 - README.md
 - lib/omniauth-swoop.rb
+- lib/omniauth-swoop/version.rb
 - lib/omniauth/strategies/swoop.rb
-- lib/omniauth/swoop-version.rb
 - omniauth-swoop.gemspec
 homepage: https://github.com/swoop-password-free/omniauth-swoop
 licenses: []