paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check service existence before use in Debug mode

Browse Source
This commit is contained in:
Paul Schneider
2018-12-18 17:47:21 +00:00
parent defdbf86dd
commit 225e364e9f
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Yavsc/Controllers/Accounting/ManageController.cs
View File

@ -302,6 +302,9 @@ namespace Yavsc.Controllers
public async Task<IActionResult> SetGoogleCalendar(string returnUrl, string pageToken)
{
#if Debug
if (_calendarManager==null) throw new Exception("No service!");
#endif
var calendar = await _calendarManager.GetCalendarsAsync(User.GetUserId(), pageToken);
if (calendar == null)
return new ChallengeResult();

18
Yavsc/Services/GoogleApis/CalendarManager.cs
View File

@ -101,8 +101,21 @@ namespace Yavsc.Services
if (string.IsNullOrWhiteSpace(userId))
throw new Exception("the user id is not specified");
var service = await CreateUserCalendarServiceAsync(userId);
#if Debug
if (service==null) throw new Exception("Could not get service");
#endif
_logger.LogInformation("Got a service");
#if Debug
if (service.CalendarList==null) throw new Exception("Could not get calendar list");
#endif
CalendarListResource.ListRequest calListReq = service.CalendarList.List ();
calListReq.PageToken = pageToken;
#if Debug
if (calListReq==null) throw new Exception ("list is null");
#endif
calListReq.PageToken = pageToken;
return calListReq.Execute ();
}
@ -241,12 +254,15 @@ namespace Yavsc.Services
{
var login = await _dbContext.GetGoogleUserLoginAsync(userId);
if (login == null) return null;
_logger.LogInformation("Got a Google login");
var token = await _flow.LoadTokenAsync(login.ProviderKey, CancellationToken.None);
_logger.LogInformation("Got a Google token");
var c = SystemClock.Default;
if (token.IsExpired(c)) {
token = await RefreshToken(token);
}
UserCredential cred = new UserCredential(_flow,login.ProviderKey,token);
_logger.LogInformation("Got creadential");
return new CalendarService(new BaseClientService.Initializer()
{
HttpClientInitializer = cred,