Merge pull request #289 from topcoder-platform/dev

JIRA-plat 346, 380,  etc

Author: sachin-maheshwari

web-assets/auth0/dev-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);
         }
 
@@ -112,7 +106,7 @@ 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);
+                        console.log('rule:onboarding-checklist:Setting show_onboarding_wizard to true');
                         return callback(null, user, context);
                     }
 
@@ -128,7 +122,7 @@ function (user, context, callback) {
                             }
                     }
 
-                    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,7 +137,7 @@ 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);
+                    console.log('rule:onboarding-checklist: set show_onboarding_wizard');
                     context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'show_onboarding_wizard'] = true;
                     return callback(null, user, context);
                 } catch (e) {

web-assets/auth0/dev-tenant/universal-login.html

@@ -26,6 +26,17 @@
         }
     </script>
 
+    <!-- Google Tag Manager -->
+    <script>(function (w, d, s, l, i) {
+            w[l] = w[l] || []; w[l].push({
+                'gtm.start':
+                    new Date().getTime(), event: 'gtm.js'
+            }); var f = d.getElementsByTagName(s)[0],
+                j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
+                    'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
+        })(window, document, 'script', 'dataLayer', 'GTM-MXXQHG8');</script>
+    <!-- End Google Tag Manager -->
+
 </head>
 
 <body>
@@ -422,4 +433,4 @@
     </script>
 </body>
 
-</html>
+</html>

web-assets/auth0/js/jquery-3.5.1.min.js

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Sign In with Topcoder</title>
-    <link rel="shortcut icon" type="image/png" href="https://www.topcoder.com/favicon.ico"/>
+    <link rel="shortcut icon" type="image/png" href="https://www.topcoder.com/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0" />
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500&display=swap" rel="stylesheet">
@@ -24,8 +24,17 @@
         }
     </script>
 
+    <!-- Google Tag Manager -->
+    <script>(function (w, d, s, l, i) {
+            w[l] = w[l] || []; w[l].push({
+                'gtm.start':
+                    new Date().getTime(), event: 'gtm.js'
+            }); var f = d.getElementsByTagName(s)[0],
+                j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
+                    'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
+        })(window, document, 'script', 'dataLayer', 'GTM-MXXQHG8');</script>
+    <!-- End Google Tag Manager -->
 </head>
-
 <body>
     <div id='wrapper-container' class='page-wrapper'>
         <div class='row'>
@@ -179,7 +188,7 @@
                 socialButtonStyle: 'small'
             },
             tc_standard: {
-                allowedConnections: ['TC-User-Database', 'github', 'google-oauth2', 'wipro-adfs', 'Verified-User-Database'],
+                allowedConnections: ['TC-User-Database', 'github', 'google-oauth2', 'wipro-adfs', 'wipro-azuread', 'Verified-User-Database'],
                 theme: {
                     logo: 'https://i.imgur.com/IY6TVjY.png',
                     primaryColor: '#137d60'
@@ -198,7 +207,7 @@
                 }
             },
             aha: {
-                allowedConnections: ['TC-User-Database', 'github', 'google-oauth2', 'wipro-adfs', 'Verified-User-Database'],
+                allowedConnections: ['TC-User-Database', 'github', 'google-oauth2', 'wipro-adfs', 'wipro-azuread', 'Verified-User-Database'],
                 theme: {
                     logo: 'https://i.imgur.com/CEU3plH.png',
                     primaryColor: '#07a8f2'
@@ -386,22 +395,22 @@
             updateSignUp(regSource);
             mediaQuery.addListener(updateSignUp);
             try {
-                    const firstNameDiv =
-                        document.getElementById("1-firstName").parentNode.parentNode;
-                    const lastNameDiv =
-                        document.getElementById("1-lastName").parentNode.parentNode;
-                    const emailDiv = document.getElementById("1-email").parentNode.parentNode;
-                    emailDiv.parentNode.insertBefore(firstNameDiv, emailDiv);
-                    emailDiv.parentNode.insertBefore(lastNameDiv, emailDiv);
-                    try {
-                        document.getElementsByName("password")[0].placeholder = "Create a Password";
-                        //document.getElementById("1-country").value = "Select your country (current location)";
-                    } catch (e) {
-                        console.log("Error occured in changing placeholder text", e);
-                    }
+                const firstNameDiv =
+                    document.getElementById("1-firstName").parentNode.parentNode;
+                const lastNameDiv =
+                    document.getElementById("1-lastName").parentNode.parentNode;
+                const emailDiv = document.getElementById("1-email").parentNode.parentNode;
+                emailDiv.parentNode.insertBefore(firstNameDiv, emailDiv);
+                emailDiv.parentNode.insertBefore(lastNameDiv, emailDiv);
+                try {
+                    document.getElementsByName("password")[0].placeholder = "Create a Password";
+                    //document.getElementById("1-country").value = "Select your country (current location)";
                 } catch (e) {
-                    console.log("Error occured in form re-ordering", e);
+                    console.log("Error occured in changing placeholder text", e);
                 }
+            } catch (e) {
+                console.log("Error occured in form re-ordering", e);
+            }
         });
 
         lock.show();
