Update for application-scoped credentials

Inedo · Aug 12, 2019 · 325562d · 325562d
1 parent 564fa23
commit 325562d
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 10 deletions.
diff --git a/Git/GitHub.InedoExtension/Credentials/GitHubCredentials.cs b/Git/GitHub.InedoExtension/Credentials/GitHubCredentials.cs
@@ -1,6 +1,9 @@
 using System.ComponentModel;
 using Inedo.Documentation;
 using Inedo.Extensibility;
+using Inedo.Extensibility.Credentials;
+using Inedo.Extensibility.ListVariableSources;
+using Inedo.Extensibility.Operations;
 using Inedo.Extensions.Credentials;
 using Inedo.Extensions.GitHub.Clients;
 using Inedo.Extensions.GitHub.SuggestionProviders;
@@ -9,12 +12,14 @@
 
 namespace Inedo.Extensions.GitHub.Credentials
 {
-    [ScriptAlias("GitHub")]
+    [ScriptAlias(GitHubCredentials.TypeName)]
     [DisplayName("GitHub")]
     [Description("Credentials for GitHub.")]
     [PersistFrom("Inedo.Extensions.Credentials.GitHubCredentials,GitHub")]
     public sealed class GitHubCredentials : GitCredentialsBase
     {
+        public const string TypeName = "GitHub";
+
         [Persistent]
         [DisplayName("API URL")]
         [PlaceholderText(GitHubClient.GitHubComUrl)]
@@ -47,5 +52,25 @@ public override RichDescription GetDescription()
 
             return desc;            
         }
+
+        internal static GitHubCredentials TryCreate(string name, ValueEnumerationContext context)
+        {
+            return (GitHubCredentials)ResourceCredentials.TryCreate(GitHubCredentials.TypeName, name, environmentId: null, applicationId: context.ProjectId, inheritFromParent: false);
+        }
+
+        internal static GitHubCredentials TryCreate(string name, IComponentConfiguration config)
+        {
+            int? projectId = AH.ParseInt(AH.CoalesceString(config["ProjectId"], config["ApplicationId"]));
+            int? environmentId = AH.ParseInt(config["EnvironmentId"]);
+
+            return (GitHubCredentials)ResourceCredentials.TryCreate(GitHubCredentials.TypeName, name, environmentId: environmentId, applicationId: projectId, inheritFromParent: false);
+        }
+        internal static GitHubCredentials TryCreate(string name, IOperationConfiguration config)
+        {
+            int? projectId = AH.ParseInt(AH.CoalesceString(config["ProjectId"], config["ApplicationId"]));
+            int? environmentId = AH.ParseInt(config["EnvironmentId"]);
+
+            return (GitHubCredentials)ResourceCredentials.TryCreate(GitHubCredentials.TypeName, name, environmentId: environmentId, applicationId: projectId, inheritFromParent: false);
+        }
     }
 }
