return None
def getAuthorities(request, admin = False):
- result = sfa_client(request,'List',hrn='onelab',object_type='authority',platforms=['myslice'],admin=admin)
+ # XXX theme has to be the same as the root authority
+ result = sfa_client(request,'List',hrn=theme.theme,object_type='authority',platforms=['myslice'],admin=admin)
authorities = list()
- for item in result['myslice']:
- authorities.append({'authority_hrn':item['hrn']})
+ try:
+ for item in result['myslice']:
+ t_hrn = item['hrn'].split('.')
+ if 'name' in item:
+ authorities.append({'authority_hrn':item['hrn'], 'name':item['name'], 'shortname':t_hrn[-1].upper()})
+ else:
+ authorities.append({'authority_hrn':item['hrn']})
+ except:
+ logger.error(result)
return sorted(authorities)
elif request['type'] == 'authority':
#hrn = "%s.%s" % (request['authority_hrn'], request['site_authority'])
hrn = request['site_authority']
+ name = request['site_name']
# XXX tmp sfa dependency
from sfa.util.xrn import Xrn
urn = Xrn(hrn, request['type']).get_urn()
# Only hrn is required for Manifold Query
sfa_authority_params = {
- 'authority_hrn' : hrn,
- #'authority_urn' : urn,
- #'type' : request['type'],
- #'pi' : None,
- #'enabled' : True
+ 'authority_hrn' : hrn,
+ 'name' : name
}
- logger.info("ADD Authority")
+ #logger.info("ADD Authority")
sfa_add_authority(wsgi_request, sfa_authority_params)
request_status['SFA authority'] = {'status': True }
a = PendingAuthority.objects.get(id=request['id'])
.select('user_id', 'config', 'email', 'status') \
.filter_by('email', '==', request['email'])
user_details = execute_admin_query(wsgi_request, user_query)
-
# USER MAIN ACCOUNT != reference
#print 'USER MAIN ACCOUNT != reference'
list_accounts_query = Query().get('local:account') \
msg.send()
# saves the user to django auth_user table [needed for password reset]
- user = User.objects.create_user(request['email'], request['email'], request['password'])
+ user = User.objects.create_user(request['email'].split('@')[-1], request['email'], request['password'])
# Creating a manifold user
user_id = manifold_add_user(wsgi_request, request)