openstax_accounts 9.7.0 → 9.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57482982ec158c16ae7ad70aadbf9bda911cd56b27fa4bfdab86c74c6ce008b2
-  data.tar.gz: fb98bd455ce7f4758d7a862305e83048b8809b1548d1bd87eaa596f433a8f820
+  metadata.gz: 52fa7d9305c25705166caab1576b661a18a542e9a1482fa9e4677f8e076f6be1
+  data.tar.gz: a7069ffb3c2145b110b91188029fb3dc89c3622740c7157a3cfabe2a57b22c2e
 SHA512:
-  metadata.gz: c9a7247488af4a6a96bbb8bb81ead9ea2208efd896a0590a4767c2c7ba88913a8deec5ef9661b72ac15d66f0be489c5177c28c277c527f65e923c904b1bb3038
-  data.tar.gz: aa45a18b1bc00ed0db4f6ab13ca85ea54dcb25be4a00dc356d202e3d00033cc8162b1c039e86f5a0c0b0932102c04e6cb657a830b20c2963b6a722c6adf0aa6c
+  metadata.gz: 1ca35029dd45866b05b0dca01e49f62968e3427f85ebf17f86d190ace2b27b2ba9d30f4bf3dffb2ae044583da661d7eabd2730eae2404595b67e8b7dc172edbe
+  data.tar.gz: 586b18d5e8508c99e3a0211fd6d20d17c93f27e25bef8828abbcc9d198b29b6433b2834b2bedc24d79e19cc0247bb68886e91efb68d2a4c19758ffb647288b04

data/app/controllers/openstax/accounts/sessions_controller.rb

@@ -47,7 +47,7 @@ module OpenStax
 
       def profile
         # TODO: stub profile if stubbing is enabled
-        redirect_to URI.join(configuration.openstax_accounts_url, '/profile').to_s
+        redirect_to URI.join(configuration.openstax_accounts_url, 'profile').to_s
       end
     end
   end

data/app/models/openstax/accounts/account.rb

@@ -39,7 +39,8 @@ module OpenStax::Accounts
       :designer,
       :other,
       :adjunct,
-      :homeschool
+      :homeschool,
+      :researcher
     ]
 
     enum school_type: [

data/lib/omniauth/strategies/openstax.rb

@@ -4,11 +4,11 @@ require 'omniauth-oauth2'
 module OmniAuth
   module Strategies
     class Openstax < OAuth2
-      option :name, "openstax"
+      option :name, 'openstax'
 
       option :client_options, {
-        site: "http://accounts.openstax.org",
-        authorize_url: "/oauth/authorize"
+        authorize_url: 'oauth/authorize',
+        token_url: 'oauth/token'
       }
 
       uid { raw_info[:uuid] }
@@ -21,9 +21,8 @@ module OmniAuth
       extra { { raw_info: raw_info } }
 
       def raw_info
-        @raw_info ||= access_token.get('/api/user.json').parsed.symbolize_keys
+        @raw_info ||= access_token.get('api/user.json').parsed.symbolize_keys
       end
-
     end
   end
 end

data/lib/openstax/accounts/api.rb

@@ -1,7 +1,6 @@
 module OpenStax
   module Accounts
     module Api
-
       DEFAULT_API_VERSION = :v1
 
       # Executes an OpenStax Accounts API request,
@@ -113,10 +112,11 @@ module OpenStax
         @client ||= OAuth2::Client.new(
           OpenStax::Accounts.configuration.openstax_application_id,
           OpenStax::Accounts.configuration.openstax_application_secret,
-          site: OpenStax::Accounts.configuration.openstax_accounts_url
+          site: OpenStax::Accounts.configuration.openstax_accounts_url,
+          authorize_url: 'oauth/authorize',
+          token_url: 'oauth/token'
         )
       end
-
     end
   end
 end

data/lib/openstax/accounts/configuration.rb

@@ -6,8 +6,12 @@ module OpenStax
       attr_reader :openstax_accounts_url
 
       def openstax_accounts_url=(url)
-        url.gsub!(/https|http/,'https') if !(url =~ /localhost/)
-        url = url + "/" if url[url.size-1] != '/'
+        # Only localhost urls are allowed to not be https
+        url.sub!('http:', 'https:') unless url.start_with?('http://localhost')
+
+        # We use URL.join with this url and it needs to end in / to make relative paths work
+        url += '/' unless url.end_with?('/')
+
         @openstax_accounts_url = url
       end
 
@@ -100,7 +104,7 @@ module OpenStax
       end
 
       def default_logout_redirect_url
-        URI.join(openstax_accounts_url, "logout").to_s
+        URI.join(openstax_accounts_url, 'logout').to_s
       end
 
       attr_writer :return_to_url_approver
@@ -114,7 +118,7 @@ module OpenStax
       def initialize
         @openstax_application_id = 'SET ME!'
         @openstax_application_secret = 'SET ME!'
-        @openstax_accounts_url = 'https://accounts.openstax.org/'
+        @openstax_accounts_url = 'https://openstax.org/accounts'
         @enable_stubbing = true
         @logout_via = :get
         @default_errors_partial = 'openstax/accounts/shared/attention'

data/lib/openstax/accounts/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Accounts
-    VERSION = '9.7.0'
+    VERSION = '9.8.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 9.7.0
+  version: 9.8.1
 platform: ruby
 authors:
 - JP Slavinsky
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2023-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -226,6 +226,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  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: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -378,7 +392,7 @@ files:
 homepage: http://github.com/openstax/accounts-rails
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -393,8 +407,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Rails common code and bindings for the 'accounts' API
 test_files: []