Merge pull request Azure-Samples#4 from Azure-Samples/release/1.3

Release 1.3 Updates

Author: tommoser

mipsdk-protectionapi-cpp-sample-basic/action.cpp

@@ -76,14 +76,31 @@ namespace sample {
 
 		Action::~Action()
 		{
-			mProfile = nullptr;
 			mEngine = nullptr;
-			mip::ReleaseAllResources();
+			mProfile = nullptr;
+			mMipContext = nullptr;
 		}
 
 		void sample::file::Action::AddNewProtectionProfile()
 		{			
-			ProtectionProfile::Settings profileSettings("mip_data", false, mAuthDelegate, std::make_shared<sample::consent::ConsentDelegateImpl>(), std::make_shared<ProtectionProfileObserverImpl>(), mAppInfo);			
+			//Create MipContext
+			mMipContext = mip::MipContext::Create(
+				mAppInfo,
+				"mip_data",
+				mip::LogLevel::Trace,
+				false,
+				nullptr /*loggerDelegateOverride*/,
+				nullptr /*telemetryOverride*/
+			);
+
+			// Initialize ProtectionProfileSettings using MipContext
+			ProtectionProfile::Settings profileSettings(mMipContext,
+				mip::CacheStorageType::OnDiskEncrypted,
+				mAuthDelegate,
+				std::make_shared<sample::consent::ConsentDelegateImpl>(),
+				std::make_shared<ProtectionProfileObserverImpl>()
+			);
+
 			auto profilePromise = std::make_shared<std::promise<std::shared_ptr<ProtectionProfile>>>();
 			auto profileFuture = profilePromise->get_future();			
 			ProtectionProfile::LoadAsync(profileSettings, profilePromise);			

mipsdk-protectionapi-cpp-sample-basic/action.h

@@ -32,6 +32,7 @@
 #include <memory>
 #include <string>
 
+#include "mip/mip_context.h"
 #include "mip/common_types.h"
 #include "mip/protection/protection_profile.h"
 #include "mip/protection/protection_engine.h"
@@ -77,6 +78,7 @@ namespace sample {
 			std::shared_ptr<mip::ProtectionDescriptor> CreateProtectionDescriptor(const ProtectionOptions protectionOptions);
 
 			std::shared_ptr<sample::auth::AuthDelegateImpl> mAuthDelegate;			// AuthDelegateImpl object that will be used throughout the sample to store auth details.
+			std::shared_ptr<mip::MipContext> mMipContext;
 			std::shared_ptr<mip::ProtectionProfile> mProfile;								// mip::FileProfile object to store/load state information 
 			std::shared_ptr<mip::ProtectionEngine> mEngine;								// mip::FileEngine object to handle user-specific actions. 
 			std::shared_ptr<sample::consent::ConsentDelegateImpl> mConsentDelegate; // Implements consent flow. Review consent_delegate_impl.cpp for implementation details.						

mipsdk-protectionapi-cpp-sample-basic/auth.py

@@ -22,44 +22,32 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
+# make sure to run pip install adal, first. 
+# for non-windows setup, review https://github.com/AzureAD/azure-activedirectory-library-for-python/wiki/ADAL-basics
 
 import getopt
 import sys
 import json
-import urllib
-import urllib2
 import re
-
-#
-# This script acquires auth tokens directly via a simple http request. This is
-# included only as a means to acquire auth tokens for use by the sample apps
-# and is not intended for use in production code. It will only work for tenants
-# that support straightforward username/password http authentication.
-#
-# For proper auth integration, please use Azure Active Directory Authentication
-# Library (ADAL), Active Directory v2 Libraries (MSAL), or other OAuth 2.0
-# libraries:
-#
-# https:// docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-authentication-libraries
-# https:// docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-v2-libraries
-#
+from adal import AuthenticationContext
 
 def printUsage():
   print('auth.py -u <username> -p <password> -a <authority> -r <resource> -c <clientId>')
 
 def main(argv):
   try:
     options, args = getopt.getopt(argv, 'hu:p:a:r:c:')
-  except getopt.GetoptFailure:
+  except getopt.GetoptError:
     printUsage()
     sys.exit(-1)
 
   username = ''
   password = ''
   authority = ''
   resource = ''
-  clientId = ''
 
+  clientId = ''
+    
   for option, arg in options:
     if option == '-h':
       printUsage()
@@ -84,31 +72,11 @@ def main(argv):
     regex = re.compile('^(.*[\/])')
     match = regex.match(authority)
     authority = match.group()
-    authority = authority + 'common/oauth2/token'
-
-  # Build REST call
-  headers = {
-    'Content-Type': 'application/x-www-form-urlencoded',
-    'Accept': 'application/json'
-  }
-
-  params = {
-    'resource': resource,
-    'client_id': clientId,
-    'grant_type': 'password',
-    'username': username,
-    'password': password
-  }
-
-  req = urllib2.Request(
-    url = authority,
-    headers = headers,
-    data = urllib.urlencode(params))
+    authority = authority + username.split('@')[1]
 
-  f = urllib2.urlopen(req)
-  response = f.read()
-  f.close()
-  sys.stdout.write(json.loads(response)['access_token'])
+  auth_context = AuthenticationContext(authority)
+  token = auth_context.acquire_token_with_username_password(resource, username, password, clientId)
+  print(token["accessToken"])
 
-if __name__ == '__main__':
+if __name__ == '__main__':  
   main(sys.argv[1:])

mipsdk-protectionapi-cpp-sample-basic/main.cpp

@@ -54,19 +54,23 @@ int main()
 	string plaintext;
 	string ciphertext;
 	string decryptedText;
+	std::string clientId = "YOUR CLIENT ID";
+	std::string appName = "YOUR APP NAME";
+	std::string appVersion = "YOUR APP VERSION";
+	std::string userName = "YOUR TEST USER";
+	std::string password = "YOUR TEST USER PASSWORD";
+
 
 	// Create the mip::ApplicationInfo object. 
 	// Client ID should be the client ID registered in Azure AD for your custom application.
 	// Friendly Name should be the name of the application as it should appear in reports.
-	// Version should should be version number of the application you're writing. This data will show in logs. 
-	mip::ApplicationInfo appInfo{ "YOUR CLIENT ID HERE", "YOUR APP NAME HERE", "YOUR APP VERSION" };
-	
-	// All actions for this tutorial project are implemented in samples::file::Action
-	// Source files are Action.h/cpp.
-	// "File" was chosen because this example is specifically for the MIP SDK File API. 
+	mip::ApplicationInfo appInfo{ clientId, appName, appVersion };
+
+	// All actions for this tutorial project are implemented in samples::policy::Action
+	// Source files are Action.h/cpp.	
 	// Action's constructor takes in the mip::ApplicationInfo object and uses the client ID for auth.
 	// Username and password are required in this sample as the oauth2 token is obtained via Python script and basic auth.
-	Action action = Action(appInfo, "YOUR TEST USER NAME","YOUR TEST USER PASSWORD");
+	Action action = Action(appInfo, userName, password);
 
 	while (true)
 	{

mipsdk-protectionapi-cpp-sample-basic/mipsdk-protectionapi-cpp-sample-basic.vcxproj

@@ -23,32 +23,32 @@
     <ProjectGuid>{F8C94F02-CAD2-4449-843F-D6ABCD8A6634}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>mipsdk-protectionapi-cpp-sample-basic</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>