[ARVADOS] updated: 1.3.0-1588-g1c3c8f7fd

[Git user]

Summary of changes:
 .../app/controllers/user_sessions_controller.rb    | 63 +---------------
 services/api/app/models/user.rb                    | 86 +++++++++++++++++++++-
 ... 20190905151603_enforce_unique_identity_url.rb} |  4 +-
 services/api/db/structure.sql                      | 10 ++-
 services/api/test/fixtures/users.yml               |  8 +-
 services/api/test/integration/remote_user_test.rb  | 42 +++++++++--
 services/api/test/integration/users_test.rb        | 28 +++++++
 services/api/test/unit/user_test.rb                | 85 +++++++++++++++++++++
 8 files changed, 251 insertions(+), 75 deletions(-)
 copy services/api/db/migrate/{20130107181109_add_uuid_to_collections.rb => 20190905151603_enforce_unique_identity_url.rb} (50%)

       via  1c3c8f7fd2e1268b139e046fbd6a7093dd82222f (commit)
       via  e22d3dc998f55e3c21125b1a1be7240f89c23dd6 (commit)
       via  168c5a9a50b93f736b15b7a6c56af900b90aab39 (commit)
       via  2fd0a7680e075431baa61288f34bf400ccaae849 (commit)
       via  9ff2b6f56e4d0c071d2f436a78bc536c541eaf16 (commit)
       via  9902ba33a4006d8652e675f76b6d7e43a2446d14 (commit)
       via  d6c4fc82452b6c8e7fe492a0e2a163a19477f95a (commit)
       via  476f6188d78a8d7c60043b0dd5d22bfba045484c (commit)
       via  5713754c574254f9e3650ac80bf8fdca235898f6 (commit)
       via  b19eea5a71ff3fa6259df25bc0726bd1e152d89b (commit)
       via  fb7a094681db65daa2f28b50ca734dc27e9d6db7 (commit)
      from  9c656c55fe63a22b075223fe7f295e7e21e18b8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1c3c8f7fd2e1268b139e046fbd6a7093dd82222f
Merge: 9c656c55f e22d3dc99
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Sep 5 17:42:30 2019 -0400

    Merge branch '15558-alternate-email-addresses' refs #15558
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit e22d3dc998f55e3c21125b1a1be7240f89c23dd6
Merge: 168c5a9a5 9c656c55f
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Sep 5 17:27:43 2019 -0400

    Merge branch 'master' into 15558-alternate-email-addresses
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --cc services/api/app/controllers/user_sessions_controller.rb
index ca7ba4a40,49af41431..4364229b7
--- a/services/api/app/controllers/user_sessions_controller.rb
+++ b/services/api/app/controllers/user_sessions_controller.rb
@@@ -13,12 -13,18 +13,16 @@@ class UserSessionsController < Applicat
  
    # omniauth callback method
    def create
+     if !Rails.configuration.Login.LoginCluster.empty? and Rails.configuration.Login.LoginCluster != Rails.configuration.ClusterID
+       raise "Local login disabled when LoginCluster is set"
+     end
+ 
      omniauth = request.env['omniauth.auth']
  
 -    identity_url_ok = (omniauth['info']['identity_url'].length > 0) rescue false
 -    unless identity_url_ok
 -      # Whoa. This should never happen.
 -      logger.error "UserSessionsController.create: omniauth object missing/invalid"
 -      logger.error "omniauth: "+omniauth.pretty_inspect
 -
 +    begin
 +      user = User.register omniauth['info']
 +    rescue => e
 +      Rails.logger.warn e
        return redirect_to login_failure_url
      end
  

-----------------------------------------------------------------------


hooks/post-receive
--