Some Fix

mckaragoz · mckaragoz · commit f623c8fc4864 · 2022-07-11T12:15:34.000+03:00
diff --git a/GoogleApis.Blazor/Calendar/CalendarService.cs b/GoogleApis.Blazor/Calendar/CalendarService.cs
@@ -90,7 +90,7 @@ public async Task<GoogleCalendarListRoot> GetCalendars(int maxResults = 250, boo
             string contentResult = await result.Content.ReadAsStringAsync();
             GoogleCalendarListRoot model = JsonSerializer.Deserialize<GoogleCalendarListRoot>(contentResult);
 
-            if (forceAccessToken == false || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
+            if (forceAccessToken == false || result.IsSuccessStatusCode || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
             {
                 return model;
             }
@@ -118,7 +118,7 @@ public async Task<GoogleCalendarListModel> GetCalendarById(string calendarId, bo
             string contentResult = await result.Content.ReadAsStringAsync();
             GoogleCalendarListModel model = JsonSerializer.Deserialize<GoogleCalendarListModel>(contentResult);
 
-            if (forceAccessToken == false || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
+            if (forceAccessToken == false || result.IsSuccessStatusCode || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
             {
                 return model;
             }
@@ -185,7 +185,7 @@ public async Task<GoogleCalendarModel> AddCalendar(GoogleCalendarListModel googl
             string contentResult = await result.Content.ReadAsStringAsync();
             GoogleCalendarModel model = JsonSerializer.Deserialize<GoogleCalendarModel>(contentResult);
 
-            if (forceAccessToken == false || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
+            if (forceAccessToken == false || result.IsSuccessStatusCode || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
             {
                 return model;
             }
@@ -220,7 +220,7 @@ public async Task<GoogleCalendarModel> UpdateCalendar(string calendarId, GoogleC
             string contentResult = await result.Content.ReadAsStringAsync();
             GoogleCalendarModel model = JsonSerializer.Deserialize<GoogleCalendarModel>(contentResult);
 
-            if (forceAccessToken == false || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
+            if (forceAccessToken == false || result.IsSuccessStatusCode || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
             {
                 return model;
             }
@@ -250,7 +250,7 @@ public async Task DeleteCalendar(string calendarId, bool forceAccessToken = fals
 
             string contentResult = await result.Content.ReadAsStringAsync();
 
-            if (forceAccessToken == false || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
+            if (forceAccessToken == false || result.IsSuccessStatusCode || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
             {
                 return;
             }
@@ -281,7 +281,7 @@ public async Task ClearCalendar(string calendarId, bool forceAccessToken = false
 
             string contentResult = await result.Content.ReadAsStringAsync();
 
-            if (forceAccessToken == false || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
+            if (forceAccessToken == false || result.IsSuccessStatusCode || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
             {
                 return;
             }
@@ -324,7 +324,7 @@ public async Task<GoogleCalendarEventRoot> GetEvents(DateTime timeMin, DateTime
             string contentResult = await result.Content.ReadAsStringAsync();
             GoogleCalendarEventRoot model = JsonSerializer.Deserialize<GoogleCalendarEventRoot>(contentResult);
 
-            if (forceAccessToken == false || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
+            if (forceAccessToken == false || result.IsSuccessStatusCode || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
             {
                 return model;
             }
@@ -353,7 +353,7 @@ public async Task<GoogleCalendarEventModel> GetEventById(string eventId, string
             string contentResult = await result.Content.ReadAsStringAsync();
             GoogleCalendarEventModel model = JsonSerializer.Deserialize<GoogleCalendarEventModel>(contentResult);
 
-            if (forceAccessToken == false || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
+            if (forceAccessToken == false || result.IsSuccessStatusCode || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
             {
                 return model;
             }
@@ -386,7 +386,7 @@ public async Task<string> AddEvent(GoogleCalendarEventModel calendarEvent, strin
 
             string model = await result.Content.ReadAsStringAsync();
 
-            if (forceAccessToken == false || !AuthService.IsAccessTokenExpired(model) || string.IsNullOrEmpty(RefreshToken))
+            if (forceAccessToken == false || result.IsSuccessStatusCode || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
             {
                 return model;
             }
@@ -432,7 +432,7 @@ public async Task<string> UpdateEvent(GoogleCalendarEventModel newCalendarEvent,
 
             string contentResult = await result.Content.ReadAsStringAsync();
 
-            if (forceAccessToken == false || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
+            if (forceAccessToken == false || result.IsSuccessStatusCode || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
             {
                 return contentResult;
             }
@@ -604,7 +604,7 @@ public async Task DeleteEvent(string eventId, string calendarId, bool forceAcces
 
             string contentResult = await result.Content.ReadAsStringAsync();
 
-            if (forceAccessToken == false || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
+            if (forceAccessToken == false || result.IsSuccessStatusCode || !AuthService.IsAccessTokenExpired(contentResult) || string.IsNullOrEmpty(RefreshToken))
             {
                 return;
             }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public async Task<GoogleCalendarListRoot> GetCalendars(int maxResults = 250, boo`
`90`	`90`	`string contentResult = await result.Content.ReadAsStringAsync();`
`91`	`91`	`GoogleCalendarListRoot model = JsonSerializer.Deserialize<GoogleCalendarListRoot>(contentResult);`
`92`	`92`
`93`		`- if (forceAccessToken == false \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
	`93`	`+ if (forceAccessToken == false \|\| result.IsSuccessStatusCode \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
`94`	`94`	`{`
`95`	`95`	`return model;`
`96`	`96`	`}`
`@@ -118,7 +118,7 @@ public async Task<GoogleCalendarListModel> GetCalendarById(string calendarId, bo`
`118`	`118`	`string contentResult = await result.Content.ReadAsStringAsync();`
`119`	`119`	`GoogleCalendarListModel model = JsonSerializer.Deserialize<GoogleCalendarListModel>(contentResult);`
`120`	`120`
`121`		`- if (forceAccessToken == false \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
	`121`	`+ if (forceAccessToken == false \|\| result.IsSuccessStatusCode \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
`122`	`122`	`{`
`123`	`123`	`return model;`
`124`	`124`	`}`
`@@ -185,7 +185,7 @@ public async Task<GoogleCalendarModel> AddCalendar(GoogleCalendarListModel googl`
`185`	`185`	`string contentResult = await result.Content.ReadAsStringAsync();`
`186`	`186`	`GoogleCalendarModel model = JsonSerializer.Deserialize<GoogleCalendarModel>(contentResult);`
`187`	`187`
`188`		`- if (forceAccessToken == false \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
	`188`	`+ if (forceAccessToken == false \|\| result.IsSuccessStatusCode \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
`189`	`189`	`{`
`190`	`190`	`return model;`
`191`	`191`	`}`
`@@ -220,7 +220,7 @@ public async Task<GoogleCalendarModel> UpdateCalendar(string calendarId, GoogleC`
`220`	`220`	`string contentResult = await result.Content.ReadAsStringAsync();`
`221`	`221`	`GoogleCalendarModel model = JsonSerializer.Deserialize<GoogleCalendarModel>(contentResult);`
`222`	`222`
`223`		`- if (forceAccessToken == false \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
	`223`	`+ if (forceAccessToken == false \|\| result.IsSuccessStatusCode \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
`224`	`224`	`{`
`225`	`225`	`return model;`
`226`	`226`	`}`
`@@ -250,7 +250,7 @@ public async Task DeleteCalendar(string calendarId, bool forceAccessToken = fals`
`250`	`250`
`251`	`251`	`string contentResult = await result.Content.ReadAsStringAsync();`
`252`	`252`
`253`		`- if (forceAccessToken == false \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
	`253`	`+ if (forceAccessToken == false \|\| result.IsSuccessStatusCode \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
`254`	`254`	`{`
`255`	`255`	`return;`
`256`	`256`	`}`
`@@ -281,7 +281,7 @@ public async Task ClearCalendar(string calendarId, bool forceAccessToken = false`
`281`	`281`
`282`	`282`	`string contentResult = await result.Content.ReadAsStringAsync();`
`283`	`283`
`284`		`- if (forceAccessToken == false \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
	`284`	`+ if (forceAccessToken == false \|\| result.IsSuccessStatusCode \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
`285`	`285`	`{`
`286`	`286`	`return;`
`287`	`287`	`}`
`@@ -324,7 +324,7 @@ public async Task<GoogleCalendarEventRoot> GetEvents(DateTime timeMin, DateTime`
`324`	`324`	`string contentResult = await result.Content.ReadAsStringAsync();`
`325`	`325`	`GoogleCalendarEventRoot model = JsonSerializer.Deserialize<GoogleCalendarEventRoot>(contentResult);`
`326`	`326`
`327`		`- if (forceAccessToken == false \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
	`327`	`+ if (forceAccessToken == false \|\| result.IsSuccessStatusCode \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
`328`	`328`	`{`
`329`	`329`	`return model;`
`330`	`330`	`}`
`@@ -353,7 +353,7 @@ public async Task<GoogleCalendarEventModel> GetEventById(string eventId, string`
`353`	`353`	`string contentResult = await result.Content.ReadAsStringAsync();`
`354`	`354`	`GoogleCalendarEventModel model = JsonSerializer.Deserialize<GoogleCalendarEventModel>(contentResult);`
`355`	`355`
`356`		`- if (forceAccessToken == false \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
	`356`	`+ if (forceAccessToken == false \|\| result.IsSuccessStatusCode \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
`357`	`357`	`{`
`358`	`358`	`return model;`
`359`	`359`	`}`
`@@ -386,7 +386,7 @@ public async Task<string> AddEvent(GoogleCalendarEventModel calendarEvent, strin`
`386`	`386`
`387`	`387`	`string model = await result.Content.ReadAsStringAsync();`
`388`	`388`
`389`		`- if (forceAccessToken == false \|\| !AuthService.IsAccessTokenExpired(model) \|\| string.IsNullOrEmpty(RefreshToken))`
	`389`	`+ if (forceAccessToken == false \|\| result.IsSuccessStatusCode \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
`390`	`390`	`{`
`391`	`391`	`return model;`
`392`	`392`	`}`
`@@ -432,7 +432,7 @@ public async Task<string> UpdateEvent(GoogleCalendarEventModel newCalendarEvent,`
`432`	`432`
`433`	`433`	`string contentResult = await result.Content.ReadAsStringAsync();`
`434`	`434`
`435`		`- if (forceAccessToken == false \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
	`435`	`+ if (forceAccessToken == false \|\| result.IsSuccessStatusCode \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
`436`	`436`	`{`
`437`	`437`	`return contentResult;`
`438`	`438`	`}`
`@@ -604,7 +604,7 @@ public async Task DeleteEvent(string eventId, string calendarId, bool forceAcces`
`604`	`604`
`605`	`605`	`string contentResult = await result.Content.ReadAsStringAsync();`
`606`	`606`
`607`		`- if (forceAccessToken == false \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
	`607`	`+ if (forceAccessToken == false \|\| result.IsSuccessStatusCode \|\| !AuthService.IsAccessTokenExpired(contentResult) \|\| string.IsNullOrEmpty(RefreshToken))`
`608`	`608`	`{`
`609`	`609`	`return;`
`610`	`610`	`}`