diff --git a/AABrowserAPI/UserAuthentication.js b/AABrowserAPI/UserAuthentication.js index b4f7eb5c7..cf93785d3 100644 --- a/AABrowserAPI/UserAuthentication.js +++ b/AABrowserAPI/UserAuthentication.js @@ -24,7 +24,7 @@ let userProfile = { userName: "Guest", devTeams: [], - storagePermissions: new Map() + storagePermissions: [] }; /* The first possibility is that the sessionToken is not there. */ @@ -59,14 +59,22 @@ for (let i = 0; i < session.devTeams.length; i++) { let devTeam = session.devTeams[i]; - let readPermission = storageAccessManager.getPermission(devTeam, "READ", MAX_STORAGE_PERMISSION_DAYS); - let writePermission = storageAccessManager.getPermission(devTeam, "WRITE", MAX_STORAGE_PERMISSION_DAYS); + let container = devTeam.codeName.toLowerCase(); - userProfile.storagePermissions.set(devTeam + "." + "READ", readPermission); - userProfile.storagePermissions.set(devTeam + "." + "WRITE", writePermission); + let readPermission = storageAccessManager.getPermission(container, "READ", MAX_STORAGE_PERMISSION_DAYS); + let writePermission = storageAccessManager.getPermission(container, "WRITE", MAX_STORAGE_PERMISSION_DAYS); + + userProfile.storagePermissions.push([devTeam.codeName + "." + "READ", readPermission]); + userProfile.storagePermissions.push([devTeam.codeName + "." + "WRITE", writePermission]); } + /* In order to be able to download a bot source code, the user will need READ permissions over the Platform container. */ + + let container = "aaplatform"; + let readPermission = storageAccessManager.getPermission(container, "READ", MAX_STORAGE_PERMISSION_DAYS); + userProfile.storagePermissions.push(["AAPlatform" + "." + "READ", readPermission]); + callBackFunction(global.DEFAULT_OK_RESPONSE, userProfile); } diff --git a/Server/StorageAccessManager.js b/Server/StorageAccessManager.js index c92afe468..97b1d09d6 100644 --- a/Server/StorageAccessManager.js +++ b/Server/StorageAccessManager.js @@ -34,7 +34,7 @@ } } - function getPermission(pTeam, pType, pDays) { + function getPermission(pContainer, pType, pDays) { let azure = require('azure-storage'); let blobService = azure.createBlobService(permissions.connectionString); @@ -58,7 +58,6 @@ } } - let container = pTeam.codeName.toLowerCase(); let blobName = undefined; let sharedAccessPolicy = { @@ -69,7 +68,7 @@ } }; - let sasToken = blobService.generateSharedAccessSignature(container, blobName, sharedAccessPolicy); + let sasToken = blobService.generateSharedAccessSignature(pContainer, blobName, sharedAccessPolicy); return "BlobEndpoint=https://aadevelop.blob.core.windows.net;SharedAccessSignature=" + sasToken + ""; diff --git a/TopSpace/EndUser.js b/TopSpace/EndUser.js index 47ff40866..602c3cf42 100644 --- a/TopSpace/EndUser.js +++ b/TopSpace/EndUser.js @@ -26,6 +26,20 @@ function newEndUser() { window.USER_LOGGED_IN = window.USER_PROFILE.userName; + /* Here we will rearrange the storage permissions array into a map, so that it can be easily consumed when needed. */ + + let permissionsMap = new Map; + + for (i = 0; i < window.USER_PROFILE.storagePermissions.length; i++) { + + let permission = window.USER_PROFILE.storagePermissions[i]; + + permissionsMap.set(permission[0], permission[1]); + + } + + window.USER_PROFILE.storagePermissions = permissionsMap; + } function getContainer(point) {