openstax_accounts 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70c240f393002aa5b92f64613b50bfe2ed7a004c
-  data.tar.gz: f0a1f4118d6aa83a0d3bc44fd2147eb55dd2f7ae
+  metadata.gz: 8ee92a3b64d5e3e96b74bb4991cc34bd70ffafba
+  data.tar.gz: b8799ffbc096a017d7f2d084de72fef2e25bd3c7
 SHA512:
-  metadata.gz: 6ecd133133d1b4ab89dd39d80f44164825e2ba4a72c0e4adb2f9f61b7a83d07f85880f1d768ea39bd7b3a10dff4d5cdcd44153880a5d5e01ecac97714fcb5ea0
-  data.tar.gz: f9fdb8b59d9ae93bb8449d0ff21bb36a4e1f0316c97abe9a4e0585b21c16bc18dee361f8769d0b469b5d5d5e9dbfb7e3f28aa6d740959b78ee5256508fed2134
+  metadata.gz: 842e2e8e5fa4200b2baf160a183409cdaace616495bfe614ae5da8b8de15097ca9e219e66881a404dc321114b4297aa9f0ea3f3dfed34fde2046b3a67039ab88
+  data.tar.gz: 69763b3c8b3d2d40a2a49e0f1986807c2e8b54c7784605848a45c9058cc582651c1ecdf7d6bfdaff33a0afa354de4a2cf01a39f61339e862bfa0d8a61ffdf95c

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

@@ -24,11 +24,11 @@ module OpenStax::Accounts
     after_initialize { self.faculty_status ||= :no_faculty_info }
     validates :faculty_status, presence: true
 
-    validates :openstax_uid, :presence => true, :uniqueness => true
-    validates :username, :presence => true, :uniqueness => true,
-                         :unless => :syncing_or_stubbing
+    validates :openstax_uid, presence: true, uniqueness: true
+    validates :username, presence: true, uniqueness: true,
+                         unless: :syncing_or_stubbing
 
-    before_update :update_openstax_accounts, :unless => :syncing_or_stubbing
+    before_update :update_openstax_accounts, unless: :syncing_or_stubbing
 
     def name
       (first_name || last_name) ? [first_name, last_name].compact.join(" ") : username

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

@@ -1,8 +1,7 @@
 module OpenStax
   module Accounts
     class ApplicationAccount
-      attr_accessor :id, :application_id, :account,
-                    :unread_updates, :default_contact_info_id
+      attr_accessor :id, :application_id, :account, :unread_updates, :default_contact_info_id
     end
   end
 end

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

@@ -1,8 +1,4 @@
 # A representer for Accounts
-#
-# This representer can be used directly or subclassed for an object that
-# delegates openstax_uid, username, first_name, last_name, full_name and
-# title to an account
 
 module OpenStax
   module Accounts
@@ -12,6 +8,10 @@ module OpenStax
 
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
+          # Do not use it in create/update APIs!
+
+          # Otherwise, this representer can be used directly or subclassed
+          # for an object that delegates openstax_uid, username, first_name, last_name, full_name, # title, faculty_status and salesforce_contact_id to an account
 
           include Roar::JSON
 
@@ -54,6 +54,20 @@ module OpenStax
                      description: "The user's title"
                    }
 
+          property :salesforce_contact_id,
+                   type: String,
+                   schema_info: {
+                     description: "The user's salesforce contact id"
+                   }
+
+          property :faculty_status,
+                   type: String,
+                   schema_info: {
+                     description: "One of #{
+                       OpenStax::Accounts::Account.faculty_statuses.keys.map(&:to_s).inspect
+                     }"
+                   }
+
         end
       end
     end

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

@@ -6,6 +6,7 @@ module OpenStax
 
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
+          # Do not use it in create/update APIs!
 
           property :total_count,
                    inherit: true,

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

@@ -6,6 +6,7 @@ module OpenStax
 
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
+          # Do not use it in create/update APIs!
 
           include Roar::JSON
 

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

@@ -6,6 +6,7 @@ module OpenStax
 
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
+          # Do not use it in create/update APIs!
 
           collection :application_accounts,
                      as: :application_users,

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

@@ -6,6 +6,7 @@ module OpenStax
 
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
+          # Do not use it in create/update APIs!
 
           include Representable::JSON::Collection
 

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

@@ -6,6 +6,7 @@ module OpenStax
 
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
+          # Do not use it in create/update APIs!
 
           include Roar::JSON
 

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

@@ -6,6 +6,7 @@ module OpenStax
 
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
+          # Do not use it in create/update APIs!
 
           include Representable::JSON::Collection
 

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

@@ -6,6 +6,7 @@ module OpenStax
 
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
+          # Do not use it in create/update APIs!
 
           include Roar::JSON
 

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

