Merge branch 'master' into enhancement/application-cache

Author: StanleyGoldman

CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

build.sh

@@ -34,6 +34,8 @@ fi
 
 xbuild GitHub.Unity.sln /property:Configuration=$Configuration /target:$Target
 
+cp -r unity/PackageProject/Assets/Editor/GitHub ../github-unity-test/GitHubExtensionProject/Assets/Editor || true
+
 rm -f unity/PackageProject/Assets/Editor/GitHub/deleteme*
 rm -f unity/PackageProject/Assets/Editor/GitHub/deleteme*
 rm -f unity/PackageProject/Assets/Editor/GitHub/*.xml

common/SolutionInfo.cs

@@ -28,6 +28,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "0.10.0.0";
+        internal const string Version = "0.11.0.0";
     }
 }

src/GitHub.Api/Api/ApiClient.cs

@@ -7,32 +7,39 @@ namespace GitHub.Unity
 {
     class ApiClient : IApiClient
     {
+        public static IApiClient Create(UriString repositoryUrl, IKeychain keychain, IAppConfiguration appConfiguration)
+        {
+            var credentialStore = keychain.Connect(repositoryUrl);
+            var hostAddress = HostAddress.Create(repositoryUrl);
+
+            return new ApiClient(repositoryUrl, keychain,
+                new GitHubClient(appConfiguration.ProductHeader, credentialStore, hostAddress.ApiUri));
+        }
+
         private static readonly Unity.ILogging logger = Unity.Logging.GetLogger<ApiClient>();
         public HostAddress HostAddress { get; }
         public UriString OriginalUrl { get; }
 
+        private readonly IKeychain keychain;
         private readonly IGitHubClient githubClient;
-        private readonly IGitHubClient githubAppClient;
-        private readonly ICredentialManager credentialManager;
         private readonly ILoginManager loginManager;
         private static readonly SemaphoreSlim sem = new SemaphoreSlim(1);
 
         Octokit.Repository repositoryCache = new Octokit.Repository();
         string owner;
         bool? isEnterprise;
 
-        public ApiClient(UriString hostUrl, ICredentialManager credentialManager, IGitHubClient githubClient, IGitHubClient githubAppClient)
+        public ApiClient(UriString hostUrl, IKeychain keychain, IGitHubClient githubClient)
         {
             Guard.ArgumentNotNull(hostUrl, nameof(hostUrl));
-            Guard.ArgumentNotNull(credentialManager, nameof(credentialManager));
+            Guard.ArgumentNotNull(keychain, nameof(keychain));
             Guard.ArgumentNotNull(githubClient, nameof(githubClient));
 
             HostAddress = HostAddress.Create(hostUrl);
             OriginalUrl = hostUrl;
+            this.keychain = keychain;
             this.githubClient = githubClient;
-            this.githubAppClient = githubAppClient;
-            this.credentialManager = credentialManager;
-            loginManager = new LoginManager(credentialManager, ApplicationInfo.ClientId, ApplicationInfo.ClientSecret);
+            loginManager = new LoginManager(keychain, ApplicationInfo.ClientId, ApplicationInfo.ClientSecret);
         }
 
         public async void GetRepository(Action<Octokit.Repository> callback)
@@ -54,6 +61,7 @@ public async Task Login(string username, string password, Action<LoginResult> ne
             }
             catch (Exception ex)
             {
+                logger.Warning(ex);
                 result(false, ex.Message);
                 return;
             }
@@ -176,10 +184,12 @@ public async Task<bool> ValidateCredentials()
         {
             try
             {
-                var credential = await credentialManager.Load(OriginalUrl);
-                if (credential != null)
+                var store = keychain.Connect(OriginalUrl);
+
+                if (store.OctokitCredentials != Credentials.Anonymous)
                 {
-                    await githubAppClient.Authorization.CheckApplicationAuthentication(ApplicationInfo.ClientId, credential.Token);
+                    var credential = store.Credential;
+                    await githubClient.Authorization.CheckApplicationAuthentication(ApplicationInfo.ClientId, credential.Token);
                 }
             }
             catch

src/GitHub.Api/Api/ApiClientFactory.cs

@@ -8,27 +8,11 @@ class AppConfiguration : IAppConfiguration
     {
         public AppConfiguration()
         {
-            applicationName = ApplicationInfo.ApplicationName;
-            applicationDescription = ApplicationInfo.ApplicationDescription;
-
             var executingAssembly = typeof(AppConfiguration).Assembly;
             AssemblyName = executingAssembly.GetName();
             ProductHeader = new ProductHeaderValue(ApplicationInfo.ApplicationSafeName, AssemblyName.Version.ToString());
         }
 
-        readonly string applicationName;
-        readonly string applicationDescription;
-
-        /// <summary>
-        /// Name of this application
-        /// </summary>
-        public string ApplicationName { get { return applicationName; } }
-
-        /// <summary>
-        /// Name of this application
-        /// </summary>
-        public string ApplicationDescription { get { return applicationDescription; } }
-
         /// <summary>
         /// The currently executing assembly.
         /// </summary>

src/GitHub.Api/Api/IApiClientFactory.cs

@@ -8,6 +8,7 @@ class ApplicationManagerBase : IApplicationManager
     {
         protected static readonly ILogging logger = Logging.GetLogger<IApplicationManager>();
 
+        private AppConfiguration appConfiguration;
         private RepositoryLocator repositoryLocator;
         private RepositoryManager repositoryManager;
 
@@ -24,14 +25,21 @@ public ApplicationManagerBase(SynchronizationContext synchronizationContext)
         protected void Initialize(IUIDispatcher uiDispatcher)
         {
             // accessing Environment triggers environment initialization if it hasn't happened yet
+            Platform = new Platform(Environment, FileSystem, uiDispatcher);
+
+            UserSettings = new UserSettings(Environment);
+            UserSettings.Initialize();
+            Logging.TracingEnabled = UserSettings.Get("EnableTraceLogging", false);
+
             LocalSettings = new LocalSettings(Environment);
-            UserSettings = new UserSettings(Environment, ApplicationInfo.ApplicationName);
-            SystemSettings = new SystemSettings(Environment, ApplicationInfo.ApplicationName);
+            LocalSettings.Initialize();
+
+            SystemSettings = new SystemSettings(Environment);
+            SystemSettings.Initialize();
+
 
-            Platform = new Platform(Environment, FileSystem, uiDispatcher);
             ProcessManager = new ProcessManager(Environment, Platform.GitEnvironment, CancellationToken);
-            Platform.Initialize(ProcessManager);
-            ApiClientFactory.Instance = new ApiClientFactory(new AppConfiguration(), Platform.CredentialManager);
+            Platform.Initialize(Environment, ProcessManager);
         }
 
         public virtual Task Run()
@@ -119,9 +127,28 @@ private async Task RunInternal()
             logger.Trace("Environment.GitExecutablePath \"{0}\" Exists:{1}", gitSetup.GitExecutablePath, gitSetup.GitExecutablePath.FileExists());
 
             await RestartRepository();
-        }
 
+            if (Environment.IsWindows)
+            {
+                string credentialHelper = null;
+                var gitConfigGetTask = new GitConfigGetTask(Environment, ProcessManager,
+                    new TaskResultDispatcher<string>(s => {
+                        credentialHelper = s;
+                    }), "credential.helper", GitConfigSource.Global);
+
+
+                await gitConfigGetTask.RunAsync(CancellationToken.None);
 
+                if (string.IsNullOrEmpty(credentialHelper))
+                {
+                    var gitConfigSetTask = new GitConfigSetTask(Environment, ProcessManager,
+                        new TaskResultDispatcher<string>(s => { }), "credential.helper", "wincred",
+                        GitConfigSource.Global);
+
+                    await gitConfigSetTask.RunAsync(CancellationToken.None);
+                }
+            }
+        }
 
         private async Task<string> LookForGitInstallationPath()
         {
@@ -149,8 +176,8 @@ protected virtual void Dispose(bool disposing)
             {
                 if (disposed) return;
                 disposed = true;
-                CancellationTokenSource.Cancel();
-                repositoryManager.Dispose();
+                if (CancellationTokenSource != null) CancellationTokenSource.Cancel();
+                if (repositoryManager != null) repositoryManager.Dispose();
             }
         }
 
@@ -159,6 +186,14 @@ public void Dispose()
             Dispose(true);
         }
 
+        public AppConfiguration AppConfiguration
+        {
+            get
+            {
+                return appConfiguration ?? (appConfiguration = new AppConfiguration());
+            }
+        }
+
         public virtual IEnvironment Environment { get; set; }
         public IFileSystem FileSystem { get; protected set; }
         public IPlatform Platform { get; protected set; }