openstax_accounts 2.0.0 → 3.0.0

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

@@ -0,0 +1,18 @@
+module OpenStax
+  module Accounts
+    module Api
+      module V1
+        class GroupNestingRepresenter < Roar::Decorator
+          include Roar::Representer::JSON
+
+          property :container_group_id,
+                   type: Integer
+
+          property :member_group_id,
+                   type: Integer
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+module OpenStax
+  module Accounts
+    module Api
+      module V1
+        class GroupRepresenter < Roar::Decorator
+          include Roar::Representer::JSON
+
+          property :openstax_uid,
+                   as: :id,
+                   type: Integer
+
+          property :name,
+                   type: String
+
+          property :is_public
+
+          collection :group_owners,
+                     as: :owners,
+                     class: GroupOwner,
+                     decorator: GroupUserRepresenter
+
+          collection :group_members,
+                     as: :members,
+                     class: GroupMember,
+                     decorator: GroupUserRepresenter
+
+          collection :member_group_nestings,
+                     as: :nestings,
+                     class: GroupNesting,
+                     decorator: GroupNestingRepresenter
+
+          property :cached_supertree_group_ids,
+                   as: :supertree_group_ids,
+                   type: Array,
+                   schema_info: {
+                     items: "integer"
+                   }
+
+          property :cached_subtree_group_ids,
+                   as: :subtree_group_ids,
+                   type: Array,
+                   schema_info: {
+                     items: "integer"
+                   }
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module OpenStax
+  module Accounts
+    module Api
+      module V1
+        class GroupUserRepresenter < Roar::Decorator
+          include Roar::Representer::JSON
+
+          property :group_id,
+                   type: Integer
+
+          nested :user do
+            property :user_id,
+                     as: :id,
+                     type: Integer
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -65,7 +65,7 @@ module OpenStax
         else
 
           # Local search
-          accounts = OpenStax::Accounts::Account.scoped
+          accounts = OpenStax::Accounts::Account.all
 
           KeywordSearch.search(query) do |with|
 
@@ -73,7 +73,7 @@ module OpenStax
 
             with.keyword :username do |usernames|
               accounts = accounts.where{username
-                .like_any my{prep_usernames(usernames)}}
+                .like_any my{prep_names(usernames)}}
             end
 
             with.keyword :first_name do |first_names|
@@ -103,7 +103,7 @@ module OpenStax
             end
 
             with.keyword :email do |emails|
-              accounts = OpenStax::Accounts::Account.where('0=1')
+              accounts = OpenStax::Accounts::Account.none
             end
 
             # Rerun the queries above for 'any' terms (which are ones without a
