Skip to content

Commit b547b76

Browse files
author
Sachin Maheshwari
committed
changes for prod rules
1 parent 29f6f63 commit b547b76

6 files changed

Lines changed: 48 additions & 46 deletions

File tree

‎web-assets/auth0/prod-tenant/database/create.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
const msg = 'Please implement the Create script for this database connection ' +
2525
'at https://manage.auth0.com/#/connections/database';
2626
return callback(new Error(msg)); */
27-
function create(user, callback) {
27+
function create(user, callback) {
2828

2929
var countryObj = JSON.parse(user.user_metadata.country);
30-
var regSource = user.user_metadata.regSource;
31-
var utmSource = user.user_metadata.utmSource;
32-
var utmMedium = user.user_metadata.utmMedium;
33-
var utmCampaign = user.user_metadata.utmCampaign;
30+
var regSource = user.user_metadata.reg_source;
31+
var utmSource = user.user_metadata.utm_source;
32+
var utmMedium = user.user_metadata.utm_medium;
33+
var utmCampaign = user.user_metadata.utm_campaign;
3434
var retUrl = user.user_metadata.returnUrl;
35-
var afterActivationURL = retUrl ? retUrl : "https://platform."+configuration.DOMAIN+"/onboard";
35+
var afterActivationURL = retUrl != null ? retUrl : "https://" + configuration.DOMAIN + "/home";
3636
if (regSource === configuration.REG_BUSINESS) {
3737
afterActivationURL = "https://connect."+configuration.DOMAIN;
3838
}
@@ -95,7 +95,9 @@ function create(user, callback) {
9595
return callback(new ValidationError(code,error_message));
9696
}
9797
//if (response.statusCode === 401) return callback();
98+
99+
98100
callback(null);
99101
}); //end post request
100102
//callback(null);
101-
}
103+
}

