Tokens will refresh and retry after 401, methods for jobs, projects, releases, versions, paths, some refactoring and naming cleanup, new tests

Author: mibewh

Folder.DotSettings.user

@@ -6,7 +6,7 @@
     <RootNamespace>CloudCMS</RootNamespace>
 
     <PackageId>cloudcms</PackageId>
-    <PackageVersion>1.1.5</PackageVersion>
+    <PackageVersion>1.1.6</PackageVersion>
     <Title>CloudCMS Driver</Title>
     <Description>C# .NET driver for CloudCMS</Description>
     <Summary>C# .NET driver for CloudCMS</Summary>

cloudcms-csharp-driver.csproj

@@ -6,6 +6,7 @@
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using System.Collections.Generic;
+using System.Net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using CloudCMS;
@@ -105,12 +106,24 @@ public async Task<JObject> PostAsync(string uri, IDictionary<string, string> que
             return await RequestAsync(uri, method, queryParams, body);
         }
 
+        public Task<JObject> PostAsync(string uri, IDictionary<string, string> queryParams, JObject body)
+        {
+            HttpContent content = new StringContent(body.ToString());
+            return PostAsync(uri, queryParams, content);
+        }
+
         public async Task<JObject> PutAsync(string uri, IDictionary<string, string> queryParams = null, HttpContent body = null)
         {
             HttpMethod method = HttpMethod.Put;
             return await RequestAsync(uri, method, queryParams, body);
         }
 
