Merge pull request #508 from gcoxmoz/mozorg

Add mozilla.org / Mozilla Organization / team_mozorg as a known staff domain

Author: bheesham

tf/actions/ensureLdapUsersUseLdap.js

@@ -92,7 +92,8 @@ exports.onExecutePostLogin = async (event, api) => {
   // The domain strings in this array should always be declared here in lowercase
   const MOZILLA_STAFF_DOMAINS = [
     "mozilla.com", // Main corp domain
-    "mozillafoundation.org", // Main org domain
+    "mozillafoundation.org", // Mozilla Foundation domain
+    "mozilla.org", // Mozilla Organization domain
     "getpocket.com", // Pocket domain
     "thunderbird.net", // MZLA domain
     "readitlater.com",

tf/actions/samlMappings.js

@@ -14,6 +14,7 @@ exports.onExecutePostLogin = async (event, api) => {
         "mozilliansorg_sec_tines-access",
         "team_moco",
         "team_mofo",
+        "team_mozorg",
         "team_mzla",
         "team_mzai",
         "team_mzvc",

tf/tests/ensureLdapUsersUseLdap.test.js

@@ -83,7 +83,8 @@ const WHITELIST = [
 
 const MOZILLA_STAFF_DOMAINS = [
   "mozilla.com", // Main corp domain
-  "mozillafoundation.org", // Main org domain
+  "mozillafoundation.org", // Mozilla Foundation domain
+  "mozilla.org", // Mozilla Organization domain
   "getpocket.com", // Pocket domain
   "thunderbird.net", // MZLA domain
   "readitlater.com",

tf/tests/samlMappings.test.js

@@ -155,6 +155,7 @@ describe("Tines SAML tests", () => {
         "bar",
         "team_moco",
         "team_mofo",
+        "team_mozorg",
         "team_mzla",
         "team_mzai",
         "team_mzvc",
@@ -166,6 +167,7 @@ describe("Tines SAML tests", () => {
           "mozilliansorg_sec_tines-access",
           "team_moco",
           "team_mofo",
+          "team_mozorg",
           "team_mzla",
           "team_mzai",
           "team_mzvc",