Merge branch 'master' into fixes/227-inner-paging

Author: jcansdale

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '21 12 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

Octokit.GraphQL.Core.Generation/Octokit.GraphQL.Core.Generation.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <ItemGroup>
@@ -9,4 +9,4 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-</Project>
+</Project>

Octokit.GraphQL.Core/Core/Syntax/VariableDefinition.cs

@@ -31,6 +31,10 @@ public static string ToTypeName(Type type, bool isNullable)
             {
                 name = "Boolean";
             }
+            else if (type == typeof(DateTimeOffset))
+            {
+                name = "DateTime";
+            }
             else if (type.IsConstructedGenericType && type.GetGenericTypeDefinition() == typeof(IEnumerable<>))
             {
                 var inner = ToTypeName(type.GenericTypeArguments[0], false);

Octokit.GraphQL.Core/Octokit.GraphQL.Core.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Octokit.GraphQL</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile>
@@ -9,10 +9,10 @@
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-</Project>
+</Project>

Octokit.GraphQL.IntegrationTests/Queries/IssueTests.cs

@@ -122,7 +122,7 @@ public async Task Can_Manually_Page_Issue_Comments_By_Node_Id()
                 .Select(issue => new
                 {
                     issue.Id,
-                    Comments = issue.Comments(100, null, null, null).Select(page => new
+                    Comments = issue.Comments(100, null, null, null, null).Select(page => new
                     {
                         page.PageInfo.HasNextPage,
                         page.PageInfo.EndCursor,
@@ -171,7 +171,7 @@ public async Task Can_AutoPage_Issue_Comments()
                 .Select(issue => new
                 {
                     issue.Id,
-                    Comments = issue.Comments(null, null, null, null).AllPages().Select(comment => comment.Body).ToList(),
+                    Comments = issue.Comments(null, null, null, null, null).AllPages().Select(comment => comment.Body).ToList(),
                 });
 
             var result = await Connection.Run(query);
@@ -226,7 +226,7 @@ public async Task Can_AutoPage_Issues_With_Subquery()
                 .Select(issue => new
                 {
                     issue.Id,
-                    Comments = issue.Comments(null, null, null, null).AllPages().Select(comment => comment.Body).ToList(),
+                    Comments = issue.Comments(null, null, null, null, null).AllPages().Select(comment => comment.Body).ToList(),
                 });
 
             var result = (await Connection.Run(query)).ToList();

Octokit.GraphQL.IntegrationTests/Queries/RepositoryTests.cs

@@ -51,8 +51,8 @@ public async Task Should_Run_Readme_Query()
             };
 
             var result = await Connection.Run(query, vars);
-            Assert.Equal(result.Login, "octokit");
-            Assert.Equal(result.Name, "octokit.graphql.net");
+            Assert.Equal("octokit", result.Login);
+            Assert.Equal("octokit.graphql.net", result.Name);
         }
 
         [IntegrationTest]
@@ -69,8 +69,8 @@ public async Task Should_Query_Repository_ByName()
             var repository = await Connection.Run(query);
 
             Assert.NotNull(repository);
-            Assert.Equal(repository.Name, "octokit.net");
-            Assert.Equal(repository.DatabaseId, 7528679);
+            Assert.Equal("octokit.net", repository.Name);
+            Assert.Equal(7528679, repository.DatabaseId);
         }
 
         [IntegrationTest]
@@ -86,11 +86,11 @@ public async Task Should_QueryRepositoryOwner_Repositories_OrderBy_Name_Ascendin
 
             var repositoryNames = (await Connection.Run(query)).ToArray();
 
-            Assert.Contains("discussions", repositoryNames);
-            Assert.Contains("go-octokit", repositoryNames);
-            Assert.Contains("octokit.net", repositoryNames);
-            Assert.Contains("octokit.objc", repositoryNames);
-            Assert.Contains("octokit.rb", repositoryNames);
+            Assert.Contains(".github", repositoryNames);
+            Assert.Contains("action.js", repositoryNames);
+            Assert.Contains("app-permissions", repositoryNames);
+            Assert.Contains("app.js", repositoryNames);
+            Assert.Contains("auth-action.js", repositoryNames);
         }
 
         [IntegrationTest]
@@ -153,7 +153,7 @@ public async Task Query_Repository_Select_Inner_Simple_Fragment()
             var query = new Query()
                 .Select(q => new
                 {
-                    Name = q.Repository("octokit.net", "octokit").Select(fragment).SingleOrDefault()
+                    Name = q.Repository("octokit.net", "octokit", null).Select(fragment).SingleOrDefault()
                 });
 
 
@@ -175,7 +175,7 @@ public async Task Query_Organization_Repositories_Select_Simple_Fragment()
 
             var repositoryName = (await Connection.Run(query)).OrderByDescending(s => s).First();
 
-            Assert.Equal("webhooks.js", repositoryName);
+            Assert.Equal("webhooks-methods.js", repositoryName);
         }
 
         [IntegrationTest]
@@ -210,8 +210,8 @@ public async Task Query_Repository_Select_Object_Fragment_Twice()
             var query = new Query()
                 .Select(q => new
                 {
-                    repo1 = q.Repository("octokit.net", "octokit").Select(fragment).Single(),
-                    repo2 = q.Repository("octokit.graphql.net", "octokit").Select(fragment).Single(),
+                    repo1 = q.Repository("octokit.net", "octokit", null).Select(fragment).Single(),
+                    repo2 = q.Repository("octokit.graphql.net", "octokit", null).Select(fragment).Single(),
                 });
 
             var result = await Connection.Run(query);
@@ -233,7 +233,7 @@ public async Task Query_Repository_Select_Inner_Object_Fragment()
             var query = new Query()
                 .Select(q => new
                 {
-                    TestModel = q.Repository("octokit.net", "octokit").Select(fragment).SingleOrDefault()
+                    TestModel = q.Repository("octokit.net", "octokit", null).Select(fragment).SingleOrDefault()
                 });
 
 
@@ -260,7 +260,7 @@ public async Task Query_Organization_Repositories_Select_Object_Fragment()
 
             var testModelObject = (await Connection.Run(query)).OrderByDescending(s => s.StringField1).First();
 
-            Assert.Equal("webhooks.js", testModelObject.StringField1);
+            Assert.Equal("webhooks-methods.js", testModelObject.StringField1);
         }
 
         [IntegrationTest]
