omniauth-mlh 1.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 622c9053382357ade0f161e78ed3f13ae01ae9f939b9bae87b43ff3281b618e2
-  data.tar.gz: bc057ee83655fcac77978e15a21891013981853cebc8e7c235d08601468d8156
+  metadata.gz: 354aa7b0fc62afc09143d95359d8d9ee5f414bb8f38fbf5e9ee501ad2d547c98
+  data.tar.gz: d21f4b91b2a41f297350a6adedf60b33adf3390c255f1254b4741713b0f75042
 SHA512:
-  metadata.gz: b4cd23553337c4dc6537a4c432c61d00f84334cd0d0372d7c3148b0c85bf175834a97ac9e213623e17541349f16b15e4489bfe0f8658302ae7fc01d71e4ad76f
-  data.tar.gz: fb197ac156fb8a6ff76c8ce5b7e01ba016ff3859ad3741cd10da11932c274c7dc33c0f1dffbc766e0479cc4607d29621267e942ed1d26f22df37bdbb8f432050
+  metadata.gz: a6302f3601f4338a87ccbdd0e77044742dd99b06cfe985af75373e089fe90102f3babb72a6fe22dacd674e9178f407d30baf34bb85bf3059fead97d466f7b2c6
+  data.tar.gz: 0302bfd088521db00c27954a7bc0454219f46acc1112166655b16e449342839fcb385a73c223296c9a0ad05997ebe41bf9b432fdbb4d1f529cc382cbf2fcdc05

data/.github/workflows/gem-push.yml

@@ -0,0 +1,30 @@
+name: Push Gem
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 3.2
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.2'
+        bundler-cache: true
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_API_KEY}}"

data/.github/workflows/test.yml

@@ -0,0 +1,30 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+    branches:
+      - 'main'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest 
+    strategy:
+      matrix:
+        ruby: ['3.2']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: |
+          gem install bundler
+          bundle install
+      - name: Run Spec
+        run: bundle exec rake spec
+      - name: Run Rubocop
+        run: bundle exec rake rubocop

data/.rubocop.yml

@@ -1,12 +1,28 @@
-AllCops:
-  TargetRubyVersion: '2.2.0'
+require: 
+  - rubocop-rspec
+  - rubocop-performance
 
-Naming/FileName:
+AllCops:
+  # Ruby 2.7 is the MINIMUM Ruby version supported
+  TargetRubyVersion: '2.7.0'
   Exclude:
-    - 'lib/omniauth-mlh.rb'
+    - vendor/**/*
 
-Metrics/BlockLength:
-  Exclude:
-    - 'Rakefile'
-    - '**/*.rake'
-    - 'spec/**/*'
+Style/WordArray:
+  Description: Force arrays of words to use bracket notation instead of %w
+  EnforcedStyle: brackets
+  Enabled: true
+
+Style/SymbolArray: 
+  Description: Force symbol arrays to use bracket notation instead of %i
+  EnforcedStyle: brackets 
+  Enabled: true
+
+Style/RegexpLiteral:
+  Description: Allow forward slashes within regular expressions
+  AllowInnerSlashes: true
+  Enabled: true
+
+RSpec/MultipleExpectations: 
+  Description: Allow tests to contain multiple expectations 
+  Enabled: false

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 3.0.5
+  - 2.2.0

data/CONTRIBUTING.md

