Merge branch 'dev' into jarias/custom-copilot-instructions

Author: juan-arias

CHANGELOG.md

@@ -1,13 +1,22 @@
+## [2.7.0]
+* Use autolayout for loading indicator #2787
+  
 ## [2.6.0]
 * Support domain_hint param #2759
 
+## [2.5.2]
+* Update changes from version 2.4.3
+
 ## [2.5.1]
 * Allow duna external idp on MacOs
 
 ## [2.5.0]
 * Awaiting MFA Delegate now automatically returns the AuthMethods to be used when calling MFA Challenge #2687
 * SDK now handles SMS as strong authentication method #2722
 
+## [2.4.3]
+* Fix issue with legacy keychain on macOS.
+
 ## [2.4.2]
 * Bug fix to prevent crash when deallocating STK SecKeyRef
 

MSAL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "2.6.0"
+  s.version      = "2.7.0"
   s.summary      = "Microsoft Authentication Library (MSAL) for iOS"
   s.description  = <<-DESC
                    The MSAL library for iOS gives your app the ability to begin using the Microsoft Cloud by supporting Microsoft Azure Active Directory and Microsoft Accounts in a converged experience using industry standard OAuth2 and OpenID Connect. The library also supports Microsoft Azure B2C for those using our hosted identity management service.

MSAL/IdentityCore

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.0</string>
+	<string>2.7.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

MSAL/resources/ios/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.0</string>
+	<string>2.7.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

MSAL/resources/mac/Info.plist

@@ -26,7 +26,7 @@
 //------------------------------------------------------------------------------
 
 #define MSAL_VER_HIGH       2
-#define MSAL_VER_LOW        6
+#define MSAL_VER_LOW        7
 #define MSAL_VER_PATCH      0
 
 #define STR_HELPER(x) #x

MSAL/src/MSAL_Internal.h

@@ -56,7 +56,7 @@ @interface MSALAcquireTokenViewController ()
 @property (atomic, weak) IBOutlet NSTextField *extraQueryParamsTextField;
 @property (atomic, weak) IBOutlet NSSegmentedControl *webViewSegment;
 @property (atomic, weak) IBOutlet NSSegmentedControl *validateAuthoritySegment;
-@property (atomic, weak) IBOutlet NSStackView *acquireTokenView;
+@property (atomic, weak) IBOutlet NSView *acquireTokenView;
 @property (atomic, weak) IBOutlet NSPopUpButton *userPopup;
 @property (atomic, weak) IBOutlet NSSegmentedControl *authSchemeSegment;
 
@@ -76,18 +76,22 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
-    CGFloat wkWebViewWidth = self.acquireTokenView.frame.size.width*0.5;
-    CGFloat wkWebViewHeight = self.acquireTokenView.frame.size.height*0.75;
-    CGFloat wkWebViewOffsetX = 0;
-    CGFloat wkWebViewOffsetY = self.acquireTokenView.frame.size.height*0.15;
     WKWebViewConfiguration *defaultWKWebConfig = [MSALWebviewParameters defaultWKWebviewConfiguration];
-    
-    self.webView = [[WKWebView alloc] initWithFrame:CGRectMake(wkWebViewOffsetX,wkWebViewOffsetY,wkWebViewWidth,wkWebViewHeight)
+    self.webView = [[WKWebView alloc] initWithFrame:CGRectZero
                                       configuration:defaultWKWebConfig];
 
     [self.webView setHidden:YES];
     [self.acquireTokenView addSubview:self.webView];
 
+    self.webView.translatesAutoresizingMaskIntoConstraints = NO;
+    [NSLayoutConstraint activateConstraints:@[
+        [self.webView.leadingAnchor constraintEqualToAnchor:self.acquireTokenView.leadingAnchor constant:0],
+        [self.webView.trailingAnchor constraintEqualToAnchor:self.acquireTokenView.trailingAnchor constant:0],
+        [self.webView.topAnchor constraintEqualToAnchor:self.acquireTokenView.topAnchor constant:0],
+        [self.webView.bottomAnchor constraintEqualToAnchor:self.acquireTokenView.bottomAnchor constant:0],
+    ]];
+    
+    
     self.settings = [MSALTestAppSettings settings];
     [self populateProfiles];
     [self populateUsers];

MSAL/test/app/mac/Base.lproj/Main.storyboard

@@ -1,18 +1,18 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.7
 
 import PackageDescription
 
 let package = Package(
   name: "MSAL",
   platforms: [
-        .macOS(.v10_15),.iOS(.v14)
+        .macOS(.v11),.iOS(.v16)
   ],
   products: [
       .library(
           name: "MSAL",
           targets: ["MSAL"]),
   ],
   targets: [
-      .binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/2.6.0/MSAL.zip", checksum: "546a5d74bc255ca4881a4f8cc4ea69d63f8c773227224a870675760b6af15674")
+      .binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/2.7.0/MSAL.zip", checksum: "1a07785e311359ed7a9a8d58ec5e65c46cb73fc762e95c6cb13fbfda48012920")
   ]
 )

MSAL/test/app/mac/MSALAcquireTokenViewController.m

@@ -180,9 +180,9 @@ For more information on common usage patterns, error handling and debugging, log
 
 ## Supported Versions
 
-**iOS** - MSAL supports iOS 14 and above.
+**iOS** - MSAL supports iOS 16 and above.
 
-**macOS** - MSAL supports macOS (OSX) 10.15 and above.
+**macOS** - MSAL supports macOS 11 and above.
 
 ## Community help and support