Enable Office365 Auth from GCC-High and DoD Closed scottdurow#466

rwilson504 · rwilson504 · commit 4c5c6b825bbf · 2022-12-19T13:10:45.000-05:00
diff --git a/spkl/spkl/XrmToolingCmdLine/XrmToolingConnection.cs b/spkl/spkl/XrmToolingCmdLine/XrmToolingConnection.cs
@@ -78,7 +78,7 @@ public CrmServiceClient Connect()
             if (newConnection)
             {
                 selectedConnection = new SavedConnection();
-                var envUrl = ReadLine("Environment/Organization Url (e.g. org123.crm.dynamics.com)", regex: @"^(?<!http)([^\s:\/]+)(\.crm[0-9]*\.dynamics\.com[\/]?)$");
+                var envUrl = ReadLine("Environment/Organization Url (e.g. org123.crm.dynamics.com)", regex: @"^(?<!http)([^\s:\/]+)(\.crm[0-9]*\.(dynamics\.com|microsoftdynamics\.us|appsplatform\.us)[\/]?)$");
                 envUrl = envUrl.TrimEnd('/');
                 selectedConnection.EnvironmentUrl = envUrl;
                 // If new connection - set LoginPrompt=Always

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public CrmServiceClient Connect()`
`78`	`78`	`if (newConnection)`
`79`	`79`	`{`
`80`	`80`	`selectedConnection = new SavedConnection();`
`81`		`- var envUrl = ReadLine("Environment/Organization Url (e.g. org123.crm.dynamics.com)", regex: @"^(?<!http)([^\s:\/]+)(\.crm[0-9]*\.dynamics\.com[\/]?)$");`
	`81`	`+ var envUrl = ReadLine("Environment/Organization Url (e.g. org123.crm.dynamics.com)", regex: @"^(?<!http)([^\s:\/]+)(\.crm[0-9]*\.(dynamics\.com\|microsoftdynamics\.us\|appsplatform\.us)[\/]?)$");`
`82`	`82`	`envUrl = envUrl.TrimEnd('/');`
`83`	`83`	`selectedConnection.EnvironmentUrl = envUrl;`
`84`	`84`	`// If new connection - set LoginPrompt=Always`