diff --git a/Git/GitHub.InedoExtension/Operations/GitHubSetStatusOperation.cs b/Git/GitHub.InedoExtension/Operations/GitHubSetStatusOperation.cs
@@ -124,7 +124,7 @@ public override async Task ExecuteAsync(IOperationExecutionContext context)
 
         protected override ExtendedRichDescription GetDescription(IOperationConfiguration config)
         {
-            var credentials = string.IsNullOrEmpty(config[nameof(CredentialName)]) ? null : ResourceCredentials.Create<GitHubCredentials>(config[nameof(CredentialName)]);
+            var credentials = string.IsNullOrEmpty(config[nameof(CredentialName)]) ? null : GitHubCredentials.TryCreate(config[nameof(CredentialName)], config);
             var repositoryOwner = AH.CoalesceString(config[nameof(OrganizationName)], credentials?.OrganizationName, config[nameof(UserName)], credentials?.UserName, "(unknown)");
             var repositoryName = AH.CoalesceString(config[nameof(RepositoryName)], credentials?.RepositoryName, "(unknown)");
             return new ExtendedRichDescription(

diff --git a/Git/GitHub.InedoExtension/SuggestionProviders/MilestoneSuggestionProvider.cs b/Git/GitHub.InedoExtension/SuggestionProviders/MilestoneSuggestionProvider.cs
@@ -3,7 +3,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Inedo.Extensibility;
-using Inedo.Extensibility.Credentials;
 using Inedo.Extensions.GitHub.Clients;
 using Inedo.Extensions.GitHub.Credentials;
 using Inedo.Web;
@@ -19,7 +18,9 @@ public async Task<IEnumerable<string>> GetSuggestionsAsync(IComponentConfigurati
             if (string.IsNullOrEmpty(credentialName))
                 return Enumerable.Empty<string>();
 
-            var credentials = ResourceCredentials.Create<GitHubCredentials>(credentialName);
+            var credentials = GitHubCredentials.TryCreate(credentialName, config);
+            if (credentials == null)
+                return Enumerable.Empty<string>();
 
             string ownerName = AH.CoalesceString(credentials.OrganizationName, credentials.UserName);
             string repositoryName = AH.CoalesceString(config["RepositoryName"], credentials.RepositoryName);

diff --git a/Git/GitHub.InedoExtension/SuggestionProviders/OrganizationNameSuggestionProvider.cs b/Git/GitHub.InedoExtension/SuggestionProviders/OrganizationNameSuggestionProvider.cs
@@ -19,7 +19,9 @@ public async Task<IEnumerable<string>> GetSuggestionsAsync(IComponentConfigurati
             if (string.IsNullOrEmpty(credentialName))
                 return Enumerable.Empty<string>();
 
-            var credentials = ResourceCredentials.Create<GitHubCredentials>(credentialName);
+            var credentials = GitHubCredentials.TryCreate(credentialName, config);
+            if (credentials == null)
+                return Enumerable.Empty<string>();
 
             string ownerName = AH.CoalesceString(credentials.OrganizationName, credentials.UserName);
 

diff --git a/Git/GitHub.InedoExtension/SuggestionProviders/RepositoryNameSuggestionProvider.cs b/Git/GitHub.InedoExtension/SuggestionProviders/RepositoryNameSuggestionProvider.cs
@@ -19,7 +19,9 @@ public async Task<IEnumerable<string>> GetSuggestionsAsync(IComponentConfigurati
             if (string.IsNullOrEmpty(credentialName))
                 return Enumerable.Empty<string>();
 
-            var credentials = ResourceCredentials.Create<GitHubCredentials>(credentialName);
+            var credentials = GitHubCredentials.TryCreate(credentialName, config);
+            if (credentials == null)
+                return Enumerable.Empty<string>();
 
             string ownerName = AH.CoalesceString(credentials.OrganizationName, credentials.UserName);
 

diff --git a/Git/GitLab.InedoExtension/Credentials/GitLabCredentials.cs b/Git/GitLab.InedoExtension/Credentials/GitLabCredentials.cs
@@ -2,6 +2,9 @@
 using System.Security;
 using Inedo.Documentation;
 using Inedo.Extensibility;
+using Inedo.Extensibility.Credentials;
+using Inedo.Extensibility.ListVariableSources;
+using Inedo.Extensibility.Operations;
 using Inedo.Extensions.Credentials;
 using Inedo.Extensions.GitLab.Clients;
 using Inedo.Extensions.GitLab.SuggestionProviders;
@@ -10,12 +13,14 @@
 
 namespace Inedo.Extensions.GitLab.Credentials
 {
-    [ScriptAlias("GitLab")]
+    [ScriptAlias(GitLabCredentials.TypeName)]
     [DisplayName("GitLab")]
     [Description("Credentials for GitLab.")]
     [PersistFrom("Inedo.Extensions.Credentials.GitLabCredentials,GitLab")]
     public sealed class GitLabCredentials : GitCredentialsBase
     {
+        public const string TypeName = "GitLab";
+
         [Persistent]
         [DisplayName("API URL")]
         [PlaceholderText(GitLabClient.GitLabComUrl)]
@@ -57,5 +62,25 @@ public override RichDescription GetDescription()
 
             return desc;            
         }
+
+        internal static GitLabCredentials TryCreate(string name, ValueEnumerationContext context)
+        {
+            return (GitLabCredentials)ResourceCredentials.TryCreate(GitLabCredentials.TypeName, name, environmentId: null, applicationId: context.ProjectId, inheritFromParent: false);
+        }
+
+        internal static GitLabCredentials TryCreate(string name, IComponentConfiguration config)
+        {
+            int? projectId = AH.ParseInt(AH.CoalesceString(config["ProjectId"], config["ApplicationId"]));
+            int? environmentId = AH.ParseInt(config["EnvironmentId"]);
+
+            return (GitLabCredentials)ResourceCredentials.TryCreate(GitLabCredentials.TypeName, name, environmentId: environmentId, applicationId: projectId, inheritFromParent: false);
+        }
+        internal static GitLabCredentials TryCreate(string name, IOperationConfiguration config)
+        {
+            int? projectId = AH.ParseInt(AH.CoalesceString(config["ProjectId"], config["ApplicationId"]));
+            int? environmentId = AH.ParseInt(config["EnvironmentId"]);
+
+            return (GitLabCredentials)ResourceCredentials.TryCreate(GitLabCredentials.TypeName, name, environmentId: environmentId, applicationId: projectId, inheritFromParent: false);
+        }
     }
 }
diff --git a/Git/GitLab.InedoExtension/SuggestionProviders/GroupNameSuggestionProvider.cs b/Git/GitLab.InedoExtension/SuggestionProviders/GroupNameSuggestionProvider.cs
@@ -19,7 +19,9 @@ public async Task<IEnumerable<string>> GetSuggestionsAsync(IComponentConfigurati
             if (string.IsNullOrEmpty(credentialName))
                 return Enumerable.Empty<string>();
 
-            var credentials = ResourceCredentials.Create<GitLabCredentials>(credentialName);
+            var credentials = GitLabCredentials.TryCreate(credentialName, config);
+            if (credentials == null)
+                return Enumerable.Empty<string>();
 
             string ownerName = AH.CoalesceString(credentials.GroupName, credentials.UserName);
 

diff --git a/Git/GitLab.InedoExtension/SuggestionProviders/MilestoneSuggestionProvider.cs b/Git/GitLab.InedoExtension/SuggestionProviders/MilestoneSuggestionProvider.cs
@@ -19,7 +19,9 @@ public async Task<IEnumerable<string>> GetSuggestionsAsync(IComponentConfigurati
             if (string.IsNullOrEmpty(credentialName))
                 return Enumerable.Empty<string>();
 
-            var credentials = ResourceCredentials.Create<GitLabCredentials>(credentialName);
+            var credentials = GitLabCredentials.TryCreate(credentialName, config);
+            if (credentials == null)
+                return Enumerable.Empty<string>();
 
             string ownerName = AH.CoalesceString(credentials.GroupName, credentials.UserName);
             string repositoryName = AH.CoalesceString(config["ProjectName"], credentials.ProjectName);

diff --git a/Git/GitLab.InedoExtension/SuggestionProviders/ProjectNameSuggestionProvider.cs b/Git/GitLab.InedoExtension/SuggestionProviders/ProjectNameSuggestionProvider.cs
@@ -19,7 +19,9 @@ public async Task<IEnumerable<string>> GetSuggestionsAsync(IComponentConfigurati
             if (string.IsNullOrEmpty(credentialName))
                 return Enumerable.Empty<string>();
 
-            var credentials = ResourceCredentials.Create<GitLabCredentials>(credentialName);
+            var credentials = GitLabCredentials.TryCreate(credentialName, config);
+            if (credentials == null)
+                return Enumerable.Empty<string>();
 
             string ownerName = AH.CoalesceString(credentials.GroupName, credentials.UserName);