openstax_accounts 9.5.0 → 9.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ae6fdbc68368694770f436f5a7a4e57dea39b18c93b2791308aace6b07a02a
-  data.tar.gz: bbfbe2609b86b3b216ad0a94c7bf41b7c6bc1b29ea65e4a99388288dfcc80f7f
+  metadata.gz: 57482982ec158c16ae7ad70aadbf9bda911cd56b27fa4bfdab86c74c6ce008b2
+  data.tar.gz: fb98bd455ce7f4758d7a862305e83048b8809b1548d1bd87eaa596f433a8f820
 SHA512:
-  metadata.gz: 29b93ef99bbb0ee170f4619269e79dd94fd89634a328985d55a057b9f0c85980480fdf8bfe47d4e946fb9dfc42e3a91c7e087a1825b8067c7c4a68d27e56f70f
-  data.tar.gz: dd689a226b1f8c92be65d8543c917b35af81eafa9a90f9de3b718fc2cf7b14e4df0ed7f64aff883bc2cf2141bfe1122dffadb9841a7cf0b1df9147e7b419779c
+  metadata.gz: c9a7247488af4a6a96bbb8bb81ead9ea2208efd896a0590a4767c2c7ba88913a8deec5ef9661b72ac15d66f0be489c5177c28c277c527f65e923c904b1bb3038
+  data.tar.gz: aa45a18b1bc00ed0db4f6ab13ca85ea54dcb25be4a00dc356d202e3d00033cc8162b1c039e86f5a0c0b0932102c04e6cb657a830b20c2963b6a722c6adf0aa6c

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/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/app/routines/openstax/accounts/sync_accounts.rb

@@ -1,7 +1,5 @@
 # Routine for getting account updates from the Accounts server
-#
 # Should be scheduled to run regularly
-
 module OpenStax
   module Accounts
     class SyncAccounts
@@ -12,36 +10,40 @@ module OpenStax
       def exec(options={})
         return if OpenStax::Accounts.configuration.enable_stubbing?
 
-        response = OpenStax::Accounts::Api.get_application_account_updates
+        loop do
+          response = OpenStax::Accounts::Api.get_application_account_updates
 
-        app_accounts = []
-        app_accounts_rep = OpenStax::Accounts::Api::V1::ApplicationAccountsRepresenter
-                             .new(app_accounts)
-        app_accounts_rep.from_json(response.body)
+          app_accounts = []
+          app_accounts_rep = OpenStax::Accounts::Api::V1::ApplicationAccountsRepresenter.new(
+            app_accounts
+          )
+          app_accounts_rep.from_json(response.body)
 
-        return if app_accounts.empty?
+          num_accounts = app_accounts.size
+          return if num_accounts == 0
 
-        updated_app_accounts = []
-        app_accounts.each do |app_account|
-          account = OpenStax::Accounts::Account.find_by(
-            uuid: app_account.account.uuid
-          ) || app_account.account
-          account.syncing = true
+          updated_app_accounts = []
+          app_accounts.each do |app_account|
+            account = OpenStax::Accounts::Account.find_by(
+              uuid: app_account.account.uuid
+            ) || app_account.account
+            account.syncing = true
 
-          if account != app_account.account
             OpenStax::Accounts::Account::SYNC_ATTRIBUTES.each do |attribute|
-              account.send("#{attribute}=", app_account.account.send(attribute))
-            end
+              account.send "#{attribute}=", app_account.account.send(attribute)
+            end if account != app_account.account
+
+            next unless account.save
+
+            updated_app_accounts << {
+              user_id: account.openstax_uid, read_updates: app_account.unread_updates
+            }
           end
 
-          next unless account.save
+          OpenStax::Accounts::Api.mark_account_updates_as_read(updated_app_accounts)
 
-          updated_app_accounts << {
-            user_id: account.openstax_uid, read_updates: app_account.unread_updates
-          }
+          return if num_accounts < OpenStax::Accounts.configuration.max_user_updates_per_request
         end
-
-        OpenStax::Accounts::Api.mark_account_updates_as_read(updated_app_accounts)
       end
     end
   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/openstax/accounts/api.rb

@@ -81,7 +81,9 @@ module OpenStax
       # On success, returns an OAuth2::Response object.
       def self.get_application_account_updates(options = {})
         limit = OpenStax::Accounts.configuration.max_user_updates_per_request
-        request(:get, "application_users/updates#{ '?limit=' + limit.to_s if !limit.blank? }", options)
+        request(
+          :get, "application_users/updates#{ '?limit=' + limit.to_s if !limit.blank? }", options
+        )
       end
 
       # Marks account updates as "read".

data/lib/openstax/accounts/version.rb

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

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 9.5.0
+  version: 9.7.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2021-10-08 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
@@ -386,7 +393,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: Rails common code and bindings for the 'accounts' API