‎web-assets/auth0/prod-tenant/rules/enterprise.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,24 @@ function (user, context, callback) {
2828
let isoAlpha2Code = _.get(context, "request.geoip.country_code");
2929
let isoAlpha3Code = _.get(context, "request.geoip.country_code3");
3030
let countryCode = _.get(context, "request.geoip.country_name");
31-
let regSource = _.get(context, "request.query.regSource", null);
31+
let regSource = _.get(context, "request.query.reg_source", null);
3232
let retUrl = _.get(context, "request.query.returnUrl", null);
33-
let utmSource = _.get(context, "request.query.utmSource", null);
34-
let utmMedium = _.get(context, "request.query.utmMedium", null);
35-
let utmCampaign = _.get(context, "request.query.utmCampaign", null);
33+
let utmSource = _.get(context, "request.query.utm_source", null);
34+
let utmMedium = _.get(context, "request.query.utm_medium", null);
35+
let utmCampaign = _.get(context, "request.query.utm_campaign", null);
3636

3737
const resourcePath = '/identityproviders?filter=handle=' + email;
3838
const afterActivationURL = configuration.DEFAULT_AFTER_ACTIVATION_URL;
3939
const hostName = _.get(context, "request.hostname", null);
4040
const registrationCompletetUrl = "https://" + hostName + "/continue";
4141
//const userHandleRedirectUrl = configuration.CUSTOM_PAGES_BASE_URL + '/signup.html?source='+ utmSource + '&formAction=' + registrationCompletetUrl;
4242
const userHandleRedirectUrl = configuration.CUSTOM_PAGES_BASE_URL +
43-
"/signup.html?regSource=" + regSource +
43+
"/signup.html?reg_source=" + regSource +
4444
"&firstName=" + encodeURIComponent(firstName) +
4545
"&lastName=" + encodeURIComponent(lastName) +
46-
"&utmSource=" + encodeURIComponent(utmSource) +
47-
"&utmMedium=" + encodeURIComponent(utmMedium) +
48-
"&utmCampaign=" + encodeURIComponent(utmCampaign) +
46+
"&utm_source=" + encodeURIComponent(utmSource) +
47+
"&utm_medium=" + encodeURIComponent(utmMedium) +
48+
"&utm_campaign=" + encodeURIComponent(utmCampaign) +
4949
"&formAction=" + registrationCompletetUrl +
5050
"&returnUrl=" + retUrl;
5151

@@ -88,9 +88,9 @@ function (user, context, callback) {
8888
isoAlpha2Code = _.get(countryObj, "alpha2", isoAlpha2Code);
8989
isoAlpha3Code = _.get(countryObj, "alpha3", isoAlpha3Code);
9090
}
91-
utmSource = _.get(context, "request.query.source", utmSource);
92-
utmMedium = _.get(context, "request.query.utmMedium", utmMedium);
93-
utmCampaign = _.get(context, "request.query.utmCampaign", utmCampaign);
91+
utmSource = _.get(context, "request.query.utm_source", utmSource);
92+
utmMedium = _.get(context, "request.query.utm_medium", utmMedium);
93+
utmCampaign = _.get(context, "request.query.utm_campaign", utmCampaign);
9494
} else {
9595
console.log('Redirect to choose user handle page.');
9696
context.redirect = {

‎web-assets/auth0/prod-tenant/rules/social.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@ function (user, context, callback) {
3333
let isoAlpha2Code = _.get(context, "request.geoip.country_code");
3434
let isoAlpha3Code = _.get(context, "request.geoip.country_code3");
3535
let countryCode = _.get(context, "request.geoip.country_name");
36-
let regSource = _.get(context, "request.query.regSource", null);
37-
let utmSource = _.get(context, "request.query.utmSource", null);
38-
let utmMedium = _.get(context, "request.query.utmMedium", null);
39-
let utmCampaign = _.get(context, "request.query.utmCampaign", null);
36+
let regSource = _.get(context, "request.query.reg_source", null);
37+
let utmSource = _.get(context, "request.query.utm_source", null);
38+
let utmMedium = _.get(context, "request.query.utm_medium", null);
39+
let utmCampaign = _.get(context, "request.query.utm_campaign", null);
4040
let retUrl = _.get(context, "request.query.returnUrl", null);
4141

4242
//console.log("resource", regSource, _.get(context, "request.query"));
4343

4444
const userHandleRedirectUrl = configuration.CUSTOM_PAGES_BASE_URL +
45-
"/signup.html?regSource=" + regSource +
45+
"/signup.html?reg_source=" + regSource +
4646
"&firstName=" + encodeURIComponent(firstName) +
4747
"&lastName=" + encodeURIComponent(lastName) +
48-
"&utmSource=" + encodeURIComponent(utmSource) +
49-
"&utmMedium=" + encodeURIComponent(utmMedium) +
50-
"&utmCampaign=" + encodeURIComponent(utmCampaign) +
48+
"&utm_source=" + encodeURIComponent(utmSource) +
49+
"&utm_medium=" + encodeURIComponent(utmMedium) +
50+
"&utm_campaign=" + encodeURIComponent(utmCampaign) +
5151
"&formAction=" + registrationCompletetUrl +
5252
"&returnUrl=" + retUrl;
5353

@@ -88,12 +88,12 @@ function (user, context, callback) {
8888
isoAlpha2Code = _.get(countryObj, "alpha2", isoAlpha2Code);
8989
isoAlpha3Code = _.get(countryObj, "alpha3", isoAlpha3Code);
9090
}
91-
regSource = _.get(context, "request.query.source", regSource);
91+
regSource = _.get(context, "request.query.reg_source", regSource);
9292
firstName = _.get(context, "request.query.firstName", firstName);
9393
lastName = _.get(context, "request.query.lastName", lastName);
94-
utmSource = _.get(context, "request.query.source", utmSource);
95-
utmMedium = _.get(context, "request.query.utmMedium", utmMedium);
96-
utmCampaign = _.get(context, "request.query.utmCampaign", utmCampaign);
94+
utmSource = _.get(context, "request.query.utm_source", utmSource);
95+
utmMedium = _.get(context, "request.query.utm_medium", utmMedium);
96+
utmCampaign = _.get(context, "request.query.utm_campaign", utmCampaign);
9797
retUrl = _.get(context, "request.query.returnUrl", retUrl);
9898
console.log("------HHHHHH-----", context.request);
9999
afterActivationURL = retUrl ? retUrl : afterActivationURL;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@
8282
var languageDictionary;
8383
var language;
8484
var optionsObj = Array();
85-
var regSource = config.extraParams.regSource || null;
86-
var utmSource = config.extraParams.utmSource || null;
87-
var utmMedium = config.extraParams.utmMedium || null;
88-
var utmCampaign = config.extraParams.utmCampaign || null;
85+
var regSource = config.extraParams.reg_source || null;
86+
var utmSource = config.extraParams.utm_source || null;
87+
var utmMedium = config.extraParams.utm_medium || null;
88+
var utmCampaign = config.extraParams.utm_campaign || null;
8989
var retUrl = config.extraParams.returnUrl || null;
9090
var loginMode = config.extraParams.mode || 'signIn';
9191

@@ -289,7 +289,7 @@
289289
additionalSignUpFields: [
290290
{
291291
type: "hidden",
292-
name: "regSource",
292+
name: "reg_source",
293293
value: regSource
294294
},
295295
{
@@ -299,17 +299,17 @@
299299
},
300300
{
301301
type: "hidden",
302-
name: "utmSource",
302+
name: "utm_source",
303303
value: utmSource
304304
},
305305
{
306306
type: "hidden",
307-
name: "utmMedium",
307+
name: "utm_medium",
308308
value: utmMedium
309309
},
310310
{
311311
type: "hidden",
312-
name: "utmCampaign",
312+
name: "utm_campaign",
313313
value: utmCampaign
314314
},
315315
{

‎web-assets/js/signup.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ $(document).ready(function () {
6767
}
6868
$('#signup').attr('action', formAction);
6969
$("#state").val(qs["state"]);
70-
$("#regSource").val(qs["regSource"]);
71-
$("#utmSource").val(qs["utmSource"]);
72-
$("#utmMedium").val(qs["utmMedium"]);
73-
$("#utmCampaign").val(qs["utmCampaign"]);
70+
$("#regSource").val(qs["reg_source"]);
71+
$("#utmSource").val(qs["utm_source"]);
72+
$("#utmMedium").val(qs["utm_medium"]);
73+
$("#utmCampaign").val(qs["utm_campaign"]);
7474
$("#returnUrl").val(qs["returnUrl"]);
7575
$("#signup").submit();
7676
submit_flag = false;

‎web-assets/static-pages/signup.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ <h1 id="page-title-heading" class="page-title-heading">
5252
</div>
5353
<form method="GET" id="signup" action="#">
5454
<input id="state" name="state" value="" type="hidden" />
55-
<input id="regSource" name="regSource" value="" type="hidden" />
56-
<input id="utmSource" name="utmSource" value="" type="hidden" />
57-
<input id="utmCampaign" name="utmCampaign" value="" type="hidden" />
58-
<input id="utmMedium" name="utmMedium" value="" type="hidden" />
55+
<input id="regSource" name="reg_source" value="" type="hidden" />
56+
<input id="utmSource" name="utm_source" value="" type="hidden" />
57+
<input id="utmCampaign" name="utm_campaign" value="" type="hidden" />
58+
<input id="utmMedium" name="utm_medium" value="" type="hidden" />
5959
<input id="returnUrl" name="returnUrl" value="" type="hidden" />
6060
<div id="hd" class="input-field active">
6161
<label for="handle">Create a Username / Handle</label>

0 commit comments

Comments
 (0)