[pull] master from imgbot:master

.github/dependabot.yml

@@ -5,93 +5,18 @@ updates:
   schedule:
     interval: daily
     time: "13:00"
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: Magick.NET-Q16-AnyCPU
-    versions:
-    - 7.23.1
-    - 7.23.2
-    - 7.23.2.1
-    - 7.23.3
-  - dependency-name: MSTest.TestAdapter
-    versions:
-    - 2.2.1
-    - 2.2.2
-  - dependency-name: MSTest.TestFramework
-    versions:
-    - 2.2.1
-    - 2.2.2
-  - dependency-name: Microsoft.NET.Test.Sdk
-    versions:
-    - 16.8.3
-    - 16.9.1
-  - dependency-name: Octokit
-    versions:
-    - 0.49.0
-  - dependency-name: Portable.BouncyCastle
-    versions:
-    - 1.8.9
-  - dependency-name: Microsoft.Azure.WebJobs.Extensions.Storage
-    versions:
-    - 4.0.3
 - package-ecosystem: npm
   directory: "/Web"
   schedule:
     interval: daily
     time: "13:00"
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: css-loader
-    versions:
-    - 5.0.1
-    - 5.0.2
-    - 5.1.0
-    - 5.1.1
-    - 5.1.2
-    - 5.1.3
-    - 5.1.4
-    - 5.2.0
-    - 5.2.1
-    - 5.2.3
-  - dependency-name: eslint
-    versions:
-    - 7.18.0
-    - 7.19.0
-    - 7.20.0
-    - 7.21.0
-    - 7.22.0
-    - 7.23.0
-    - 7.24.0
-  - dependency-name: "@babel/core"
-    versions:
-    - 7.12.10
-    - 7.12.13
-    - 7.12.16
-    - 7.12.17
-    - 7.13.1
-    - 7.13.10
-    - 7.13.14
-    - 7.13.15
-    - 7.13.8
-  - dependency-name: y18n
-    versions:
-    - 4.0.1
-    - 4.0.2
-  - dependency-name: grunt
-    versions:
-    - 1.3.0
-  - dependency-name: lodash
-    versions:
-    - 4.17.20
 - package-ecosystem: docker
   directory: "/"
   schedule:
     interval: daily
     time: "13:00"
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: dotnet/core/sdk
-    versions:
-    - 3.1.405
-    - 3.1.406
-    - 3.1.407
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"

.github/workflows/dockerimage.yml

@@ -13,6 +13,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build the Docker image
       run: docker build -f Dockerfile.CompressImages . -t imgbot

.github/workflows/test.yml

@@ -0,0 +1,26 @@
+name: Dotnet Tests
+
+on:  
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dotnet-version: [ '6.0.402' ]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: ${{ matrix.dotnet-version }}     
+      - name: Install dependencies
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+      - name: Test
+        run: dotnet test --no-restore --verbosity normal

Auth/Auth.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AzureFunctionsVersion>v2</AzureFunctionsVersion>
+    <TargetFramework>net6.0</TargetFramework>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
   </ItemGroup>
   <ItemGroup>

Auth/AuthFunction.cs

@@ -100,8 +100,8 @@ public static async Task<HttpResponseMessage> Callback(
                 var mktplcResponse = await HttpClient.SendAsync(mktplcRequest);
                 var planDataJson = await mktplcResponse.Content.ReadAsStringAsync();
                 var planData = JsonConvert.DeserializeObject<PlanData[]>(planDataJson);
-
                 var eduData = new Edu();
+                var isStudent = false;
                 try
                 {
                     var eduRequest = new HttpRequestMessage(HttpMethod.Get, "https://education.github.com/api/user");
@@ -110,6 +110,10 @@ public static async Task<HttpResponseMessage> Callback(
                     var eduResponse = await HttpClient.SendAsync(eduRequest);
                     var eduDataJson = await eduResponse.Content.ReadAsStringAsync();
                     eduData = JsonConvert.DeserializeObject<Edu>(eduDataJson);
+                    if (eduData != null)
+                    {
+                        isStudent = eduData.Student;
+                    }
                 }
                 catch (Exception e)
                 {
@@ -122,9 +126,8 @@ public static async Task<HttpResponseMessage> Callback(
                     {
                         AccountType = item.account.type,
                         PlanId = item.plan.id,
-                        Student = eduData.Student,
+                        Student = isStudent,
                     };
-
                     await marketplaceTable.CreateIfNotExistsAsync();
                     await marketplaceTable.ExecuteAsync(TableOperation.InsertOrMerge(marketplaceRow));
                 }

Auth/InstallationFunction.cs

@@ -46,6 +46,8 @@ public static async Task<HttpResponseMessage> ListAsync(
                     x.account.avatar_url,
                     planId = (mktplc.Result as Common.TableModels.Marketplace)?.PlanId,
                     student = (mktplc.Result as Common.TableModels.Marketplace)?.Student,
+                    allowedPrivate = (mktplc.Result as Common.TableModels.Marketplace)?.AllowedPrivate,
+                    usedPrivate = (mktplc.Result as Common.TableModels.Marketplace)?.UsedPrivate,
                 };
             }));
 
@@ -167,9 +169,10 @@ public static async Task<HttpResponseMessage> ListPullsAsync(
 
         [FunctionName("RequestRepositoryCheckFunction")]
         public static async Task<HttpResponseMessage> RequestRepositoryCheckAsync(
-            [HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = "repositories/check/{installationid}/{repositoryid}")]HttpRequestMessage req,
+            [HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = "repositories/check/{installationid}/{repositoryid}/{compress?}")]HttpRequestMessage req,
             string installationid,
