v1.0.6

swhitley · swhitley · commit e64659992d23 · 2021-12-27T09:03:15.000-08:00
- Set drive "owned by" to uploading account.
diff --git a/CLARiNET.csproj b/CLARiNET.csproj
@@ -7,7 +7,7 @@
     <PackageIcon>CLARiNET.ico</PackageIcon>
     <PackageIconUrl />
     <ApplicationIcon>CLARiNET.ico</ApplicationIcon>
-    <Version>1.0.5</Version>
+    <Version>1.0.6</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DriveApi.cs b/DriveApi.cs
@@ -9,7 +9,7 @@ namespace CLARiNET
 {
     internal class DriveApi
     {
-        public static string BuildSoapRequest(string file, string contents, bool trashed)
+        public static string BuildSoapRequest(string file, string contents, string uploadedBy, bool trashed)
         {
             string xmlData = "";
             string delimiter = "~";
@@ -47,7 +47,12 @@ public static string BuildSoapRequest(string file, string contents, bool trashed
                 xmlData = xmlData.Replace("{contents}", contents)
                     .Replace("{document_wid}", wid)
                     .Replace("{filename}", filename)
-                    .Replace("{username}", username);
+                    .Replace("{owned_by_username}", username)
+                    .Replace("{uploaded_by_username}", username);
+            }
+            else
+            {
+                throw new Exception("Could not parse file name or read input line.");
             }
 
             return xmlData;
diff --git a/Program.cs b/Program.cs
@@ -70,8 +70,7 @@ static void Main(string[] args)
                 }
 
                 // API Call
-                string result = "";
-                options.Username = options.Username + "@" + options.Tenant;
+                string result = "";         
                 restUrl = cloudRepoUrl.Replace("{host}", host) + cloudCollection;
                 soapUrl = soapUrl.Replace("{tenant}", options.Tenant).Replace("{version}", "v37.0");
 
@@ -94,26 +93,29 @@ static void Main(string[] args)
                         case Command.CLAR_UPLOAD:
                             bytes = File.ReadAllBytes(file);
                             Console.WriteLine("\n\nDeploying the CLAR and awaiting the result...\n\n");
-                            result = WDWebService.CallRest(options.Tenant, options.Username, options.Password, restUrl, "PUT", bytes);
+                            result = WDWebService.CallRest(options.Tenant, options.Username + "@" + options.Tenant, options.Password, restUrl, "PUT", bytes);
                             break;
                         case Command.DRIVE_UPLOAD:
                             bytes = File.ReadAllBytes(file);
-                            result = DriveUpload(file, bytes, soapUrl);
+                            result = DriveUpload(file, bytes, soapUrl, options.Username);
                             break;
                         case Command.DRIVE_TRASH:
-                            result = DriveTrash(file, soapUrl);
+                            result = DriveTrash(file, soapUrl, options.Username);
                             break;
                     }
 
-                    if (result.IndexOf("<?xml") < 0 && result.IndexOf("<SOAP") < 0)
+                    if (result.ToLower().IndexOf("<html") >= 0)
                     {
                         Console.WriteLine("No XML response detected.  Workday may be unavailable or your parameters are incorrect.");
                     }
                     else
                     {
-                        Console.WriteLine("Result for " + file + "\n");
-                        Console.WriteLine(result);
-                        Console.WriteLine("\n\n");
+                        if (!String.IsNullOrEmpty(result))
+                        {
+                            Console.WriteLine("Result for " + file + "\n");
+                            Console.WriteLine(result);
+                            Console.WriteLine("\n\n");
+                        }
                     }
                 }
             }
@@ -436,7 +438,7 @@ static string SoapUrlBuild()
             return soapUrl;
         }
 
