Feature: Added support for pushing Git commits

builds/azure-pipelines-preview.yml

@@ -68,6 +68,17 @@ jobs:
         }
       failOnStderr: true
 
+# Injects the GitHub token to the project
+  - task: PowerShell@2
+    displayName: 'Inject AppCenter token'
+    inputs:
+      targetType: 'inline'
+      script: |
+        gci $(Build.SourcesDirectory)\src -Include *.cs -recurse | ForEach -Process {
+        (Get-Content $_ -Raw | ForEach -Process {$_ -replace "githubclientid.secret", "$(githubclientid.secret)"}) | Set-Content $_ -NoNewline
+        }
+      failOnStderr: true
+
   - task: UseDotNet@2
     inputs:
       packageType: sdk

builds/azure-pipelines-release.yml

@@ -100,6 +100,17 @@ jobs:
         }
       failOnStderr: true
 
+# Injects the GitHub token to the project
+  - task: PowerShell@2
+    displayName: 'Inject AppCenter token'
+    inputs:
+      targetType: 'inline'
+      script: |
+        gci $(Build.SourcesDirectory)\src -Include *.cs -recurse | ForEach -Process {
+        (Get-Content $_ -Raw | ForEach -Process {$_ -replace "githubclientid.secret", "$(githubclientid.secret)"}) | Set-Content $_ -NoNewline
+        }
+      failOnStderr: true
+
   - task: UseDotNet@2
     inputs:
       packageType: sdk
@@ -215,6 +226,17 @@ jobs:
         }
       failOnStderr: true
 
+# Injects the GitHub token to the project
+  - task: PowerShell@2
+    displayName: 'Inject AppCenter token'
+    inputs:
+      targetType: 'inline'
+      script: |
+        gci $(Build.SourcesDirectory)\src -Include *.cs -recurse | ForEach -Process {
+        (Get-Content $_ -Raw | ForEach -Process {$_ -replace "githubclientid.secret", "$(githubclientid.secret)"}) | Set-Content $_ -NoNewline
+        }
+      failOnStderr: true
+
   - task: UseDotNet@2
     inputs:
       packageType: sdk

src/Files.App/Actions/Git/GitPushAction.cs

@@ -0,0 +1,39 @@
+using Files.App.Commands;
+using Files.App.Contexts;
+
+namespace Files.App.Actions
+{
+	internal class GitPushAction : ObservableObject, IAction
+	{
+		private readonly IContentPageContext _context;
+
+		public string Label { get; } = "Push".GetLocalizedResource();
+
+		public string Description { get; } = "GitPushDescription".GetLocalizedResource();
+
+		public RichGlyph Glyph { get; } = new("\uE74A");
+
+		public bool IsExecutable =>
+			_context.CanExecuteGitAction;
+
+		public GitPushAction()
+		{
+			_context = Ioc.Default.GetRequiredService<IContentPageContext>();
+
+			_context.PropertyChanged += Context_PropertyChanged;
+		}
+
+		public Task ExecuteAsync()
+		{
+			return GitHelpers.PushToOrigin(
+				_context.ShellPage?.InstanceViewModel.GitRepositoryPath,
+				_context.ShellPage?.InstanceViewModel.GitBranchName);
+		}
+
+		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName is nameof(IContentPageContext.CanExecuteGitAction))
+				OnPropertyChanged(nameof(IsExecutable));
+		}
+	}
+}

src/Files.App/Actions/Git/GitSyncAction.cs

