Make strictScope return null when id is null

Author: Damans227

framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java

@@ -426,7 +426,7 @@ public T valueInScope(Scope scope, Long id) {
 
     public T valueInScope(Scope scope, Long id, boolean strictScope) {
         if (id == null) {
-            return value();
+            return strictScope ? null : value();
         }
         String value = s_depot != null ? s_depot.getConfigStringValue(_name, scope, id) : null;
         if (value == null) {

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java

@@ -79,6 +79,9 @@ public boolean start() {
     }
 
     protected boolean isOAuthPluginEnabled(Long domainId) {
+        if (domainId == null) {
+            return Boolean.TRUE.equals(OAuth2IsPluginEnabled.value());
+        }
         return Boolean.TRUE.equals(OAuth2IsPluginEnabled.valueInScope(ConfigKey.Scope.Domain, domainId, true));
     }
 

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2UserAuthenticator.java

@@ -92,6 +92,9 @@ public String encode(String password) {
     }
 
     protected boolean isOAuthPluginEnabled(Long domainId) {
+        if (domainId == null) {
+            return Boolean.TRUE.equals(OAuth2IsPluginEnabled.value());
+        }
         return Boolean.TRUE.equals(OAuth2IsPluginEnabled.valueInScope(ConfigKey.Scope.Domain, domainId, true));
     }
 }

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/OauthLoginAPIAuthenticatorCmd.java

@@ -144,7 +144,10 @@ public String authenticate(String command, Map<String, Object[]> params, HttpSes
             domainId = userDomain.getId();
         }
 
-        if (!Boolean.TRUE.equals(OAuth2IsPluginEnabled.valueInScope(ConfigKey.Scope.Domain, domainId, true))) {
+        boolean oauthEnabled = domainId == null
+                ? Boolean.TRUE.equals(OAuth2IsPluginEnabled.value())
+                : Boolean.TRUE.equals(OAuth2IsPluginEnabled.valueInScope(ConfigKey.Scope.Domain, domainId, true));
+        if (!oauthEnabled) {
             throw new CloudAuthenticationException("OAuth is not enabled, users cannot login using OAuth");
         }
 

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/UpdateOAuthProviderCmd.java

@@ -127,7 +127,10 @@ public void execute() {
                 String name = authenticator.getName();
                 authenticatorPluginNames.add(name);
             }
-            if (Boolean.TRUE.equals(OAuth2AuthManager.OAuth2IsPluginEnabled.valueInScope(ConfigKey.Scope.Domain, result.getDomainId(), true)) && authenticatorPluginNames.contains(result.getProvider()) && result.isEnabled()) {
+            boolean oauthEnabled = result.getDomainId() == null
+                    ? Boolean.TRUE.equals(OAuth2AuthManager.OAuth2IsPluginEnabled.value())
+                    : Boolean.TRUE.equals(OAuth2AuthManager.OAuth2IsPluginEnabled.valueInScope(ConfigKey.Scope.Domain, result.getDomainId(), true));
+            if (oauthEnabled && authenticatorPluginNames.contains(result.getProvider()) && result.isEnabled()) {
                 r.setEnabled(true);
             } else {
                 r.setEnabled(false);