Merge pull request #302 from topcoder-platform/dev

Plat-320, onboarding rule changes

Author: sachin-maheshwari

web-assets/auth0/prod-tenant/rules/onboardingChecklist.js

@@ -1,9 +1,8 @@
 function (user, context, callback) {
     if (context.clientID === configuration.CLIENT_ACCOUNTS_LOGIN) {
         console.log("rule:onboarding-checklist:enter");
-        console.log("rule:onboarding-checklist:context.request", context.request);
-
-        if (context.redirect) {
+        
+       if (context.redirect) {
             console.log("rule:onboarding-checklist:exiting due to context being a redirect");
             return callback(null, user, context);
         }
@@ -22,16 +21,11 @@ function (user, context, callback) {
             return callback(null, user, context);
         }
 
-        let handle = _.get(user, "handle", null);
-        const provider = _.get(user, "identities[0].provider", null);
-        if (isSocial || (!handle && provider === "auth0")) {
-          handle = _.get(user, "nickname", null);
-        }
-
-        console.log("rule:onboarding-checklist: fetch onboarding_checklist for email/handle: ", user.email, handle, provider);
+        const handle = context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'handle'];
+        console.log("rule:onboarding-checklist: fetch onboarding_checklist for email/handle: ", user.email, handle);
 
-        // TODO: Properly fetch handle for social logins
-        if (handle == null || isSocial) {
+        if (handle == null) {
+            console.log("rule:onboarding-checklist: exiting due to handle being null.");
             return callback(null, user, context);
         }
 
@@ -111,24 +105,28 @@ function (user, context, callback) {
 
                     if (data.length === 0) {                        
                         // User doesn't have any traits with traitId onboarding_checklist and should be shown the onboarding wizard
-                        context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'show_onboarding_wizard'] = true;
-                        console.log('rule:onboarding-checklist:Setting show_onboarding_wizard to true', user);
+                        context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'onboarding_wizard'] = 'show';
+                        console.log('rule:onboarding-checklist:Setting onboarding_wizard to show');
                         return callback(null, user, context);
                     }
 
                     const onboardingChecklistTrait = data.filter((item) => item.traitId === 'onboarding_checklist')[0].traits;
+                    let override = 'show';
 
                     for (let checklistTrait of onboardingChecklistTrait.data) {
-                        if (
-                            checklistTrait.onboarding_wizard != null &&
-                            (checklistTrait.onboarding_wizard.status != null || // any valid status indicates user has already seen onboarding wizard and needn't be shown again.
-                                checklistTrait.onboarding_wizard.skip) // for certain signup routes skip is set to true, and thus onboarding wizard needn't be shown
-                            ) {
+                        if (checklistTrait.onboarding_wizard != null) {
+                            if ( checklistTrait.onboarding_wizard.status !== 'pending_at_user' || // any non pending_at_user status indicates OB was either seen or completed and can be skipped
+                                checklistTrait.onboarding_wizard.skip ||// for certain signup routes skip is set to true, and thus onboarding wizard needn't be shown
+                                checklistTrait.onboarding_wizard.override === 'skip')
+                            {
                                 return callback(null, user, context);
+                            } else if (checklistTrait.onboarding_wizard.override === 'useRetUrl') {
+                                override = 'useRetUrl';
                             }
+                        }
                     }
-        
-                    const profileCompletedData = onboardingChecklistTrait.data[0].profile_completed;
+
+                    const profileCompletedData = onboardingChecklistTrait.data.length > 0 ? onboardingChecklistTrait.data[0].profile_completed : null;
 
                     if (profileCompletedData) {
                         if (profileCompletedData.status === "completed") {
@@ -143,8 +141,12 @@ function (user, context, callback) {
                     }
 
                     // All checks failed - indicating user newly registered and needs to be shown the onboarding wizard
-                    console.log('rule:onboarding-checklist: set show_onboarding_wizard', user);
-                    context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'show_onboarding_wizard'] = true;
+                    console.log('rule:onboarding-checklist: set onboarding_wizard ' + override);
+                    
+                    context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'onboarding_wizard'] = override;
+
+
+
                     return callback(null, user, context);
                 } catch (e) {
                     console.log("rule:onboarding-checklist:Error in fetching onboarding_checklist", e);