[ARVADOS] updated: 35295980b918232db8a8f3321e3bf02729e26c9f

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/user.rb     |    2 +-
 services/api/test/unit/user_test.rb |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  35295980b918232db8a8f3321e3bf02729e26c9f (commit)
      from  074147b4138f7a29ed9ff054b916ac1856b71e9f (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 35295980b918232db8a8f3321e3bf02729e26c9f
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Apr 22 16:06:00 2014 -0400

    Properties should not have symbol keys. Our API runs on JSON, which does
    not have symbol keys. We want to be consistent in our use of keys, so we
    don't use symbol keys within the API server for object properties.
    
    This fixes pre-authenticating users. Again.

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index f00a42e..513e0ae 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -245,7 +245,7 @@ class User < ArvadosModel
   end
 
   def create_oid_login_perm (openid_prefix)
-    login_perm_props = {identity_url_prefix: openid_prefix}
+    login_perm_props = { "identity_url_prefix" => openid_prefix}
 
     # Check oid_login_perm
     oid_login_perms = Link.where(tail_uuid: self.email,
diff --git a/services/api/test/unit/user_test.rb b/services/api/test/unit/user_test.rb
index 6eb048e..67d0bad 100644
--- a/services/api/test/unit/user_test.rb
+++ b/services/api/test/unit/user_test.rb
@@ -175,7 +175,7 @@ class UserTest < ActiveSupport::TestCase
     verify_link oid_login_perm, 'permission', 'can_login', resp_user[:email],
         resp_user[:uuid]
 
-    assert_equal openid_prefix, oid_login_perm[:properties][:identity_url_prefix],
+    assert_equal openid_prefix, oid_login_perm[:properties]['identity_url_prefix'],
         'expected identity_url_prefix not found for oid_login_perm'
 
     group_perm = find_obj_in_resp response, 'Link', 'arvados#group'
@@ -217,7 +217,7 @@ class UserTest < ActiveSupport::TestCase
     verify_link oid_login_perm, 'permission', 'can_login', resp_user[:email],
         resp_user[:uuid]
 
-    assert_equal openid_prefix, oid_login_perm[:properties][:identity_url_prefix],
+    assert_equal openid_prefix, oid_login_perm[:properties]['identity_url_prefix'],
         'expected identity_url_prefix not found for oid_login_perm'
 
     group_perm = find_obj_in_resp response, 'Link', 'arvados#group'
@@ -248,7 +248,7 @@ class UserTest < ActiveSupport::TestCase
     oid_login_perm = find_obj_in_resp response, 'Link', 'arvados#user'
     verify_link oid_login_perm, 'permission', 'can_login', resp_user[:email],
         resp_user[:uuid]
-    assert_equal openid_prefix, oid_login_perm[:properties][:identity_url_prefix],
+    assert_equal openid_prefix, oid_login_perm[:properties]['identity_url_prefix'],
         'expected identity_url_prefix not found for oid_login_perm'
 
     group_perm = find_obj_in_resp response, 'Link', 'arvados#group'

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


hooks/post-receive
--