Merge pull request #161 from Resgrid/develop

ucswift · web-flow · commit 4eae821cf08e · 2024-10-12T00:07:29.000-07:00
CU-868a7khdq trying to fix sub bug
diff --git a/Core/Resgrid.Services/SubscriptionsService.cs b/Core/Resgrid.Services/SubscriptionsService.cs
@@ -991,6 +991,9 @@ public async Task<CreateStripeSessionForUpdateData> CreateStripeSessionForUpdate
 		{
 			if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
 			{
+				if (string.IsNullOrWhiteSpace(stripeCustomerId))
+					stripeCustomerId = " ";
+
 				var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());
 				var request = new RestRequest($"/api/Billing/CreateStripeSessionForUpdate", Method.Get);
 				request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);
@@ -1018,6 +1021,9 @@ public async Task<GetCanceledPlanFromStripeData> GetActiveStripeSubscriptionAsyn
 		{
 			if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
 			{
+				if (string.IsNullOrWhiteSpace(stripeCustomerId))
+					stripeCustomerId = " ";
+
 				var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());
 				var request = new RestRequest($"/api/Billing/GetActiveStripeSubscription", Method.Get);
 				request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);
@@ -1042,6 +1048,9 @@ public async Task<GetCanceledPlanFromStripeData> GetActivePTTStripeSubscriptionA
 		{
 			if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
 			{
+				if (string.IsNullOrWhiteSpace(stripeCustomerId))
+					stripeCustomerId = " ";
+
 				var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());
 				var request = new RestRequest($"/api/Billing/GetActivePTTStripeSubscription", Method.Get);
 				request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);
