omniauth-scientist 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60103e1cd9f35d1c4536365b3b174581ce4e1b58e4314cc50f2b501f28931720
-  data.tar.gz: dec823994918653c5e8d563d128679ef192cd257468d6385e59a841478fbd08d
+  metadata.gz: 60f5d4986e0ec7f55a516595d3b199a65a29dbb16e1c55f6d0a739770244e8d8
+  data.tar.gz: 6b408a16846f342773d7e8c4b2bba5322313bdf5e62449394663d5c8861205d5
 SHA512:
-  metadata.gz: 12fc82e60833aed5d672a8decb29fc2b49e3d6f04969eb480f6e0e540a01e12ed7a3283b3c522e368ecb90f2383838932ad0996d8772e0bc1a9e5dd5c13c0b07
-  data.tar.gz: 395f62e98a7572ac5e5c3011040dc3c76281d344f4a80391eead74c8dc8486d04c36912493cf43199f40a9bf952040f24853754272582dcbe7e343e05c9de82e
+  metadata.gz: 3b557b19453d5c632c748f7226ab9feec444722dd444942836659f1c5e739eab38d2f75b485042377625defb5815c27e131244b45335431afaddd41e9434c8c6
+  data.tar.gz: 949c4bbafbc75633d70706ff68ac0f2b014dd3363be3814af4e31333341a6b535e93101a537b5282a5a04dd31b8ad0ceb3d88dbf1dd78d44acd2838db603bd29

data/.github/workflows/ruby.yml

@@ -0,0 +1,20 @@
+name: Ruby
+
+on: pull_request
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Build and test with Rake
+      run: bundle exec rake

data/README.md

@@ -3,7 +3,7 @@
 ## Basic Usage
 
 ```ruby
-use OmniAuth::Builder do
+Rails.application.config.middleware.use OmniAuth::Builder do
   provider :scientist, ENV['SCIENTIST_ID'], ENV['SCIENTIST_SECRET']
 end
 ```
@@ -11,19 +11,25 @@ end
 ## Enterprise Usage
 
 ```ruby
-provider :scientist, ENV['SCIENTIST_ID'], ENV['SCIENTIST_SECRET'],
-  {
-    client_options: {
-      site: 'https://<YOURSUBDOMAIN>.scientist.com',
-      authorize_url: 'https://<YOURSUBDOMAIN>.scientist.com/oauth/authorize',
-      token_url: 'https://<YOURSUBDOMAIN>.scientist.com/oauth/token'
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :scientist, ENV['SCIENTIST_ID'], ENV['SCIENTIST_SECRET'],
+    {
+      client_options: {
+        site: 'https://<YOURSUBDOMAIN>.scientist.com',
+        authorize_url: 'https://<YOURSUBDOMAIN>.scientist.com/oauth/authorize',
+        token_url: 'https://<YOURSUBDOMAIN>.scientist.com/oauth/token'
+      }
     }
-  }
+end
 ```
 
