@@ -17,19 +17,31 @@ const TASK_TYPE = 'demo-url-processor';
1717
1818/**
1919 * Gets the IMS tenant ID from the organization
20+ * @param {string } imsOrgId - The IMS organization ID
2021 * @param {object } organization - The organization object
2122 * @param {object } context - The context object
2223 * @param {object } log - The log object
24+ * @param {object } env - The environment object
25+ * @param {object } slackContext - The Slack context object
2326 * @returns {string } The IMS tenant ID
2427 */
25- function getImsTenantId ( imsOrgId , organization , context , log ) {
28+ async function getImsTenantId ( imsOrgId , organization , context , log , env , slackContext ) {
2629 const { name, tenantId } = organization ;
27- if ( ! name || ! tenantId ) {
28- log . error ( 'Organization name is missing, using default tenant ID' ) ;
29- return context . env . DEFAULT_TENANT_ID ;
30- } else {
30+
31+ // If tenantId is there, return it
32+ if ( tenantId ) {
33+ return tenantId ;
34+ }
35+
36+ // If tenantId isn't there, use name to generate (backward compatible for existing orgs)
37+ if ( name ) {
3138 return name . toLowerCase ( ) . replace ( / \s + / g, '' ) ;
3239 }
40+
41+ // If name is also not there, log an error and return DEFAULT_TENANT_ID
42+ log . error ( 'Organization name and tenantId are missing, using default tenant ID' ) ;
43+ await say ( env , log , slackContext , ':x: Organization name and tenantId are missing, using default tenant ID' ) ;
44+ return context . env . DEFAULT_TENANT_ID ;
3345}
3446
3547/**
@@ -61,7 +73,7 @@ export async function runDemoUrlProcessor(message, context) {
6173 return ok ( { message : 'Organization not found' } ) ;
6274 }
6375
64- const imsTenantId = getImsTenantId ( imsOrgId , organization , context , log ) ;
76+ const imsTenantId = await getImsTenantId ( imsOrgId , organization , context , log , env , slackContext ) ;
6577 const demoUrl = `${ experienceUrl } ?organizationId=${ organizationId } #/@${ imsTenantId } /sites-optimizer/sites/${ siteId } /home` ;
6678 const slackMessage = `:white_check_mark: Setup complete! Access your demo environment here: ${ demoUrl } ` ;
6779 await say ( env , log , slackContext , slackMessage ) ;
0 commit comments