@@ -1066,6 +1075,9 @@ public async Task<bool> ModifyPTTAddonSubscriptionAsync(string stripeCustomerId,
 		{
 			if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
 			{
+				if (string.IsNullOrWhiteSpace(stripeCustomerId))
+					stripeCustomerId = " ";
+
 				var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());
 				var request = new RestRequest($"/api/Billing/ModifyPTTAddonSubscription", Method.Get);
 				request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);
@@ -1092,6 +1104,9 @@ public async Task<bool> CancelSubscriptionAsync(string stripeCustomerId)
 		{
 			if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
 			{
+				if (string.IsNullOrWhiteSpace(stripeCustomerId))
+					stripeCustomerId = " ";
+
 				var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());
 				var request = new RestRequest($"/api/Billing/CancelSubscription", Method.Get);
 				request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);
@@ -1116,6 +1131,9 @@ public async Task<CreateStripeBillingPortalSessionData> CreateStripeSessionForCu
 		{
 			if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
 			{
+				if (string.IsNullOrWhiteSpace(stripeCustomerId))
+					stripeCustomerId = " ";
+
 				var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());
 				var request = new RestRequest($"/api/Billing/CreateStripeSessionForCustomerPortal", Method.Get);
 				request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);
@@ -1152,6 +1170,9 @@ public async Task<CreateStripeSessionForUpdateData> CreateStripeSessionForSub(in
 		{
 			if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
 			{
+				if (string.IsNullOrWhiteSpace(stripeCustomerId))
+					stripeCustomerId = " ";
+
 				var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());
 				var request = new RestRequest($"/api/Billing/CreateStripeSessionForSubscriptionCheckout", Method.Get);
 				request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);
@@ -1182,6 +1203,9 @@ public async Task<ChangeActiveSubscriptionData> ChangeActiveSubscriptionAsync(st
 		{
 			if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
 			{
+				if (string.IsNullOrWhiteSpace(stripeCustomerId))
+					stripeCustomerId = " ";
+
 				var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());
 				var request = new RestRequest($"/api/Billing/ChangeActiveSubscription", Method.Get);
 				request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);

Original file line number	Diff line number	Diff line change
`@@ -991,6 +991,9 @@ public async Task<CreateStripeSessionForUpdateData> CreateStripeSessionForUpdate`
`991`	`991`	`{`
`992`	`992`	`if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))`
`993`	`993`	`{`
	`994`	`+ if (string.IsNullOrWhiteSpace(stripeCustomerId))`
	`995`	`+ stripeCustomerId = " ";`
	`996`	`+`
`994`	`997`	`var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());`
`995`	`998`	`var request = new RestRequest($"/api/Billing/CreateStripeSessionForUpdate", Method.Get);`
`996`	`999`	`request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);`
`@@ -1018,6 +1021,9 @@ public async Task<GetCanceledPlanFromStripeData> GetActiveStripeSubscriptionAsyn`
`1018`	`1021`	`{`
`1019`	`1022`	`if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))`
`1020`	`1023`	`{`
	`1024`	`+ if (string.IsNullOrWhiteSpace(stripeCustomerId))`
	`1025`	`+ stripeCustomerId = " ";`
	`1026`	`+`
`1021`	`1027`	`var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());`
`1022`	`1028`	`var request = new RestRequest($"/api/Billing/GetActiveStripeSubscription", Method.Get);`
`1023`	`1029`	`request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);`
`@@ -1042,6 +1048,9 @@ public async Task<GetCanceledPlanFromStripeData> GetActivePTTStripeSubscriptionA`
`1042`	`1048`	`{`
`1043`	`1049`	`if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))`
`1044`	`1050`	`{`
	`1051`	`+ if (string.IsNullOrWhiteSpace(stripeCustomerId))`
	`1052`	`+ stripeCustomerId = " ";`
	`1053`	`+`
`1045`	`1054`	`var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());`
`1046`	`1055`	`var request = new RestRequest($"/api/Billing/GetActivePTTStripeSubscription", Method.Get);`
`1047`	`1056`	`request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);`
`@@ -1066,6 +1075,9 @@ public async Task<bool> ModifyPTTAddonSubscriptionAsync(string stripeCustomerId,`
`1066`	`1075`	`{`
`1067`	`1076`	`if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))`
`1068`	`1077`	`{`
	`1078`	`+ if (string.IsNullOrWhiteSpace(stripeCustomerId))`
	`1079`	`+ stripeCustomerId = " ";`
	`1080`	`+`
`1069`	`1081`	`var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());`
`1070`	`1082`	`var request = new RestRequest($"/api/Billing/ModifyPTTAddonSubscription", Method.Get);`
`1071`	`1083`	`request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);`
`@@ -1092,6 +1104,9 @@ public async Task<bool> CancelSubscriptionAsync(string stripeCustomerId)`
`1092`	`1104`	`{`
`1093`	`1105`	`if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))`
`1094`	`1106`	`{`
	`1107`	`+ if (string.IsNullOrWhiteSpace(stripeCustomerId))`
	`1108`	`+ stripeCustomerId = " ";`
	`1109`	`+`
`1095`	`1110`	`var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());`
`1096`	`1111`	`var request = new RestRequest($"/api/Billing/CancelSubscription", Method.Get);`
`1097`	`1112`	`request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);`
`@@ -1116,6 +1131,9 @@ public async Task<CreateStripeBillingPortalSessionData> CreateStripeSessionForCu`
`1116`	`1131`	`{`
`1117`	`1132`	`if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))`
`1118`	`1133`	`{`
	`1134`	`+ if (string.IsNullOrWhiteSpace(stripeCustomerId))`
	`1135`	`+ stripeCustomerId = " ";`
	`1136`	`+`
`1119`	`1137`	`var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());`
`1120`	`1138`	`var request = new RestRequest($"/api/Billing/CreateStripeSessionForCustomerPortal", Method.Get);`
`1121`	`1139`	`request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);`
`@@ -1152,6 +1170,9 @@ public async Task<CreateStripeSessionForUpdateData> CreateStripeSessionForSub(in`
`1152`	`1170`	`{`
`1153`	`1171`	`if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))`
`1154`	`1172`	`{`
	`1173`	`+ if (string.IsNullOrWhiteSpace(stripeCustomerId))`
	`1174`	`+ stripeCustomerId = " ";`
	`1175`	`+`
`1155`	`1176`	`var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());`
`1156`	`1177`	`var request = new RestRequest($"/api/Billing/CreateStripeSessionForSubscriptionCheckout", Method.Get);`
`1157`	`1178`	`request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);`
`@@ -1182,6 +1203,9 @@ public async Task<ChangeActiveSubscriptionData> ChangeActiveSubscriptionAsync(st`
`1182`	`1203`	`{`
`1183`	`1204`	`if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))`
`1184`	`1205`	`{`
	`1206`	`+ if (string.IsNullOrWhiteSpace(stripeCustomerId))`
	`1207`	`+ stripeCustomerId = " ";`
	`1208`	`+`
`1185`	`1209`	`var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());`
`1186`	`1210`	`var request = new RestRequest($"/api/Billing/ChangeActiveSubscription", Method.Get);`
`1187`	`1211`	`request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);`