[v10] Enterprise connections don't strip domain from email #543

auth0 · Dec 19, 2016 · 8974c1d · 8974c1d
1 parent f8f0109
commit 8974c1d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/connection/enterprise.js b/src/connection/enterprise.js
@@ -134,6 +134,7 @@ export function isHRDDomain(m, email) {
 export function toggleHRD(m, email) {
   if (email) {
     const username = l.defaultADUsernameFromEmailPrefix(m) ? emailLocalPart(email) : email;
+
     m = setUsername(m, username, "username", false);
     m = tset(m, "hrdEmail", email);
   } else {

diff --git a/src/connection/enterprise/actions.js b/src/connection/enterprise/actions.js
@@ -6,7 +6,9 @@ import {
   toggleHRD
 } from '../enterprise';
 import { getFieldValue, hideInvalidFields } from '../../field/index';
+import { emailLocalPart } from '../../field/email';
 import { logIn as coreLogIn } from '../../core/actions';
+import * as l from '../../core/index';
 
 // TODO: enterprise connections should not depend on database
 // connections. However, we now allow a username input to contain also
@@ -49,8 +51,10 @@ function logInActiveFlow(id) {
     ? "username"
     : "email";
 
-  const username = getFieldValue(m, usernameField);
-  const connection = enterpriseActiveFlowConnection(m); 
+  const originalUsername = getFieldValue(m, usernameField);
+  const connection = enterpriseActiveFlowConnection(m);
+
+  const username = l.defaultADUsernameFromEmailPrefix(m) ? emailLocalPart(originalUsername) : originalUsername;
 
   coreLogIn(id, ["password", usernameField], {
     connection: connection ? connection.get("name") : null,

diff --git a/src/connection/enterprise/hrd_screen.jsx b/src/connection/enterprise/hrd_screen.jsx
@@ -10,9 +10,9 @@ const Component = ({i18n, model}) => {
   const domain = enterpriseDomain(model);
 
   var headerText;
-  
+
   if (domain != null) {
-    headerText = i18n.html("enterpriseActiveLoginInstructions", domain);     
+    headerText = i18n.html("enterpriseActiveLoginInstructions", domain);
   } else {
     headerText = i18n.html("enterpriseLoginIntructions");
   }

diff --git a/src/core/index.js b/src/core/index.js
@@ -34,7 +34,7 @@ export function setup(id, clientID, domain, options, hookRunner, emitEventFn) {
     hashCleanup: options.hashCleanup === false ? false : true,
     allowedConnections: Immutable.fromJS(options.allowedConnections || []),
     ui: extractUIOptions(id, options),
-    defaultADUsernameFromEmailPrefix: !!options.defaultADUsernameFromEmailPrefix
+    defaultADUsernameFromEmailPrefix: options.defaultADUsernameFromEmailPrefix === false ? false : true
   }));
 
   m = i18n.initI18n(m);