[BACK-43] jellyfish updates based on reuse of legacy _id for migration

env.js

@@ -89,19 +89,6 @@ module.exports = (function () {
   env.mongo = {
     connectionString: cs('data'),
   };
-
-  // users who are going to upload via platform during migration
-  var usersFile = fs.readFileSync(__dirname + '/platform_users.json');
-  var platformUsers = JSON.parse(usersFile);
-  if (!Array.isArray(platformUsers)){
-    throw new Error(
-      'Must contain an array in platform_users.json'
-    );
-  }
 
-  env.uploader = {
-    platformUsers: platformUsers.map(item => item.toLowerCase().trim()),
-  };
-
   return env;
 })();

lib/jellyfishService.js

@@ -169,7 +169,7 @@ function createServer(
     var uploaderDestination = null;
 
     if (request.params.userId) {
-      if (serverConfig.uploader.platformUsers.includes(request.params.userId.trim().toLowerCase())) {        
+      if (schemaEnv.platformUserIds.includes(request.params.userId.trim().toLowerCase())) {        
         uploaderDestination = 'platform';
       }else{
         uploaderDestination = 'jellyfish';
@@ -184,12 +184,12 @@ function createServer(
       },
       versions: {
         uploaderMinimum: schemaEnv.minimumUploaderVersion,
-        uploaderDestination,
         loop: {
           minimumSupported: loop.minimumVersion,
           criticalUpdateNeeded: loop.criticalUpdateVersions,
         },
       },
+      uploaderDestination,
     };
     response.status(200).send(body);
   });

lib/schema/schemaEnv.js

@@ -25,10 +25,21 @@ module.exports = (function () {
 
   // The version that we will accept upload requests from, will be in format of 0.200.0
   // NOTE: This will probably be eliminated in favor of using schemaVersion above for the same purpose
-  schemaEnv.minimumUploaderVersion = config.fromEnvironment('MINIMUM_UPLOADER_VERSION', '2.53.0');
+  schemaEnv.minimumUploaderVersion = config.fromEnvironment(
+    'MINIMUM_UPLOADER_VERSION',
+    '2.53.0'
+  );
 
   schemaEnv.authRealm = config.fromEnvironment('KEYCLOAK_AUTH_REALM', null);
   schemaEnv.authUrl = config.fromEnvironment('KEYCLOAK_AUTH_URL', null);
+  var usersStr = config.fromEnvironment('UPLOADER_PLATFORM_USER_IDS', null);
+  var platformUsers = [];
+  if (usersStr) {
+    platformUsers = usersStr
+      .split(',')
+      .map((item) => item.toLowerCase().trim());
+  }
+  schemaEnv.platformUserIds = platformUsers;
 
   return schemaEnv;
 })();