add tests project, move configuration verification to VippsConfiguration.cs

2 files changed, 33 insertions, 23 deletions

diff --git a/src/IOL.VippsEcommerce/Models/VippsConfiguration.cs b/src/IOL.VippsEcommerce/Models/VippsConfiguration.cs
index 4a78166..19ca140 100644
--- a/src/IOL.VippsEcommerce/Models/VippsConfiguration.cs
+++ b/src/IOL.VippsEcommerce/Models/VippsConfiguration.cs
@@ -122,6 +122,34 @@ namespace IOL.VippsEcommerce.Models
 			}
 		}
 
+		/// <summary>
+		/// Ensure that the configuration can be used to issue requests to the vipps api.
+		/// <exception cref="ArgumentNullException">Throws if a required value is null or whitespace.</exception>
+		/// </summary>
+		public void Verify() {
+			if (GetValue(VippsConfigurationKeyNames.VIPPS_API_URL).IsNullOrWhiteSpace()) {
+				throw new ArgumentNullException(VippsConfigurationKeyNames.VIPPS_API_URL,
+				                                "VippsEcommerceService: VIPPS_API_URL is not provided in configuration.");
+			}
+
+			if (GetValue(VippsConfigurationKeyNames.VIPPS_CLIENT_ID).IsNullOrWhiteSpace()) {
+				throw new ArgumentNullException(VippsConfigurationKeyNames.VIPPS_CLIENT_ID,
+				                                "VippsEcommerceService: VIPPS_CLIENT_ID is not provided in configuration.");
+			}
+
+			if (GetValue(VippsConfigurationKeyNames.VIPPS_CLIENT_SECRET).IsNullOrWhiteSpace()) {
+				throw new ArgumentNullException(VippsConfigurationKeyNames.VIPPS_CLIENT_SECRET,
+				                                "VippsEcommerceService: VIPPS_CLIENT_SECRET is not provided in configuration.");
+			}
+
+			if (GetValue(VippsConfigurationKeyNames.VIPPS_SUBSCRIPTION_KEY_PRIMARY).IsNullOrWhiteSpace()
+			    && GetValue(VippsConfigurationKeyNames.VIPPS_SUBSCRIPTION_KEY_SECONDARY).IsNullOrWhiteSpace()) {
+				throw new ArgumentNullException(VippsConfigurationKeyNames.VIPPS_SUBSCRIPTION_KEY_PRIMARY
+				                                + VippsConfigurationKeyNames.VIPPS_SUBSCRIPTION_KEY_SECONDARY,
+				                                "VippsEcommerceService: Neither VIPPS_SUBSCRIPTION_KEY_PRIMARY nor VIPPS_SUBSCRIPTION_KEY_SECONDARY was provided in configuration.");
+			}
+		}
+
 		private string GetValueFromObject(string key) {
 			foreach (var prop in typeof(VippsConfiguration).GetProperties()) {
 				foreach (var attribute in prop.CustomAttributes) {
diff --git a/src/IOL.VippsEcommerce/VippsEcommerceService.cs b/src/IOL.VippsEcommerce/VippsEcommerceService.cs
index 594d73a..54e68a6 100644
--- a/src/IOL.VippsEcommerce/VippsEcommerceService.cs
+++ b/src/IOL.VippsEcommerce/VippsEcommerceService.cs
@@ -41,36 +41,18 @@ namespace IOL.VippsEcommerce
 			IOptions<VippsConfiguration> options
 		) {
 			Configuration = options.Value;
+			Configuration.Verify();
 			var vippsApiUrl = Configuration.GetValue(VippsConfigurationKeyNames.VIPPS_API_URL);
-			if (vippsApiUrl.IsNullOrWhiteSpace()) {
-				throw new ArgumentException("VippsEcommerceService: Api url is not provided in configuration.");
-			}
-
 			client.BaseAddress = new Uri(vippsApiUrl);
 			_client = client;
 			_logger = logger;
-
 			_vippsClientId = Configuration.GetValue(VippsConfigurationKeyNames.VIPPS_CLIENT_ID);
-			if (_vippsClientId.IsNullOrWhiteSpace()) {
-				throw new ArgumentException("VippsEcommerceService: Client id is not provided in configuration.");
-			}
-
 			_vippsClientSecret = Configuration.GetValue(VippsConfigurationKeyNames.VIPPS_CLIENT_SECRET);
-			if (_vippsClientSecret.IsNullOrWhiteSpace()) {
-				throw new ArgumentException("VippsEcommerceService: Client secret is not provided in configuration.");
-			}
-
-			var primarySubscriptionKey =
-				Configuration.GetValue(VippsConfigurationKeyNames.VIPPS_SUBSCRIPTION_KEY_PRIMARY);
-			var secondarySubscriptionKey =
-				Configuration.GetValue(VippsConfigurationKeyNames.VIPPS_SUBSCRIPTION_KEY_SECONDARY);
-			if (primarySubscriptionKey.IsNullOrWhiteSpace() && secondarySubscriptionKey.IsNullOrWhiteSpace()) {
-				throw new
-					ArgumentException("VippsEcommerceService: Neither primary nor secondary subscription key was provided in configuration.");
-			}
-
 			client.DefaultRequestHeaders.Add("Ocp-Apim-Subscription-Key",
-			                                 primarySubscriptionKey ?? secondarySubscriptionKey);
+			                                 Configuration.GetValue(VippsConfigurationKeyNames
+				                                                        .VIPPS_SUBSCRIPTION_KEY_PRIMARY)
+			                                 ?? Configuration.GetValue(VippsConfigurationKeyNames
+				                                                           .VIPPS_SUBSCRIPTION_KEY_SECONDARY));
 
 			var msn = Configuration.GetValue(VippsConfigurationKeyNames.VIPPS_MSN);
 			if (msn.IsPresent()) {