From 8684a432e3c6c6d02c023593d5eb05d304d86c98 Mon Sep 17 00:00:00 2001 From: mgtennant <100305096+mgtennant@users.noreply.github.com> Date: Wed, 6 Nov 2024 09:21:47 -0800 Subject: [PATCH] remove gen reports role --- backend/src/admin/admin.service.ts | 78 +----------------------------- backend/src/enum/role.enum.ts | 1 - 2 files changed, 2 insertions(+), 77 deletions(-) diff --git a/backend/src/admin/admin.service.ts b/backend/src/admin/admin.service.ts index a296bb0a..3c52b8dd 100644 --- a/backend/src/admin/admin.service.ts +++ b/backend/src/admin/admin.service.ts @@ -169,7 +169,7 @@ export class AdminService { /** * Searches for an IDIR user with the given search params and if only one is found - * then gives them the ticdi_admin & generate_documents roles in both IDIR and AzureIDIR + * then gives them the ticdi_admin role in both IDIR and AzureIDIR * * @param firstName * @param lastName @@ -214,23 +214,6 @@ export class AdminService { console.log(err); throw new Error('Failed to add idir ticdi_admin role'); }); - await axios - .post( - addAdminUrl, - { - roleName: Role.GENERATE_DOCUMENTS, - username: username + '@idir', - operation: 'add', - }, - { headers: { Authorization: 'Bearer ' + bearerToken } } - ) - .then((res) => { - return res.data; - }) - .catch((err) => { - console.log(err); - throw new Error('Failed to add idir generate_documents role'); - }); await axios .post( addAdminUrl, @@ -248,23 +231,6 @@ export class AdminService { console.log(err); throw new Error('Failed to add azureidir ticdi_admin role'); }); - await axios - .post( - addAdminUrl, - { - roleName: Role.GENERATE_DOCUMENTS, - username: username + '@azureidir', - operation: 'add', - }, - { headers: { Authorization: 'Bearer ' + bearerToken } } - ) - .then((res) => { - return res.data; - }) - .catch((err) => { - console.log(err); - throw new Error('Failed to add azureidir generate_documents role'); - }); } catch (err) { console.log(err); } @@ -307,7 +273,7 @@ export class AdminService { } /** - * Removes the ticdi_admin & generate_documents role from an IDIR user + * Removes the ticdi_admin role from an IDIR user * * @param username * @returns null @@ -317,9 +283,7 @@ export class AdminService { const idirUsername = username?.split('@')[0].concat('@idir'); const azureidirUsername = username?.split('@')[0].concat('@azureidir'); const idirAdminUrl = `${process.env.users_api_base_url}/integrations/${process.env.integration_id}/${process.env.css_environment}/users/${idirUsername}/roles/${Role.TICDI_ADMIN}`; - const idirGDUrl = `${process.env.users_api_base_url}/integrations/${process.env.integration_id}/${process.env.css_environment}/users/${idirUsername}/roles/${Role.GENERATE_DOCUMENTS}`; const azureidirAdminUrl = `${process.env.users_api_base_url}/integrations/${process.env.integration_id}/${process.env.css_environment}/users/${azureidirUsername}/roles/${Role.TICDI_ADMIN}`; - const azureidirGDUrl = `${process.env.users_api_base_url}/integrations/${process.env.integration_id}/${process.env.css_environment}/users/${azureidirUsername}/roles/${Role.GENERATE_DOCUMENTS}`; try { await axios .delete(idirAdminUrl, { @@ -339,25 +303,6 @@ export class AdminService { return { error: 'Failed to remove idir_admin role' }; } } - try { - await axios - .delete(idirGDUrl, { - headers: { Authorization: 'Bearer ' + bearerToken }, - }) - .then((res) => { - return res; - }) - .catch((err) => { - throw err; - }); - } catch (err) { - console.log(err.response.data); - if (err?.response?.data?.message?.includes('not associated')) { - // ignore error if user is not associated with the role - } else { - return { error: 'Failed to remove generate_documents role' }; - } - } try { await axios .delete(azureidirAdminUrl, { @@ -377,25 +322,6 @@ export class AdminService { return { error: 'Failed to remove idir_admin role' }; } } - try { - await axios - .delete(azureidirGDUrl, { - headers: { Authorization: 'Bearer ' + bearerToken }, - }) - .then((res) => { - return res; - }) - .catch((err) => { - throw err; - }); - } catch (err) { - console.log(err.response.data); - if (err?.response?.data?.message?.includes('not associated')) { - // ignore error if user is not associated with the role - } else { - return { error: 'Failed to remove generate_documents role' }; - } - } return { error: null }; } diff --git a/backend/src/enum/role.enum.ts b/backend/src/enum/role.enum.ts index b0f6bdfc..928e2f90 100644 --- a/backend/src/enum/role.enum.ts +++ b/backend/src/enum/role.enum.ts @@ -1,4 +1,3 @@ export enum Role { TICDI_ADMIN = 'ticdi_admin', - GENERATE_DOCUMENTS = 'generate_documents', }