Merge pull request #152 from AzureAD/oldalton/added_app_install_links

Added app install URLs to the test config for the automated test multi-app execution

Author: oldalton

IdentityCore/tests/automation/MSIDTestAccountsProvider.h

@@ -29,9 +29,30 @@
 
 - (instancetype)init NS_UNAVAILABLE;
 
+/*
+This information would normally come from a configuration file.
+@param certificate Base64 encoded client certificate to authenticate with keyvault
+@param password Certificate password in case it's password protected
+@param additionalConfigurations Additional local configurations that should override server configurations
+@param appInstallLinks Information necessary to install additional apps to run multi-app tests, e.g.
+
+ "msal": {
+    "install_url": "https://...",
+    "app_bundle_id": "com.microsoft.MSALTestApp",
+    "app_name": "MSAL Test App"
+ },
+ "broker": {
+    "install_url": "https://...",
+    "app_bundle_id": "com.microsoft.broker",
+    "app_name": "Broker"
+ }
+@param apiPath Lab API path
+ */
+
 - (instancetype)initWithClientCertificateContents:(NSString *)certificate
                               certificatePassword:(NSString *)password
                          additionalConfigurations:(NSDictionary *)additionalConfigurations
+                                  appInstallLinks:(NSDictionary *)appInstallLinks
                                           apiPath:(NSString *)apiPath;
 
 - (instancetype)initWithConfigurationPath:(NSString *)configurationPath;
@@ -42,4 +63,6 @@
 - (void)passwordForAccount:(MSIDTestAccount *)account
          completionHandler:(void (^)(NSString *password))completionHandler;
 
+- (NSDictionary *)appInstallForConfiguration:(NSString *)appId;
+
 @end

IdentityCore/tests/automation/MSIDTestAccountsProvider.m

@@ -27,6 +27,7 @@
 @interface MSIDTestAccountsProvider()
 
 @property (nonatomic, strong) NSMutableDictionary *cachedConfigurations;
+@property (nonatomic, strong) NSDictionary *appInstallLinks;
 @property (nonatomic, strong) KeyvaultAuthentication *keyvaultAuthentication;
 @property (nonatomic, strong) NSString *apiPath;
 
@@ -37,6 +38,7 @@ @implementation MSIDTestAccountsProvider
 - (instancetype)initWithClientCertificateContents:(NSString *)certificate
                               certificatePassword:(NSString *)password
                          additionalConfigurations:(NSDictionary *)additionalConfigurations
+                                  appInstallLinks:(NSDictionary *)appInstallLinks
                                           apiPath:(NSString *)apiPath
 {
     self = [super init];
@@ -47,6 +49,7 @@ - (instancetype)initWithClientCertificateContents:(NSString *)certificate
         _keyvaultAuthentication = [[KeyvaultAuthentication alloc] initWithCertContents:certificate certPassword:password];
         _apiPath = apiPath;
         [_cachedConfigurations addEntriesFromDictionary:additionalConfigurations];
+        _appInstallLinks = appInstallLinks;
     }
 
     return self;
@@ -90,10 +93,16 @@ - (instancetype)initWithConfigurationPath:(NSString *)configurationPath
     return [self initWithClientCertificateContents:encodedCertificate
                                certificatePassword:certificatePassword
                           additionalConfigurations:additionalConfsDictionary
+                                   appInstallLinks:configurationDictionary[@"app_install_urls"]
                                            apiPath:apiPath];
 
 }
 
+- (NSDictionary *)appInstallForConfiguration:(NSString *)appId
+{
+    return _appInstallLinks[appId];
+}
+
 - (void)configurationWithRequest:(MSIDTestAutomationConfigurationRequest *)request
                completionHandler:(void (^)(MSIDTestAutomationConfiguration *configuration))completionHandler
 {