Merged in NRRPLT-8432-frontend-admins (pull request #128)

[NRRPLT-8432] Update admin group name

* [NRRPLT-8432] Change admin group and groups structure

Approved-by: Ugo Albanese
Approved-by: Vahid Zolfaghari

Jenkinsfile

@@ -31,15 +31,15 @@ pipeline {
         // Jenkins global scope (def ..=..)
         TOPIC_BRANCH = "${TOPIC_BRANCH}"
         DEFAULT_BRANCH = "${DEFAULT_BRANCH}"
-
-        HBP = "/home/bbpnrsoa/nrp/src"
     }
     agent {
         docker {
             label 'ci_label'
-
+            alwaysPull true
             // NEXUS_REGISTRY_IP and NEXUS_REGISTRY_PORT are Jenkins global variables
-            image "${env.NEXUS_REGISTRY_IP}:${env.NEXUS_REGISTRY_PORT}/nrp_frontend:${IMG_TAG}"
+            registryUrl "https://${env.NEXUS_REGISTRY_IP}:${env.NEXUS_REGISTRY_PORT}"
+            registryCredentialsId 'nexusadmin'
+            image "nrp_frontend:${IMG_TAG}"
             args '--entrypoint="" -u root --privileged'
         }
     }

app.ts

@@ -73,7 +73,7 @@ const checkAdminRights = (req, res, next) => {
   return storageRequestHandler
     .getUserGroups(getAuthToken(req))
     .then(groups => {
-      if (!groups.some(g => g.name === 'hbp-sp10-administrators'))
+      if (!groups.some(g => g === 'group-HBP-NRP-Admins'))
         throw 'Administration rights required';
     })
     .then(() => next())
@@ -86,7 +86,7 @@ const checkAdminRights = (req, res, next) => {
 const isAdmin = req => {
   return storageRequestHandler
     .getUserGroups(getAuthToken(req))
-    .then(groups => groups.some(g => g.name === 'hbp-sp10-administrators'));
+    .then(groups => groups.some(g => g === 'group-HBP-NRP-Admins'));
 };
 
 const handleError = (res, err) => {

storage/FS/Identity.ts

@@ -85,8 +85,8 @@ export class Identity extends BaseIdentity {
   }
 
   getUserGroups(token, userId) {
-    const groups = [{ name: 'hbp-sp10-user-edit-rights' }];
-    if (userId === 'admin') groups.push({ name: 'hbp-sp10-administrators' });
+    const groups = ['hbp-sp10-user-edit-rights'];
+    if (userId === 'admin') groups.push('group-HBP-NRP-Admins');
     return q.when(groups);
   }
 }

test/storage/IdentitySpec.js

@@ -62,14 +62,11 @@ describe('FSidentity', () => {
   it(`should return default groups`, () => {
     return identity
       .getUserGroups()
-      .should.eventually.deep.equal([{ name: 'hbp-sp10-user-edit-rights' }]);
+      .should.eventually.deep.equal(['hbp-sp10-user-edit-rights']);
   });
 
   it(`should return the default group plus admin group`, () => {
-    let expectedGroup = [
-      { name: 'hbp-sp10-user-edit-rights' },
-      { name: 'hbp-sp10-administrators' }
-    ];
+    let expectedGroup = ['hbp-sp10-user-edit-rights', 'group-HBP-NRP-Admins'];
     return identity
       .getUserGroups(fakeToken, 'admin')
       .should.eventually.deep.equal(expectedGroup);

test/storage/RequestHandlerSpec.js

@@ -872,9 +872,7 @@ describe('Storage request handler', () => {
   // getUserGroups success
   it(`should successfully return the group info`, () => {
     return storageRequestHandler.getUserGroups(fakeToken).then(resp => {
-      resp[0].should.deep.equal({
-        name: 'hbp-sp10-user-edit-rights'
-      });
+      resp[0].should.deep.equal('hbp-sp10-user-edit-rights');
     });
   });