Merge pull request #350 from april/master

Change LDAP check from CISv1 to CISv2

Author: april

config/development.json

@@ -3,7 +3,7 @@
   "auth0_domain": "auth-dev.mozilla.auth0.com",
   "cdn_domain": "cdn.sso.allizom.org",
   "LDAP_connection_name": "Mozilla-LDAP-Dev",
-  "person_api_domain": "https://person-api.sso.allizom.org/v1/connection/",
+  "person_api_domain": "person.api.test.sso.allizom.org",
   "logout_url": "https://auth-dev.mozilla.auth0.com/v2/logout?returnTo=https://sso.allizom.org/signout.html",
   "sso_dashboard_url": "https://sso.allizom.org",
   "GTM_ID": "GTM-T2N2BRW",
@@ -14,7 +14,7 @@
     "maintenance_mode": "false"
   },
   "supportedLoginMethods": [ "github", "google-oauth2", "firefoxaccounts", "email" ],
-  "csp": "default-src 'none'; connect-src 'self' https://person-api.sso.allizom.org; script-src 'self' https://cdn.sso.allizom.org https://www.googletagmanager.com https://www.google-analytics.com; style-src 'self' https://cdn.sso.allizom.org; font-src 'self' https://cdn.sso.allizom.org; img-src 'self' https://cdn.sso.allizom.org https://www.google-analytics.com",
+  "csp": "default-src 'none'; connect-src 'self' https://person.api.test.sso.allizom.org; script-src 'self' https://cdn.sso.allizom.org https://www.googletagmanager.com https://www.google-analytics.com; style-src 'self' https://cdn.sso.allizom.org; font-src 'self' https://cdn.sso.allizom.org; img-src 'self' https://cdn.sso.allizom.org https://www.google-analytics.com",
   "displayNames": {
     "github": "GitHub",
     "google-oauth2": "Google",

config/local.json

@@ -3,7 +3,7 @@
   "auth0_domain": "auth-dev.mozilla.auth0.com",
   "cdn_domain": "localhost:3000",
   "LDAP_connection_name": "Mozilla-LDAP-Dev",
-  "person_api_domain": "https://person-api.sso.allizom.org/v1/connection/",
+  "person_api_domain": "person.api.dev.sso.allizom.org",
   "logout_url": "https://auth-dev.mozilla.auth0.com/v2/logout?returnTo=https://sso.allizom.org/signout.html",
   "sso_dashboard_url": "https://sso.allizom.org",
   "GTM_ID": "GTM-T2N2BRW",

config/production.json

@@ -3,7 +3,7 @@
   "auth0_domain": "auth.mozilla.auth0.com",
   "cdn_domain": "cdn.sso.mozilla.com",
   "LDAP_connection_name": "Mozilla-LDAP",
-  "person_api_domain": "https://person-api.sso.mozilla.com/v1/connection/",
+  "person_api_domain": "person.api.sso.mozilla.com",
   "logout_url": "https://auth.mozilla.auth0.com/v2/logout?returnTo=https://sso.mozilla.com/signout.html",
   "sso_dashboard_url": "https://sso.mozilla.com",
   "GTM_ID": "GTM-T2N2BRW",
@@ -13,7 +13,7 @@
     "maintenance_mode": "false"
   },
   "supportedLoginMethods": [ "github", "google-oauth2", "firefoxaccounts", "email" ],
-  "csp": "default-src 'none'; connect-src 'self' https://person-api.sso.mozilla.com; script-src 'self' https://cdn.sso.mozilla.com https://www.googletagmanager.com https://www.google-analytics.com; style-src 'self' https://cdn.sso.mozilla.com; font-src 'self' https://cdn.sso.mozilla.com; img-src 'self' https://cdn.sso.mozilla.com https://www.google-analytics.com",
+  "csp": "default-src 'none'; connect-src 'self' https://person.api.sso.mozilla.com; script-src 'self' https://cdn.sso.mozilla.com https://www.googletagmanager.com https://www.google-analytics.com; style-src 'self' https://cdn.sso.mozilla.com; font-src 'self' https://cdn.sso.mozilla.com; img-src 'self' https://cdn.sso.mozilla.com https://www.google-analytics.com",
   "displayNames": {
     "github": "GitHub",
     "google-oauth2": "Google",

src/html/index.html

@@ -48,7 +48,7 @@
     <title>Mozilla Login</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta http-equiv="Content-Security-Policy" content="{{{ csp }}}">
-    <link rel="dns-prefetch" href="{{{ person_api_domain }}}">
+    <link rel="dns-prefetch" href="https://{{{ person_api_domain }}}">
     <link rel="stylesheet" href="{{{ cdn }}}/css/fonts.css" type="text/css" />
     <link rel="stylesheet" href="{{{ cdn }}}/css/styles.css" type="text/css" />
     <link rel="icon" href="{{{ cdn }}}/images/favicon.png" type="image/png" sizes="192x192" />

src/js/handlers/enter.js

@@ -29,7 +29,7 @@ module.exports = function enter( element ) {
   var qualifiesForLDAPShortcut = /@(mozilla\.com|getpocket\.com|mozillafoundation\.org)$/.test( emailField.value );
   var supportedByRP = form.loginMethods ? form.loginMethods['supportedByRP'] : null;
   var onlyAcceptsLDAP = supportedByRP && supportedByRP.length === 1 && supportedByRP.indexOf( NLX.LDAP_connection_name ) === 0;
-  var ENDPOINT = NLX.person_api_domain;
+  var ENDPOINT = 'https://' + NLX.person_api_domain + '/v2/user/metadata/';
 
   if ( emailField.value === '' || emailField.validity.valid === false ) {
     emailField.focus();
@@ -47,11 +47,8 @@ module.exports = function enter( element ) {
       fetch( ENDPOINT + emailFieldValue )
         .then(
           function( response ) {
-            response.json().then( function( data ) {
-              var userinfo = JSON.parse( data );
-              var isLDAP = userinfo.hasOwnProperty( 'user_email' ) && userinfo.hasOwnProperty( 'connection_method' ) && userinfo[ 'connection_method' ] === 'ad';
-
-              if ( isLDAP ) {
+            response.json().then( function( userinfo ) {
+              if ( userinfo.exists.ldap ) {
                 showLDAP( element, passwordField );
               }
               else {