@@ -472,11 +481,15 @@
 
     </script>
     <script>
-  !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on","addSourceMiddleware","addIntegrationMiddleware","setAnonymousId","addDestinationMiddleware"];analytics.factory=function(e){return function(){var t=Array.prototype.slice.call(arguments);t.unshift(e);analytics.push(t);return analytics}};for(var e=0;e<analytics.methods.length;e++){var key=analytics.methods[e];analytics[key]=analytics.factory(key)}analytics.load=function(key,e){var t=document.createElement("script");t.type="text/javascript";t.async=!0;t.src="https://cdn.segment.com/analytics.js/v1/" + key + "/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);analytics._loadOptions=e};analytics._writeKey="ti8hUmZ1P9BJ73vUVM3CEe0iJCuvzMCY";analytics.SNIPPET_VERSION="4.13.2";
-  analytics.load("ti8hUmZ1P9BJ73vUVM3CEe0iJCuvzMCY");
-  analytics.page();
-  }}();
-</script>
+        !function () {
+            var analytics = window.analytics = window.analytics || []; if (!analytics.initialize) if (analytics.invoked) window.console && console.error && console.error("Segment snippet included twice."); else {
+                analytics.invoked = !0; analytics.methods = ["trackSubmit", "trackClick", "trackLink", "trackForm", "pageview", "identify", "reset", "group", "track", "ready", "alias", "debug", "page", "once", "off", "on", "addSourceMiddleware", "addIntegrationMiddleware", "setAnonymousId", "addDestinationMiddleware"]; analytics.factory = function (e) { return function () { var t = Array.prototype.slice.call(arguments); t.unshift(e); analytics.push(t); return analytics } }; for (var e = 0; e < analytics.methods.length; e++) { var key = analytics.methods[e]; analytics[key] = analytics.factory(key) } analytics.load = function (key, e) { var t = document.createElement("script"); t.type = "text/javascript"; t.async = !0; t.src = "https://cdn.segment.com/analytics.js/v1/" + key + "/analytics.min.js"; var n = document.getElementsByTagName("script")[0]; n.parentNode.insertBefore(t, n); analytics._loadOptions = e }; analytics._writeKey = "ti8hUmZ1P9BJ73vUVM3CEe0iJCuvzMCY"; analytics.SNIPPET_VERSION = "4.13.2";
+                analytics.load("ti8hUmZ1P9BJ73vUVM3CEe0iJCuvzMCY");
+                analytics.page();
+            }
+        }();
+    </script>
+
 </body>
 
-</html>
+</html>

web-assets/auth0/prod-tenant/universal-login.html

@@ -12,7 +12,6 @@
     />
     <link href="https://fonts.googleapis.com/css2?family=Barlow+Condensed:wght@500&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="./styles.css" />
-
     <script src="https://tc-public-static-files.topcoder.com/topcoder-auth/js/jquery-3.5.1.min.js"></script>
     <script src="https://tc-public-static-files.topcoder.com/topcoder-auth/js/country.js"></script>
     <script type="text/javascript" src="signup.js"></script>