@@ -0,0 +1,27 @@
+# Contributing Guidelines
+
+Thank you for considering contributing to omniauth-mlh.
+
+## Contributor Checklist
+
+- Fork the Repo ( https://github.com/mlh/omniauth-mlh/fork )
+- Create your feature branch (`git checkout -b my-new-feature`)
+- Commit your changes (`git commit -am 'Add some feature'`)
+- Push to the branch (`git push origin my-new-feature`)
+- Create a new Pull Request
+
+### Running tests
+
+Following command can be used to run the test 
+
+```bash
+$ bundle exec rake spec
+```
+
+## Code quality tools
+
+Code quality is enforced across the entire gem with Rubocop:
+
+```bash
+$ bundle exec rubocop
+```

data/Gemfile

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in omniauth-mlh.gemspec
 gemspec
+gem 'activesupport'

data/README.md

@@ -1,18 +1,19 @@
-# MLH/my-mlh-omniauth
+# MLH/omniauth-mlh
 
-[![Build Status](https://travis-ci.org/MLH/my-mlh-omniauth.svg?branch=master)](https://travis-ci.org/MLH/my-mlh-omniauth)
+[![Gem Version](https://badge.fury.io/rb/omniauth-mlh.svg)](https://badge.fury.io/rb/omniauth-mlh)
+[![Test](https://github.com/MLH/omniauth-mlh/actions/workflows/test.yml/badge.svg)](https://github.com/MLH/omniauth-mlh/actions/workflows/test.yml)
 
 This is the official [OmniAuth](https://github.com/omniauth/omniauth) strategy for
-authenticating with [MyMLH](https://my.mlh.io). To use it, you'll need to
-[register an application](https://my.mlh.io/oauth/applications) and obtain a OAuth Application ID and Secret from MyMLH.
+authenticating with [MyMLH](https://my.mlh.io) in Ruby applications. To use it, you'll need to
+[register an application](https://my.mlh.io/developers) and obtain a OAuth Application ID and Secret from MyMLH.
 
-It now supports MyMLH API V3. [Read the MyMLH V3 docs here](https://my.mlh.io/docs).
+It now supports MyMLH API V4. [Read the MyMLH V4 docs here](https://my.mlh.io/developers/docs).
 
 Once you have done so, you can follow the instructions below:
 
 ## Requirements
 
-You need to have at least Ruby 3.0.5 to use this gem.
+This Gem requires your Ruby version to be at least `3.2.0`.
 
 ## Installation
 
@@ -32,9 +33,13 @@ Or install it yourself as:
 
 ## Usage (Rack)
 
+You can find a list of potential scopes and expandable fields in the [docs](https://my.mlh.io/developers/docs). The below defaults are provided simply as an example.
+
 ```ruby
 use OmniAuth::Builder do
-  provider :mlh, ENV['MY_MLH_KEY'], ENV['MY_MLH_SECRET'], scope: 'default email birthday'
+  provider :mlh, ENV['MY_MLH_KEY'], ENV['MY_MLH_SECRET'],
+    scope: 'public offline_access user:read:profile',
+    expand_fields: ['education']
 end
 ```
 
@@ -44,17 +49,30 @@ end
 # config/devise.rb
 
 Devise.setup do |config|
-  config.provider :mlh, ENV['MY_MLH_KEY'], ENV['MY_MLH_SECRET'], scope: 'default email birthday'
+  config.provider :mlh, ENV['MY_MLH_KEY'], ENV['MY_MLH_SECRET'],
+    scope: 'public offline_access user:read:profile',
+    expand_fields: ['education']
 end
 ```
 
+## Accessing User Data
+Once a user has been authorized and you have received a token in your callback, you may access the scoped information for that user via the info key on the request data, as per the below example from a simple Sinatra app:
+
+```ruby
+get '/auth/mlh/callback' do
+  auth = request.env['omniauth.auth']
+  user_data = auth['info']
+  first_name = user_data['first_name']
+  erb "
+    <h1>Hello #{first_name}</h1>"
+end
+```
+
+You can find the full User object in the [docs](https://my.mlh.io/developers/docs).
+
 ## Contributing
 
-1. Fork it ( https://github.com/mlh/my-mlh-omniauth/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+For guidance on setting up a development environment and how to make a contribution to omniauth-mlh, see the [contributing guidelines](https://github.com/MLH/omniauth-mlh/blob/main/CONTRIBUTING.md).
 
 ## Credit
 
@@ -63,6 +81,6 @@ We used part of [datariot/omniauth-paypal](http://github.com/datariot/omniauth-p
 ## Questions?
 
 Have a question about the API or this library? Start by checking out the
-[official MyMLH documentation](https://my.mlh.io/docs). If you still can't
+[official MyMLH documentation](https://my.mlh.io/developers/docs). If you still can't
 find an answer, tweet at [@MLHacks](http://twitter.com/mlhacks) or drop an
 email to [engineering@mlh.io](mailto:engineering@mlh.io).

data/Rakefile

@@ -1,8 +1,12 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new
+RuboCop::RakeTask.new
 
 desc 'Run specs'
 task default: :spec

data/lib/omniauth/strategies/mlh.rb

@@ -5,42 +5,99 @@ require 'ostruct'
 
 module OmniAuth
   module Strategies
+    # MLH OAuth2 Strategy
+    #
+    # @example Basic Usage
+    #   use OmniAuth::Builder do
+    #     provider :mlh, ENV['MLH_KEY'], ENV['MLH_SECRET']
+    #   end
+    #
+    # @example With Expandable Fields
+    #   use OmniAuth::Builder do
+    #     provider :mlh, ENV['MLH_KEY'], ENV['MLH_SECRET'],
+    #              expand_fields: ['education', 'professional_experience']
+    #   end
+    #
+    # @example With Refresh Tokens (offline access)
+    #   use OmniAuth::Builder do
+    #     provider :mlh, ENV['MLH_KEY'], ENV['MLH_SECRET'],
+    #              scope: 'user:read:profile offline_access'
+    #   end
+    #
+    # When offline_access scope is requested, the strategy will include
+    # refresh_token in the credentials hash if provided by the server.
     class MLH < OmniAuth::Strategies::OAuth2 # :nodoc:
       option :name, :mlh
 
       option :client_options, {
         site: 'https://my.mlh.io',
         authorize_url: 'oauth/authorize',
-        token_url: 'oauth/token'
+        token_url: 'oauth/token',
+        auth_scheme: :request_body # Change from basic auth to request body
       }
 
+      # Support expandable fields through options
+      option :expand_fields, []
+
       uid { data[:id] }
 
       info do
-        data.slice(
-          :email,
-          :created_at,
-          :updated_at,
-          :first_name,
-          :last_name,
-          :level_of_study,
-          :major,
-          :date_of_birth,
-          :gender,
-          :phone_number,
-          :profession_type,
-          :company_name,
-          :company_title,
-          :scopes,
-          :school
-        )
+        {
+          # Basic fields
+          id: data[:id],
+          created_at: data[:created_at],
+          updated_at: data[:updated_at],
+          first_name: data[:first_name],
+          last_name: data[:last_name],
+          email: data[:email],
+          phone_number: data[:phone_number],
+          roles: data[:roles],
+
+          # Expandable fields
+          profile: data[:profile],
+          address: data[:address],
+          social_profiles: data[:social_profiles],
+          professional_experience: data[:professional_experience],
+          education: data[:education],
+          identifiers: data[:identifiers]
+        }
       end
 
       def data
-        @data ||= begin
-          access_token.get('/api/v3/user.json').parsed.deep_symbolize_keys[:data]
-        rescue StandardError
-          {}
+        @data ||= fetch_and_process_data.compact
+      rescue StandardError
+        {}
+      end
+
+      private
+
+      def fetch_and_process_data
+        response = access_token.get(build_api_url)
+        data = JSON.parse(response.body, symbolize_names: true)
+        return {} unless data.is_a?(Hash)
+
+        symbolize_nested_arrays(data)
+      end
+
+      def build_api_url
+        url = 'https://api.mlh.com/v4/users/me'
+        expand_fields = options[:expand_fields] || []
+        return url if expand_fields.empty?
+
+        expand_query = expand_fields.map { |f| "expand[]=#{f}" }.join('&')
+        "#{url}?#{expand_query}"
+      end
+
+      def symbolize_nested_arrays(hash)
+        hash.transform_values do |value|
+          case value
+          when Hash
+            symbolize_nested_arrays(value)
+          when Array
+            value.map { |item| item.is_a?(Hash) ? symbolize_nested_arrays(item) : item }
+          else
+            value
+          end
         end
       end
     end
@@ -48,5 +105,5 @@ module OmniAuth
 end
 
 OmniAuth.config.add_camelization 'mlh', 'MLH'
-OmniAuth.config.allowed_request_methods = %i[post get]
+OmniAuth.config.allowed_request_methods = [:post, :get]
 OmniAuth.config.silence_get_warning = true

data/lib/omniauth-mlh/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module MLH
-    VERSION = '1.0.0'
+    VERSION = '4.0.1'
   end
 end

data/lib/{omniauth-mlh.rb → omniauth_mlh.rb}

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 
-require 'active_support'
 require 'omniauth-mlh/version'
 require 'omniauth/strategies/mlh'

data/omniauth-mlh.gemspec

@@ -8,15 +8,15 @@ require 'omniauth-mlh/version'
 Gem::Specification.new do |spec|
   spec.name          = 'omniauth-mlh'
   spec.version       = OmniAuth::MLH::VERSION
-  spec.authors       = ['Swift']
-  spec.email         = ['swift@mlh.io']
+  spec.authors       = ['Major League Hacking (MLH)']
+  spec.email         = ['hi@mlh.io']
 
   spec.summary       = 'Official OmniAuth strategy for MyMLH.'
   spec.description   = 'Official OmniAuth strategy for MyMLH.'
   spec.homepage      = 'http://github.com/mlh/omniauth-mlh'
   spec.license       = 'MIT'
 
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.executables    = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.files          = `git ls-files`.split("\n")
@@ -26,13 +26,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'oauth2', '~> 2.0.9'
   spec.add_dependency 'omniauth', '~> 2.1.1'
   spec.add_dependency 'omniauth-oauth2', '~> 1.8.0'
-  spec.add_dependency 'omniauth-rails_csrf_protection', '~> 1.0.1'
-
-  spec.add_dependency 'activesupport'
 
   spec.add_development_dependency 'rack-test'
-  spec.add_development_dependency 'rake', '~> 10.5'
-  spec.add_development_dependency 'rspec', '~> 2.7'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rubocop', '~> 1.0'
+  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
 end

data/spec/omni_auth/mlh_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe OmniAuth::MLH do
+  it 'has a version number' do
+    expect(OmniAuth::MLH::VERSION).not_to be_nil
+    expect(OmniAuth::MLH::VERSION).to eq('4.0.1')
+  end
+
+  it 'loads the MLH strategy' do
+    expect(OmniAuth::Strategies::MLH).to be_a(Class)
+    expect(OmniAuth::Strategies::MLH.superclass).to eq(OmniAuth::Strategies::OAuth2)
+  end
+end

data/spec/omni_auth/strategies/mlh_spec.rb

@@ -0,0 +1,196 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe OmniAuth::Strategies::MLH do
+  let(:strategy) { described_class.new(app, 'client_id', 'client_secret') }
+
+  let(:app) { ->(_env) { [200, {}, ['Hello.']] } }
+  let(:access_token) { instance_double(OAuth2::AccessToken, options: {}) }
+
+  before do
+    allow(strategy).to receive(:access_token).and_return(access_token)
+  end
+
+  shared_context 'with oauth response' do |response_data|
+    let(:oauth_response) do
+      instance_double(OAuth2::Response,
+                      body: response_data.to_json,
+                      parsed: response_data)
+    end
+    before do
+      allow(access_token).to receive(:get)
+        .with('https://api.mlh.com/v4/users/me')
+        .and_return(oauth_response)
+    end
+  end
+
+  describe '#data' do
+    context 'with expandable fields' do
+      let(:response) do
+        instance_double(OAuth2::Response, body: {}.to_json, parsed: {})
+      end
+      let(:expand_url) { 'https://api.mlh.com/v4/users/me?expand[]=profile&expand[]=education' }
+
+      before do
+        allow(strategy).to receive(:options).and_return(expand_fields: ['profile', 'education'])
+        allow(access_token).to receive(:get).with(expand_url).and_return(response)
+      end
+
+      it 'constructs the correct URL with expand parameters' do
+        strategy.data
+
+        expect(access_token).to have_received(:get).with(expand_url)
+      end
+
+      it 'returns an empty hash for empty response' do
+        expect(strategy.data).to eq({})
+      end
+    end
+
+    context 'with v4 API nested profile data' do
+      include_context 'with oauth response', {
+        'id' => 'test-id',
+        'first_name' => 'Jane',
+        'profile' => {
+          'age' => 22,
+          'gender' => 'Female'
+        }
+      }
+
+      it 'correctly parses nested profile data' do
+        result = strategy.data
+
+        expect(result).to be_a(Hash)
+        expect(result[:profile]).to eq({ age: 22, gender: 'Female' })
+      end
+    end
+
+    context 'with v4 API empty response' do
+      include_context 'with oauth response', {}
+
+      it 'returns an empty hash for empty data' do
+        expect(strategy.data).to eq({})
+      end
+    end
+
+    context 'with v4 API complex data structures' do
+      include_context 'with oauth response', {
+        'id' => 'test-id',
+        'education' => [{
+          'school' => {
+            'name' => 'Test University',
+            'location' => 'Test City'
+          },
+          'graduation_year' => 2024
+        }],
+        'social_profiles' => [
+          { 'platform' => 'github', 'url' => 'https://github.com' },
+          'https://twitter.com'
+        ],
+        'professional_experience' => [{
+          'company' => 'Tech Corp',
+          'positions' => [
+            { 'title' => 'Engineer', 'years' => [2022, 2023] }
+          ]
+        }]
+      }
+
+      it 'correctly processes complex nested structures' do
+        result = strategy.data
+
+        expect(result).to be_a(Hash)
+        expect(result[:education].first[:school]).to eq({ name: 'Test University', location: 'Test City' })
+        expect(result[:social_profiles]).to eq([{ platform: 'github', url: 'https://github.com' }, 'https://twitter.com'])
+        expect(result[:professional_experience].first[:positions].first[:years]).to eq([2022, 2023])
+      end
+    end
+
+    context 'with v4 API nil and empty values' do
+      include_context 'with oauth response', {
+        'id' => 'test-id',
+        'first_name' => 'Jane',
+        'last_name' => nil,
+        'profile' => {
+          'age' => 22,
+          'gender' => nil,
+          'location' => {
+            'city' => nil,
+            'country' => 'USA'
+          }
+        },
+        'education' => nil,
+        'social_profiles' => {
+          'github' => {},
+          'linkedin' => {}
+        }
+      }
+
+      it 'handles nil values correctly' do
+        result = strategy.data
+
+        expect(result[:last_name]).to be_nil
+        expect(result[:profile][:gender]).to be_nil
+        expect(result[:profile][:location]).to eq({ city: nil, country: 'USA' })
+        expect(result[:education]).to be_nil
+      end
+
+      it 'handles empty hash structures' do
+        result = strategy.data
+
+        expect(result[:social_profiles]).to eq({ github: {}, linkedin: {} })
+      end
+    end
+
+    context 'with API error' do
+      it 'returns empty hash on error' do
+        allow(access_token).to receive(:get).and_raise(StandardError)
+
+        expect(strategy.data).to eq({})
+      end
+    end
+  end
+
+  describe '#uid' do
+    context 'with valid data' do
+      it 'returns the id from the data hash' do
+        allow(strategy).to receive(:data).and_return({ id: 'test-123' })
+        expect(strategy.uid).to eq('test-123')
+      end
+    end
+
+    context 'with missing id' do
+      it 'returns nil when id is not present' do
+        allow(strategy).to receive(:data).and_return({})
+        expect(strategy.uid).to be_nil
+      end
+    end
+  end
+
+  describe '#info' do
+    let(:user_data) do
+      {
+        first_name: 'Jane',
+        last_name: 'Hacker',
+        email: 'jane@example.com',
+        roles: ['hacker']
+      }
+    end
+
+    before do
+      allow(strategy).to receive(:data).and_return(user_data)
+    end
+
+    it 'includes basic user information' do
+      expect(strategy.info).to include(
+        first_name: 'Jane',
+        last_name: 'Hacker',
+        email: 'jane@example.com'
+      )
+    end
+
+    it 'includes user roles' do
+      expect(strategy.info[:roles]).to eq(['hacker'])
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,23 +1,31 @@
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
-
-require 'simplecov'
-SimpleCov.start
-
 require 'bundler/setup'
-require 'rspec'
-require 'rack/test'
 require 'webmock/rspec'
+require 'simplecov'
+require 'active_support'
+require 'active_support/core_ext/hash'
+
+# Configure SimpleCov before requiring our library
+SimpleCov.start do
+  add_filter '/spec/'
+  add_filter '/vendor/'
+  track_files 'lib/**/*.rb'
+  enable_coverage :branch
+end
+
 require 'omniauth'
-require 'omniauth-mlh'
+require 'omniauth-oauth2'
+require 'omniauth_mlh'
+require 'omniauth/strategies/mlh'
 
-Dir[File.expand_path('support/**/*', __dir__)].sort.each { |f| require f }
+Dir[File.expand_path('support/**/*.rb', __dir__)].sort.each { |f| require f }
 
 RSpec.configure do |config|
-  config.include WebMock::API
-  config.include Rack::Test::Methods
-  config.extend  OmniAuth::Test::StrategyMacros, type: :strategy
-
-  OmniAuth.config.test_mode = true
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end
+
+WebMock.disable_net_connect!(allow_localhost: true)

data/spec/support/shared_examples.rb

@@ -1,41 +1,84 @@
 # frozen_string_literal: true
 
-# Credit: https://github.com/datariot/omniauth-paypal/blob/master/spec/support/shared_examples.rb
-# NOTE it would be useful if this lived in omniauth-oauth2 eventually
-
-shared_examples 'an oauth2 strategy' do
-  describe '#client' do
-    it 'should be initialized with symbolized client_options' do
-      @options = { client_options: { 'authorize_url' => 'https://example.com' } }
-      expect(subject.client.options[:authorize_url]).to eq('https://example.com')
+RSpec.shared_examples 'basic data retrieval tests' do
+  context 'with successful API response' do
+    before do
+      allow(access_token).to receive(:get)
+        .with('https://api.mlh.com/v4/users/me')
+        .and_return(instance_double(OAuth2::Response, parsed: { 'data' => base_user_data }))
+    end
+
+    it 'returns symbolized user data' do
+      expect(strategy.data).to include(
+        id: 'c2ac35c6-aa8c-11ed-afa1-0242ac120002',
+        first_name: 'Jane'
+      )
     end
   end
+end
 
-  describe '#authorize_params' do
-    it 'should include any authorize params passed in the :authorize_params option' do
-      @options = { authorize_params: { foo: 'bar', baz: 'zip' } }
-      expect(subject.authorize_params['foo']).to eq('bar')
-      expect(subject.authorize_params['baz']).to eq('zip')
+RSpec.shared_examples 'expandable fields tests' do
+  let(:expanded_user_data) do
+    base_user_data.merge(
+      'profile' => {
+        'age' => 22,
+        'gender' => 'Female'
+      },
+      'education' => [{
+        'current' => true,
+        'school_name' => 'Hacker University',
+        'major' => 'Computer Science'
+      }]
+    )
+  end
+
+  context 'with expandable fields' do
+    before do
+      allow(access_token).to receive(:get)
+        .with('https://api.mlh.com/v4/users/me?expand[]=profile&expand[]=education')
+        .and_return(instance_double(OAuth2::Response, parsed: { 'data' => expanded_user_data }))
+      allow(strategy).to receive(:options).and_return(expand_fields: ['profile', 'education'])
     end
 
-    it 'should include top-level options that are marked as :authorize_options' do
-      @options = { authorize_options: %i[scope foo], scope: 'bar', foo: 'baz' }
-      expect(subject.authorize_params['scope']).to eq('bar')
-      expect(subject.authorize_params['foo']).to eq('baz')
+    it 'fetches expanded fields' do
+      expect(strategy.data).to include(
+        profile: include(age: 22),
+        education: include(hash_including(school_name: 'Hacker University'))
+      )
     end
   end
+end
 
-  describe '#token_params' do
-    it 'should include any token params passed in the :token_params option' do
-      @options = { token_params: { foo: 'bar', baz: 'zip' } }
-      expect(subject.token_params['foo']).to eq('bar')
-      expect(subject.token_params['baz']).to eq('zip')
+RSpec.shared_examples 'error handling tests' do
+  context 'when API returns error' do
+    before do
+      allow(access_token).to receive(:get).and_raise(StandardError)
     end
 
-    it 'should include top-level options that are marked as :token_options' do
-      @options = { token_options: %i[scope foo], scope: 'bar', foo: 'baz' }
-      expect(subject.token_params['scope']).to eq('bar')
-      expect(subject.token_params['foo']).to eq('baz')
+    it 'returns empty hash on error' do
+      expect(strategy.data).to eq({})
     end
   end
 end
+
+RSpec.shared_examples 'info hash tests' do
+  let(:user_info) do
+    {
+      id: 'c2ac35c6-aa8c-11ed-afa1-0242ac120002',
+      first_name: 'Jane',
+      last_name: 'Hacker',
+      email: 'jane.hacker@example.com'
+    }
+  end
+
+  before do
+    allow(strategy).to receive(:data).and_return(user_info)
+  end
+
+  it 'returns formatted info hash' do
+    expect(strategy.info).to include(
+      name: 'Jane Hacker',
+      email: 'jane.hacker@example.com'
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mlh
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 4.0.1
 platform: ruby
 authors:
-- Swift
-autorequire:
+- Major League Hacking (MLH)
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -53,75 +53,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: omniauth-rails_csrf_protection
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 12.3.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -152,31 +166,35 @@ dependencies:
         version: '0'
 description: Official OmniAuth strategy for MyMLH.
 email:
-- swift@mlh.io
+- hi@mlh.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gem-push.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/omniauth-mlh.rb
 - lib/omniauth-mlh/version.rb
 - lib/omniauth/strategies/mlh.rb
+- lib/omniauth_mlh.rb
 - omniauth-mlh.gemspec
-- spec/omniauth/mlh_spec.rb
+- spec/omni_auth/mlh_spec.rb
+- spec/omni_auth/strategies/mlh_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
 homepage: http://github.com/mlh/omniauth-mlh
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -184,18 +202,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.4.19
+signing_key: 
 specification_version: 4
 summary: Official OmniAuth strategy for MyMLH.
-test_files:
-- spec/omniauth/mlh_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_examples.rb
+test_files: []

data/spec/omniauth/mlh_spec.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe OmniAuth::MLH do
-  subject do
-    OmniAuth::Strategies::MLH.new(nil, @options || {})
-  end
-
-  it_should_behave_like 'an oauth2 strategy'
-
-  describe '#client' do
-    it 'has correct MyMLH site' do
-      expect(subject.client.site).to eq('https://my.mlh.io')
-    end
-
-    it 'has correct authorize url' do
-      expect(subject.client.options[:authorize_url]).to eq('oauth/authorize')
-    end
-
-    it 'has correct token url' do
-      expect(subject.client.options[:token_url]).to eq('oauth/token')
-    end
-
-    it 'runs the setup block if passed one' do
-      counter = ''
-      @options = { setup: proc { |_env| counter = 'ok' } }
-      subject.setup_phase
-      expect(counter).to eq('ok')
-    end
-  end
-
-  describe '#callback_path' do
-    it 'has the correct callback path' do
-      expect(subject.callback_path).to eq('/auth/mlh/callback')
-    end
-  end
-end