task/DES-2561: create Scratch 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,

designsafe/settings/common_settings.py

@@ -486,6 +486,7 @@
 
 AGAVE_TOKEN_SESSION_ID = os.environ.get('AGAVE_TOKEN_SESSION_ID', 'agave_token')
 AGAVE_STORAGE_SYSTEM = os.environ.get('AGAVE_STORAGE_SYSTEM')
+AGAVE_WORKING_SYSTEM = os.environ.get('AGAVE_WORKING_SYSTEM', 'designsafe.storage.frontera.scratch')
 
 AGAVE_JWT_PUBKEY = os.environ.get('AGAVE_JWT_PUBKEY')
 AGAVE_JWT_ISSUER = os.environ.get('AGAVE_JWT_ISSUER')

designsafe/static/scripts/data-depot/components/data-depot-nav/data-depot-nav.component.js

@@ -45,6 +45,12 @@ class DataDepotNavCtrl {
  state: 'myData',
  description: 'Private directory for your data'
  },
+ {
+ name: 'Working Files (scratch Frontera)',
+ collapsible: false,
+ state: 'myDataScratch',
+ description: 'Scratch directory on Frontera for use with JupyterHub'
+ },
  {
  name: 'My Projects',
  collapsible: false,

designsafe/static/scripts/data-depot/components/data-depot-toolbar/data-depot-toolbar.component.js

@@ -16,6 +16,7 @@ class DataDepotToolbarCtrl {
  placeholder() {
  var stateNames = {
  'myData': 'My Data',
+ 'myDataScratch': 'Working Files (scratch Frontera)',
  'projects.list': 'My Projects',
  'sharedData': 'Shared Data',
  'boxData': 'Box',

designsafe/static/scripts/data-depot/index.js

@@ -83,6 +83,39 @@ function config(
  },
  },
  })
+ .state('myDataScratch', {
+ url: '/agave/{systemId}/{filePath:any}/?query_string&offset&limit',
+ component: 'dataDepotBrowser',
+ params: {
+ systemId: 'designsafe.storage.frontera.scratch',
+ filePath: Django.user,
+ },
+ resolve: {
+ apiParams: ()=> {
+ return {
+ fileMgr: 'agave',
+ };
+ },
+ path: ($stateParams, Django) => {
+ 'ngInject';
+ if ($stateParams.filePath.replace(/^\/+/, '') === '') {
+ return Django.user;
+ }
+ return $stateParams.filePath;
+ },
+ auth: ($q, Django) => {
+ 'ngInject';
+ if (Django.context.authenticated) {
+ return true;
+ }
+
+ return $q.reject({
+ type: 'authn',
+ context: Django.context,
+ });
+ },
+ },
+ })
  .state('sharedData', {
  url: '/shared/{systemId}/{filePath:any}?query_string',
  component: 'dataDepotBrowser',

designsafe/static/scripts/ng-designsafe/services/file-operation-service.js

@@ -49,7 +49,7 @@ export class FileOperationService {
 
  getTests(files) {
  const externalDataStates = ['boxData', 'dropboxData', 'googledriveData'];
- const agaveDataStates = ['myData', 'projects.view', 'projects.curation'];
+ const agaveDataStates = ['myData', 'myDataScratch', 'projects.view', 'projects.curation'];
  let isHazmapper = files.length > 0 ? files.some((e) => e.name.endsWith('hazmapper')) : false;
  const tests = {
  copy: this.Django.context.authenticated && !isHazmapper && files.length > 0,

designsafe/static/scripts/workspace/components/workspace-data-browser/workspace-data-browser.component.js

@@ -17,6 +17,7 @@ class WorkspaceDataBrowserCtrl {
 
  this.options = [
  { name: 'myData', label: 'My Data' },
+ { name: 'myDataScratch', label: 'Working Files (scratch Frontera)' },
  { name: 'myProjects', label: 'My Projects' },
  { name: 'publications', label: 'Published' },
  { name: 'nees', label: 'Published (NEES)' },
@@ -58,6 +59,17 @@ class WorkspaceDataBrowserCtrl {
  });
  this.breadcrumbParams = this.FileListingService.fileMgrMappings.agave.breadcrumbParams;
  break;
+ case 'myDataScratch':
+ this.listingType = 'files';
+ this.FileListingService.browse({
+ section: 'main',
+ api: 'agave',
+ scheme: 'private',
+ system: 'designsafe.storage.frontera.scratch',
+ path: this.Django.user,
+ });
+ this.breadcrumbParams = this.FileListingService.fileMgrMappings.agave.breadcrumbParams;
+ break;
  case 'myProjects':
  this.listingType = 'projects';
  this.ProjectService.listProjects({ section: 'main' });