openstax_accounts 9.5.1 → 9.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bbc4f9d4b0e45a223ac13d149012a2f27fc8ab8b77d71aa2213f447974ae0ee
-  data.tar.gz: fed8b3ecbf12bbd0cf45ca9f11a0e73a98c4a4157f97733ce3b2672ecb8bc7ff
+  metadata.gz: 3cd4aa7a22ea69ad3166b90650c73a63b0bcdf5b029bb6d1d3405d45c3769fdc
+  data.tar.gz: 4d0308a4b059dc5d4f81042995d930f60a571c44f6bdf432f9718b771f198b75
 SHA512:
-  metadata.gz: eaf4336be588df387e67d9f79633f398053f655c10d624f29d2d0dfe027854a5def31a12c70e088edd7069633762c12707e481cf078e12ea9a389d98b43658be
-  data.tar.gz: 98a1fd1915f40aaf349112a28d91a359cc5ec2b8fbeb230d7192e423b07aaab0a65a367367c400bf2ac3ed3180158561a3abcd9a4e930ea6e2c0af18e0dc88d3
+  metadata.gz: 9594b3dfa88ac6e1a79ab3c75e13a895eea7661827050c61f7573983a44696a69a29d0433dc23937a3ff18d745ec1e52e15dba01682be7d095ff2dcc5aaa62cd
+  data.tar.gz: d808626f78220265082eaac3855b4f47700c843d0e36564ff67e4e3e6194790fca1c9497aab2093ee1e8a8da8387f41603ee9ee9c2fdfe36caeaa7f247d04516

data/README.md

@@ -2,7 +2,7 @@ accounts-rails
 =============
 
 [![Gem Version](https://badge.fury.io/rb/openstax_accounts.svg)](http://badge.fury.io/rb/openstax_accounts)
-[![Build Status](https://travis-ci.org/openstax/accounts-rails.svg?branch=master)](https://travis-ci.org/openstax/accounts-rails)
+[![Tests](https://github.com/openstax/accounts-rails/workflows/Tests/badge.svg)](https://github.com/openstax/accounts-rails/actions?query=workflow:Tests)
 [![Code Climate](https://codeclimate.com/github/openstax/accounts-rails/badges/gpa.svg)](https://codeclimate.com/github/openstax/accounts-rails)
 
 A rails engine for interfacing with OpenStax's accounts server.
@@ -190,3 +190,8 @@ In that folder's config folder, create a `secret_settings.yml` file according to
 instructions in `secret_settings.yml.example`. Run the example server in the normal way (bundle install..., migrate db, rails server).
 7. Navigate to the home page, http://localhost:4000.  Click log in and play around.  You can also refresh the accounts site and see yourself logged in, log out, etc.
 8. For fun, change example/config/openstax_accounts.rb to set `enable_stubbing` to `true`.  Now when you click login you'll be taken to a developer-only page where you can login as other users, generate new users, create new users, etc.
+
+Additional Documentation
+------------------------
+
+Additional documentation is in the [accounts-rails wiki](https://github.com/openstax/accounts-rails/wiki).

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

@@ -5,6 +5,7 @@ module OpenStax::Accounts
     SYNC_ATTRIBUTES = [
       :openstax_uid,
       :username,
+      :is_administrator,
       :first_name,
       :last_name,
       :full_name,

data/app/representers/openstax/accounts/api/v1/account_representer.rb

@@ -30,6 +30,12 @@ module OpenStax
                      required: true
                    }
 
+          property :is_administrator,
+                    type: :boolean,
+                    schema_info: {
+                      description: 'Whether or not this user is an administrator on Accounts'
+                    }
+
           property :first_name,
                    type: String,
                    schema_info: {

data/app/representers/openstax/accounts/api/v1/account_search_representer.rb

@@ -1,3 +1,5 @@
+require 'openstax_api'
+
 module OpenStax
   module Accounts
     module Api

data/app/routines/openstax/accounts/find_or_create_from_sso.rb

@@ -8,7 +8,7 @@ module OpenStax
         uid = attrs.delete('id')
         uuid = attrs.delete('uuid')
         account = Account.find_or_initialize_by(uuid: uuid)
-        account.update_attributes!(attrs.slice(*Account.column_names))
+        account.update!(attrs.slice(*Account.column_names))
         transfer_errors_from(account, {type: :verbatim})
         outputs.account = account
       end

data/config/routes.rb

@@ -17,8 +17,8 @@ OpenStax::Accounts::Engine.routes.draw do
 
   # OmniAuth local routes (SessionsController)
   scope module: 'sessions' do
-    get 'auth/:provider/callback', action: :callback, as: :callback # Authentication success
-    get 'auth/failure', action: :failure, as: :failure              # Authentication failure
+    get 'auth/openstax/callback', action: :callback, as: :callback # Authentication success
+    get 'auth/failure', action: :failure, as: :failure             # Authentication failure
 
     get 'login', action: :new # Redirects to /auth/openstax or stub
     match 'logout', action: :destroy, # Redirects to logout path or stub

data/db/migrate/19_add_is_administrator_to_openstax_accounts_accounts.rb

@@ -0,0 +1,5 @@
+class AddIsAdministratorToOpenStaxAccountsAccounts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :openstax_accounts_accounts, :is_administrator, :boolean
+  end
+end

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.5.1'
+    VERSION = '9.8.0'
   end
 end

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 9.5.1
+  version: 9.8.0
 platform: ruby
 authors:
 - JP Slavinsky
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +92,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: lev
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +350,7 @@ files:
 - db/migrate/16_add_is_kip_to_openstax_accounts_accounts.rb
 - db/migrate/17_add_school_location_to_openstax_accounts_accounts.rb
 - db/migrate/18_add_grant_tutor_access_to_openstax_accounts_accounts.rb
+- db/migrate/19_add_is_administrator_to_openstax_accounts_accounts.rb
 - db/migrate/1_create_openstax_accounts_groups.rb
 - db/migrate/2_create_openstax_accounts_group_members.rb
 - db/migrate/3_create_openstax_accounts_group_owners.rb
@@ -371,7 +378,7 @@ files:
 homepage: http://github.com/openstax/accounts-rails
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -386,8 +393,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Rails common code and bindings for the 'accounts' API
 test_files: []