Skip to content

Commit

Permalink
Merge pull request #6 from dropbox/jack-updates
Browse files Browse the repository at this point in the history 
4.1
  • Loading branch information
@jackb-dropbox
jackb-dropbox authored Sep 21, 2016
2 parents 594ac91 + b709f70 commit 4167eb5
Show file tree
Hide file tree
Showing 12 changed files with 220 additions and 105 deletions.
Binary file modified Installer/DBAdminToolkit.Setup.zip
View file
Binary file not shown.
91 changes: 77 additions & 14 deletions Source/DBAdminToolkit.Setup/DBAdminToolkit.Setup.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@
}
"Entry"
{
"MsmKey" = "8:_518A735363D64D80BAB4864F321FBD01"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_5661ECFE82564529A2FCAA07988A44AF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -99,6 +105,12 @@
}
"Entry"
{
"MsmKey" = "8:_949030045CBA4F5090FA4DBB6CA51E8F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_98D806DD5327570DE7FD64E4DBD7FD2B"
"OwnerKey" = "8:_4A6B6FBF12AC43BB83F88A643D56B1CE"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -136,61 +148,61 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_29597E39965D4D82B7C1E43E5262B5D8"
"OwnerKey" = "8:_20D2D1C0384C24D624835FDEEA55E755"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_A4152587AA564BE2471A6D4C0F596B87"
"OwnerKey" = "8:_604E624E49524AB483464DD673E08914"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_2EEC1DA55561C2D8DA9E1CA61339695B"
"OwnerKey" = "8:_98D806DD5327570DE7FD64E4DBD7FD2B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_2E62269EFD269AEF848109100FDA0E52"
"OwnerKey" = "8:_BEC6DA59794123F937E6DB1C4BB41961"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_692BA171A886727BC0AB5754FBD09D80"
"OwnerKey" = "8:_8E616154BC4D8F6BDB3BC1C2BA7CAFB7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_8E616154BC4D8F6BDB3BC1C2BA7CAFB7"
"OwnerKey" = "8:_692BA171A886727BC0AB5754FBD09D80"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_BEC6DA59794123F937E6DB1C4BB41961"
"OwnerKey" = "8:_2E62269EFD269AEF848109100FDA0E52"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_98D806DD5327570DE7FD64E4DBD7FD2B"
"OwnerKey" = "8:_2EEC1DA55561C2D8DA9E1CA61339695B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_604E624E49524AB483464DD673E08914"
"OwnerKey" = "8:_A4152587AA564BE2471A6D4C0F596B87"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_20D2D1C0384C24D624835FDEEA55E755"
"OwnerKey" = "8:_29597E39965D4D82B7C1E43E5262B5D8"
"MsmSig" = "8:_UNDEFINED"
}
}
Expand Down Expand Up @@ -318,7 +330,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:ProviderLauncher, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:ProviderLauncher, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_29597E39965D4D82B7C1E43E5262B5D8"
Expand Down Expand Up @@ -401,7 +413,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:DfBAdminToolkit, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:DfBAdminToolkit, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_4A6B6FBF12AC43BB83F88A643D56B1CE"
Expand All @@ -428,6 +440,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_518A735363D64D80BAB4864F321FBD01"
{
"SourcePath" = "8:..\\..\\..\\..\\ProvisioningTemplate.csv"
"TargetName" = "8:ProvisioningTemplate.csv"
"Tag" = "8:"
"Folder" = "8:_DF991A4076234D9C941D22E5025CD05C"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5661ECFE82564529A2FCAA07988A44AF"
{
"SourcePath" = "8:..\\DfBAdminToolkit\\app.manifest"
Expand Down Expand Up @@ -571,6 +603,26 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_949030045CBA4F5090FA4DBB6CA51E8F"
{
"SourcePath" = "8:..\\..\\..\\..\\UpdateMembersTemplate.csv"
"TargetName" = "8:UpdateMembersTemplate.csv"
"Tag" = "8:"
"Folder" = "8:_DF991A4076234D9C941D22E5025CD05C"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_98D806DD5327570DE7FD64E4DBD7FD2B"
{
"AssemblyRegister" = "3:1"
Expand Down Expand Up @@ -721,6 +773,17 @@
"Property" = "8:TARGETDIR"
"Folders"
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_DF991A4076234D9C941D22E5025CD05C"
{
"Name" = "8:Templates"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Property" = "8:_7FBA90444E11439EB38206A7E0A12DE9"
"Folders"
{
}
}
}
}
"{1525181F-901A-416C-8A58-119130FE478E}:_6E0C177DEB914B8EA568D08C12583CE3"
Expand Down Expand Up @@ -750,15 +813,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Dropbox Business Admin Toolkit"
"ProductCode" = "8:{FE93966C-DFA1-4F23-BCA8-FEAC7D424855}"
"ProductCode" = "8:{F095753C-0E82-4DEA-B5B4-4A6D3EB75D53}"
"PackageCode" = "8:{4F507568-2104-402C-812B-BF0F65944546}"
"UpgradeCode" = "8:{F6F4214B-C1CB-4F20-B1B3-35E1B7262F93}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:4.0.0"
"ProductVersion" = "8:4.1.0"
"Manufacturer" = "8:Dropbox Enterprise Services"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down
4 changes: 2 additions & 2 deletions Source/DfBAdminToolkit.Common/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.0.0.0")]
[assembly: AssemblyFileVersion("4.0.0.0")]
[assembly: AssemblyVersion("4.1.0.0")]
[assembly: AssemblyFileVersion("4.1.0.0")]
2 changes: 1 addition & 1 deletion Source/DfBAdminToolkit.Common/Services/MemberServices.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ public IServiceResponse CreateGroup(string groupName, string authToken)
request.RequestFormat = DataFormat.Json;
client.UserAgent = UserAgentVersion;
IRestResponse response = client.Execute(request);
serviceResponse = new ServiceResponse(response.StatusCode, response.ErrorMessage);
serviceResponse = new ServiceResponse(response.StatusCode, response.Content);
}
else
{
Expand Down
23 changes: 13 additions & 10 deletions Source/DfBAdminToolkit/ErrorMessages.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,35 @@
public static class ErrorMessages
{
public readonly static string DLG_DEFAULT_TITLE = "Dropbox Business Admin Toolkit";
public readonly static string MISSING_QUERYSTRING = "You must enter a query string first";
public readonly static string MISSING_QUERYSTRING = "You must enter a query string first.";
public readonly static string INVALID_TOKEN = "You must provide a valid access token first";
public readonly static string INVALID_TOKEN_AND_USER = "You must provide a valid access token, and select a user from the list";
public readonly static string INVALID_DUMP_FILE_SELECTION = "You must choose at least one file to dump locally";
public readonly static string INVALID_CSV_FILE = "Please provide a valid CSV file";
public readonly static string MISSING_CSV_FILE = "Selected CSV file no longer exists";
public readonly static string INVALID_CSV_DATA = "CSV file contains invalid data";
public readonly static string INVALID_TOKEN_AND_USER = "You must provide a valid access token, and select a user from the list.";
public readonly static string INVALID_DUMP_FILE_SELECTION = "You must choose at least one file to dump locally.";
public readonly static string INVALID_CSV_FILE = "Please provide a valid CSV file.";
public readonly static string MISSING_CSV_FILE = "Selected CSV file no longer exists.";
public readonly static string INVALID_CSV_DATA = "CSV file contains invalid data.";
public readonly static string FAILED_TO_ADD_MEMBER = "Bad request to the API, possibly due to no permissions on your app to add members.";
public readonly static string FAILED_TO_REMOVE_MEMBER = "Bad request to the API, possibly due to no permissions on your app to remove members.";
public readonly static string FAILED_TO_SUSPEND_MEMBER = "Bad request to the API, possibly due to no permissions on your app to suspend members.";
public readonly static string FAILED_TO_UNSUSPEND_MEMBER = "Bad request to the API, possibly due to no permissions on your app to unsuspend members.";
public readonly static string FAILED_TO_UPDATE_PROFILE = "Bad request to the API, possibly due to no permissions on your app to update profiles.";
public readonly static string USER_NOT_FOUND = "No matching user found. The provided email does not exist on this team.";
public readonly static string USER_NOT_IN_TEAM = "The user is not a member of this team.";
public readonly static string MISSING_ROLE = "Please select a user role first";
public readonly static string MISSING_OUTPUT_FOLDER = "Please select output directory first";
public readonly static string MISSING_FILES = "Please list file(s) first. You can do this by right-click and choose [ List file(s) ] option";
public readonly static string MISSING_ROLE = "Please select a user role first.";
public readonly static string MISSING_OUTPUT_FOLDER = "Please select output directory first.";
public readonly static string MISSING_FILES = "Please list file(s) first. You can do this by right-click and choose [ List file(s) ] option.";
public readonly static string CONFIRM_DELETE = "Are you sure you want to remove this list of members from your Dropbox Business account?";
public readonly static string CONFIRM_DELETE_KEEP_ACCOUNT = "Are you sure you would like these users to keep their accounts active? Their accounts will be downgraded to Dropbox Basic and you will no longer have ownership of account data.";
public readonly static string CONFIRM_SUSPEND = "Are you sure you want to suspend this list of members from your Dropbox Business account?";
public readonly static string CONFIRM_UNSUSPEND = "Are you sure you want to unsuspend this list of members from your Dropbox Business account?";
public readonly static string CONFIRM_SET_PROFILE = "Are you sure you want to update profiles on this list of members from your Dropbox Business account?";
public readonly static string CONFIRM_SEND_WELCOME_EMAIL = "Warning: Please consult your Dropbox account team prior to disabling welcome emails. Please ensure that your domains are verified and single sign-on (SSO) is enabled and set to required in the Dropbox admin console if you decide to use this feature.";
public readonly static string MISSING_TOKEN = "You must go to File->Settings to add your app tokens before performing any actions in the toolkit.";
public readonly static string INVALID_EXPORT_FOLDER = "Directory to export report file is not found";
public readonly static string INVALID_EXPORT_FOLDER = "Directory to export report file is not found.";
public readonly static string FAILED_TO_GET_GROUPS = "Bad request to the API, possibly due to no permissions to get groups.";
public readonly static string FAILED_TO_CREATE_GROUP = "Bad request to the API, possibly due to no permissions on your app to create groups.";
public readonly static string FAILED_TO_CREATE_GROUP_GROUP_EXISTS = "Group was not created. Reason: Group name already exists.";
public readonly static string FAILED_TO_CREATE_GROUP_GROUP_INVALID = "Group was not created. Reason: Group name was invalid.";
public readonly static string FAILED_TO_ADD_MEMBER_TO_GROUP = "Bad request to the API, possibly due to no permissions on your app to add members to groups.";
public readonly static string FAILED_TO_DELETE_MEMBER_FROM_GROUP = "Bad request to the API, possibly due to no permissions on your app to delete members from groups.";
public readonly static string FAILED_TO_GET_TEAMFOLDERS = "Bad request to the API, possibly due to no permissions to get team folders.";
Expand Down
Loading

0 comments on commit 4167eb5

Please sign in to comment.