@@ -0,0 +1,40 @@
+using Files.App.Commands;
+using Files.App.Contexts;
+
+namespace Files.App.Actions
+{
+	internal class GitSyncAction : ObservableObject, IAction
+	{
+		private readonly IContentPageContext _context;
+
+		public string Label { get; } = "GitSync".GetLocalizedResource();
+
+		public string Description { get; } = "GitSyncDescription".GetLocalizedResource();
+
+		public RichGlyph Glyph { get; } = new("\uEDAB");
+
+		public bool IsExecutable =>
+			_context.CanExecuteGitAction;
+
+		public GitSyncAction()
+		{
+			_context = Ioc.Default.GetRequiredService<IContentPageContext>();
+
+			_context.PropertyChanged += Context_PropertyChanged;
+		}
+
+		public Task ExecuteAsync()
+		{
+			GitHelpers.PullOrigin(_context.ShellPage?.InstanceViewModel.GitRepositoryPath);
+			return GitHelpers.PushToOrigin(
+				_context.ShellPage?.InstanceViewModel.GitRepositoryPath,
+				_context.ShellPage?.InstanceViewModel.GitBranchName);
+		}
+
+		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName is nameof(IContentPageContext.CanExecuteGitAction))
+				OnPropertyChanged(nameof(IsExecutable));
+		}
+	}
+}

src/Files.App/Commands/CommandCodes.cs

@@ -183,5 +183,7 @@ public enum CommandCodes
 		// Git
 		GitFetch,
 		GitPull,
+		GitPush,
+		GitSync,
 	}
 }

src/Files.App/Commands/Manager/CommandManager.cs

@@ -159,6 +159,8 @@ public IRichCommand this[HotKey hotKey]
 		public IRichCommand PlayAll => commands[CommandCodes.PlayAll];
 		public IRichCommand GitFetch => commands[CommandCodes.GitFetch];
 		public IRichCommand GitPull => commands[CommandCodes.GitPull];
+		public IRichCommand GitPush => commands[CommandCodes.GitPush];
+		public IRichCommand GitSync => commands[CommandCodes.GitSync];
 
 		public CommandManager()
 		{
@@ -312,6 +314,8 @@ public CommandManager()
 			[CommandCodes.PlayAll] = new PlayAllAction(),
 			[CommandCodes.GitFetch] = new GitFetchAction(),
 			[CommandCodes.GitPull] = new GitPullAction(),
+			[CommandCodes.GitPush] = new GitPushAction(),
+			[CommandCodes.GitSync] = new GitSyncAction(),
 		};
 
 		private void UpdateHotKeys()

src/Files.App/Commands/Manager/ICommandManager.cs

@@ -162,5 +162,7 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 
 		IRichCommand GitFetch { get; }
 		IRichCommand GitPull { get; }
+		IRichCommand GitPush { get; }
+		IRichCommand GitSync { get; }
 	}
 }

src/Files.App/Data/Models/DirectoryPropertiesViewModel.cs

@@ -61,11 +61,18 @@ public bool ShowLocals
 			}
 		}
 
-		private string _PullInfo = "0";
-		public string PullInfo
+		private string _StatusInfo = "0 / 0";
+		public string StatusInfo
 		{
-			get => _PullInfo;
-			set => SetProperty(ref _PullInfo, value);
+			get => _StatusInfo;
+			set => SetProperty(ref _StatusInfo, value);
+		}
+
+		private string _ExtendedStatusInfo = string.Format("CommitsNumber".GetLocalizedResource(), 0);
+		public string ExtendedStatusInfo
+		{
+			get => _ExtendedStatusInfo;
+			set => SetProperty(ref _ExtendedStatusInfo, value);
 		}
 
 		public ObservableCollection<string> BranchesNames => _ShowLocals 
