Update licensing switches for Office365 and Google SSO through OAuth2 (#3786)

model/license.go

@@ -35,8 +35,8 @@ type Features struct {
 	Users                *int  `json:"users"`
 	LDAP                 *bool `json:"ldap"`
 	MFA                  *bool `json:"mfa"`
-	GoogleSSO            *bool `json:"google_sso"`
-	Office365SSO         *bool `json:"office365_sso"`
+	GoogleOAuth          *bool `json:"google_oauth"`
+	Office365OAuth       *bool `json:"office365_oauth"`
 	Compliance           *bool `json:"compliance"`
 	Cluster              *bool `json:"cluster"`
 	CustomBrand          *bool `json:"custom_brand"`
@@ -67,14 +67,14 @@ func (f *Features) SetDefaults() {
 		*f.MFA = *f.FutureFeatures
 	}
 
-	if f.GoogleSSO == nil {
-		f.GoogleSSO = new(bool)
-		*f.GoogleSSO = true
+	if f.GoogleOAuth == nil {
+		f.GoogleOAuth = new(bool)
+		*f.GoogleOAuth = *f.FutureFeatures
 	}
 
-	if f.Office365SSO == nil {
-		f.Office365SSO = new(bool)
-		*f.Office365SSO = true
+	if f.Office365OAuth == nil {
+		f.Office365OAuth = new(bool)
+		*f.Office365OAuth = *f.FutureFeatures
 	}
 
 	if f.Compliance == nil {