+## Credits
+
+Heavily inspired by: [omniauth-github](https://github.com/omniauth/omniauth-github)
+
 ## License
 
-Copyright (c) 2019 Assay Depot Inc. d/b/a Scientist.com
+Copyright (c) 2024 Assay Depot Inc. d/b/a Scientist.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/omniauth/strategies/scientist.rb

@@ -4,9 +4,9 @@ module OmniAuth
   module Strategies
     class Scientist < OmniAuth::Strategies::OAuth2
       option :client_options, {
-        :site => 'https://app.scientist.com',
-        :authorize_url => 'https://app.scientist.com/oauth/authorize',
-        :token_url => 'https://app.scientist.com/oauth/token'
+        site: 'https://app.scientist.com',
+        authorize_url: 'https://app.scientist.com/oauth/authorize',
+        token_url: 'https://app.scientist.com/oauth/token'
       }
 
       def request_phase
@@ -15,7 +15,7 @@ module OmniAuth
 
       def authorize_params
         super.tap do |params|
-          %w[scope client_options].each do |v|
+          %w[client_options].each do |v|
             if request.params[v]
               params[v.to_sym] = request.params[v]
             end
@@ -23,19 +23,21 @@ module OmniAuth
         end
       end
 
-      uid { user_attribute('id') }
+      uid {
+        raw_info['id'].to_s
+      }
 
       info do
         {
           'provider' => 'scientist',
           'uid' => uid,
           'email' => email,
-          'name' => "#{user_attribute('first_name')} #{user_attribute('last_name')}",
-          'first_name' => user_attribute('first_name'),
-          'last_name' => user_attribute('last_name'),
-          'title' => user_attribute('title'),
-          'company' => user_attribute('company'),
-          'site' => user_attribute('site')
+          'name' => "#{raw_info['first_name']} #{raw_info['last_name']}",
+          'first_name' => raw_info['first_name'],
+          'last_name' => raw_info['last_name'],
+          'title' => raw_info['title'],
+          'company' => raw_info['company'],
+          'site' => raw_info['site']
         }
       end
 
@@ -45,21 +47,15 @@ module OmniAuth
 
       def raw_info
         access_token.options[:mode] = :header
-        @raw_info ||= { 'user' => access_token['user'] }
+        @raw_info ||= access_token["user"]
       end
 
       def email
-        user_attribute('email')
+        raw_info['email']
       end
 
       def callback_url
-        full_host + script_name + callback_path
-      end
-
-      protected
-
-      def user_attribute(attribute)
-        raw_info['user'][attribute] if raw_info['user']
+        full_host + callback_path
       end
     end
   end

data/lib/omniauth-scientist/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Scientist
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/omniauth-scientist.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = OmniAuth::Scientist::VERSION
 
-  gem.add_dependency 'omniauth', '~> 1.9'
-  gem.add_dependency 'omniauth-oauth2', '>= 1.6.0', '< 2.0'
-  gem.add_development_dependency 'rspec'
+  gem.add_dependency 'omniauth', '~> 2.0'
+  gem.add_dependency 'omniauth-oauth2', '~> 1.8'
+  gem.add_development_dependency 'rspec', '~> 3.5'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'webmock'

data/spec/omniauth/strategies/scientist_spec.rb

@@ -1,22 +1,20 @@
 require 'spec_helper'
 
 describe OmniAuth::Strategies::Scientist do
-  let(:access_token) { instance_double('AccessToken', :options => {}) }
-  let(:parsed_response) { instance_double('ParsedResponse') }
-  let(:response) { instance_double('Response', :parsed => parsed_response) }
+  let(:access_token) { instance_double('AccessToken', :options => {}, :[] => 'user') }
 
-  let(:enterprise_site)          { 'https://some.other.site.com/' }
-  let(:enterprise_authorize_url) { 'https://some.other.site.com/oauth/authorize' }
-  let(:enterprise_token_url)     { 'https://some.other.site.com/oauth/token' }
+  let(:enterprise_site)          { 'https://some.other.site.com/api/v3' }
+  let(:enterprise_authorize_url) { 'https://some.other.site.com/login/oauth/authorize' }
+  let(:enterprise_token_url)     { 'https://some.other.site.com/login/oauth/access_token' }
   let(:enterprise) do
-    OmniAuth::Strategies::Scientist.new('SCIENTIST_ID', 'SCIENTIST_SECRET',
-      {
-        :client_options => {
-          :site => enterprise_site,
-          :authorize_url => enterprise_authorize_url,
-          :token_url => enterprise_token_url
+    OmniAuth::Strategies::Scientist.new('SIENTIST_KEY', 'SIENTIST_SECRET',
+        {
+            :client_options => {
+                :site => enterprise_site,
+                :authorize_url => enterprise_authorize_url,
+                :token_url => enterprise_token_url
+            }
         }
-      }
     )
   end
 
@@ -61,40 +59,6 @@ describe OmniAuth::Strategies::Scientist do
       allow(subject).to receive(:raw_info).and_return({ 'email' => 'you@example.com' })
       expect(subject.email).to eq('you@example.com')
     end
-
-    it 'should return nil if there is no raw_info and email access is not allowed' do
-      allow(subject).to receive(:raw_info).and_return({})
-      expect(subject.email).to be_nil
-    end
-
-    it 'should not return the primary email if there is no raw_info and email access is allowed' do
-      emails = [
-        { 'email' => 'secondary@example.com', 'primary' => false },
-        { 'email' => 'primary@example.com',   'primary' => true }
-      ]
-      allow(subject).to receive(:raw_info).and_return({})
-      subject.options['scope'] = 'user'
-      allow(subject).to receive(:emails).and_return(emails)
-      expect(subject.email).to be_nil
-    end
-
-    it 'should not return the first email if there is no raw_info and email access is allowed' do
-      emails = [
-        { 'email' => 'first@example.com',   'primary' => false },
-        { 'email' => 'second@example.com',  'primary' => false }
-      ]
-      allow(subject).to receive(:raw_info).and_return({})
-      subject.options['scope'] = 'user'
-      allow(subject).to receive(:emails).and_return(emails)
-      expect(subject.email).to be_nil
-    end
-  end
-
-  context '#raw_info' do
-    it 'should use relative paths' do
-      expect(access_token).to receive(:get).with('user').and_return(response)
-      expect(subject.raw_info).to eq(parsed_response)
-    end
   end
 
   context '#info.email' do
@@ -113,4 +77,4 @@ describe OmniAuth::Strategies::Scientist do
       expect(subject.callback_url).to eq('https://example.com/sub_uri/auth/scientist/callback')
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-scientist
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Petersen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -16,48 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - Gemfile
@@ -123,7 +118,7 @@ homepage: https://github.com/assaydepot/omniauth-scientist
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,9 +133,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.5.3
+signing_key:
 specification_version: 4
 summary: Official OmniAuth strategy for Scientist.
 test_files: