RubyGems - openstax_accounts - Versions diffs - 8.0.1 → 9.0.2 - Mend

openstax_accounts 8.0.1 → 9.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (51) hide show

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

@@ -1,23 +1,17 @@
 module OpenStax
   module Accounts
     class FindOrCreateFromSso
       lev_routine express_output: :account
       def exec(attrs)
         attrs.stringify_keys!
         uid = attrs.delete('id')
         uuid = attrs.delete('uuid')
-        account = Account.find_or_initialize_by(
-          uuid: uuid, openstax_uid: uid
-        )
-        account.update_attributes!(
-          attrs.slice(*Account.column_names)
-        )
+        account = Account.find_or_initialize_by(uuid: uuid)
+        account.update_attributes!(attrs.slice(*Account.column_names))
         transfer_errors_from(account, {type: :verbatim})
         outputs.account = account
       end
     end
   end
 end

data/app/routines/openstax/accounts/sync_accounts.rb CHANGED Viewed

@@ -4,9 +4,7 @@
 module OpenStax
   module Accounts
     class SyncAccounts
       lev_routine transaction: :no_transaction
       protected
@@ -27,7 +25,7 @@ module OpenStax
         updated_app_accounts = []
         app_accounts.each do |app_account|
           account = OpenStax::Accounts::Account.find_by(
-            openstax_uid: app_account.account.openstax_uid
+            uuid: app_account.account.uuid
           ) || app_account.account
           account.syncing = true
@@ -45,10 +43,7 @@ module OpenStax
         end
         OpenStax::Accounts::Api.mark_account_updates_as_read(updated_app_accounts)
       end
     end
   end
 end

data/app/views/layouts/openstax/accounts/application.html.erb CHANGED Viewed

@@ -2,8 +2,8 @@
 <html>
 <head>
   <title>Accounts</title>
-  <%= stylesheet_link_tag    "openstax/accounts/application", :media => "all" %>
-  <%= javascript_include_tag "openstax/accounts/application" %>
+  <%= stylesheet_link_tag    'openstax/accounts/application', media: 'all' %>
+  <%= javascript_include_tag 'openstax/accounts/application' %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/app/views/openstax/accounts/dev/accounts/_search_results.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
-<% total_count = @handler_result.outputs[:total_count]
-   accounts = @handler_result.outputs[:items] %>
+<% total_count = @handler_result.outputs.total_count
+   accounts = @handler_result.outputs.items || [] %>
 <div id='search-results-count'>
   <%= pluralize(total_count, 'user') %> found.
@@ -9,16 +9,15 @@
   <%= osu.action_list(
         records: accounts,
         list: {
-          headings: ['UID', 'Username (click to sign in as)', 'Name'],
-          widths: ['20%', '40%', '40%'],
+          headings: ['UID', 'UUID', 'Username (click to sign in as)', 'Name'],
+          widths: ['20%', '20%', '30%', '30%'],
           data_procs: [
-            lambda { |account| account.openstax_uid },
-            lambda { |account|
-              link_to account.username, become_dev_account_path(
-                                          account.openstax_uid
-                                        ), method: :post
+            ->(account) { account.openstax_uid },
+            ->(account) { account.uuid },
+            ->(account) {
+              link_to account.username, become_dev_account_path(account.id), method: :post
             },
-            lambda { |account| account.name || '---' }
+            ->(account) { account.name || '---' }
           ]
         }
       ) %>

data/app/views/openstax/accounts/dev/accounts/index.html.erb CHANGED Viewed

@@ -1,5 +1,4 @@
 <div class="openstax-accounts development-login">
   <%= render partial: 'openstax/accounts/shared/attention' %>
   <h3>Create an Account</h3>
@@ -11,7 +10,7 @@
     <div class="form-group">
-      <%= f.text_field :username, placeholder: "Username" %>&nbsp;
+      <%= f.text_field :username, placeholder: 'Username' %>&nbsp;
       <%= f.select :role, OpenStax::Accounts::Account.roles.keys.map{|rr| [rr, rr]} %>&nbsp;
       <%= f.submit 'Create', class: 'btn btn-primary' %>
     </div>
@@ -23,15 +22,13 @@
   <p>You need to login, but we're not connected to the Accounts server.<br>
   Search for a user below and click the sign in link next to him or her.</p>
-  <%= render :partial => 'openstax/accounts/shared/accounts/search',
-             :locals => {
-               :search_action_path => openstax_accounts.search_dev_accounts_path,
-               :remote => true,
-               :method => :get
+  <%= render partial: 'openstax/accounts/shared/accounts/search',
+             locals: {
+               search_action_path: openstax_accounts.dev_accounts_path,
+               search_results_partial: 'openstax/accounts/dev/accounts/search_results',
+               remote: true,
+               method: :get
              } %>
   <br>
-  <div id="search-results"></div>
 </div>

data/app/views/openstax/accounts/dev/accounts/{search.js.erb → index.js.erb} RENAMED Viewed

File without changes

data/app/views/openstax/accounts/shared/_attention.html.erb CHANGED Viewed

@@ -1,3 +1,11 @@
 <% handler_errors.each do |error| %>
-  <%= error.translate %>
+  <div class="error"><%= error.translate %></div>
+<% end %>
+<% if flash.alert %>
+  <div class="alert"><%= flash.alert %></div>
+<% end %>
+<% if flash.notice %>
+  <div class="notice"><%= flash.notice %></div>
 <% end %>

data/app/views/openstax/accounts/shared/accounts/_search.html.erb CHANGED Viewed

@@ -1,12 +1,11 @@
 <%
-   # Clients of this partial can override the following variables:
-   search_action_path ||= nil
-   method ||= :get
-   remote ||= false
-   form_html ||=  {id: 'search-form',
-                   class: 'form-inline'}
-   search_types ||= ['Any', 'Username', 'Name',
-                     'First Name', 'Last Name', 'Email']
+  # Clients of this partial can override the following variables:
+  search_action_path ||= nil
+  search_results_partial ||= nil
+  method ||= :get
+  remote ||= false
+  form_html ||=  {id: 'search-form', class: 'form-inline'}
+  search_types ||= ['Any', 'Username', 'Name', 'First Name', 'Last Name', 'Email']
 %>
 <%= lev_form_for :search,
@@ -26,6 +25,11 @@
 <% end %>
+<div id="search-results">
+  <% unless search_results_partial.blank? %>
+    <%= render partial: search_results_partial %>
+  <% end %>
+</div>
 <script>
   var input = $('input[name="search[query]"]');

data/config/routes.rb CHANGED Viewed

@@ -1,18 +1,16 @@
 OpenStax::Accounts::Engine.routes.draw do
   # Redirect here if we don't know what to do (theoretically should not happen)
   root to: 'sessions#new'
   # Shortcut to OmniAuth route that redirects to the Accounts server
   # This is provided by OmniAuth and is not in the SessionsController
-  get '/auth/openstax', as: 'openstax_login'
+  get '/auth/openstax', to: ->(env) { [ 404, {}, [ '' ] ] }, as: 'openstax_login'
-  # User profile route
   if OpenStax::Accounts.configuration.enable_stubbing?
+    # User profile route
     namespace :dev do
       resources :accounts, only: [:index, :create] do
         post 'become', on: :member
-        get 'search', on: :collection
       end
     end
   end
@@ -27,5 +25,4 @@ OpenStax::Accounts::Engine.routes.draw do
                     via: OpenStax::Accounts.configuration.logout_via
     get 'profile', action: :profile # Redirects to profile path or stub
   end
 end

data/db/migrate/14_drop_openstax_uid_and_username_uniqueness.rb ADDED Viewed

@@ -0,0 +1,9 @@
+class DropOpenStaxUidAndUsernameUniqueness < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :openstax_accounts_accounts, column: [ :openstax_uid ], unique: true
+    remove_index :openstax_accounts_accounts, column: [ :username ], unique: true
+    add_index :openstax_accounts_accounts, :openstax_uid
+    add_index :openstax_accounts_accounts, :username
+  end
+end

data/db/migrate/15_drop_accounts_groups.rb ADDED Viewed

@@ -0,0 +1,42 @@
+class DropAccountsGroups < ActiveRecord::Migration[5.2]
+  def change
+    drop_table "openstax_accounts_group_members" do |t|
+      t.integer "group_id", null: false
+      t.integer "user_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["group_id", "user_id"], name: "index_openstax_accounts_group_members_on_group_id_and_user_id", unique: true
+      t.index ["user_id"], name: "index_openstax_accounts_group_members_on_user_id"
+    end
+    drop_table "openstax_accounts_group_nestings" do |t|
+      t.integer "member_group_id", null: false
+      t.integer "container_group_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["container_group_id"], name: "index_openstax_accounts_group_nestings_on_container_group_id"
+      t.index ["member_group_id"], name: "index_openstax_accounts_group_nestings_on_member_group_id", unique: true
+    end
+    drop_table "openstax_accounts_group_owners" do |t|
+      t.integer "group_id", null: false
+      t.integer "user_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["group_id", "user_id"], name: "index_openstax_accounts_group_owners_on_group_id_and_user_id", unique: true
+      t.index ["user_id"], name: "index_openstax_accounts_group_owners_on_user_id"
+    end
+    drop_table "openstax_accounts_groups" do |t|
+      t.integer "openstax_uid", null: false
+      t.boolean "is_public", default: false, null: false
+      t.string "name"
+      t.text "cached_subtree_group_ids"
+      t.text "cached_supertree_group_ids"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["is_public"], name: "index_openstax_accounts_groups_on_is_public"
+      t.index ["openstax_uid"], name: "index_openstax_accounts_groups_on_openstax_uid", unique: true
+    end
+  end
+end

data/lib/omniauth/strategies/openstax.rb CHANGED Viewed

@@ -11,7 +11,7 @@ module OmniAuth
         authorize_url: "/oauth/authorize"
       }
-      uid { raw_info[:id] }
+      uid { raw_info[:uuid] }
       info do
         # Changed to conform to the omniauth schema

data/lib/openstax/accounts/api.rb CHANGED Viewed

@@ -97,155 +97,6 @@ module OpenStax
         request(:put, 'application_users/updated', options.merge(body: application_users.to_json))
       end
-      # Retrieves information about groups that have been
-      # recently updated.
-      # Results are limited to groups that users of the current app
-      # have access to.
-      # Takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.get_application_group_updates(options = {})
-        request(:get, 'application_groups/updates', options)
-      end
-      # Marks group updates as "read".
-      # The application_groups parameter is an array of hashes.
-      # Each hash has 2 required fields: 'id', which should contain the
-      # application_group's id, and 'read_updates', which should contain
-      # the last received value of unread_updates for that application_group.
-      # Can only be called for application_groups that belong to the current app.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.mark_group_updates_as_read(application_groups, options = {})
-        request(:put, 'application_groups/updated', options.merge(
-          body: application_groups.to_json
-        ))
-      end
-      # Creates a group in the Accounts server.
-      # The given account will be the owner of the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns a hash containing the group attributes
-      def self.create_group(account, group, options = {})
-        response = ActiveSupport::JSON.decode(
-          request_for_account(account, :post, 'groups', options.merge(
-            body: group.attributes.slice('name', 'is_public').to_json
-          )).body
-        )
-        group.openstax_uid = response['id']
-        response
-      end
-      # Updates a group in the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.update_group(account, group, options = {})
-        request_for_account(account, :put, "groups/#{group.openstax_uid}",
-          options.merge(
-            body: group.attributes.slice('name', 'is_public').to_json
-          )
-        )
-      end
-      # Deletes a group from the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.destroy_group(account, group, options = {})
-        request_for_account(account, :delete, "groups/#{group.openstax_uid}", options)
-      end
-      # Creates a group_member in the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.create_group_member(account, group_member, options = {})
-        request_for_account(
-          account,
-          :post,
-          "groups/#{group_member.group_id}/members/#{group_member.user_id}",
-          options
-        )
-      end
-      # Deletes a group_member from the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.destroy_group_member(account, group_member, options = {})
-        request_for_account(
-          account,
-          :delete,
-          "groups/#{group_member.group_id}/members/#{group_member.user_id}",
-          options
-        )
-      end
-      # Creates a group_owner in the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.create_group_owner(account, group_owner, options = {})
-        request_for_account(
-          account,
-          :post,
-          "groups/#{group_owner.group_id}/owners/#{group_owner.user_id}",
-          options
-        )
-      end
-      # Deletes a group_owner from the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.destroy_group_owner(account, group_owner, options = {})
-        request_for_account(
-          account,
-          :delete,
-          "groups/#{group_owner.group_id}/owners/#{group_owner.user_id}",
-          options
-        )
-      end
-      # Creates a group_nesting in the Accounts server.
-      # The given account must own both groups.
-      # Also takes an an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.create_group_nesting(account, group_nesting, options = {})
-        request_for_account(
-          account,
-          :post,
-          "groups/#{group_nesting.container_group_id}/nestings/#{
-                    group_nesting.member_group_id}",
-          options
-        )
-      end
-      # Deletes a group_nesting from the Accounts server.
-      # The given account must own either group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.destroy_group_nesting(account, group_nesting, options = {})
-        request_for_account(
-          account,
-          :delete,
-          "groups/#{group_nesting.container_group_id}/nestings/#{
-                    group_nesting.member_group_id}",
-          options
-        )
-      end
       # Finds an account matching the provided attributes or creates a new
       # account.  Also takes an options hash.
       # On failure, throws an Exception, just like the request method.

data/lib/openstax/accounts/current_user_manager.rb CHANGED Viewed

@@ -1,7 +1,6 @@
 module OpenStax
   module Accounts
     class CurrentUserManager
       def initialize(request, session, cookies)
         @request = request
         @session = session
@@ -22,9 +21,7 @@ module OpenStax
       # Signs in the given user or account
       def sign_in!(user)
-        user.is_a?(Account) ?
-          self.current_account = user :
-          self.current_user = user
+        user.is_a?(Account) ? self.current_account = user : self.current_user = user
       end
       alias_method :sign_in, :sign_in!
@@ -126,7 +123,6 @@ module OpenStax
       def account_user_mapper
         OpenStax::Accounts.configuration.account_user_mapper
       end
     end
   end
 end