TerribleDev/Untappd.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15 from rodkings/authrequests

Browse Source 
Everything looks good!
This commit is contained in:
Tommy Parnell
2015-04-21 19:10:25 -04:00
parent 409793da96 449a3aa594
commit 8dd565e91a
27 changed files with 816 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Untappd.Net.UnitTests/Class1.cs
View File

@@ -2,7 +2,9 @@
using NUnit.Framework;
using Untappd.Net.Client;
using Untappd.Net.Request;
using Untappd.Net.Responses.UserInfo;
using UserInfo = Untappd.Net.Responses.UserInfo;
using ActivityFeed = Untappd.Net.Responses.Feeds.ActivityFeed;
using UserActivityFeed = Untappd.Net.Responses.Feeds.UserActivityFeed;
namespace Untappd.Net.UnitTests
{
@@ -15,8 +17,22 @@ namespace Untappd.Net.UnitTests
{
var ts = new UnAuthenticatedUntappdCredentials("id", "scrt");
var t = new Repository().Get<UserInfo>(ts, "tparnell");
var t = new Repository().Get<UserInfo.UserInfo>(ts, "tparnell");
Console.WriteLine(t);
}
[Test]
[Ignore]
public void GetActualJsonRequest()
{
var credentials = new AuthenticatedUntappdCredentials(
"",
"",
"");
var repo = new Repository();
var activityFeed = repo.Get<UserActivityFeed.UserActivityFeed>(credentials);
}
}
}

2
src/Untappd.Net.UnitTests/Request/TestRepository.cs
View File