@@ -279,7 +279,7 @@ public async Task Query_Organization_Repositories_Select_Multiple_Object_Fragmen
                     Member = organization.MembersWithRole(10, null, null, null).Nodes
                         .Select(fragment).ToList().OrderBy(o => o.StringField1).First(),
 
-                    MentionableUser = organization.Repository("octokit.net")
+                    MentionableUser = organization.Repository("octokit.net", null)
                         .MentionableUsers(10, null, null, null, null).Nodes
                         .Select(fragment).ToList().OrderBy(o => o.StringField1).First()
                 });
@@ -370,7 +370,7 @@ public async Task Should_Query_RepositoryOwner_Repository_With_Fragment()
             var query = new Query().Select(q => new
             {
                 repoOwner = q
-                    .Repository("octokit.net", "octokit")
+                    .Repository("octokit.net", "octokit", null)
                     .Owner
                     .Select(fragment)
                     .SingleOrDefault()

Octokit.GraphQL.IntegrationTests/Queries/ViewerTests.cs

@@ -1,4 +1,6 @@
-using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Octokit.GraphQL.Core;
 using Octokit.GraphQL.IntegrationTests.Utilities;
@@ -52,7 +54,7 @@ public async Task Viewer_By_GraphyQL_Matches_Api()
 
             Assert.NotNull(graphqlUser);
 
-            Assert.Equal(apiUser.AvatarUrl, graphqlUser.AvatarUrl);
+            Assert.Equal(apiUser.AvatarUrl.Split("?").First(), graphqlUser.AvatarUrl.Split("?").First());
             Assert.Equal(apiUser.Bio, graphqlUser.Bio);
             Assert.Equal(apiUser.Company, graphqlUser.Company);
 
@@ -88,5 +90,23 @@ public async Task Viewer_Has_No_OrganizationVerifiedDomainEmails_For_Octokit()
 
             Assert.Empty(emails);
         }
+
+        [IntegrationTest]
+        public async Task DateTime_Filter_Works()
+        {
+            var query = new GraphQL.Query()
+                        .Viewer.ContributionsCollection(from: Variable.Var("start"))
+                        .Select(c => c.User.Name);
+
+            var vars = new Dictionary<string, object>
+            {
+                { "start", new DateTimeOffset(2000, 1, 2, 3, 4, 5, default) }
+            };
+
+            var response = await Connection.Run(query.Compile(), vars);
+
+            // no server error
+            Assert.NotNull(response);
+        }
     }
 }

Octokit.GraphQL.Pack/Octokit.GraphQL.Pack.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <NoBuild>true</NoBuild>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <NuspecFile>../Octokit.GraphQL.nuspec</NuspecFile>

Octokit.GraphQL.UnitTests/ExpressionRewiterTests.cs

@@ -62,8 +62,8 @@ public void Repository_Select_Use_Fragment_Twice()
             var query = new Query()
                 .Select(q => new
                 {
-                    repo1 = q.Repository("foo", "bar").Select(fragment).SingleOrDefault(),
-                    repo2 = q.Repository("foo", "bar").Select(fragment).SingleOrDefault()
+                    repo1 = q.Repository("foo", "bar", null).Select(fragment).SingleOrDefault(),
+                    repo2 = q.Repository("foo", "bar", null).Select(fragment).SingleOrDefault()
                 });
 
             Expression<Func<JObject, object>> expected = data =>

Octokit.GraphQL.UnitTests/QueryBuilderTests.cs

@@ -317,5 +317,26 @@ ... on User {
 
             Assert.Equal(expected, query.ToString(), ignoreLineEndingDifferences: true);
         }
+
+        [Fact]
+        public void DateTimeOffsetVariable()
+        {
+            var expected = @"query($start: DateTime) {
+  user(login: ""grokys"") {
+    contributionsCollection(from: $start) {
+      latestRestrictedContributionDate
+    }
+  }
+}";
+
+            var expression = new Query()
+                             .User("grokys")
+                             .ContributionsCollection(@from: Variable.Var("start"))
+                             .Select(c => c.LatestRestrictedContributionDate);
+
+            var query = expression.Compile();
+
+            Assert.Equal(expected, query.ToString(), ignoreLineEndingDifferences: true);
+        }
     }
 }