-            string repositoryid)
+            string repositoryid,
+            string compress)
         {
             var token = req.ReadCookie("token");
             if (token == null)
@@ -190,22 +193,71 @@ public static async Task<HttpResponseMessage> RequestRepositoryCheckAsync(
             response.EnableCors();
 
             var imgbotBranch = await GetImgbotBranch(repository, token);
-            if (imgbotBranch != null)
+            if (imgbotBranch != null && compress == null)
             {
                 // branch already exists
                 response.SetJson(new { status = "branchexists" });
                 return response;
             }
 
+            var shouldCompress = true;
+            if (compress == "false")
+            {
+                shouldCompress = false;
+            }
+
+            bool updateValid = true;
+            int? usedPrivateValue = 0;
+            if (compress != null && repository.@private == true)
+            {
+                updateValid = false;
+                var marketplaceTable = GetTable("marketplace");
+                var installationsData = await GetInstallationsData(token);
+                await Task.WhenAll(installationsData.installations.Select(async x =>
+                {
+                    var mktplc = await marketplaceTable.ExecuteAsync(
+                        TableOperation.Retrieve<Common.TableModels.Marketplace>(x.account.id.ToString(), x.account.login));
+
+                    var allowedPrivate = (mktplc.Result as Common.TableModels.Marketplace)?.AllowedPrivate;
+                    var usedPrivate = (mktplc.Result as Common.TableModels.Marketplace)?.UsedPrivate;
+                    usedPrivateValue = usedPrivate;
+                    if (shouldCompress)
+                    {
+                        if (usedPrivate < allowedPrivate || allowedPrivate == null)
+                        {
+                            usedPrivate++;
+                            updateValid = true;
+                        }
+                    }
+                    else
+                    {
+                        usedPrivate--;
+                        updateValid = true;
+                    }
+
+                    if (updateValid == true)
+                    {
+                        await marketplaceTable.ExecuteAsync(TableOperation.InsertOrMerge(new Common.TableModels.Marketplace(x.account.id, x.account.login)
+                        {
+                            UsedPrivate = usedPrivate,
+                        }));
+                        usedPrivateValue = usedPrivate;
+                    }
+                }));
+            }
+
             await routerQueue.AddMessageAsync(new CloudQueueMessage(JsonConvert.SerializeObject(new Common.Messages.RouterMessage
             {
                 CloneUrl = repository.html_url,
                 InstallationId = Convert.ToInt32(installationid),
                 Owner = repository.owner.login,
                 RepoName = repository.name,
+                Compress = shouldCompress,
+                IsPrivate = repository.@private,
+                Update = updateValid,
             })));
 
-            response.SetJson(new { status = "OK" });
+            response.SetJson(new { status = "OK", usedPrivate = usedPrivateValue });
             return response;
         }
 
@@ -222,6 +274,7 @@ public static async Task<HttpResponseMessage> GetRepositorySettingsAsync(
             }
 
             var repository = await GetRepository(installationid, token, repositoryid);
+
             if (repository == null)
             {
                 throw new Exception("repository request mismatch");
@@ -308,7 +361,9 @@ private static async Task<object> RepositoryResponse(Model.Repository ghReposito
                 ghRepository.html_url,
                 ghRepository.name,
                 ghRepository.fork,
-                lastchecked = (installation.Result as Common.TableModels.Installation)?.LastChecked
+                lastchecked = (installation.Result as Common.TableModels.Installation)?.LastChecked,
+                IsPrivate = (installation.Result as Common.TableModels.Installation)?.IsPrivate,
+                IsOptimized = (installation.Result as Common.TableModels.Installation)?.IsOptimized
             };
         }
 

Common/Common.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

Common/KnownGitHubs.cs

@@ -1,4 +1,7 @@
-namespace Common
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace Common
 {
     public static class KnownGitHubs
     {
@@ -14,9 +17,38 @@ public static class KnownGitHubs
 
         public const string BranchName = "imgbot";
 
-        /// <remarks>
-        /// {0} = installation_id
-        /// </remarks>
+        // <remarks>
+        // {0} = installation_id.
+        // </remarks>
         public const string AccessTokensUrlFormat = "https://api.github.com/app/installations/{0}/access_tokens";
+
+        public const int SmallestLimitPaidPlan = 1;
+
+        // -1 for existing plans that include unlimited private
+        // -2 for old plans which also have unlimited private, that do not need marketplacesync
+        // int values represent the number of private repos
+        // the last plan we need to edit after creating it in github market place
+        public static readonly ReadOnlyDictionary<int, int> Plans
+        = new ReadOnlyDictionary<int, int>(
+            new Dictionary<int, int>()
+            {
+                { 781, 0 },
+                { 1749, 0 },
+                { 6927, 0 },
+                { 1750, -2 },
+                { 2840, -2 },
+                { 2841, -2 },
+                { 6894, 5 },
+                { 6919, 10 },
+                { 6920, 20 },
+                { 6921, 50 },
+                { 6922, 100 },
+                { 6923, 200 },
+                { 7386, 1 },
+                { 7387, 3 },
+                { 7388, 10 },
+                { 7389, 25 },
+                { 7390, 100 },
+            });
     }
 }

Common/Messages/BackupMessage.cs

@@ -0,0 +1,17 @@
+namespace Common.Messages
+{
+    public class BackupMessage
+    {
+        public int PlanId { get; set; }
+
+        public string SaleType { get; set; }
+
+        public string BillingCycle { get; set; }
+
+        public int Price { get; set; }
+
+        public string SenderEmail { get; set; }
+
+        public string OrganizationBillingEmail { get; set; }
+    }
+}