@@ -15,7 +15,7 @@ namespace Untappd.Net.UnitTests.Request
[Test]
public void ConfirmRequestWorks()
{
var mockCreds = new Mock<IUntappdCredentials>();
var mockCreds = new Mock<IUnAuthenticadedUntappdCredentials>();
mockCreds.Setup(a => a.ClientId).Returns("id");
mockCreds.Setup(a => a.ClientSecret).Returns("secret");
var bodyParam = new Dictionary<string, string> {{"key", "value"}};

4
src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs
View File

@@ -2,9 +2,9 @@
namespace Untappd.Net.Client
{
public sealed class AuthenticatedUntappdCredentials : UnAuthenticatedUntappdCredentials
public class AuthenticatedUntappdCredentials : UntappdCredentials, IAuthenticatedUntappdCredentials
{
internal string AccessToken { get; private set; }
public string AccessToken { get; private set; }
/// <summary>
/// Pass your authenticated access token
/// </summary>

12
src/Untappd.Net/Client/IUnAuthenticadedUntappdCredentials.cs Normal file
View File

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Untappd.Net.Client
{
public interface IUnAuthenticadedUntappdCredentials : IUntappdCredentials
{
}
}

16
src/Untappd.Net/Client/UnAuthenticatedUntappdCredentials.cs
View File

@@ -2,28 +2,16 @@
namespace Untappd.Net.Client
{
public class UnAuthenticatedUntappdCredentials : IUntappdCredentials
public class UnAuthenticatedUntappdCredentials : UntappdCredentials, IUnAuthenticadedUntappdCredentials
{
public string ClientId { get; private set; }
public string ClientSecret { get; private set; }
/// <summary>
/// UnAuthenticated request. Pass your API id and secret
/// </summary>
/// <param name="clientId"></param>
/// <param name="clientSecret"></param>
public UnAuthenticatedUntappdCredentials(string clientId, string clientSecret)
: base(clientId, clientSecret)
{
if (string.IsNullOrWhiteSpace(clientId))
{
throw new ArgumentNullException("clientId");
}
if (string.IsNullOrWhiteSpace(clientSecret))
{
throw new ArgumentNullException("clientSecret");
}
ClientId = string.Copy(clientId);
ClientSecret = string.Copy(clientSecret);
}
}
}

33
src/Untappd.Net/Client/UntappdCredentials.cs Normal file
View File

@@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Untappd.Net.Client
{
public abstract class UntappdCredentials : IUntappdCredentials
{
public string ClientId { get; private set; }
public string ClientSecret { get; private set; }
/// <summary>
/// UnAuthenticated request. Pass your API id and secret
/// </summary>
/// <param name="clientId"></param>
/// <param name="clientSecret"></param>
public UntappdCredentials(string clientId, string clientSecret)
{
if (string.IsNullOrWhiteSpace(clientId))
{
throw new ArgumentNullException("clientId");
}
if (string.IsNullOrWhiteSpace(clientSecret))
{
throw new ArgumentNullException("clientSecret");
}
ClientId = string.Copy(clientId);
ClientSecret = string.Copy(clientSecret);
}
}
}

3
src/Untappd.Net/Properties/AssemblyInfo.cs
View File

@@ -33,5 +33,6 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.2.*")]
[assembly: AssemblyFileVersion("0.2.*")]
//If AssemblyFileVersion is not explicitly set, it takes its value from the AssemblyVersion attribute.
//[assembly: AssemblyFileVersion("0.2.*")]
[assembly: InternalsVisibleTo("Untappd.Net.UnitTests")]

22
src/Untappd.Net/Request/AuthenticatedRequest.cs
View File

@@ -1,22 +0,0 @@
using Untappd.Net.Exception;
namespace Untappd.Net.Request
{
public abstract class AuthenticatedRequest
{
protected abstract string _EndPoint { get; }
/// <summary>
/// Pass in the url parameter into the request...ie username, brewery, etc.
/// </summary>
/// <param name="parameter">this can be null if request has no url params</param>
/// <returns></returns>
internal string EndPoint(string parameter)
{
if (string.IsNullOrWhiteSpace(_EndPoint))
{
throw new EndpointConfigurationException();
}
return string.Format(_EndPoint, parameter);
}
}
}

22
src/Untappd.Net/Request/BasicRequest.cs Normal file
View File

@@ -0,0 +1,22 @@
using System;
namespace Untappd.Net.Request
{
public abstract class BasicRequest
{
protected abstract string _EndPoint { get; }
/// <summary>
/// Pass in the parameter into the request...ie username, brewery, etc.
/// </summary>
/// <param name="parameter"></param>
/// <returns></returns>
public string EndPoint(string parameter = "")
{
if (!String.IsNullOrEmpty(parameter))
{
parameter = string.Format("/{0}", parameter);
return string.Format(_EndPoint, parameter);
}
return string.Format(_EndPoint, string.Empty);
}
}
}

12
src/Untappd.Net/Request/IAuthenticatedRequest.cs Normal file
View File

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Untappd.Net.Request
{
public interface IAuthenticatedRequest : IRequest
{
}
}

13
src/Untappd.Net/Request/IRequest.cs Normal file
View File

@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Untappd.Net.Request
{
public interface IRequest
{
string EndPoint(string parameter);
}
}

12
src/Untappd.Net/Request/IUnAuthenticatedRequest.cs Normal file
View File

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Untappd.Net.Request
{
public interface IUnAuthenticatedRequest : IRequest
{
}
}

20
src/Untappd.Net/Request/Repository.cs
View File

@@ -30,8 +30,8 @@ namespace Untappd.Net.Request
/// <param name="urlParameter">this is the main parameter for a request. ie v4/user/checkins/urlParameter. Consult the untappd docs, this can be null for a few requests</param>
/// <param name="bodyParameters">Any additional params you wish to add to the request</param>
/// <returns></returns>
public TResult Get<TResult> (IUntappdCredentials credentials, string urlParameter, IDictionary<string, string> bodyParameters = null)
where TResult : UnAuthenticatedRequest,new()
public TResult Get<TResult> (IUnAuthenticadedUntappdCredentials credentials, string urlParameter, IDictionary<string, string> bodyParameters = null)
where TResult : IUnAuthenticatedRequest,new()
{
var result = new TResult();
Request.Resource = result.EndPoint(urlParameter);
@@ -49,10 +49,20 @@ namespace Untappd.Net.Request
}
public TResult Get<TResult>(IAuthenticatedUntappdCredentials credentials, string parameter)
where TResult : AuthenticatedRequest, new()
public TResult Get<TResult>(IAuthenticatedUntappdCredentials credentials, string parameter = "", IDictionary<string, string> bodyParameters = null)
where TResult : IAuthenticatedRequest, new()
{
throw new NotImplementedException();
var result = new TResult();
var client = new RestClient(Constants.BaseRequestString);
var request = new RestRequest(result.EndPoint(parameter), Method.GET);
request.AddParameter("access_token", credentials.AccessToken);
if (bodyParameters != null)
foreach (var param in bodyParameters)
request.AddParameter(param.Key, param.Value);
var resp = client.Execute(request);
var jsonresult = JsonConvert.DeserializeObject<TResult>(resp.Content);
return jsonresult;
}
}
}

8
src/Untappd.Net/Request/UnAuthenticatedRequest.cs
View File

@@ -1,8 +0,0 @@
namespace Untappd.Net.Request
{
public abstract class UnAuthenticatedRequest : AuthenticatedRequest
{
protected override abstract string _EndPoint { get; }
}
}

20
src/Untappd.Net/Responses/BeerInfo.cs
View File

@@ -155,7 +155,7 @@ namespace Untappd.Net.Responses.BeerInfo
public string BeerStyle { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -358,7 +358,7 @@ namespace Untappd.Net.Responses.BeerInfo
public string BeerStyle { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -619,7 +619,7 @@ namespace Untappd.Net.Responses.BeerInfo
public string BeerLabel { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -819,7 +819,7 @@ namespace Untappd.Net.Responses.BeerInfo
public Brewery Brewery { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -847,9 +847,10 @@ namespace Untappd.Net.Responses.BeerInfo
public Beer Beer { get; set; }
}
public class BeerInfo : UnAuthenticatedRequest
public class BeerInfo : BasicRequest, IAuthenticatedRequest, IUnAuthenticatedRequest
{
protected override string _EndPoint { get { return "v4/beer/info{0}"; }
}
[JsonProperty("meta")]
public Meta Meta { get; set; }
@@ -858,12 +859,5 @@ namespace Untappd.Net.Responses.BeerInfo
[JsonProperty("response")]
public Response Response { get; set; }
protected override string _EndPoint
{
get { return "v4/beer/info/{0}"; }
}
}
}

15
src/Untappd.Net/Responses/BeerSearch.cs
View File

@@ -66,7 +66,7 @@ namespace Untappd.Net.Responses.BeerSearch
public string BeerStyle { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -192,7 +192,7 @@ namespace Untappd.Net.Responses.BeerSearch
public string BeerStyle { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -388,9 +388,10 @@ namespace Untappd.Net.Responses.BeerSearch
public Breweries Breweries { get; set; }
}
public class BeerSearch : UnAuthenticatedRequest
public class BeerSearch : BasicRequest, IAuthenticatedRequest, IUnAuthenticatedRequest
{
protected override string _EndPoint { get { return "v4/search/beer"; }
}
[JsonProperty("meta")]
public Meta Meta { get; set; }
@@ -399,11 +400,5 @@ namespace Untappd.Net.Responses.BeerSearch
[JsonProperty("response")]
public Response Response { get; set; }
protected override string _EndPoint
{
get { return "v4/search/beer"; }
}
}
}

10
src/Untappd.Net/Responses/BreweryInfo.cs
View File

@@ -172,7 +172,7 @@ namespace Untappd.Net.Responses.BreweryInfo
public string BeerStyle { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -360,7 +360,7 @@ namespace Untappd.Net.Responses.BreweryInfo
public string BeerStyle { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -760,7 +760,7 @@ namespace Untappd.Net.Responses.BreweryInfo
public string CreatedAt { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -954,9 +954,9 @@ namespace Untappd.Net.Responses.BreweryInfo
public Brewery Brewery { get; set; }
}
public class BreweryInfo : UnAuthenticatedRequest
public class BreweryInfo : BasicRequest, IAuthenticatedRequest, IUnAuthenticatedRequest
{
protected override string _EndPoint { get { return "v4/brewery/info/{0}"; } }
protected override string _EndPoint { get { return "v4/brewery/info{0}"; } }
[JsonProperty("meta")]
public Meta Meta { get; set; }

11
src/Untappd.Net/Responses/BrewerySearch.cs
View File

@@ -115,9 +115,10 @@ namespace Untappd.Net.Responses.BrewerySearch
public Brewery Brewery { get; set; }
}
public class BrewerySearch : UnAuthenticatedRequest
public class BrewerySearch : BasicRequest, IAuthenticatedRequest, IUnAuthenticatedRequest
{
protected override string _EndPoint { get { return "v4/search/brewery"; }
}
[JsonProperty("meta")]
public Meta Meta { get; set; }
@@ -126,11 +127,5 @@ namespace Untappd.Net.Responses.BrewerySearch
[JsonProperty("response")]
public Response Response { get; set; }
protected override string _EndPoint
{
get { return "v4/search/brewery"; }
}
}
}

524
src/Untappd.Net/Responses/Feeds/ActivityFeed.cs Normal file
View File

@@ -0,0 +1,524 @@
using System.Collections.Generic;
using Newtonsoft.Json;
using Untappd.Net.Request;
namespace Untappd.Net.Responses.Feeds.ActivityFeed
{
public class ResponseTime
{
[JsonProperty("time")]
public double Time { get; set; }
[JsonProperty("measure")]
public string Measure { get; set; }
}
public class InitTime
{
[JsonProperty("time")]
public double Time { get; set; }
[JsonProperty("measure")]
public string Measure { get; set; }
}
public class Meta
{
[JsonProperty("code")]
public int Code { get; set; }
[JsonProperty("response_time")]
public ResponseTime ResponseTime { get; set; }
[JsonProperty("init_time")]
public InitTime InitTime { get; set; }
}
public class UnreadCount
{
[JsonProperty("comments")]
public int Comments { get; set; }
[JsonProperty("toasts")]
public int Toasts { get; set; }
[JsonProperty("friends")]
public int Friends { get; set; }
[JsonProperty("messages")]
public int Messages { get; set; }
[JsonProperty("news")]
public int News { get; set; }
}
public class Notifications
{
[JsonProperty("type")]
public string Type { get; set; }
[JsonProperty("unread_count")]
public UnreadCount UnreadCount { get; set; }
}
public class User
{
[JsonProperty("uid")]
public int Uid { get; set; }
[JsonProperty("user_name")]
public string UserName { get; set; }
[JsonProperty("first_name")]
public string FirstName { get; set; }
[JsonProperty("last_name")]
public string LastName { get; set; }
[JsonProperty("location")]
public string Location { get; set; }
[JsonProperty("url")]
public string Url { get; set; }
[JsonProperty("is_supporter")]
public int IsSupporter { get; set; }
[JsonProperty("relationship")]
public string Relationship { get; set; }
[JsonProperty("bio")]
public string Bio { get; set; }
[JsonProperty("user_avatar")]
public string UserAvatar { get; set; }
}
public class Beer
{
[JsonProperty("bid")]
public int Bid { get; set; }
[JsonProperty("beer_name")]
public string BeerName { get; set; }
[JsonProperty("beer_label")]
public string BeerLabel { get; set; }
[JsonProperty("beer_style")]
public string BeerStyle { get; set; }
[JsonProperty("beer_abv")]
public double BeerAbv { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
[JsonProperty("beer_active")]
public int BeerActive { get; set; }
}
public class Contact
{
[JsonProperty("twitter")]
public string Twitter { get; set; }
[JsonProperty("facebook")]
public string Facebook { get; set; }
[JsonProperty("instagram")]
public string Instagram { get; set; }
[JsonProperty("url")]
public string Url { get; set; }
}
public class Location
{
[JsonProperty("brewery_city")]
public string BreweryCity { get; set; }
[JsonProperty("brewery_state")]
public string BreweryState { get; set; }
[JsonProperty("lat")]
public double Lat { get; set; }
[JsonProperty("lng")]
public double Lng { get; set; }
}
public class Brewery
{
[JsonProperty("brewery_id")]
public int BreweryId { get; set; }
[JsonProperty("brewery_name")]
public string BreweryName { get; set; }
[JsonProperty("brewery_slug")]
public string BrewerySlug { get; set; }
[JsonProperty("brewery_label")]
public string BreweryLabel { get; set; }
[JsonProperty("country_name")]
public string CountryName { get; set; }
[JsonProperty("contact")]
public Contact Contact { get; set; }
[JsonProperty("location")]
public Location Location { get; set; }
[JsonProperty("brewery_active")]
public int BreweryActive { get; set; }
}
public class User2
{
[JsonProperty("uid")]
public int Uid { get; set; }
[JsonProperty("user_name")]
public string UserName { get; set; }
[JsonProperty("first_name")]
public string FirstName { get; set; }
[JsonProperty("last_name")]
public string LastName { get; set; }
[JsonProperty("bio")]
public string Bio { get; set; }
[JsonProperty("location")]
public string Location { get; set; }
[JsonProperty("relationship")]
public string Relationship { get; set; }
[JsonProperty("is_supporter")]
public int IsSupporter { get; set; }
[JsonProperty("user_avatar")]
public string UserAvatar { get; set; }
[JsonProperty("user_link")]
public string UserLink { get; set; }
[JsonProperty("account_type")]
public string AccountType { get; set; }
[JsonProperty("brewery_details")]
public IList<object> BreweryDetails { get; set; }
}
public class Item2
{
[JsonProperty("user")]
public User2 User { get; set; }
[JsonProperty("checkin_id")]
public int CheckinId { get; set; }
[JsonProperty("comment_id")]
public int CommentId { get; set; }
[JsonProperty("comment_owner")]
public bool CommentOwner { get; set; }
[JsonProperty("comment_editor")]
public bool CommentEditor { get; set; }
[JsonProperty("comment")]
public string Comment { get; set; }
[JsonProperty("created_at")]
public string CreatedAt { get; set; }
[JsonProperty("comment_source")]
public string CommentSource { get; set; }
}
public class Comments
{
[JsonProperty("total_count")]
public int TotalCount { get; set; }
[JsonProperty("count")]
public int Count { get; set; }
[JsonProperty("items")]
public IList<Item2> Items { get; set; }
}
public class User3
{
[JsonProperty("uid")]
public int Uid { get; set; }
[JsonProperty("user_name")]
public string UserName { get; set; }
[JsonProperty("first_name")]
public string FirstName { get; set; }
[JsonProperty("last_name")]
public string LastName { get; set; }
[JsonProperty("bio")]
public string Bio { get; set; }
[JsonProperty("location")]
public string Location { get; set; }
[JsonProperty("user_avatar")]
public string UserAvatar { get; set; }
[JsonProperty("user_link")]
public string UserLink { get; set; }
[JsonProperty("account_type")]
public string AccountType { get; set; }
[JsonProperty("brewery_details")]
public IList<object> BreweryDetails { get; set; }
}
public class Item3
{
[JsonProperty("uid")]
public int Uid { get; set; }
[JsonProperty("user")]
public User3 User { get; set; }
[JsonProperty("like_id")]
public int LikeId { get; set; }
[JsonProperty("like_owner")]
public bool LikeOwner { get; set; }
[JsonProperty("created_at")]
public string CreatedAt { get; set; }
}
public class Toasts
{
[JsonProperty("total_count")]
public int TotalCount { get; set; }
[JsonProperty("count")]
public int Count { get; set; }
[JsonProperty("auth_toast")]
public bool AuthToast { get; set; }
[JsonProperty("items")]
public IList<Item3> Items { get; set; }
}
public class Photo
{
[JsonProperty("photo_img_sm")]
public string PhotoImgSm { get; set; }
[JsonProperty("photo_img_md")]
public string PhotoImgMd { get; set; }
[JsonProperty("photo_img_lg")]
public string PhotoImgLg { get; set; }
[JsonProperty("photo_img_og")]
public string PhotoImgOg { get; set; }
}
public class Item4
{
[JsonProperty("photo_id")]
public int PhotoId { get; set; }
[JsonProperty("photo")]
public Photo Photo { get; set; }
}
public class Media
{
[JsonProperty("count")]
public int Count { get; set; }
[JsonProperty("items")]
public IList<Item4> Items { get; set; }
}
public class Source
{
[JsonProperty("app_name")]
public string AppName { get; set; }
[JsonProperty("app_website")]
public string AppWebsite { get; set; }
}
public class BadgeImage
{
[JsonProperty("sm")]
public string Sm { get; set; }
[JsonProperty("md")]
public string Md { get; set; }
[JsonProperty("lg")]
public string Lg { get; set; }
}
public class Item5
{
[JsonProperty("badge_id")]
public int BadgeId { get; set; }
[JsonProperty("user_badge_id")]
public int UserBadgeId { get; set; }
[JsonProperty("badge_name")]
public string BadgeName { get; set; }
[JsonProperty("badge_description")]
public string BadgeDescription { get; set; }
[JsonProperty("created_at")]
public string CreatedAt { get; set; }
[JsonProperty("badge_image")]
public BadgeImage BadgeImage { get; set; }
}
public class Badges
{
[JsonProperty("count")]
public int Count { get; set; }
[JsonProperty("items")]
public IList<Item5> Items { get; set; }
}
public class Item
{
[JsonProperty("checkin_id")]
public int CheckinId { get; set; }
[JsonProperty("created_at")]
public string CreatedAt { get; set; }
[JsonProperty("checkin_comment")]
public string CheckinComment { get; set; }
[JsonProperty("rating_score")]
public double RatingScore { get; set; }
[JsonProperty("user")]
public User User { get; set; }
[JsonProperty("beer")]
public Beer Beer { get; set; }
[JsonProperty("brewery")]
public Brewery Brewery { get; set; }
[JsonProperty("venue")]
public object Venue { get; set; }
[JsonProperty("comments")]
public Comments Comments { get; set; }
[JsonProperty("toasts")]
public Toasts Toasts { get; set; }
[JsonProperty("media")]
public Media Media { get; set; }
[JsonProperty("source")]
public Source Source { get; set; }
[JsonProperty("badges")]
public Badges Badges { get; set; }
}
public class Checkins
{
[JsonProperty("count")]
public int Count { get; set; }
[JsonProperty("items")]
public IList<Item> Items { get; set; }
}
public class Pagination
{
[JsonProperty("next_url")]
public string NextUrl { get; set; }
[JsonProperty("max_id")]
public int MaxId { get; set; }
[JsonProperty("since_url")]
public string SinceUrl { get; set; }
}
public class Response
{
[JsonProperty("mg")]
public bool Mg { get; set; }
[JsonProperty("checkins")]
public Checkins Checkins { get; set; }
[JsonProperty("pagination")]
public Pagination Pagination { get; set; }
}
public class ActivityFeed : BasicRequest, IAuthenticatedRequest
{
protected override string _EndPoint { get { return "/v4/checkin/recent"; } }
[JsonProperty("meta")]
public Meta Meta { get; set; }
[JsonProperty("notifications")]
public Notifications Notifications { get; set; }
[JsonProperty("response")]
public Response Response { get; set; }
}
}

12
src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs
View File

@@ -2,7 +2,7 @@
using Newtonsoft.Json;
using Untappd.Net.Request;
namespace Untappd.Net.Responses.Feeds
namespace Untappd.Net.Responses.Feeds.UserActivityFeed
{
public sealed class ResponseTime
{
@@ -119,7 +119,7 @@ namespace Untappd.Net.Responses.Feeds
public double BeerAbv { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -424,8 +424,9 @@ namespace Untappd.Net.Responses.Feeds
public Checkins Checkins { get; set; }
}
public class UserActivityFeed : UnAuthenticatedRequest
public class UserActivityFeed : BasicRequest, IAuthenticatedRequest, IUnAuthenticatedRequest
{
protected override string _EndPoint { get { return "v4/user/checkins{0}"; } }
[JsonProperty("meta")]
public Meta Meta { get; set; }
@@ -435,10 +436,5 @@ namespace Untappd.Net.Responses.Feeds
[JsonProperty("response")]
public Response Response { get; set; }
protected override string _EndPoint
{
get { return "v4/user/checkins/{0}"; }
}
}
}

7
src/Untappd.Net/Responses/UserBadges.cs
View File

@@ -126,9 +126,10 @@ namespace Untappd.Net.Responses.UserBadges
public IList<Item> Items { get; set; }
}
public class UserBadges : UnAuthenticatedRequest
public class UserBadges : BasicRequest, IAuthenticatedRequest, IUnAuthenticatedRequest
{
protected override string _EndPoint { get { return "v4/user/badges/{0}"; } }
protected override string _EndPoint { get { return "v4/user/badges{0}"; } }
[JsonProperty("meta")]
public Meta Meta { get; set; }
@@ -138,6 +139,4 @@ namespace Untappd.Net.Responses.UserBadges
[JsonProperty("response")]
public Response Response { get; set; }
}
}

34
src/Untappd.Net/Responses/UserDistinctBeer.cs
View File

@@ -69,7 +69,7 @@ namespace Untappd.Net.Responses.UserDistinctBeer
public string CreatedAt { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -191,6 +191,28 @@ namespace Untappd.Net.Responses.UserDistinctBeer
public IList<Item> Items { get; set; }
}
public class UnreadCount
{
[JsonProperty("comments")]
public int Comments { get; set; }
[JsonProperty("toasts")]
public int Toasts { get; set; }
[JsonProperty("friends")]
public int Friends { get; set; }
[JsonProperty("messages")]
public int Messages { get; set; }
[JsonProperty("news")]
public int news { get; set; }
}
public class Notifications
{
[JsonProperty("type")]
public string Type { get; set; }
[JsonProperty("unread_count")]
public UnreadCount UnreadCount { get; set; }
}
public class Response
{
@@ -201,22 +223,18 @@ namespace Untappd.Net.Responses.UserDistinctBeer
public Beers Beers { get; set; }
}
public class UserDistinctBeers : UnAuthenticatedRequest
public class UserDistinctBeers : BasicRequest, IAuthenticatedRequest, IUnAuthenticatedRequest
{
protected override string _EndPoint { get { return "v4/user/beers{0}"; } }
[JsonProperty("meta")]
public Meta Meta { get; set; }
[JsonProperty("notifications")]
public IList<object> Notifications { get; set; }
public Notifications Notifications { get; set; }
[JsonProperty("response")]
public Response Response { get; set; }
protected override string _EndPoint
{
get { return "v4/user/beers/{0}"; }
}
}
}

5
src/Untappd.Net/Responses/UserFriends.cs
View File

@@ -105,9 +105,10 @@ namespace Untappd.Net.Responses.UserFriends
public IList<Item> Items { get; set; }
}
public class UserFriends : UnAuthenticatedRequest
public class UserFriends : BasicRequest, IAuthenticatedRequest, IUnAuthenticatedRequest
{
protected override string _EndPoint { get { return "v4/user/friends/{0}"; } }
protected override string _EndPoint { get { return "v4/user/friends{0}"; } }
[JsonProperty("meta")]
public Meta Meta { get; set; }

75
src/Untappd.Net/Responses/UserInfo.cs
View File

@@ -31,6 +31,12 @@ namespace Untappd.Net.Responses.UserInfo
[JsonProperty("code")]
public int Code { get; set; }
[JsonProperty("error_detail")]
public string ErrorDetail { get; set; }
[JsonProperty("error_type")]
public string ErrorType { get; set; }
[JsonProperty("response_time")]
public ResponseTime ResponseTime { get; set; }
@@ -240,7 +246,7 @@ namespace Untappd.Net.Responses.UserInfo
public double BeerAbv { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -718,6 +724,41 @@ namespace Untappd.Net.Responses.UserInfo
public string Twitter { get; set; }
}
public class Badge
{
[JsonProperty("badges_to_facebook")]
public int BadgesToFacebook { get; set; }
[JsonProperty("badges_to_twitter")]
public int BadgesToTwitter { get; set; }
}
public class Checkin
{
[JsonProperty("checkin_to_facebook")]
public int CheckinToFacebook { get; set; }
[JsonProperty("checkin_to_twitter")]
public int CheckinToTwitter { get; set; }
[JsonProperty("checkin_to_foursquare")]
public int CheckinToFoursquare { get; set; }
}
public class Navigation
{
[JsonProperty("default_to_checkin")]
public int DefaultToCheckin { get; set; }
}
public class Settings
{
[JsonProperty("badge")]
public Badge Badge { get; set; }
[JsonProperty("checkin")]
public Checkin Checkin { get; set; }
[JsonProperty("navigation")]
public Navigation Navigation { get; set; }
[JsonProperty("email_address")]
public string EmailAddress { get; set; }
}
public class User
{
@@ -791,7 +832,29 @@ namespace Untappd.Net.Responses.UserInfo
public string DateJoined { get; set; }
[JsonProperty("settings")]
public IList<object> Settings { get; set; }
public Settings Settings { get; set; }
}
public class UnreadCount
{
[JsonProperty("comments")]
public int Comments { get; set; }
[JsonProperty("toasts")]
public int Toasts { get; set; }
[JsonProperty("friends")]
public int Friends { get; set; }
[JsonProperty("messages")]
public int Messages { get; set; }
[JsonProperty("news")]
public int news { get; set; }
}
public class Notifications
{
[JsonProperty("type")]
public string Type { get; set; }
[JsonProperty("unread_count")]
public UnreadCount UnreadCount { get; set; }
}
public class Response
@@ -801,17 +864,17 @@ namespace Untappd.Net.Responses.UserInfo
public User User { get; set; }
}
public class UserInfo : UnAuthenticatedRequest
public class UserInfo : BasicRequest, IAuthenticatedRequest, IUnAuthenticatedRequest
{
protected override string _EndPoint { get { return "v4/user/info/{0}"; } }
protected override string _EndPoint { get { return "v4/user/info{0}"; } }
[JsonProperty("meta")]
public Meta Meta { get; set; }
[JsonProperty("notifications")]
public IList<object> Notifications { get; set; }
public Notifications Notifications { get; set; }
[JsonProperty("response")]
public Response Response { get; set; }
}
}

6
src/Untappd.Net/Responses/UserWishlist.cs
View File

@@ -64,9 +64,9 @@ namespace Untappd.Net.Responses.UserWishlist
public Beers Beers { get; set; }
}
public class UserWishList : UnAuthenticatedRequest
public class UserWishList : BasicRequest, IAuthenticatedRequest, IUnAuthenticatedRequest
{
protected override string _EndPoint { get { return "/v4/user/wishlist/{0}"; } }
protected override string _EndPoint { get { return "/v4/user/wishlist{0}"; } }
[JsonProperty("meta")]
public Meta Meta { get; set; }
@@ -76,6 +76,4 @@ namespace Untappd.Net.Responses.UserWishlist
[JsonProperty("response")]
public Response Response { get; set; }
}
}

