[24.x] Fix issues with PowerBIManagement and OAuthIntegration

src/System Application/App/ControlAddIns/src/OAuthControlAddIn.ControlAddIn.al

@@ -1,4 +1,3 @@
-#if not CLEAN24
 // ------------------------------------------------------------------------------------------------
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
@@ -8,16 +7,13 @@ namespace System.Security.Authentication;
 
 controladdin OAuthControlAddIn
 {
-    Scripts = 'Resources\OAuthIntegration\js\OAuthIntegration.js';
-    StartupScript = 'Resources\OAuthIntegration\js\Startup.js';
     RequestedWidth = 0;
     RequestedHeight = 0;
     HorizontalStretch = false;
     VerticalStretch = false;
-    ObsoleteState = Pending;
-    ObsoleteReason = 'This control add-in is replaced by OAuthIntegration.';
-    ObsoleteTag = '24.0';
 
+    Scripts = 'Resources\OAuthIntegration\js\OAuthIntegration.js';
+    StartupScript = 'Resources\OAuthIntegration\js\Startup.js';
 
     /// <summary>
     /// Starts the authorization process.
@@ -42,5 +38,4 @@ controladdin OAuthControlAddIn
     /// Event triggered when the Add-In is loaded and ready to use.
     /// </summary>
     event ControlAddInReady();
-}
-#endif
+}

src/System Application/App/ControlAddIns/src/OAuthIntegration.Controladdin.al

@@ -7,12 +7,14 @@ namespace System.Security.Authentication;
 
 controladdin OAuthIntegration
 {
-    RequestedWidth = 0;
-    RequestedHeight = 0;
-    HorizontalStretch = false;
-    VerticalStretch = false;
-    HorizontalShrink = true;
+    RequestedHeight = 30;
+    RequestedWidth = 200;
+    MinimumHeight = 20;
+    MinimumWidth = 200;
+    VerticalStretch = true;
     VerticalShrink = true;
+    HorizontalStretch = true;
+    HorizontalShrink = true;
 
     Scripts = 'Resources\OAuthIntegration\js\OAuthIntegration.js';
     StyleSheets = 'Resources\OAuthIntegration\stylesheets\OAuthIntegration.css';

src/System Application/App/ControlAddIns/src/PowerBIManagement.ControlAddin.al

@@ -16,7 +16,11 @@ controladdin PowerBIManagement
     HorizontalStretch = true;
     HorizontalShrink = true;
 
-    Scripts = 'Resources\PowerBIManagement\js\PowerBIManagement.js';
+    Scripts = 'Resources\PowerBIManagement\js\PowerBIManagement.js',
+              // The powerbi.js file comes from the nuget package: Microsoft.PowerBI.Javascript version: 2.22.2
+              // https://github.com/microsoft/PowerBI-JavaScript/blob/master/dist/powerbi.js
+              // The file below should point to the nuget package when the AL infrastructure supports it.
+              'Resources\PowerBIManagement\js\powerbi.js';
     StartupScript = 'Resources\PowerBIManagement\js\Startup.js';
     StyleSheets = 'Resources\PowerBIManagement\stylesheets\PowerBIManagement.css';
 

src/System Application/App/OAuth2/OAuth2ControlAddIn.Page.al

@@ -28,7 +28,7 @@ page 502 OAuth2ControlAddIn
                 InstructionalText = 'A sign in window is open. To continue, pick the account you want to use and accept the conditions. This message will close when you are done.';
                 ShowCaption = false;
             }
-            usercontrol(OAuthIntegration; OAuthIntegration)
+            usercontrol(OAuthIntegration; OAuthControlAddIn)
             {
                 ApplicationArea = All;
                 trigger AuthorizationCodeRetrieved(code: Text)