create myworkingfiles dir on login

conf/env_files/designsafe.sample.env

@@ -74,6 +74,7 @@ AGAVE_CLIENT_SECRET=
 AGAVE_SUPER_TOKEN=
 
 AGAVE_STORAGE_SYSTEM=
+AGAVE_WORKING_SYSTEM=
 AGAVE_JWT_PUBKEY=
 AGAVE_JWT_ISSUER=
 AGAVE_JWT_HEADER=

designsafe/apps/accounts/views.py

@@ -441,7 +441,9 @@ def email_confirmation(request, code=None):
  user = tas.get_user(username=username)
  if tas.verify_user(user['id'], code, password=password):
  logger.info('TAS Account activation succeeded.')
- check_or_create_agave_home_dir.apply(args=(user["username"],))
+ from django.conf import settings
+ check_or_create_agave_home_dir.apply_async(args=(user.username, settings.AGAVE_STORAGE_SYSTEM))
+ check_or_create_agave_home_dir.apply_async(args=(user.username, settings.AGAVE_WORKING_SYSTEM))
  return HttpResponseRedirect(reverse('designsafe_accounts:manage_profile'))
  else:
  messages.error(request,

designsafe/apps/auth/tasks.py

@@ -13,28 +13,28 @@
 
 
 @shared_task(default_retry_delay=1*30, max_retries=3)
-def check_or_create_agave_home_dir(username):
+def check_or_create_agave_home_dir(username, systemId):
  try:
  # TODO should use OS calls to create directory.
  logger.info(
  "Checking home directory for user=%s on "
  "default storage systemId=%s",
  username,
- settings.AGAVE_STORAGE_SYSTEM
+ systemId
  )
  ag = Agave(api_server=settings.AGAVE_TENANT_BASEURL,
  token=settings.AGAVE_SUPER_TOKEN)
  try:
  listing_response = ag.files.list(
- systemId=settings.AGAVE_STORAGE_SYSTEM,
+ systemId=systemId,
  filePath=username)
  logger.info('check home dir response: {}'.format(listing_response))
 
  except HTTPError as e:
  if e.response.status_code == 404:
  logger.info("Creating the home directory for user=%s then going to run setfacl", username)
  body = {'action': 'mkdir', 'path': username}
- fm_response = ag.files.manage(systemId=settings.AGAVE_STORAGE_SYSTEM,
+ fm_response = ag.files.manage(systemId=systemId,
  filePath='',
  body=body)
  logger.info('mkdir response: {}'.format(fm_response))
@@ -62,13 +62,13 @@ def check_or_create_agave_home_dir(username):
 
  # add dir to index
  logger.info("Indexing the home directory for user=%s", username)
- agave_indexer.apply_async(kwargs={'username': username, 'systemId': settings.AGAVE_STORAGE_SYSTEM, 'filePath': username}, queue='indexing')
+ agave_indexer.apply_async(kwargs={'username': username, 'systemId': systemId, 'filePath': username}, queue='indexing')
 
  except(AgaveException):
  #except (HTTPError, AgaveException):
  logger.exception('Failed to create home directory.',
  extra={'user': username,
- 'systemId': settings.AGAVE_STORAGE_SYSTEM})
+ 'systemId': systemId})
 
 
 @shared_task(default_retry_delay=1*30, max_retries=3)

designsafe/apps/auth/views.py

@@ -110,7 +110,7 @@ def agave_oauth_callback(request):
  http://agaveapi.co/documentation/authorization-guide/#authorization_code_flow
  """
  state = request.GET.get('state')
- 
+
  if request.session['auth_state'] != state:
  msg = (
  'OAuth Authorization State mismatch!? auth_state=%s '
@@ -152,7 +152,7 @@ def agave_oauth_callback(request):
  token_data['created'] = int(time.time())
  # log user in
  user = authenticate(backend='agave', token=token_data['access_token'])
- 
+
  if user:
  try:
  token = user.agave_oauth
@@ -172,8 +172,15 @@ def agave_oauth_callback(request):
  filePath=user.username)
  except HTTPError as e:
  if e.response.status_code == 404:
- check_or_create_agave_home_dir.apply_async(args=(user.username,),queue='files')
-
+ check_or_create_agave_home_dir.apply_async(args=(user.username, settings.AGAVE_STORAGE_SYSTEM),queue='files')
+
+ try:
+ ag.files.list(systemId=settings.AGAVE_WORKING_SYSTEM,
+ filePath=user.username)
+ except HTTPError as e:
+ if e.response.status_code == 404:
+ check_or_create_agave_home_dir.apply_async(args=(user.username, settings.AGAVE_WORKING_SYSTEM),queue='files')
+
  else:
  messages.error(
  request,