12
src/Untappd.Net/Responses/VenueInfo.cs
View File

@@ -192,7 +192,7 @@ namespace Untappd.Net.Responses.VenueInfo
public string BeerStyle { get; set; }
[JsonProperty("auth_rating")]
public int AuthRating { get; set; }
public double AuthRating { get; set; }
[JsonProperty("wish_list")]
public bool WishList { get; set; }
@@ -554,8 +554,10 @@ namespace Untappd.Net.Responses.VenueInfo
public Venue Venue { get; set; }
}
public class VenueInfo : UnAuthenticatedRequest
public class VenueInfo : BasicRequest, IAuthenticatedRequest, IUnAuthenticatedRequest
{
protected override string _EndPoint { get { return "v4/venue/info{0}"; }
}
[JsonProperty("meta")]
public Meta Meta { get; set; }
@@ -565,11 +567,5 @@ namespace Untappd.Net.Responses.VenueInfo
[JsonProperty("response")]
public Response Response { get; set; }
protected override string _EndPoint
{
get { return "v4/venue/info/{0}"; }
}
}
}

12
src/Untappd.Net/Untappd.Net.csproj
View File

@@ -48,17 +48,22 @@
<ItemGroup>
<Compile Include="Client\AuthenticatedUntappdCredentials.cs" />
<Compile Include="Client\IAuthenticatedUntappdCredentials.cs" />
<Compile Include="Client\IUnAuthenticadedUntappdCredentials.cs" />
<Compile Include="Client\IUntappdCredentials.cs" />
<Compile Include="Client\UnAuthenticatedUntappdCredentials.cs" />
<Compile Include="Client\UntappdCredentials.cs" />
<Compile Include="Constants.cs" />
<Compile Include="Exception\BaseUntappdException.cs" />
<Compile Include="Exception\EndpointConfigurationException.cs" />
<Compile Include="Request\AuthenticatedRequest.cs" />
<Compile Include="Request\UnAuthenticatedRequest.cs" />
<Compile Include="Request\IAuthenticatedRequest.cs" />
<Compile Include="Request\IRequest.cs" />
<Compile Include="Request\BasicRequest.cs" />
<Compile Include="Request\IUnAuthenticatedRequest.cs" />
<Compile Include="Responses\BeerInfo.cs" />
<Compile Include="Responses\BeerSearch.cs" />
<Compile Include="Responses\BreweryInfo.cs" />
<Compile Include="Responses\BrewerySearch.cs" />
<Compile Include="Responses\Feeds\ActivityFeed.cs" />
<Compile Include="Responses\Feeds\UserActivityFeed.cs" />
<Compile Include="Responses\UserBadges.cs" />
<Compile Include="Responses\UserDistinctBeer.cs" />
@@ -72,6 +77,9 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Responses\Actions\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.