New: Add additional functionality for resource and new resource fields

coscine/issues#283

src/Project/Controllers/DataSourceController.cs

@@ -75,11 +75,17 @@ namespace Coscine.Api.Project.Controllers
 
             if (resource.Type.DisplayName.ToLower() == "rds")
             {
-                authHeader = BuildRdsAuthHeader(resource.ExternalId);
+                RDSResourceTypeModel rdsResourceTypeModel = new RDSResourceTypeModel();
+                var rdsResourceType = rdsResourceTypeModel.GetById(resource.ResourceTypeOptionId.Value);
+
+                authHeader = BuildRdsAuthHeader(rdsResourceType);
             }
             else if (resource.Type.DisplayName.ToLower() == "gitlab")
             {
-                authHeader = BuildGitlabAuthHeader(resource.ExternalId, resource.Url);
+                GitlabResourceTypeModel gitlabResourceTypeModel = new GitlabResourceTypeModel();
+                var gitlabResourceType = gitlabResourceTypeModel.GetById(resource.ResourceTypeOptionId.Value);
+
+                authHeader = BuildGitlabAuthHeader(gitlabResourceType);
             }
 
             if (authHeader != null)
@@ -146,39 +152,39 @@ namespace Coscine.Api.Project.Controllers
             return _jwtHandler.GenerateJwtToken(payload);
         }
 
-        private string BuildRdsAuthHeader(string bucketname)
+        private string BuildRdsAuthHeader(RDSResourceType rdsResourceType)
         {
             var auth = new Dictionary<string, object>();
 
             var credentials = new Dictionary<string, object>
             {
-                { "access_key", _configuration.GetString("coscine/global/rds_access_key") },
-                { "secret_key", _configuration.GetString("coscine/global/rds_secret_key") }
+                { "access_key", rdsResourceType.AccessKey },
+                { "secret_key", rdsResourceType.SecretKey }
             };
 
             var settings = new Dictionary<string, object>
             {
-                { "bucket", bucketname }
+                { "bucket", rdsResourceType.BucketName }
             };
 
             return BuildWaterbutlerPayload(auth, credentials, settings);
         }
 
-        private string BuildGitlabAuthHeader(string externalId, string url)
+        private string BuildGitlabAuthHeader(GitlabResourceType gitlabResourceType)
         {
 
             var auth = new Dictionary<string, object>();
 
             var credentials = new Dictionary<string, object>
             {
-                { "token", _configuration.GetString("coscine/global/gitlabtoken") }
+                { "token", gitlabResourceType.Token }
             };
 
             var settings = new Dictionary<string, object>
             {
                 {"owner", "Tester"},
-                {"repo", url},
-                { "repo_id", externalId},
+                { "repo", gitlabResourceType.RepositoryUrl},
+                { "repo_id", gitlabResourceType.RepositoryNumber},
                 { "host", "https://git.rwth-aachen.de"}
             };