-        static string DriveUpload(string file, byte[] bytes, string soapUrl)
+        static string DriveUpload(string file, byte[] bytes, string soapUrl, string uploadedBy)
         {
             string result = "";
             try
@@ -445,8 +447,8 @@ static string DriveUpload(string file, byte[] bytes, string soapUrl)
                 {
                     Console.WriteLine("\n\nUploading " + file + " to Drive and awaiting the result...\n\n");
                     string fileContents = Convert.ToBase64String(bytes);
-                    string xmlData = DriveApi.BuildSoapRequest(file, fileContents, false);
-                    result = WDWebService.CallAPI(options.Username, options.Password, soapUrl, xmlData);
+                    string xmlData = DriveApi.BuildSoapRequest(file, fileContents, uploadedBy, false);
+                    result = WDWebService.CallAPI(options.Username + "@" + options.Tenant, options.Password, soapUrl, xmlData);
                     if (result.IndexOf("<?xml") == 0)
                     {
                         string processedFile = Path.Combine(processedDir, Path.GetFileName(file));
@@ -469,16 +471,16 @@ static string DriveUpload(string file, byte[] bytes, string soapUrl)
             return result;
         }
 
-        static string DriveTrash(string file, string soapUrl)
+        static string DriveTrash(string file, string soapUrl, string uploadedBy)
         {
             string result = "";
             try
             {
                 if (file.Trim().Length > 0)
                 {
                     Console.WriteLine("\n\nTrashing " + file + " in Drive and awaiting the result...\n\n");
-                    string xmlData = DriveApi.BuildSoapRequest(file, "", true);
-                    result = WDWebService.CallAPI(options.Username, options.Password, soapUrl, xmlData);
+                    string xmlData = DriveApi.BuildSoapRequest(file, "", uploadedBy, true);
+                    result = WDWebService.CallAPI(options.Username + "@" + options.Tenant, options.Password, soapUrl, xmlData);
                 }
             }
             catch (Exception ex)
diff --git a/Resources.Designer.cs b/Resources.Designer.cs
diff --git a/Resources.resx b/Resources.resx
@@ -126,12 +126,12 @@
 		&lt;bsvc:Workdrive_Item_Generic_Data&gt;
 			&lt;bsvc:Drive_Item_Name&gt;{filename}&lt;/bsvc:Drive_Item_Name&gt;
 			&lt;bsvc:Owned_By_Reference&gt;
-				&lt;bsvc:ID bsvc:type="WorkdayUserName"&gt;{username}&lt;/bsvc:ID&gt;
+				&lt;bsvc:ID bsvc:type="WorkdayUserName"&gt;{owned_by_username}&lt;/bsvc:ID&gt;
 			&lt;/bsvc:Owned_By_Reference&gt;
 		&lt;/bsvc:Workdrive_Item_Generic_Data&gt;
 		&lt;bsvc:File&gt;{contents}&lt;/bsvc:File&gt;
 		&lt;bsvc:Drive_File_Uploaded_By_Reference&gt;
-			&lt;bsvc:ID bsvc:type="WorkdayUserName"&gt;{username}&lt;/bsvc:ID&gt;
+			&lt;bsvc:ID bsvc:type="WorkdayUserName"&gt;{uploaded_by_username}&lt;/bsvc:ID&gt;
 		&lt;/bsvc:Drive_File_Uploaded_By_Reference&gt;
 	&lt;/bsvc:Drive_Document_Content_Data&gt;
 &lt;/bsvc:Put_Drive_Document_Content_Request&gt;</value>
@@ -148,11 +148,11 @@
 			&lt;bsvc:Drive_Item_Name&gt;{filename}&lt;/bsvc:Drive_Item_Name&gt;
 			&lt;bsvc:Trashed&gt;true&lt;/bsvc:Trashed&gt;
 			&lt;bsvc:Owned_By_Reference&gt;
-				&lt;bsvc:ID bsvc:type="WorkdayUserName"&gt;{username}&lt;/bsvc:ID&gt;
+				&lt;bsvc:ID bsvc:type="WorkdayUserName"&gt;{owned_by_username}&lt;/bsvc:ID&gt;
 			&lt;/bsvc:Owned_By_Reference&gt;
 		&lt;/bsvc:Workdrive_Item_Generic_Data&gt;		
 		&lt;bsvc:Drive_File_Uploaded_By_Reference&gt;
-			&lt;bsvc:ID bsvc:type="WorkdayUserName"&gt;{username}&lt;/bsvc:ID&gt;
+			&lt;bsvc:ID bsvc:type="WorkdayUserName"&gt;{uploaded_by_username}&lt;/bsvc:ID&gt;
 		&lt;/bsvc:Drive_File_Uploaded_By_Reference&gt;
 	&lt;/bsvc:Drive_Document_Content_Data&gt;
 &lt;/bsvc:Put_Drive_Document_Content_Request&gt;</value>

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace CLARiNET`
`9`	`9`	`{`
`10`	`10`	`internal class DriveApi`
`11`	`11`	`{`
`12`		`- public static string BuildSoapRequest(string file, string contents, bool trashed)`
	`12`	`+ public static string BuildSoapRequest(string file, string contents, string uploadedBy, bool trashed)`
`13`	`13`	`{`
`14`	`14`	`string xmlData = "";`
`15`	`15`	`string delimiter = "~";`
`@@ -47,7 +47,12 @@ public static string BuildSoapRequest(string file, string contents, bool trashed`
`47`	`47`	`xmlData = xmlData.Replace("{contents}", contents)`
`48`	`48`	`.Replace("{document_wid}", wid)`
`49`	`49`	`.Replace("{filename}", filename)`
`50`		`- .Replace("{username}", username);`
	`50`	`+ .Replace("{owned_by_username}", username)`
	`51`	`+ .Replace("{uploaded_by_username}", username);`
	`52`	`+ }`
	`53`	`+ else`
	`54`	`+ {`
	`55`	`+ throw new Exception("Could not parse file name or read input line.");`
`51`	`56`	`}`
`52`	`57`
`53`	`58`	`return xmlData;`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,7 @@ static void Main(string[] args)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// API Call`
`73`		`- string result = "";`
`74`		`- options.Username = options.Username + "@" + options.Tenant;`
	`73`	`+ string result = "";`
`75`	`74`	`restUrl = cloudRepoUrl.Replace("{host}", host) + cloudCollection;`
`76`	`75`	`soapUrl = soapUrl.Replace("{tenant}", options.Tenant).Replace("{version}", "v37.0");`
`77`	`76`
`@@ -94,26 +93,29 @@ static void Main(string[] args)`
`94`	`93`	`case Command.CLAR_UPLOAD:`
`95`	`94`	`bytes = File.ReadAllBytes(file);`
`96`	`95`	`Console.WriteLine("\n\nDeploying the CLAR and awaiting the result...\n\n");`
`97`		`- result = WDWebService.CallRest(options.Tenant, options.Username, options.Password, restUrl, "PUT", bytes);`
	`96`	`+ result = WDWebService.CallRest(options.Tenant, options.Username + "@" + options.Tenant, options.Password, restUrl, "PUT", bytes);`
`98`	`97`	`break;`
`99`	`98`	`case Command.DRIVE_UPLOAD:`
`100`	`99`	`bytes = File.ReadAllBytes(file);`
`101`		`- result = DriveUpload(file, bytes, soapUrl);`
	`100`	`+ result = DriveUpload(file, bytes, soapUrl, options.Username);`
`102`	`101`	`break;`
`103`	`102`	`case Command.DRIVE_TRASH:`
`104`		`- result = DriveTrash(file, soapUrl);`
	`103`	`+ result = DriveTrash(file, soapUrl, options.Username);`
`105`	`104`	`break;`
`106`	`105`	`}`
`107`	`106`
`108`		`- if (result.IndexOf("<?xml") < 0 && result.IndexOf("<SOAP") < 0)`
	`107`	`+ if (result.ToLower().IndexOf("<html") >= 0)`
`109`	`108`	`{`
`110`	`109`	`Console.WriteLine("No XML response detected. Workday may be unavailable or your parameters are incorrect.");`
`111`	`110`	`}`
`112`	`111`	`else`
`113`	`112`	`{`
`114`		`- Console.WriteLine("Result for " + file + "\n");`
`115`		`- Console.WriteLine(result);`
`116`		`- Console.WriteLine("\n\n");`
	`113`	`+ if (!String.IsNullOrEmpty(result))`
	`114`	`+ {`
	`115`	`+ Console.WriteLine("Result for " + file + "\n");`
	`116`	`+ Console.WriteLine(result);`
	`117`	`+ Console.WriteLine("\n\n");`
	`118`	`+ }`
`117`	`119`	`}`
`118`	`120`	`}`
`119`	`121`	`}`
`@@ -436,7 +438,7 @@ static string SoapUrlBuild()`
`436`	`438`	`return soapUrl;`
`437`	`439`	`}`
`438`	`440`
`439`		`- static string DriveUpload(string file, byte[] bytes, string soapUrl)`
	`441`	`+ static string DriveUpload(string file, byte[] bytes, string soapUrl, string uploadedBy)`
`440`	`442`	`{`
`441`	`443`	`string result = "";`
`442`	`444`	`try`
`@@ -445,8 +447,8 @@ static string DriveUpload(string file, byte[] bytes, string soapUrl)`
`445`	`447`	`{`
`446`	`448`	`Console.WriteLine("\n\nUploading " + file + " to Drive and awaiting the result...\n\n");`
`447`	`449`	`string fileContents = Convert.ToBase64String(bytes);`
`448`		`- string xmlData = DriveApi.BuildSoapRequest(file, fileContents, false);`
`449`		`- result = WDWebService.CallAPI(options.Username, options.Password, soapUrl, xmlData);`
	`450`	`+ string xmlData = DriveApi.BuildSoapRequest(file, fileContents, uploadedBy, false);`
	`451`	`+ result = WDWebService.CallAPI(options.Username + "@" + options.Tenant, options.Password, soapUrl, xmlData);`
`450`	`452`	`if (result.IndexOf("<?xml") == 0)`
`451`	`453`	`{`
`452`	`454`	`string processedFile = Path.Combine(processedDir, Path.GetFileName(file));`
`@@ -469,16 +471,16 @@ static string DriveUpload(string file, byte[] bytes, string soapUrl)`
`469`	`471`	`return result;`
`470`	`472`	`}`
`471`	`473`
`472`		`- static string DriveTrash(string file, string soapUrl)`
	`474`	`+ static string DriveTrash(string file, string soapUrl, string uploadedBy)`
`473`	`475`	`{`
`474`	`476`	`string result = "";`
`475`	`477`	`try`
`476`	`478`	`{`
`477`	`479`	`if (file.Trim().Length > 0)`
`478`	`480`	`{`
`479`	`481`	`Console.WriteLine("\n\nTrashing " + file + " in Drive and awaiting the result...\n\n");`
`480`		`- string xmlData = DriveApi.BuildSoapRequest(file, "", true);`
`481`		`- result = WDWebService.CallAPI(options.Username, options.Password, soapUrl, xmlData);`
	`482`	`+ string xmlData = DriveApi.BuildSoapRequest(file, "", uploadedBy, true);`
	`483`	`+ result = WDWebService.CallAPI(options.Username + "@" + options.Tenant, options.Password, soapUrl, xmlData);`
`482`	`484`	`}`
`483`	`485`	`}`
`484`	`486`	`catch (Exception ex)`