@@ -91,9 +98,11 @@ public void UpdateGitInfo(bool isGitRepository, string? repositoryPath, BranchIt
 			_gitRepositoryPath = repositoryPath;
 			ShowLocals = true;
 
-			PullInfo = branches.Any() 
-				? branches[0].BehindBy.ToString() ?? "0"
-				: "0";
+			var behind = branches.Any() ? branches[0].BehindBy ?? 0 : 0;
+			var ahead = branches.Any() ? branches[0].AheadBy ?? 0 : 0;
+
+			ExtendedStatusInfo = string.Format("GitSyncStatusExtendedInfo".GetLocalizedResource(), ahead, behind);
+			StatusInfo = $"{ahead} / {behind}";
 
 			if (isGitRepository)
 			{

src/Files.App/Data/Parameters/GitConfirmLoginParams.cs

@@ -0,0 +1,23 @@
+using System.Text.Json.Serialization;
+
+namespace Files.App.Data.Parameters
+{
+	internal class GitConfirmLoginParams
+	{
+		[JsonPropertyName("client_id")]
+		public string ClientId { get; init; }
+
+		[JsonPropertyName("device_code")]
+		public string DeviceCode { get; init; }
+
+		[JsonPropertyName("grant_type")]
+		public string GrantType { get; init; }
+
+		public GitConfirmLoginParams(string clientId = "", string deviceCode = "") 
+		{
+			ClientId = clientId;
+			DeviceCode = deviceCode;
+			GrantType = "urn:ietf:params:oauth:grant-type:device_code";
+		}
+	}
+}

src/Files.App/Data/Parameters/GitRequireTokenParams.cs

@@ -0,0 +1,19 @@
+using System.Text.Json.Serialization;
+
+namespace Files.App.Data.Parameters
+{
+	internal class GitRequireTokenParams
+	{
+		[JsonPropertyName("client_id")]
+		public string ClientId { get; init; }
+
+		[JsonPropertyName("scope")]
+		public string Scope { get; init; }
+
+		public GitRequireTokenParams(string clientId = "", string scope = "repo")
+		{
+			ClientId = clientId;
+			Scope = scope;
+		}
+	}
+}

src/Files.App/Helpers/CredentialsHelpers.cs

@@ -0,0 +1,34 @@
+using System.Runtime.InteropServices;
+using Windows.Security.Credentials;
+
+namespace Files.App.Helpers
+{
+	internal class CredentialsHelpers
+	{
+		public static void SavePassword(string resourceName, string username, string password)
+		{
+			var vault = new PasswordVault();
+			var credential = new PasswordCredential(resourceName, username, password);
+
+			vault.Add(credential);
+		}
+
+		public static string GetPassword(string resourceName, string username)
+		{
+			try
+			{
+				var vault = new PasswordVault();
+				var credential = vault.Retrieve(resourceName, username);
+
+				credential.RetrievePassword();
+
+				return credential.Password;
+			}
+			// Thrown if the resource does not exist
+			catch (COMException)
+			{
+				return string.Empty;
+			}
+		}
+	}
+}

src/Files.App/Helpers/DynamicDialogFactory.cs

@@ -3,6 +3,7 @@
 
 using Files.App.Dialogs;
 using Files.App.ViewModels.Dialogs;
+using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
@@ -262,5 +263,53 @@ public static DynamicDialog GetFor_GitCheckoutConflicts(string checkoutBranchNam
 
 			return dialog;
 		}
+
+		public static DynamicDialog GetFor_GitLogin(string userCode)
+		{
+			var url = "https://github.com/login/device";
+
+			var redirectLink = new HyperlinkButton()
+			{
+				Content = url,
+				NavigateUri = new Uri(url),
+				HorizontalAlignment = HorizontalAlignment.Center
+			};
+			var userCodeTextBlock = new TextBlock()
+			{
+				Text = userCode,
+				FontWeight = FontWeights.Bold,
+				FontSize = 20.0d,
+				HorizontalAlignment = HorizontalAlignment.Center
+			};
+
+			return new DynamicDialog(new DynamicDialogViewModel()
+			{
+				TitleText = "ConnectGitHub".GetLocalizedResource(),
+				PrimaryButtonText = "Close".GetLocalizedResource(),
+				SubtitleText = "ConnectGitHubDescription".GetLocalizedResource(),
+				DisplayControl = new StackPanel()
+				{
+					MinWidth = 250d,
+					Children =
+					{
+						redirectLink,
+						userCodeTextBlock
+					}
+				},
+				DynamicButtons = DynamicDialogButtons.Primary,
+			});
+		}
+
+		public static DynamicDialog GetFor_GitHubConnectionError()
+		{
+			DynamicDialog dialog = new DynamicDialog(new DynamicDialogViewModel()
+			{
+				TitleText = "Error".GetLocalizedResource(),
+				SubtitleText = "CannotReachGitHubError".GetLocalizedResource(),
+				PrimaryButtonText = "Close".GetLocalizedResource(),
+				DynamicButtons = DynamicDialogButtons.Primary
+			});
+			return dialog;
+		}
 	}
 }