+        public Task<JObject> PutAsync(string uri, IDictionary<string, string> queryParams, JObject body)
+        {
+            HttpContent content = new StringContent(body.ToString());
+            return PutAsync(uri, queryParams, content);
+        }
+
         public async Task<JObject> DeleteAsync(string uri, IDictionary<string, string> queryParams = null)
         {
             HttpMethod method = HttpMethod.Delete;
@@ -148,6 +161,14 @@ public async Task UploadAsync(string uri, IDictionary<string, string> paramMap,
             HttpContent content = GenerateUploadContent(payloads);
             await _requestAsync(uri, HttpMethod.Post, paramMap, content);
         }
+
+        public async Task<IPlatform> ReadCurrentPlatform()
+        {
+            string uri = "/";
+            JObject response = await GetAsync(uri);
+            IPlatform result = new Platform(this, response);
+            return result;
+        }
 
         private HttpContent GenerateUploadContent(byte[] bytes, string mimetype)
         {
@@ -179,7 +200,13 @@ public async Task<JObject> RequestAsync(string uri, HttpMethod method, IDictiona
         {
             HttpResponseMessage response = await _requestAsync(uri, method, queryParams, body);
             string responseString = await response.Content.ReadAsStringAsync();
-            return JObject.Parse(responseString);
+            JObject result = JObject.Parse(responseString);
+
+            if (result.ContainsKey("error"))
+            {
+                throw new CloudCMSException("whoa");
+            }
+            return result;
         }
 
         public async Task<string> RequestStringAsync(string uri, HttpMethod method, IDictionary<string, string> queryParams = null, HttpContent body = null)
@@ -210,6 +237,17 @@ private async Task<HttpResponseMessage> _requestAsync(string uri, HttpMethod met
                 client.DefaultRequestHeaders.Authorization = auth;
 
                 HttpResponseMessage response = await client.SendAsync(request);
+                if (response.StatusCode == HttpStatusCode.Unauthorized)
+                {
+                    // Refresh and retry
+                    await RefreshTokenAsync();
+                    auth = new AuthenticationHeaderValue(token.token_type, token.access_token);
+                    client.DefaultRequestHeaders.Authorization = auth;
+                    
+                    request =  new HttpRequestMessage(method, url);
+                    response = await client.SendAsync(request);
+                }
+                    
                 if (!response.IsSuccessStatusCode)
                 {
                     string responseString = await response.Content.ReadAsStringAsync();
@@ -231,6 +269,11 @@ private string BuildUrl(string uri, IDictionary<string, string> queryParams)
                 query["full"] = "true";
             }
 
+            if (query["metadata"] == null)
+            {
+                query["metadata"] = "true";
+            }
+
             // Add all params to query string
             if (queryParams != null)
             {

src/CloudCMSDriver.cs

@@ -12,13 +12,16 @@ public interface ICloudCMSDriver
         Task<string> RequestStringAsync(string uri, HttpMethod method, IDictionary<string, string> queryParams = null, HttpContent body = null);
         Task<JObject> GetAsync(string uri, IDictionary<string, string> queryParams = null);
         Task<JObject> PostAsync(string uri, IDictionary<string, string> queryParams = null, HttpContent body = null);
+        Task<JObject> PostAsync(string uri, IDictionary<string, string> queryParams, JObject body);
         Task<JObject> PutAsync(string uri, IDictionary<string, string> queryParams = null, HttpContent body = null);
+        Task<JObject> PutAsync(string uri, IDictionary<string, string> queryParams, JObject body);
         Task<JObject> DeleteAsync(string uri, IDictionary<string, string> queryParams = null);
         Task<Stream> DownloadAsync(string uri);
         Task<byte[]> DownloadBytesAsync(string uri);
         Task UploadAsync(string uri, byte[] bytes, string mimetype, IDictionary<string, string> paramMap = null);
         Task UploadAsync(string uri, Stream stream, string mimetype, IDictionary<string, string> paramMap = null);
         Task UploadAsync(string uri, IDictionary<string, string> paramMap, IDictionary<string, AttachmentContent> payloads);
-
+        
+        Task<IPlatform> ReadCurrentPlatform();
     }
 }

src/ICloudCMSDriver.cs

@@ -212,7 +212,7 @@ public async Task<INode> RootNodeAsync()
             return (INode) await ReadNodeAsync("root");
         }
 
-        public async Task<JObject> GraphqlQuery(string query, string operationName = null, IDictionary<string, string> variables = null)
+        public async Task<JObject> GraphqlQueryAsync(string query, string operationName = null, IDictionary<string, string> variables = null)
         {
             string uri = this.URI + "/graphql";
 
@@ -236,10 +236,22 @@ public async Task<JObject> GraphqlQuery(string query, string operationName = nul
             return response;
         }
 
-        public Task<string> GraphqlSchema()
+        public Task<string> GraphqlSchemaAsync()
         {
             string uri = this.URI + "/graphql/schema";
             return Driver.RequestStringAsync(uri, HttpMethod.Get);
         }
+
+        public async Task<IJob> StartResetAsync(string changesetId)
+        {
+            string uri = URI + "/reset/start";
+            IDictionary<string, string> queryParams = new Dictionary<string, string>();
+            queryParams.Add("id", changesetId);
+
+            JObject response = await Driver.PostAsync(uri, queryParams, new JObject());
+            string jobId = response.GetValue("_doc").ToString();
+
+            return await Platform.ReadJobAsync(jobId);
+        }
     }
 }

src/branches/Branch.cs

@@ -23,8 +23,10 @@ public interface IBranch : IRepositoryDocument
 
         Task<INode> RootNodeAsync();
 
-        Task<JObject> GraphqlQuery(string query, string operationName=null, IDictionary<string, string> variables=null);
+        Task<JObject> GraphqlQueryAsync(string query, string operationName=null, IDictionary<string, string> variables=null);
 
-        Task<string> GraphqlSchema();
+        Task<string> GraphqlSchemaAsync();
+
+        Task<IJob> StartResetAsync(string changesetId);
     }
 }

src/branches/IBranch.cs

@@ -37,8 +37,5 @@ public async Task UpdateAsync()
             HttpContent content = new StringContent(Data.ToString());
             await Driver.PutAsync(URI, body: content);
         }
-
-        public abstract string TypeId { get; }
-        public abstract Reference Ref { get; }
     }
 }

src/documents/AbstractDocument.cs

@@ -0,0 +1,18 @@
+using Newtonsoft.Json.Linq;
+
+namespace CloudCMS
+{
+    public abstract class AbstractPlatformDocument : AbstractDocument, IPlatformDocument
+    {
+        public IPlatform Platform { get; }
+
+        protected AbstractPlatformDocument(IPlatform platform, JObject obj) : base(platform.Driver, obj)
+        {
+            Platform = platform;
+        }
+        
+        public abstract Reference Ref { get; }
+
+        public abstract string TypeId { get; }
+    }
+}

src/documents/AbstractPlatformDocument.cs

@@ -3,7 +3,7 @@
 
 namespace CloudCMS
 {
-    public interface IDocument : ITypedID, IReferenceable
+    public interface IDocument
     {
         string Id { get; set; }
 

src/documents/IDocument.cs

@@ -0,0 +1,7 @@
+namespace CloudCMS
+{
+    public interface IPlatformDocument : IDocument, IReferenceable, ITypedID
+    {
+        IPlatform Platform { get; }
+    }
+}