Merge pull request #1 from adriangodong/master

Merge Adrian Godong work into my master branch.

Octokit.Reactive/Clients/IObservableAccessTokensClient.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Octokit.Reactive
+{
+    public interface IObservableAccessTokensClient
+    {
+        IObservable<AccessToken> Create(int installationId);
+    }
+}

Octokit.Reactive/Clients/IObservableInstallationsClient.cs

@@ -0,0 +1,7 @@
+namespace Octokit.Reactive
+{
+    public interface IObservableInstallationsClient
+    {
+        IObservableAccessTokensClient AccessTokens { get; }
+    }
+}

Octokit.Reactive/Clients/ObservableAccessTokensClient.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Reactive.Threading.Tasks;
+
+namespace Octokit.Reactive
+{
+    class ObservableAccessTokensClient : IObservableAccessTokensClient
+    {
+        readonly IAccessTokensClient _client;
+        readonly IConnection _connection;
+
+        public ObservableAccessTokensClient(IGitHubClient client)
+        {
+            Ensure.ArgumentNotNull(client, "client");
+
+            _client = client.Installations.AccessTokens;
+            _connection = client.Connection;
+        }
+
+        public IObservable<AccessToken> Create(int installationId)
+        {
+            return _client.Create(installationId).ToObservable();
+        }
+    }
+}

Octokit.Reactive/Clients/ObservableInstallationsClient.cs

@@ -0,0 +1,19 @@
+namespace Octokit.Reactive
+{
+    class ObservableInstallationsClient : IObservableInstallationsClient
+    {
+        readonly IInstallationsClient _client;
+        readonly IConnection _connection;
+
+        public ObservableInstallationsClient(IGitHubClient client)
+        {
+            Ensure.ArgumentNotNull(client, "client");
+
+            _client = client.Installations;
+            _connection = client.Connection;
+            AccessTokens = new ObservableAccessTokensClient(client);
+        }
+
+        public IObservableAccessTokensClient AccessTokens { get; }
+    }
+}

Octokit.Reactive/IObservableGitHubClient.cs

@@ -18,6 +18,7 @@ public interface IObservableGitHubClient : IApiInfoProvider
 
         IObservableAuthorizationsClient Authorization { get; }
         IObservableActivitiesClient Activity { get; }
+        IObservableInstallationsClient Installations { get; }
         IObservableIssuesClient Issue { get; }
         IObservableMiscellaneousClient Miscellaneous { get; }
         IObservableOauthClient Oauth { get; }

Octokit.Reactive/ObservableGitHubClient.cs

@@ -33,6 +33,7 @@ public ObservableGitHubClient(IGitHubClient gitHubClient)
             _gitHubClient = gitHubClient;
             Authorization = new ObservableAuthorizationsClient(gitHubClient);
             Activity = new ObservableActivitiesClient(gitHubClient);
+            Installations = new ObservableInstallationsClient(gitHubClient);
             Issue = new ObservableIssuesClient(gitHubClient);
             Miscellaneous = new ObservableMiscellaneousClient(gitHubClient);
             Oauth = new ObservableOauthClient(gitHubClient);
@@ -69,6 +70,7 @@ public void SetRequestTimeout(TimeSpan timeout)
 
         public IObservableAuthorizationsClient Authorization { get; private set; }
         public IObservableActivitiesClient Activity { get; private set; }
+        public IObservableInstallationsClient Installations { get; private set; }
         public IObservableIssuesClient Issue { get; private set; }
         public IObservableMiscellaneousClient Miscellaneous { get; private set; }
         public IObservableOauthClient Oauth { get; private set; }

Octokit/Authentication/AuthenticationType.cs

@@ -16,6 +16,10 @@ public enum AuthenticationType
         /// <summary>
         /// Delegated access to a third party
         /// </summary>
-        Oauth
+        Oauth,
+        /// <summary>
+        /// Credential for GitHub App using signed JWT
+        /// </summary>
+        Bearer
     }
 }

Octokit/Authentication/Authenticator.cs

@@ -10,7 +10,8 @@ class Authenticator
             {
                 { AuthenticationType.Anonymous, new AnonymousAuthenticator() },
                 { AuthenticationType.Basic, new BasicAuthenticator() },
-                { AuthenticationType.Oauth, new TokenAuthenticator() }
+                { AuthenticationType.Oauth, new TokenAuthenticator() },
+                { AuthenticationType.Bearer, new BearerTokenAuthenticator() }
             };
 
         public Authenticator(ICredentialStore credentialStore)

Octokit/Authentication/BearerTokenAuthenticator.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Globalization;
+
+namespace Octokit.Internal
+{
+    class BearerTokenAuthenticator: IAuthenticationHandler
+    {
+        public void Authenticate(IRequest request, Credentials credentials)
+        {
+            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(credentials, "credentials");
+            Ensure.ArgumentNotNull(credentials.Password, "credentials.Password");
+
+            if (credentials.Login != null)
+            {
+                throw new InvalidOperationException("The Login is not null for a token authentication request. You " +
+                                                    "probably did something wrong.");
+            }
+
+            request.Headers["Authorization"] = string.Format(CultureInfo.InvariantCulture, "Bearer {0}", credentials.Password);
+        }
+    }
+}

