diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a31496..0a9a361 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,6 +70,7 @@ workflows: branches: only: - dev + - jira-plat-742 # Production builds are exectuted only on tagged commits to the # master branch. diff --git a/web-assets/auth0/dev-tenant/database/create.js b/web-assets/auth0/dev-tenant/database/create.js index c178112..a1c11f6 100644 --- a/web-assets/auth0/dev-tenant/database/create.js +++ b/web-assets/auth0/dev-tenant/database/create.js @@ -26,83 +26,97 @@ 'at https://manage.auth0.com/#/connections/database'; return callback(new Error(msg)); */ function create(user, callback) { - //console.log("landed here..................................."); - var countryObj = JSON.parse(user.user_metadata.country); - var regSource = user.user_metadata.regSource; - var utmSource = user.user_metadata.utmSource; - var utmMedium = user.user_metadata.utmMedium; - var utmCampaign = user.user_metadata.utmCampaign; - var retUrl = user.user_metadata.returnUrl; - var afterActivationURL = retUrl != null ? retUrl : "https://" + configuration.DOMAIN + "/home"; - if (regSource === configuration.REG_BUSINESS) { - afterActivationURL = "https://connect." + configuration.DOMAIN; - } - var data = { - "param": { - "handle": user.username, - "email": user.email, - "credential": { - "password": user.password - }, - "firstName": user.user_metadata.firstName, - "lastName": user.user_metadata.lastName, - "country": { - "code": countryObj.code, - "isoAlpha3Code": countryObj.alpha3, - "isoAlpha2Code": countryObj.alpha2 - }, - "regSource": regSource, - "utmSource": utmSource, - "utmMedium": utmMedium, - "utmCampaign": utmCampaign, - }, - "options": { - "afterActivationURL": encodeURIComponent(afterActivationURL) - } - }; - //console.log("SignUp....", user, data); - request.post({ - url: "https://api." + configuration.DOMAIN + "/v3/users", - json: data - //for more options check: - //https://github.com/mikeal/request#requestoptions-callback - }, function (err, response, body) { - - // console.log(err); - // console.log(response.statusCode); - // console.log(body.result.content); - - if (err) return callback(err); - console.log(body.result.content); - if (response.statusCode !== 200) { - //return callback(new ValidationError("lock.fallback",body.result.content)); - const error_message = body.result.content; - let code = "lock.fallback"; - - if (error_message.search("Handle may not contain a space") !== -1) { - code = "handle_invalid_space"; - } else if (error_message.search("Length of Handle in character should be between 2 and 15") !== -1) { - code = "handle_invalid_length"; - } else if (error_message.search("Please choose another handle, not starting with admin") !== -1) { - code = "handle_invalid_startwith_admin"; - } else if (error_message.search('Handle may contain only letters, numbers and') !== -1) { - code = "handle_invalid_constains_forbidden_char"; - } else if (error_message.search("Handle may not contain only punctuation") !== -1) { - code = "handle_invalid_conatins_only_punctuation"; - } else if (error_message.search("The user already exists") !== -1) { - code = "user_exists"; - } else if (error_message.search("has already been taken") !== -1) { - code = "user_exists"; - } + //console.log("landed here..................................."); + var countryObj = JSON.parse(user.user_metadata.country); + var regSource = user.user_metadata.reg_source; + var utmSource = user.user_metadata.utm_source; + var utmMedium = user.user_metadata.utm_medium; + var utmCampaign = user.user_metadata.utm_campaign; + var retUrl = user.user_metadata.returnUrl; + var afterActivationURL = + retUrl !== null ? retUrl : "https://" + configuration.DOMAIN + "/home"; + if (regSource === configuration.REG_BUSINESS) { + afterActivationURL = "https://connect." + configuration.DOMAIN; + } + var data = { + param: { + handle: user.username, + email: user.email, + credential: { + password: user.password, + }, + firstName: user.user_metadata.firstName, + lastName: user.user_metadata.lastName, + country: { + code: countryObj.code, + isoAlpha3Code: countryObj.alpha3, + isoAlpha2Code: countryObj.alpha2, + }, + regSource: regSource, + utmSource: utmSource, + utmMedium: utmMedium, + utmCampaign: utmCampaign, + }, + options: { + afterActivationURL: encodeURIComponent(afterActivationURL), + }, + }; + //console.log("SignUp....", user, data); + request.post( + { + url: "https://api." + configuration.DOMAIN + "/v3/users", + json: data, + //for more options check: + //https://github.com/mikeal/request#requestoptions-callback + }, + function (err, response, body) { + // console.log(err); + // console.log(response.statusCode); + // console.log(body.result.content); + if (err) return callback(err); + console.log(body.result.content); + if (response.statusCode !== 200) { + //return callback(new ValidationError("lock.fallback",body.result.content)); + const error_message = body.result.content; + let code = "lock.fallback"; + if (error_message.search("Handle may not contain a space") !== -1) { + code = "handle_invalid_space"; + } else if ( + error_message.search( + "Length of Handle in character should be between 2 and 15" + ) !== -1 + ) { + code = "handle_invalid_length"; + } else if ( + error_message.search( + "Please choose another handle, not starting with admin" + ) !== -1 + ) { + code = "handle_invalid_startwith_admin"; + } else if ( + error_message.search( + "Handle may contain only letters, numbers and" + ) !== -1 + ) { + code = "handle_invalid_constains_forbidden_char"; + } else if ( + error_message.search("Handle may not contain only punctuation") !== -1 + ) { + code = "handle_invalid_conatins_only_punctuation"; + } else if (error_message.search("The user already exists") !== -1) { + code = "user_exists"; + } else if (error_message.search("has already been taken") !== -1) { + code = "user_exists"; + } - return callback(new ValidationError(code, error_message)); + return callback(new ValidationError(code, error_message)); - //return callback(new Error(body.result.content)); - } - //if (response.statusCode === 401) return callback(); - /* const Analytics = require('analytics-node'); + //return callback(new Error(body.result.content)); + } + //if (response.statusCode === 401) return callback(); + /* const Analytics = require('analytics-node'); const _ = require('lodash'); var analytics = new Analytics('bkPtWMUMTYDhww2zsJluzxtdhtmSsyd9'); analytics.identify({ @@ -116,9 +130,24 @@ function create(user, callback) { event: 'signUp', properties: _.omit(user, ['credential', 'password']) });*/ - callback(null); - }); //end post request - //callback(null); + /* const ua = require('universal-analytics'); + let visitor = ua('UA-6340959-1'); + visitor.pageview("/signup").send(); + var eParams = { + ec: "utmCode", + ea: "tracking", + el: "tracking", + cn: utmCampaign, + cm: utmMedium, + cs: utmSource, + dp: "/signup" + }; + + visitor.event(eParams).send(); */ + callback(null); + } + ); //end post request + //callback(null); } //} diff --git a/web-assets/auth0/dev-tenant/rules/custom.js b/web-assets/auth0/dev-tenant/rules/custom.js index 899cf76..640bd55 100644 --- a/web-assets/auth0/dev-tenant/rules/custom.js +++ b/web-assets/auth0/dev-tenant/rules/custom.js @@ -1,78 +1,78 @@ function (user, context, callback) { - if (context.clientID === configuration.CLIENT_ACCOUNTS_LOGIN) { // - const _ = require('lodash'); - - // TODO: implement your rule - // if (context.protocol === "redirect-callback") { - // User was redirected to the /continue endpoint - if (context.redirect) { - return callback(null, user, context); - // returnning from here no need to check further - } - // otherwise to nothing - - console.log("Enter Rule: Custom-Claims"); - let handle = _.get(user, "handle", null); - const provider = _.get(user, "identities[0].provider", null); - if (!handle && provider === "auth0") { - handle = _.get(user, "nickname", null); - } - console.log("Fetch roles for email/handle: ", user.email, handle, provider); - - global.AUTH0_CLAIM_NAMESPACE = "https://" + configuration.DOMAIN + "/"; - try { - request.post({ - url: 'https://api.' + configuration.DOMAIN + '/v3/users/roles', - form: { - email: user.email, - handle: handle - } - }, function (err, response, body) { - console.log("called topcoder api for role: response status - ", response.statusCode); - if (err) return callback(err, user, context); - if (response.statusCode !== 200) { - return callback('Login Error: Whoops! Something went wrong. Looks like your registered email has discrepancy with Authentication. Please connect to our support support@topcoder.com. Back to application ', user, context); - } - - let res = JSON.parse(body); - // TODO need to double sure about multiple result or no result - let userId = res.result.content.id; - let handle = res.result.content.handle; - let roles = res.result.content.roles.map(function (role) { - return role.roleName; - }); - let userStatus = res.result.content.active; // true/false + if (context.clientID === configuration.CLIENT_ACCOUNTS_LOGIN) { // + const _ = require('lodash'); + + // TODO: implement your rule + // if (context.protocol === "redirect-callback") { + // User was redirected to the /continue endpoint + if (context.redirect) { + return callback(null, user, context); + // returnning from here no need to check further + } + // otherwise to nothing + + console.log("Enter Rule: Custom-Claims"); + let handle = _.get(user, "handle", null); + const provider = _.get(user, "identities[0].provider", null); + if (!handle && provider === "auth0") { + handle = _.get(user, "nickname", null); + } + console.log("Fetch roles for email/handle: ", user.email, handle, provider); + + global.AUTH0_CLAIM_NAMESPACE = "https://" + configuration.DOMAIN + "/"; + try { + request.post({ + url: 'https://api.' + configuration.DOMAIN + '/v3/users/roles', + form: { + email: user.email, + handle: handle + } + }, function (err, response, body) { + console.log("called topcoder api for role: response status - ", response.statusCode); + if (err) return callback(err, user, context); + if (response.statusCode !== 200) { + return callback('Login Error: Whoops! Something went wrong. Looks like your registered email has discrepancy with Authentication. Please connect to our support support@topcoder.com. Back to application ', user, context); + } + + let res = JSON.parse(body); + // TODO need to double sure about multiple result or no result + let userId = res.result.content.id; + let handle = res.result.content.handle; + let roles = res.result.content.roles.map(function (role) { + return role.roleName; + }); + let userStatus = res.result.content.active; // true/false - // TEMP - let tcsso = res.result.content.regSource || ''; + // TEMP + let tcsso = res.result.content.regSource || ''; - context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'roles'] = roles; - context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'userId'] = userId; - context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'handle'] = handle; - context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'user_id'] = user.identities[0].provider + "|" + userId; - context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'tcsso'] = tcsso; - context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'active'] = userStatus; - context.idToken.nickname = handle; - //console.log(user, context); - if (!userStatus) { - context.redirect = { - url: `https://accounts-auth0.${configuration.DOMAIN}/check_email.html` - }; - return callback(null, user, context); - } - if (!userStatus && context.login_counts > 1) { - return callback('Login Alert: Please verify your email first! Please connect to our support support@topcoder.com. Back to application ', user, context); - } + context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'roles'] = roles; + context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'userId'] = userId; + context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'handle'] = handle; + context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'user_id'] = user.identities[0].provider + "|" + userId; + context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'tcsso'] = tcsso; + context.idToken[global.AUTH0_CLAIM_NAMESPACE + 'active'] = userStatus; + context.idToken.nickname = handle; + //console.log(user, context); + if (!userStatus) { + context.redirect = { + url: `https://accounts-auth0.${configuration.DOMAIN}/check_email.html` + }; return callback(null, user, context); - } - ); - } catch (e) { - console.log("Error in calling user roles" + e); - return callback("Something went worng!. Please retry.", user, context); - } - } else { - // for other apps do nothing - return callback(null, user, context); - } + } + if (!userStatus && context.login_counts > 1) { + return callback('Login Alert: Please verify your email first! Please connect to our support support@topcoder.com. Back to application ', user, context); + } + return callback(null, user, context); + } + ); + } catch (e) { + console.log("Error in calling user roles" + e); + return callback("Something went worng!. Please retry.", user, context); + } + } else { + // for other apps do nothing + return callback(null, user, context); + } } \ No newline at end of file diff --git a/web-assets/auth0/dev-tenant/rules/enterprise.js b/web-assets/auth0/dev-tenant/rules/enterprise.js index cc31fe1..3145c9e 100644 --- a/web-assets/auth0/dev-tenant/rules/enterprise.js +++ b/web-assets/auth0/dev-tenant/rules/enterprise.js @@ -29,11 +29,11 @@ function (user, context, callback) { let isoAlpha2Code = _.get(context, "request.geoip.country_code"); let isoAlpha3Code = _.get(context, "request.geoip.country_code3"); let countryCode = _.get(context, "request.geoip.country_name"); - let regSource = _.get(context, "request.query.regSource", null); + let regSource = _.get(context, "request.query.reg_source", null); let retUrl = _.get(context, "request.query.returnUrl", null); - let utmSource = _.get(context, "request.query.utmSource", null); - let utmMedium = _.get(context, "request.query.utmMedium", null); - let utmCampaign = _.get(context, "request.query.utmCampaign", null); + let utmSource = _.get(context, "request.query.utm_source", null); + let utmMedium = _.get(context, "request.query.utm_medium", null); + let utmCampaign = _.get(context, "request.query.utm_campaign", null); const resourcePath = '/identityproviders?filter=handle=' + email; const afterActivationURL = configuration.DEFAULT_AFTER_ACTIVATION_URL; @@ -41,12 +41,12 @@ function (user, context, callback) { const registrationCompletetUrl = "https://" + hostName + "/continue"; //const userHandleRedirectUrl = configuration.CUSTOM_PAGES_BASE_URL + '/signup.html?source='+ utmSource + '&formAction=' + registrationCompletetUrl; const userHandleRedirectUrl = configuration.CUSTOM_PAGES_BASE_URL + - "/signup.html?regSource=" + regSource + + "/signup.html?reg_source=" + regSource + "&firstName=" + encodeURIComponent(firstName) + "&lastName=" + encodeURIComponent(lastName) + - "&utmSource=" + encodeURIComponent(utmSource) + - "&utmMedium=" + encodeURIComponent(utmMedium) + - "&utmCampaign=" + encodeURIComponent(utmCampaign) + + "&utm_source=" + encodeURIComponent(utmSource) + + "&utm_medium=" + encodeURIComponent(utmMedium) + + "&utm_campaign=" + encodeURIComponent(utmCampaign) + "&formAction=" + registrationCompletetUrl + "&returnUrl=" + retUrl; @@ -94,9 +94,9 @@ function (user, context, callback) { isoAlpha2Code = _.get(countryObj, "alpha2", isoAlpha2Code); isoAlpha3Code = _.get(countryObj, "alpha3", isoAlpha3Code); } - utmSource = _.get(context, "request.query.source", utmSource); - utmMedium = _.get(context, "request.query.utmMedium", utmMedium); - utmCampaign = _.get(context, "request.query.utmCampaign", utmCampaign); + utmSource = _.get(context, "request.query.utm_source", utmSource); + utmMedium = _.get(context, "request.query.utm_medium", utmMedium); + utmCampaign = _.get(context, "request.query.utm_campaign", utmCampaign); } else { console.log('Redirect to choose user handle page.'); context.redirect = { diff --git a/web-assets/auth0/dev-tenant/rules/social.js b/web-assets/auth0/dev-tenant/rules/social.js index afdfb83..a46c6f6 100644 --- a/web-assets/auth0/dev-tenant/rules/social.js +++ b/web-assets/auth0/dev-tenant/rules/social.js @@ -33,21 +33,21 @@ function (user, context, callback) { let isoAlpha2Code = _.get(context, "request.geoip.country_code"); let isoAlpha3Code = _.get(context, "request.geoip.country_code3"); let countryCode = _.get(context, "request.geoip.country_name"); - let regSource = _.get(context, "request.query.regSource", null); - let utmSource = _.get(context, "request.query.utmSource", null); - let utmMedium = _.get(context, "request.query.utmMedium", null); - let utmCampaign = _.get(context, "request.query.utmCampaign", null); + let regSource = _.get(context, "request.query.reg_source", null); + let utmSource = _.get(context, "request.query.utm_source", null); + let utmMedium = _.get(context, "request.query.utm_medium", null); + let utmCampaign = _.get(context, "request.query.utm_campaign", null); let retUrl = _.get(context, "request.query.returnUrl", null); //console.log("resource", regSource, _.get(context, "request.query")); const userHandleRedirectUrl = configuration.CUSTOM_PAGES_BASE_URL + - "/signup.html?regSource=" + regSource + + "/signup.html?reg_source=" + regSource + "&firstName=" + encodeURIComponent(firstName) + "&lastName=" + encodeURIComponent(lastName) + - "&utmSource=" + encodeURIComponent(utmSource) + - "&utmMedium=" + encodeURIComponent(utmMedium) + - "&utmCampaign=" + encodeURIComponent(utmCampaign) + + "&utm_source=" + encodeURIComponent(utmSource) + + "&utm_medium=" + encodeURIComponent(utmMedium) + + "&utm_campaign=" + encodeURIComponent(utmCampaign) + "&formAction=" + registrationCompletetUrl + "&returnUrl=" + retUrl; @@ -88,12 +88,12 @@ function (user, context, callback) { isoAlpha2Code = _.get(countryObj, "alpha2", isoAlpha2Code); isoAlpha3Code = _.get(countryObj, "alpha3", isoAlpha3Code); } - regSource = _.get(context, "request.query.source", regSource); + regSource = _.get(context, "request.query.reg_source", regSource); firstName = _.get(context, "request.query.firstName", firstName); lastName = _.get(context, "request.query.lastName", lastName); - utmSource = _.get(context, "request.query.source", utmSource); - utmMedium = _.get(context, "request.query.utmMedium", utmMedium); - utmCampaign = _.get(context, "request.query.utmCampaign", utmCampaign); + utmSource = _.get(context, "request.query.utm_source", utmSource); + utmMedium = _.get(context, "request.query.utm_medium", utmMedium); + utmCampaign = _.get(context, "request.query.utm_campaign", utmCampaign); retUrl = _.get(context, "request.query.returnUrl", retUrl); console.log("------HHHHHH-----", context.request); afterActivationURL = retUrl ? retUrl : afterActivationURL; diff --git a/web-assets/auth0/dev-tenant/universal-login.html b/web-assets/auth0/dev-tenant/universal-login.html index 916d973..ee309a9 100644 --- a/web-assets/auth0/dev-tenant/universal-login.html +++ b/web-assets/auth0/dev-tenant/universal-login.html @@ -89,10 +89,10 @@ var languageDictionary; var language; var optionsObj = Array(); - var regSource = config.extraParams.regSource || null; - var utmSource = config.extraParams.utmSource || null; - var utmMedium = config.extraParams.utmMedium || null; - var utmCampaign = config.extraParams.utmCampaign || null; + var regSource = config.extraParams.reg_source || null; + var utmSource = config.extraParams.utm_source || null; + var utmMedium = config.extraParams.utm_medium || null; + var utmCampaign = config.extraParams.utm_campaign || null; var retUrl = config.extraParams.returnUrl || null; var loginMode = config.extraParams.mode || 'signIn'; @@ -249,7 +249,7 @@ additionalSignUpFields: [ { type: "hidden", - name: "regSource", + name: "reg_source", value: regSource }, { @@ -259,17 +259,17 @@ }, { type: "hidden", - name: "utmSource", + name: "utm_source", value: utmSource }, { type: "hidden", - name: "utmMedium", + name: "utm_medium", value: utmMedium }, { type: "hidden", - name: "utmCampaign", + name: "utm_campaign", value: utmCampaign }, { diff --git a/web-assets/auth0/prod-tenant/database/create.js b/web-assets/auth0/prod-tenant/database/create.js index 54e8fa6..05e9e7b 100644 --- a/web-assets/auth0/prod-tenant/database/create.js +++ b/web-assets/auth0/prod-tenant/database/create.js @@ -24,15 +24,15 @@ const msg = 'Please implement the Create script for this database connection ' + 'at https://manage.auth0.com/#/connections/database'; return callback(new Error(msg)); */ -function create(user, callback) { + function create(user, callback) { var countryObj = JSON.parse(user.user_metadata.country); - var regSource = user.user_metadata.regSource; - var utmSource = user.user_metadata.utmSource; - var utmMedium = user.user_metadata.utmMedium; - var utmCampaign = user.user_metadata.utmCampaign; + var regSource = user.user_metadata.reg_source; + var utmSource = user.user_metadata.utm_source; + var utmMedium = user.user_metadata.utm_medium; + var utmCampaign = user.user_metadata.utm_campaign; var retUrl = user.user_metadata.returnUrl; - var afterActivationURL = retUrl ? retUrl : "https://platform."+configuration.DOMAIN+"/onboard"; + var afterActivationURL = retUrl != null ? retUrl : "https://" + configuration.DOMAIN + "/home"; if (regSource === configuration.REG_BUSINESS) { afterActivationURL = "https://connect."+configuration.DOMAIN; } @@ -95,7 +95,9 @@ function create(user, callback) { return callback(new ValidationError(code,error_message)); } //if (response.statusCode === 401) return callback(); + + callback(null); }); //end post request //callback(null); -} +} \ No newline at end of file diff --git a/web-assets/auth0/prod-tenant/rules/enterprise.js b/web-assets/auth0/prod-tenant/rules/enterprise.js index 44b3940..ed7f636 100644 --- a/web-assets/auth0/prod-tenant/rules/enterprise.js +++ b/web-assets/auth0/prod-tenant/rules/enterprise.js @@ -28,11 +28,11 @@ function (user, context, callback) { let isoAlpha2Code = _.get(context, "request.geoip.country_code"); let isoAlpha3Code = _.get(context, "request.geoip.country_code3"); let countryCode = _.get(context, "request.geoip.country_name"); - let regSource = _.get(context, "request.query.regSource", null); + let regSource = _.get(context, "request.query.reg_source", null); let retUrl = _.get(context, "request.query.returnUrl", null); - let utmSource = _.get(context, "request.query.utmSource", null); - let utmMedium = _.get(context, "request.query.utmMedium", null); - let utmCampaign = _.get(context, "request.query.utmCampaign", null); + let utmSource = _.get(context, "request.query.utm_source", null); + let utmMedium = _.get(context, "request.query.utm_medium", null); + let utmCampaign = _.get(context, "request.query.utm_campaign", null); const resourcePath = '/identityproviders?filter=handle=' + email; const afterActivationURL = configuration.DEFAULT_AFTER_ACTIVATION_URL; @@ -40,12 +40,12 @@ function (user, context, callback) { const registrationCompletetUrl = "https://" + hostName + "/continue"; //const userHandleRedirectUrl = configuration.CUSTOM_PAGES_BASE_URL + '/signup.html?source='+ utmSource + '&formAction=' + registrationCompletetUrl; const userHandleRedirectUrl = configuration.CUSTOM_PAGES_BASE_URL + - "/signup.html?regSource=" + regSource + + "/signup.html?reg_source=" + regSource + "&firstName=" + encodeURIComponent(firstName) + "&lastName=" + encodeURIComponent(lastName) + - "&utmSource=" + encodeURIComponent(utmSource) + - "&utmMedium=" + encodeURIComponent(utmMedium) + - "&utmCampaign=" + encodeURIComponent(utmCampaign) + + "&utm_source=" + encodeURIComponent(utmSource) + + "&utm_medium=" + encodeURIComponent(utmMedium) + + "&utm_campaign=" + encodeURIComponent(utmCampaign) + "&formAction=" + registrationCompletetUrl + "&returnUrl=" + retUrl; @@ -88,9 +88,9 @@ function (user, context, callback) { isoAlpha2Code = _.get(countryObj, "alpha2", isoAlpha2Code); isoAlpha3Code = _.get(countryObj, "alpha3", isoAlpha3Code); } - utmSource = _.get(context, "request.query.source", utmSource); - utmMedium = _.get(context, "request.query.utmMedium", utmMedium); - utmCampaign = _.get(context, "request.query.utmCampaign", utmCampaign); + utmSource = _.get(context, "request.query.utm_source", utmSource); + utmMedium = _.get(context, "request.query.utm_medium", utmMedium); + utmCampaign = _.get(context, "request.query.utm_campaign", utmCampaign); } else { console.log('Redirect to choose user handle page.'); context.redirect = { diff --git a/web-assets/auth0/prod-tenant/rules/social.js b/web-assets/auth0/prod-tenant/rules/social.js index e281b89..680ee18 100644 --- a/web-assets/auth0/prod-tenant/rules/social.js +++ b/web-assets/auth0/prod-tenant/rules/social.js @@ -33,21 +33,21 @@ function (user, context, callback) { let isoAlpha2Code = _.get(context, "request.geoip.country_code"); let isoAlpha3Code = _.get(context, "request.geoip.country_code3"); let countryCode = _.get(context, "request.geoip.country_name"); - let regSource = _.get(context, "request.query.regSource", null); - let utmSource = _.get(context, "request.query.utmSource", null); - let utmMedium = _.get(context, "request.query.utmMedium", null); - let utmCampaign = _.get(context, "request.query.utmCampaign", null); + let regSource = _.get(context, "request.query.reg_source", null); + let utmSource = _.get(context, "request.query.utm_source", null); + let utmMedium = _.get(context, "request.query.utm_medium", null); + let utmCampaign = _.get(context, "request.query.utm_campaign", null); let retUrl = _.get(context, "request.query.returnUrl", null); //console.log("resource", regSource, _.get(context, "request.query")); const userHandleRedirectUrl = configuration.CUSTOM_PAGES_BASE_URL + - "/signup.html?regSource=" + regSource + + "/signup.html?reg_source=" + regSource + "&firstName=" + encodeURIComponent(firstName) + "&lastName=" + encodeURIComponent(lastName) + - "&utmSource=" + encodeURIComponent(utmSource) + - "&utmMedium=" + encodeURIComponent(utmMedium) + - "&utmCampaign=" + encodeURIComponent(utmCampaign) + + "&utm_source=" + encodeURIComponent(utmSource) + + "&utm_medium=" + encodeURIComponent(utmMedium) + + "&utm_campaign=" + encodeURIComponent(utmCampaign) + "&formAction=" + registrationCompletetUrl + "&returnUrl=" + retUrl; @@ -88,12 +88,12 @@ function (user, context, callback) { isoAlpha2Code = _.get(countryObj, "alpha2", isoAlpha2Code); isoAlpha3Code = _.get(countryObj, "alpha3", isoAlpha3Code); } - regSource = _.get(context, "request.query.source", regSource); + regSource = _.get(context, "request.query.reg_source", regSource); firstName = _.get(context, "request.query.firstName", firstName); lastName = _.get(context, "request.query.lastName", lastName); - utmSource = _.get(context, "request.query.source", utmSource); - utmMedium = _.get(context, "request.query.utmMedium", utmMedium); - utmCampaign = _.get(context, "request.query.utmCampaign", utmCampaign); + utmSource = _.get(context, "request.query.utm_source", utmSource); + utmMedium = _.get(context, "request.query.utm_medium", utmMedium); + utmCampaign = _.get(context, "request.query.utm_campaign", utmCampaign); retUrl = _.get(context, "request.query.returnUrl", retUrl); console.log("------HHHHHH-----", context.request); afterActivationURL = retUrl ? retUrl : afterActivationURL; diff --git a/web-assets/auth0/prod-tenant/universal-login.html b/web-assets/auth0/prod-tenant/universal-login.html index f7a64ed..2455de0 100644 --- a/web-assets/auth0/prod-tenant/universal-login.html +++ b/web-assets/auth0/prod-tenant/universal-login.html @@ -82,10 +82,10 @@ var languageDictionary; var language; var optionsObj = Array(); - var regSource = config.extraParams.regSource || null; - var utmSource = config.extraParams.utmSource || null; - var utmMedium = config.extraParams.utmMedium || null; - var utmCampaign = config.extraParams.utmCampaign || null; + var regSource = config.extraParams.reg_source || null; + var utmSource = config.extraParams.utm_source || null; + var utmMedium = config.extraParams.utm_medium || null; + var utmCampaign = config.extraParams.utm_campaign || null; var retUrl = config.extraParams.returnUrl || null; var loginMode = config.extraParams.mode || 'signIn'; @@ -289,7 +289,7 @@ additionalSignUpFields: [ { type: "hidden", - name: "regSource", + name: "reg_source", value: regSource }, { @@ -299,17 +299,17 @@ }, { type: "hidden", - name: "utmSource", + name: "utm_source", value: utmSource }, { type: "hidden", - name: "utmMedium", + name: "utm_medium", value: utmMedium }, { type: "hidden", - name: "utmCampaign", + name: "utm_campaign", value: utmCampaign }, { diff --git a/web-assets/js/setupAuth0WithRedirect.js b/web-assets/js/setupAuth0WithRedirect.js index 3858eaa..b5cd6a4 100644 --- a/web-assets/js/setupAuth0WithRedirect.js +++ b/web-assets/js/setupAuth0WithRedirect.js @@ -187,10 +187,10 @@ const authSetup = function () { auth0 .loginWithRedirect({ redirect_uri: host + '?appUrl=' + returnAppUrl, - regSource: regSource, - utmSource: utmSource, - utmCampaign: utmCampaign, - utmMedium: utmMedium, + reg_source: regSource, + utm_source: utmSource, + utm_campaign: utmCampaign, + utm_medium: utmMedium, returnUrl: returnAppUrl, mode: mode }) diff --git a/web-assets/js/signup.js b/web-assets/js/signup.js index 80a5516..9ec781f 100644 --- a/web-assets/js/signup.js +++ b/web-assets/js/signup.js @@ -67,10 +67,10 @@ $(document).ready(function () { } $('#signup').attr('action', formAction); $("#state").val(qs["state"]); - $("#regSource").val(qs["regSource"]); - $("#utmSource").val(qs["utmSource"]); - $("#utmMedium").val(qs["utmMedium"]); - $("#utmCampaign").val(qs["utmCampaign"]); + $("#regSource").val(qs["reg_source"]); + $("#utmSource").val(qs["utm_source"]); + $("#utmMedium").val(qs["utm_medium"]); + $("#utmCampaign").val(qs["utm_campaign"]); $("#returnUrl").val(qs["returnUrl"]); $("#signup").submit(); submit_flag = false; diff --git a/web-assets/static-pages/signup.html b/web-assets/static-pages/signup.html index 5c11478..4565f7f 100644 --- a/web-assets/static-pages/signup.html +++ b/web-assets/static-pages/signup.html @@ -52,10 +52,10 @@

- - - - + + + +