Multi-Org - Ignore if primary org is Non-Dev-Org, when user has multiple orgs

#141

Author: Chris Wiechmann

apibuilder4elastic/custom_flow_nodes/api-builder-plugin-axway-api-management/src/actions.js

@@ -108,7 +108,8 @@ async function lookupCurrentUser(params, options) {
 		throw new Error(`User: '${user.loginName}' not found in API-Manager.`);
 	}
 	user.apiManager = users[0];
-	// Get the name of the primary organization
+	// Get the name of the primary organization, ignore the Dev-Status if the user has multiple organizations
+	options.mustBeDevelopmentOrg = (user.apiManager.orgs2Name) ? false : true;
 	var org = await _getOrganization(user.apiManager, null, null, options);
 	user.apiManager.organizationName = org.name;
 	logger.debug(`User: '${user.loginName}' (Role: ${user.apiManager.role}) found in API-Manager. Organization: '${user.apiManager.organizationName}'`);
@@ -667,7 +668,7 @@ async function _getApplication(applicationId, groupId, region) {
 }
 
 async function _getOrganization(apiProxy, groupId, region, options) {
-	const { logger } = options;
+	const { logger, mustBeDevelopmentOrg } = options;
 	if(apiProxy.locallyConfigured) {
 		if(apiProxy.organizationName == undefined) apiProxy.organizationName = "N/A";
 		return apiProxy;
@@ -701,7 +702,7 @@ async function _getOrganization(apiProxy, groupId, region, options) {
 	if(!org.enabled) {
 		throw new Error(`Organization: '${org.name}' is disabled.`);
 	}
-	if(!org.development) {
+	if(!org.development && mustBeDevelopmentOrg) {
 		throw new Error(`Organization: '${org.name}' is not a development organization.`);
 	}
 	cache.set(orgCacheKey, org)

apibuilder4elastic/custom_flow_nodes/api-builder-plugin-axway-api-management/test/test-userlookup.js

@@ -308,5 +308,18 @@ describe('Tests User-Lookup with complete configuration parameters', () => {
 				.and.to.have.property('message', 'Organization: \'API Development\' is not a development organization.');
 			expect(output).to.equal('error');
 		});
+
+		it('should NOT error even if belonging organization has no development flag if the user has multiple organizations-', async () => {
+			nock('https://mocked-api-gateway:8190').get('/api/rbac/currentuser').reply(200, { "result": "chris" });
+			nock('https://mocked-api-gateway:8190').get('/api/rbac/permissions/currentuser').replyWithFile(200, './test/testReplies/gateway/operatorRoleOnlyPermissions.json');
+			nock('https://mocked-api-gateway:8175').get(`/api/portal/v1.3/users?field=loginName&op=eq&value=chris${enabledField}`).replyWithFile(200, './test/testReplies/apimanager/apiManagerUserChrisMultiOrg.json');
+			nock('https://mocked-api-gateway:8175').get(`/api/portal/v1.3/organizations/2bfaa1c2-49ab-4059-832d-f833ca1c0a74`).replyWithFile(200, './test/testReplies/apimanager/noDevelopmentOrg.json');
+
+			const { value, output } = await flowNode.lookupCurrentUser({ 
+				requestHeaders: {"host":"api-gateway:8090","max-forwards":"20", "cookie":"VIDUSR=1597381095-XTawGDtJhBA7Zw==;", "csrf-token": "CF2796B3BD18C1B0B5AB1C8E95B75662E92FBC04BD799DEB97838FC5B9C39348"}
+			});
+
+			expect(output).to.equal('next');
+		});
 	});
 });