Skip to content

Commit

Permalink
Up[dated bug in Keep Account wipe data call
Browse files Browse the repository at this point in the history
  • Loading branch information
jackb-dropbox committed Jul 7, 2016
1 parent 33882ae commit df86fae
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
Binary file modified Installer/DBAdminToolkit.Setup.zip
Binary file not shown.
4 changes: 2 additions & 2 deletions Source/DfBAdminToolkit.Common/Properties/AssemblyInfo.cs
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("3.1.0.0")]
[assembly: AssemblyFileVersion("3.1.0.0")]
[assembly: AssemblyVersion("3.2.0.0")]
[assembly: AssemblyFileVersion("3.2.0.0")]
7 changes: 6 additions & 1 deletion Source/DfBAdminToolkit.Common/Services/MemberServices.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ public IServiceResponse AddMember(IMemberData data, string authToken)
public IServiceResponse RemoveMember(IMemberData data, string authToken)
{
IServiceResponse serviceResponse = null;
bool wipeData = true;
if (data.KeepAccount)
{
wipeData = false;
}
try
{
if (!string.IsNullOrEmpty(RemoveMemberUrl))
Expand All @@ -127,7 +132,7 @@ public IServiceResponse RemoveMember(IMemberData data, string authToken)
new JProperty("email", data.Email)
)
),
new JProperty("wipe_data", true),
new JProperty("wipe_data", wipeData),
new JProperty("keep_account", data.KeepAccount)
);
request.AddParameter("application/json", jsonProv, ParameterType.RequestBody);
Expand Down
4 changes: 4 additions & 0 deletions Source/DfBAdminToolkit/DfBAdminToolkit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down
4 changes: 2 additions & 2 deletions Source/DfBAdminToolkit/Properties/AssemblyInfo.cs
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("3.1.0.0")]
[assembly: AssemblyFileVersion("3.1.0.0")]
[assembly: AssemblyVersion("3.2.0.0")]
[assembly: AssemblyFileVersion("3.2.0.0")]

0 comments on commit df86fae

Please sign in to comment.