Merge pull request #12 from CodeBeamOrg/dev

Delete error statements

Author: mckaragoz

GoogleApis.Blazor/Auth/AuthService.cs

@@ -89,11 +89,6 @@ public string GetUserMail(string accessToken)
             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
             var result = client.GetAsync("https://www.googleapis.com/userinfo/v2/me").Result;
 
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
-
             var jsonResult = JsonDocument.Parse(result.Content.ReadAsStringAsync().Result);
             string email = jsonResult.RootElement.GetProperty("email").ToString();
 
@@ -126,11 +121,6 @@ public string GetAccessTokenDetails(string accessToken)
             var client = HttpClientFactory.CreateClient();
             var result = client.GetAsync($"https://oauth2.googleapis.com/tokeninfo?access_token={accessToken}").Result;
 
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
-
             return result.Content.ReadAsStringAsync().Result;
         }
 

GoogleApis.Blazor/Calendar/CalendarService.cs

@@ -49,11 +49,6 @@ public string GetCalendars()
             //This uses calendar list instead of calendar. Read for the difference https://developers.google.com/calendar/api/concepts/events-calendars#calendar_and_calendar_list
             var result = client.GetAsync("https://www.googleapis.com/calendar/v3/users/me/calendarList?access_token=" + _accessToken).Result;
 
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
-
             return result.Content.ReadAsStringAsync().Result;
         }
 
@@ -65,14 +60,8 @@ public string GetCalendars()
         public string GetCalendarById(string calendarId)
         {
             var client = HttpClientFactory.CreateClient();
-
             var result = client.GetAsync($"https://www.googleapis.com/calendar/v3/users/me/calendarList/{calendarId}?access_token=" + _accessToken).Result;
 
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
-
             return result.Content.ReadAsStringAsync().Result;
         }
 
@@ -84,10 +73,6 @@ public string GetCalendarById(string calendarId)
         public string GetCalendarBySummary(string summary)
         {
             string calendars = GetCalendars();
-            if (calendars == "error")
-            {
-                return "error: Can't fetch calendars.";
-            }
             GoogleCalendarListRoot jsonCalendar = JsonSerializer.Deserialize<GoogleCalendarListRoot>(calendars);
 
             if (jsonCalendar.items == null)
@@ -129,11 +114,6 @@ public string AddCalendar(GoogleCalendarListModel googleCalendarListModel)
 
             var result = client.PostAsync($"https://www.googleapis.com/calendar/v3/calendars", content).Result;
 
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
-
             return result.Content.ReadAsStringAsync().Result;
         }
 
@@ -154,11 +134,6 @@ public string UpdateCalendar(string calendarId, GoogleCalendarListModel googleCa
 
             var result = client.PutAsync($"https://www.googleapis.com/calendar/v3/calendars/{calendarId}", content).Result;
 
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
-
             return result.Content.ReadAsStringAsync().Result;
         }
 
@@ -175,11 +150,6 @@ public string DeleteCalendar(string calendarId)
 
             var result = client.DeleteAsync($"https://www.googleapis.com/calendar/v3/calendars/{calendarId}").Result;
 
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
-
             return result.Content.ReadAsStringAsync().Result;
         }
 
@@ -197,11 +167,6 @@ public string ClearCalendar(string calendarId)
 
             var result = client.PostAsync($"https://www.googleapis.com/calendar/v3/calendars/{calendarId}/clear", content).Result;
 
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
-
             return result.Content.ReadAsStringAsync().Result;
         }
 
@@ -222,11 +187,6 @@ public string GetEvents(DateTime timeMin, DateTime timeMax, string calendarId)
             var client = HttpClientFactory.CreateClient();
             var result = client.GetAsync($"https://www.googleapis.com/calendar/v3/calendars/{calendarId}/events?access_token={_accessToken}&maxResults=2500").Result;
 
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
-
             return result.Content.ReadAsStringAsync().Result;
         }
 
@@ -241,11 +201,6 @@ public string GetEventById(string eventId, string calendarId)
             var client = HttpClientFactory.CreateClient();
             var result = client.GetAsync($"https://www.googleapis.com/calendar/v3/calendars/{calendarId}/events/{eventId}?access_token=" + _accessToken).Result;
 
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
-
             return result.Content.ReadAsStringAsync().Result;
         }
 
@@ -264,10 +219,6 @@ public string AddEvent(GoogleCalendarEventModel calendarEvent, string calendarId
             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", _accessToken);
             var content = new StringContent(requestBody, Encoding.UTF8, "application/json");
             var result = client.PostAsync($"https://www.googleapis.com/calendar/v3/calendars/{calendarId}/events", content).Result;
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
 
             return result.Content.ReadAsStringAsync().Result;
         }
@@ -300,10 +251,6 @@ public string UpdateEvent(GoogleCalendarEventModel newCalendarEvent, string even
             //    result = client.PutAsync($"https://www.googleapis.com/calendar/v3/calendars/{calendarId}/events/{eventId}", content).Result;
             //}
             result = client.PutAsync($"https://www.googleapis.com/calendar/v3/calendars/{calendarId}/events/{eventId}", content).Result;
-            if (!result.IsSuccessStatusCode)
-            {
-                return "error";
-            }
 
             return result.Content.ReadAsStringAsync().Result;
         }
@@ -319,10 +266,6 @@ public string UpdateEvent(GoogleCalendarEventModel newCalendarEvent, string even
         public string GetEventBySummary(string summary, DateTime dateMin, DateTime dateMax, string calendarId)
         {
             string events = GetEvents(dateMin, dateMax, calendarId);
-            if (events == "error")
-            {
-                return "error: Can't fetch calendars.";
-            }
             GoogleCalendarEventRoot jsonEvent = JsonSerializer.Deserialize<GoogleCalendarEventRoot>(events);
 
             if (jsonEvent.items == null)
@@ -551,10 +494,6 @@ public string FindCalendarId(CalendarValueType valueType, object val)
         public string FindEventId(EventValueType valueType, object val, DateTime timeMin, DateTime timeMax, string calendarId)
         {
             string googleEvents = GetEvents(timeMin, timeMax, calendarId);
-            if (googleEvents == "error")
-            {
-                return "error: Can't fetch calendars.";
-            }
             GoogleCalendarEventRoot googleCalendarEventRoot = JsonSerializer.Deserialize<GoogleCalendarEventRoot>(googleEvents);
 
             if (googleCalendarEventRoot.items == null)