@@ -6,6 +6,7 @@ module OpenStax
 
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
+          # Do not use it in create/update APIs!
 
           include Roar::JSON
 

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

@@ -6,6 +6,7 @@ module OpenStax
 
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
+          # Do not use it in create/update APIs!
 
           include Roar::JSON
 

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

@@ -6,6 +6,7 @@ module OpenStax
 
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
+          # Do not use it in create/update APIs!
 
           include Roar::JSON
 

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

@@ -7,18 +7,21 @@ module OpenStax
       protected
 
       def exec(email: nil, username: nil, password: nil,
-               first_name: nil, last_name: nil, full_name: nil, title: nil)
+               first_name: nil, last_name: nil, full_name: nil, title: nil,
+               salesforce_contact_id: nil, faculty_status: nil)
         raise ArgumentError,
               'You must specify either an email address or a username (and an optional password)' \
                 if email.nil? && username.nil?
 
         if OpenStax::Accounts.configuration.enable_stubbing
           # We can only stub finding by username b/c accounts-rails doesn't persist emails
-          id = Account.find_by(username: username).try(:openstax_uid) || -SecureRandom.hex(4).to_i(16)/2
+          id = Account.find_by(username: username).try!(:openstax_uid) ||
+               -SecureRandom.hex(4).to_i(16)/2
         else
           response = Api.find_or_create_account(
             email: email, username: username, password: password,
-            first_name: first_name, last_name: last_name, full_name: full_name)
+            first_name: first_name, last_name: last_name, full_name: full_name,
+            salesforce_contact_id: salesforce_contact_id, faculty_status: faculty_status)
           fatal_error(code: :invalid_inputs) unless (200..202).include?(response.status)
 
           struct = OpenStruct.new
@@ -37,6 +40,8 @@ module OpenStax
           account.last_name = last_name
           account.full_name = full_name
           account.title = title
+          account.salesforce_contact_id = salesforce_contact_id
+          account.faculty_status = faculty_status || :no_faculty_info
           account.save!
         end
 

data/lib/openstax/accounts/api.rb

@@ -92,9 +92,7 @@ module OpenStax
       # On failure, throws an Exception, just like the request method.
       # On success, returns an OAuth2::Response object.
       def self.mark_account_updates_as_read(application_users, options = {})
-        request(:put, 'application_users/updated', options.merge(
-          body: application_users.to_json
-        ))
+        request(:put, 'application_users/updated', options.merge(body: application_users.to_json))
       end
 
       # Retrieves information about groups that have been
@@ -157,8 +155,7 @@ module OpenStax
       # 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)
+        request_for_account(account, :delete, "groups/#{group.openstax_uid}", options)
       end
 
       # Creates a group_member in the Accounts server.
@@ -228,7 +225,8 @@ module OpenStax
           :post,
           "groups/#{group_nesting.container_group_id}/nestings/#{
                     group_nesting.member_group_id}",
-                 options)
+          options
+        )
       end
 
       # Deletes a group_nesting from the Accounts server.
@@ -251,9 +249,7 @@ module OpenStax
       # On failure, throws an Exception, just like the request method.
       # On success, returns an OAuth2::Response object.
       def self.find_or_create_account(attributes, options = {})
-        request(:post, "user/find-or-create", options.merge(
-          body: attributes.to_json
-        ))
+        request(:post, "user/find-or-create", options.merge(body: attributes.to_json))
       end
 
       protected

data/lib/openstax/accounts/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Accounts
-    VERSION = "7.1.0"
+    VERSION = "7.2.0"
   end
 end

data/spec/routines/openstax/accounts/find_or_create_account_spec.rb

@@ -29,18 +29,23 @@ module OpenStax
         expect(account_2).not_to eq(account_3)
       end
 
-      it 'passes names to the API when creating users' do
+      it 'passes params to the API when creating users' do
         find_or_create_account_response = double('Response')
         allow(find_or_create_account_response).to receive(:status).and_return(201)
         allow(find_or_create_account_response).to receive(:body).and_return('{"id":1}')
         expect(OpenStax::Accounts::Api).to receive(:find_or_create_account).with(
           email: 'bob@example.com', username: nil, password: nil,
-          first_name: 'Bob', last_name: 'Smith', full_name: 'Bob Smith'
+          first_name: 'Bob', last_name: 'Smith', full_name: 'Bob Smith',
+          salesforce_contact_id: 'b0b', faculty_status: :rejected_faculty
         ).and_return(find_or_create_account_response)
 
         FindOrCreateAccount.call(
-          email: 'bob@example.com', first_name: 'Bob', last_name: 'Smith',
-          full_name: 'Bob Smith'
+          email: 'bob@example.com',
+          first_name: 'Bob',
+          last_name: 'Smith',
+          full_name: 'Bob Smith',
+          salesforce_contact_id: 'b0b',
+          faculty_status: :rejected_faculty
         )
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails