dbeaver/pro#9031 oracle entra id desktop (#274)

* dbeaver/pro#9031: fix OAuth login

* dbeaver/pro#9031: fix code review

* dbeaver/pro#9031: fix CPU usage build up

---------

Co-authored-by: kseniaguzeeva <112612526+kseniaguzeeva@users.noreply.github.com>

Author: SolovevAnton

modules/org.jkiss.utils/src/org/jkiss/utils/oauth/code/OAuthCodeHandler.java

@@ -72,6 +72,10 @@ public class OAuthCodeHandler implements IOAuthHandler {
     protected int timeout;
     @Nullable
     protected String state;
+
+    @Nullable
+    protected final String scope;
+
     @Nullable
     protected String codeChallenge;
 
@@ -93,6 +97,29 @@ public OAuthCodeHandler(
         @NotNull String callbackEndpoint,
         @NotNull String redirectUri,
         int callbackPort
+    ) {
+        this(clientId, secretId, authUrl, tokenURL, callbackEndpoint, redirectUri, callbackPort, null);
+    }
+
+    /**
+     * Constructs an OAuthHandler with required parameters.
+     *
+     * @param clientId     the OAuth client ID
+     * @param secretId     the OAuth client secret (nullable for PKCE-only flows)
+     * @param authUrl      the authorization endpoint URL
+     * @param tokenURL     the token exchange endpoint URL
+     * @param callbackPort the port on which the temporary server will listen for the callback
+     * @param scope        requested scope
+     */
+    public OAuthCodeHandler(
+        @NotNull String clientId,
+        @Nullable String secretId,
+        @NotNull String authUrl,
+        @NotNull String tokenURL,
+        @NotNull String callbackEndpoint,
+        @NotNull String redirectUri,
+        int callbackPort,
+        @Nullable String scope
     ) {
         this.clientId = clientId;
         this.secretId = secretId;
@@ -101,9 +128,9 @@ public OAuthCodeHandler(
         this.callbackEndpoint = callbackEndpoint;
         this.callbackPort = callbackPort;
         this.redirectUri = redirectUri;
+        this.scope = scope;
     }
 
-
     /**
      * Sets the timeout (in seconds) to wait for the OAuth callback response.
      *
@@ -277,6 +304,9 @@ protected String buildAuthUrl() throws IOException {
         if (codeChallenge != null) {
             builder.withCodeChallenge(codeChallenge);
         }
+        if (CommonUtils.isNotEmpty(scope)) {
+            builder.withScope(scope);
+        }
         return builder.build();
     }
 
@@ -298,6 +328,8 @@ public static class OAuthCodeHandlerBuilder<T extends OAuthCodeHandler> {
         protected String redirectUri;
         protected int callbackPort = 0;
 
+        protected String scope;
+
         protected int timeout = OAuthConstants.AUTH_DEFAULT_SSO_TIMEOUT;
         protected String callbackEndpoint = OAuthConstants.DEFAULT_CALLBACK_ENDPOINT;
         protected String state;
@@ -343,6 +375,12 @@ public OAuthCodeHandlerBuilder<T> withRedirectUri(@NotNull String redirectUri) {
             return this;
         }
 
+        @NotNull
+        public OAuthCodeHandlerBuilder<T> withScope(@NotNull String scope) {
+            this.scope = scope;
+            return this;
+        }
+
         @NotNull
         public T build() {
             if (CommonUtils.isEmpty(clientId)) {
@@ -370,7 +408,7 @@ public T build() {
         @NotNull
         protected T createOAuthCodeHandler() {
             //noinspection unchecked
-            return (T) new OAuthCodeHandler(clientId, secretId, authUrl, tokenURL, callbackEndpoint, redirectUri, callbackPort);
+            return (T) new OAuthCodeHandler(clientId, secretId, authUrl, tokenURL, callbackEndpoint, redirectUri, callbackPort, scope);
         }
     }
 }

modules/org.jkiss.utils/src/org/jkiss/utils/oauth/code/OAuthCodeResponseHandler.java

@@ -46,6 +46,8 @@ public class OAuthCodeResponseHandler implements IOAuthCodeResponseHandler {
     @NotNull
     private final String callbackEndpoint;
 
+    private volatile boolean notShutDown;
+
     /**
      * Creates a new instance of the response handler.
      *
@@ -83,6 +85,7 @@ public void initServer() throws IOException {
      */
     @Override
     public Future<String> requestCode() {
+        notShutDown = true;
         return executor.submit(() -> {
             AtomicReference<String> result = new AtomicReference<>();
             AtomicBoolean hasErrors = new AtomicBoolean(false);
@@ -109,7 +112,7 @@ public Future<String> requestCode() {
                     exchange.close();
                 }
             );
-            while (result.get() == null) {
+            while (result.get() == null && notShutDown) {
                 Thread.onSpinWait();
             }
             httpServer.removeContext(callbackEndpoint);
@@ -146,6 +149,7 @@ public void close() throws IOException {
             httpServer.stop(0);
         }
         executor.shutdown();
+        notShutDown = false;
     }
 
     @NotNull