Octokit/Clients/AccessTokensClient.cs

@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+
+namespace Octokit
+{
+    class AccessTokensClient : ApiClient, IAccessTokensClient
+    {
+        private const string AcceptHeader = "application/vnd.github.machine-man-preview+json";
+
+        public AccessTokensClient(IApiConnection apiConnection) : base(apiConnection)
+        {
+        }
+
+        public Task<AccessToken> Create(int installationId)
+        {
+            return ApiConnection.Post<AccessToken>(ApiUrls.AccessTokens(installationId), null, AcceptHeader);
+        }
+    }
+}

Octokit/Clients/IAccessTokensClient.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Octokit
+{
+    public interface IAccessTokensClient
+    {
+        Task<AccessToken> Create(int installationId);
+    }
+}

Octokit/Clients/IInstallationsClient.cs

@@ -0,0 +1,7 @@
+namespace Octokit
+{
+    public interface IInstallationsClient
+    {
+        IAccessTokensClient AccessTokens { get; }
+    }
+}

Octokit/Clients/InstallationsClient.cs

@@ -0,0 +1,12 @@
+namespace Octokit
+{
+    class InstallationsClient : ApiClient, IInstallationsClient
+    {
+        public InstallationsClient(IApiConnection apiConnection) : base(apiConnection)
+        {
+            AccessTokens = new AccessTokensClient(apiConnection);
+        }
+
+        public IAccessTokensClient AccessTokens { get; private set; }
+    }
+}

Octokit/GitHubClient.cs

@@ -87,6 +87,7 @@ public GitHubClient(IConnection connection)
             Enterprise = new EnterpriseClient(apiConnection);
             Gist = new GistsClient(apiConnection);
             Git = new GitDatabaseClient(apiConnection);
+            Installations = new InstallationsClient(apiConnection);
             Issue = new IssuesClient(apiConnection);
             Migration = new MigrationClient(apiConnection);
             Miscellaneous = new MiscellaneousClient(connection);
@@ -171,6 +172,9 @@ public Uri BaseAddress
         /// </remarks>
         public IActivitiesClient Activity { get; private set; }
 
+        public IInstallationsClient Installations { get; private set; }
+
+
         /// <summary>
         /// Access GitHub's Issue API.
         /// </summary>

Octokit/Helpers/ApiUrls.cs

@@ -293,6 +293,11 @@ public static Uri NotificationSubscription(int id)
             return "notifications/threads/{0}/subscription".FormatUri(id);
         }
 
+        public static Uri AccessTokens(int installationId)
+        {
+            return "installations/{0}/access_tokens".FormatUri(installationId);
+        }
+
         /// <summary>
         /// Returns the <see cref="Uri"/> that returns all of the issues  across all the authenticated user’s visible
         /// repositories including owned repositories, member repositories, and organization repositories:

Octokit/Http/Credentials.cs

@@ -13,13 +13,8 @@ private Credentials()
             AuthenticationType = AuthenticationType.Anonymous;
         }
 
-        public Credentials(string token)
+        public Credentials(string token) : this(token, AuthenticationType.Oauth)
         {
-            Ensure.ArgumentNotNullOrEmptyString(token, "token");
-
-            Login = null;
-            Password = token;
-            AuthenticationType = AuthenticationType.Oauth;
         }
 
         public Credentials(string login, string password)
@@ -32,6 +27,15 @@ public Credentials(string login, string password)
             AuthenticationType = AuthenticationType.Basic;
         }
 
+        public Credentials(string token, AuthenticationType authenticationType)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(token, "token");
+
+            Login = null;
+            Password = token;
+            AuthenticationType = authenticationType;
+        }
+
         public string Login
         {
             get;

Octokit/IGitHubClient.cs

@@ -38,6 +38,8 @@ public interface IGitHubClient : IApiInfoProvider
         /// </remarks>
         IActivitiesClient Activity { get; }
 
+        IInstallationsClient Installations { get; }
+
         /// <summary>
         /// Access GitHub's Issue API.
         /// </summary>

Octokit/Models/Response/AccessToken.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Diagnostics;
+using System.Globalization;
+
+namespace Octokit
+{
+    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    public class AccessToken
+    {
+        public AccessToken() { }
+
+        public AccessToken(string token, DateTime expiresAt)
+        {
+            Token = token;
+            ExpiresAt = expiresAt;
+        }
+
+        public string Token { get; protected set; }
+        public DateTime ExpiresAt { get; protected set; }
+
+        internal string DebuggerDisplay
+        {
+            get
+            {
+                return string.Format(CultureInfo.InvariantCulture, "Token: {0}, ExpiresAt: {1}", Token, ExpiresAt);
+            }
+        }
+    }
+}