@@ -113,7 +113,7 @@ module OpenStax
               names = prep_names(terms)
 
               accounts = accounts.where{
-                (  lower(username).like_any my{prep_usernames(terms)}) |
+                (lower(username).like_any   names) |
                 (lower(first_name).like_any names)                     |
                 (lower(last_name).like_any  names)                     |
                 (lower(full_name).like_any  names)                     |
@@ -175,21 +175,14 @@ module OpenStax
         # Return no results if query exceeds maximum allowed number of matches
         max_accounts = options[:max_matching_accounts] || \
                     OpenStax::Accounts.configuration.max_matching_accounts
-        outputs[:accounts] = OpenStax::Accounts::Account.where('0=1') \
+        outputs[:accounts] = OpenStax::Accounts::Account.none \
           if outputs[:num_matching_accounts] > max_accounts
 
       end
       
-      # Downcase, and put a wildcard at the end.
-      # For the moment don't exclude characters.
+      # Downcase, remove all wildcards and put a wildcard at the end.
       def prep_names(names)
-        names.collect{|name| name.downcase + '%'}
-      end
-      
-      def prep_usernames(usernames)
-        usernames.collect{|username| username.gsub(
-          OpenStax::Accounts::Account::USERNAME_DISCARDED_CHAR_REGEX, '')
-          .downcase + '%'}
+        names.collect{|name| "#{name.downcase.gsub('%', '')}%"}
       end
 
     end

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

@@ -16,28 +16,42 @@ module OpenStax
       
       def exec(options={})
 
-        return if OpenStax::Accounts.configuration.enable_stubbing?
+        begin
+          OpenStax::Accounts.syncing = true
 
-        response = OpenStax::Accounts.get_application_account_updates
+          return if OpenStax::Accounts.configuration.enable_stubbing?
 
-        app_accounts = []
-        app_accounts_rep = OpenStax::Accounts::Api::V1::ApplicationAccountsRepresenter
+          response = OpenStax::Accounts.get_application_account_updates
+
+          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?
-
-        app_accounts_hash = {}
-        app_accounts.each do |app_account|
-          account = OpenStax::Accounts::Account.where(
-            :openstax_uid => app_account.account.openstax_uid).first
-          account.syncing_with_accounts = true
-          next unless account.update_attributes(
-            app_account.account.attributes.slice(*SYNC_ATTRIBUTES))
-          app_accounts_hash[app_account.id] = app_account.unread_updates
-        end
+          app_accounts_rep.from_json(response.body)
+
+          return if app_accounts.empty?
+
+          updated_app_accounts = []
+          app_accounts.each do |app_account|
+            account = OpenStax::Accounts::Account.where(
+                        :openstax_uid => app_account.account.openstax_uid).first ||\
+                        app_account.account
 
-        OpenStax::Accounts.mark_updates_as_read(app_accounts_hash)
+            if account != app_account.account
+              SYNC_ATTRIBUTES.each do |attribute|
+                account.send("#{attribute}=", app_account.account.send(attribute))
+              end
+            end
+
+            next unless account.save
+
+            updated_app_accounts << {user_id: account.openstax_uid,
+                                    read_updates: app_account.unread_updates}
+          end
+
+          OpenStax::Accounts.mark_account_updates_as_read(updated_app_accounts)
+        ensure
+          OpenStax::Accounts.syncing = false
+        end
 
       end
 

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

@@ -0,0 +1,61 @@
+# Routine for getting group updates from the Accounts server
+#
+# Should be scheduled to run regularly
+
+module OpenStax
+  module Accounts
+
+    class SyncGroups
+
+      SYNC_ATTRIBUTES = ['name', 'is_public', 'group_members',
+                         'group_owners', 'member_group_nestings',
+                         'cached_supertree_group_ids', 'cached_subtree_group_ids']
+
+      lev_routine transaction: :no_transaction
+      
+      protected
+      
+      def exec(options={})
+
+        begin
+          OpenStax::Accounts.syncing = true
+
+          return if OpenStax::Accounts.configuration.enable_stubbing?
+
+          response = OpenStax::Accounts.get_application_group_updates
+
+          app_groups = []
+          app_groups_rep = OpenStax::Accounts::Api::V1::ApplicationGroupsRepresenter
+                             .new(app_groups)
+          app_groups_rep.from_json(response.body)
+
+          return if app_groups.empty?
+
+          updated_app_groups = []
+          app_groups.each do |app_group|
+            group = OpenStax::Accounts::Group.where(
+                      :openstax_uid => app_group.group.openstax_uid).first || app_group.group
+
+            if group != app_group.group
+              SYNC_ATTRIBUTES.each do |attribute|
+                group.send("#{attribute}=", app_group.group.send(attribute))
+              end
+            end
+
+            next unless group.save
+
+            updated_app_groups << {group_id: group.openstax_uid,
+                                   read_updates: app_group.unread_updates}
+          end
+
+          OpenStax::Accounts.mark_group_updates_as_read(updated_app_groups)
+        ensure
+          OpenStax::Accounts.syncing = false
+        end
+
+      end
+
+    end
+
+  end
+end

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

@@ -0,0 +1,27 @@
+# Routine for updating group caches when a group_nesting is created or destroyed
+#
+# Caller provides the group_nesting object
+
+module OpenStax
+  module Accounts
+
+    class UpdateGroupCaches
+
+      # This transaction needs :repeatable_read to prevent missed updates
+      lev_routine transaction: :repeatable_read
+
+      protected
+
+      def exec(group_nesting)
+        subtree_group_ids = group_nesting.member_group.subtree_group_ids
+        supertree_group_ids = group_nesting.container_group.supertree_group_ids
+        tree_group_ids = (subtree_group_ids + supertree_group_ids).uniq
+
+        Group.where(id: subtree_group_ids).update_all(cached_supertree_group_ids: nil)
+        Group.where(id: supertree_group_ids).update_all(cached_subtree_group_ids: nil)
+      end
+
+    end
+
+  end
+end

data/app/views/openstax/accounts/shared/accounts/_index.html.erb

@@ -1,7 +1,6 @@
 <%
    # Clients of this partial can override the following variables:
    search_action_path ||= nil
-   results_list_id ||= 'search-results-list'
    method ||= :post
    remote ||= false
    form_html ||=  {id: 'search-form',
@@ -23,5 +22,3 @@
   <%= f.submit 'Search', class: 'btn btn-primary' %>
 
 <% end %>
-
-<div id=<%= results_list_id %>></div>

data/config/initializers/action_interceptor.rb

@@ -6,7 +6,7 @@ ActionInterceptor.configure do
     return if account && !account.is_anonymous?
 
     respond_to do |format|
-      format.html { redirect_to registration_path }
+      format.html { redirect_to openstax_accounts.login_url }
       format.json { head(:forbidden) }
     end
   end

data/db/migrate/20140811182433_create_openstax_accounts_groups.rb

@@ -0,0 +1,16 @@
+class CreateOpenStaxAccountsGroups < ActiveRecord::Migration
+  def change
+    create_table :openstax_accounts_groups do |t|
+      t.integer :openstax_uid, :null => false
+      t.boolean :is_public, null: false, default: false
+      t.string :name
+      t.text :cached_subtree_group_ids
+      t.text :cached_supertree_group_ids
+
+      t.timestamps
+    end
+
+    add_index :openstax_accounts_groups, :openstax_uid, :unique => true
+    add_index :openstax_accounts_groups, :is_public
+  end
+end

data/db/migrate/20140811182505_create_openstax_accounts_group_members.rb

@@ -0,0 +1,13 @@
+class CreateOpenStaxAccountsGroupMembers < ActiveRecord::Migration
+  def change
+    create_table :openstax_accounts_group_members do |t|
+      t.references :group, null: false
+      t.references :user, null: false
+
+      t.timestamps
+    end
+
+    add_index :openstax_accounts_group_members, [:group_id, :user_id], unique: true
+    add_index :openstax_accounts_group_members, :user_id
+  end
+end

data/db/migrate/20140811182527_create_openstax_accounts_group_owners.rb

@@ -0,0 +1,13 @@
+class CreateOpenStaxAccountsGroupOwners < ActiveRecord::Migration
+  def change
+    create_table :openstax_accounts_group_owners do |t|
+      t.references :group, null: false
+      t.references :user, null: false
+
+      t.timestamps
+    end
+
+    add_index :openstax_accounts_group_owners, [:group_id, :user_id], unique: true
+    add_index :openstax_accounts_group_owners, :user_id
+  end
+end

data/db/migrate/20140811182553_create_openstax_accounts_group_nestings.rb

@@ -0,0 +1,13 @@
+class CreateOpenStaxAccountsGroupNestings < ActiveRecord::Migration
+  def change
+    create_table :openstax_accounts_group_nestings do |t|
+      t.references :member_group, null: false
+      t.references :container_group, null: false
+
+      t.timestamps
+    end
+
+    add_index :openstax_accounts_group_nestings, :member_group_id, unique: true
+    add_index :openstax_accounts_group_nestings, :container_group_id
+  end
+end

data/lib/generators/openstax/accounts/schedule/templates/schedule.rb

@@ -1,3 +1,4 @@
 every 5.minutes do
   runner "OpenStax::Accounts::SyncAccounts.call"
+  runner "OpenStax::Accounts::SyncGroups.call"
 end

data/lib/openstax/accounts/current_user_manager.rb

@@ -50,7 +50,7 @@ module OpenStax
           @cookies.delete(:secure_account_id)
         else
           @session[:account_id] = account.id
-          @cookies.signed[:secure_account_id] = { secure: true,
+          @cookies.encrypted[:secure_account_id] = { secure: true,
             httponly: true, value: "secure#{account.id}" }
         end
       end
@@ -64,7 +64,7 @@ module OpenStax
         # and the signed secure ID doesn't match the unsecure ID
         # http://railscasts.com/episodes/356-dangers-of-session-hijacking
         if @request.ssl? && \
-          @cookies.signed[:secure_account_id] != "secure#{@session[:account_id]}"
+          @cookies.encrypted[:secure_account_id] != "secure#{@session[:account_id]}"
           sign_out!
           return
         end

data/lib/openstax/accounts/has_many_through_groups.rb

@@ -0,0 +1,45 @@
+module OpenStax
+  module Accounts
+    module HasManyThroughGroups
+      module ActiveRecord
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
+        
+        module ClassMethods
+          def has_many_through_groups(groups_name, name, options = {})
+            options = {class_name: name.to_s.classify}.merge(options)
+            association_name = "direct_#{name.to_s}".to_sym
+
+            OpenStax::Accounts::Group.class_exec do
+              has_many association_name, options
+
+              define_method(name) do
+                OpenStax::Accounts::Group.includes(association_name)
+                  .where(id: supertree_group_ids)
+                  .collect{|g| g.send(association_name).to_a}.flatten.uniq
+              end
+            end
+
+            class_exec do
+              has_many association_name, options if options[:as]
+
+              define_method(name) do
+                direct_records = respond_to?(association_name) ? \
+                                   send(association_name).to_a : []
+                indirect_records = OpenStax::Accounts::Group
+                  .includes(association_name).where(
+                    id: send(groups_name).collect{|g| g.supertree_group_ids}.flatten.uniq
+                  )
+                  .collect{|g| g.send(association_name).to_a}
+                (direct_records + indirect_records).flatten.uniq
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, OpenStax::Accounts::HasManyThroughGroups::ActiveRecord