Merge pull request #140 from AzureAD/dev

Release version 0.1.2

README.md

@@ -2,7 +2,7 @@
 Microsoft Authentication Library Preview for JavaScript (MSAL.js)
 =========================================================
 
-| [Getting Started](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi-v2 )| [Docs](https://aka.ms/aaddevv2) | [API Reference](https://htmlpreview.github.io/?https://raw.githubusercontent.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/docs/classes/_useragentapplication_.msal.useragentapplication.html) | [Support](README.md#community-help-and-support) | [Samples](./devApps/VanillaJSTestApp )
+| [Getting Started](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi-v2 )| [Docs](https://aka.ms/aaddevv2) | [Library Reference](https://htmlpreview.github.io/?https://raw.githubusercontent.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/docs/classes/_useragentapplication_.msal.useragentapplication.html) | [Support](README.md#community-help-and-support) | [Samples](./devApps/VanillaJSTestApp )
 | --- | --- | --- | --- | --- |
 
 
@@ -43,7 +43,7 @@ This example shows how to acquire a token to read user information from Microsof
  console.log("ATS promise resolved");
  }, function (error) {
  // interaction required 
- if(error.indexOf("interaction_required" != -1)) {
+ if(error.indexOf("interaction_required") != -1){
  userAgentApplication.acquireTokenPopup(["user.read"]).then(function (token) {
  // success
  }, function (error) {
@@ -65,14 +65,14 @@ Via NPM:
 Via CDN:
 ```JavaScript
  <!-- Latest compiled and minified JavaScript -->
- <script src="https://secure.aadcdn.microsoftonline-p.com/lib/0.1.1/js/msal.min.js"></script>
+ <script src="https://secure.aadcdn.microsoftonline-p.com/lib/0.1.2/js/msal.min.js"></script>
 ```
 
 Note that msal.js is built for ES5, therefore enabling support of Internet Explorer 11. If you want to target Internet Explorer, you'll need to add a reference to promises polyfill. You might want to read more in the [FAQ](../../wiki)
 ```JavaScript
  <!-- IE support: add promises polyfill before msal.js -->
  <script src="https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.3.4/bluebird.min.js" class="pre"></script> 
- <script src="https://secure.aadcdn.microsoftonline-p.com/lib/0.1.1/js/msal.min.js"></script>
+ <script src="https://secure.aadcdn.microsoftonline-p.com/lib/0.1.2/js/msal.min.js"></script>
 ```
 
 ## Community Help and Support
@@ -88,7 +88,7 @@ We highly recommend you ask your questions on Stack Overflow first and browse ex
 
 ## Contribute
 
-We enthusiastically welcome contributions and feedback. You can clone the repo and start contributing now. Read our [Contribution Guide](Contributing.md) for more information.
+We enthusiastically welcome contributions and feedback. You can clone the repo and start contributing now. 
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 

devApps/VanillaJSTestApp-b2c/Readme.txt

@@ -0,0 +1,28 @@
+What is this sample?
+--------------------
+This is a simple JavaScript Simple page application 
+showcasing how to use MSAL.js to authenticate users 
+via Azure Active Directory B2C, 
+and access a Web API with the resulting tokens. 
+
+
+How to run this AzureAD B2C sample
+----------------------------------
+Pre-requisite
+- Install node.js if needed (https://nodejs.org/en/)
+
+Resolving the server.js references
+- In a command prompt, run npm install
+
+Running the sample
+- In a command prompt, run �node server.js�
+
+- Navigate to http://localhost:6420 with the browser of your choice
+
+- In the web page, click on the �Login� button
+- Sign-up with a local account (at the bottom of the page click sign-up, and then answer the questions)
+ alternatively sign-in with a gmail account
+- Once signed-in, the "Logout" button appears
+- Click on "Call Web Api" to call the Web APi application (which source code is in https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi)
+
+ Signing-in with an MSA or a Twitter account does not work yet.

devApps/VanillaJSTestApp-b2c/index.html

@@ -0,0 +1,119 @@
+<html>
+<head>
+ <title>Calling a Web API as a user authenticated with Msal.js app</title>
+ <style>
+ .hidden {
+ visibility: hidden
+ }
+
+ .visible {
+ visibility: visible
+ }
+
+ .response {
+ border: solid;
+ border-width: thin;
+ background-color: azure;
+ padding: 2px;
+ }
+ </style>
+</head>
+<body>
+ <!-- bluebird only needed if this page needs to run on Internet Explorer -->
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.3.4/bluebird.min.js" class="pre"></script>
+ <script src="out/msal.js" class="pre"></script>
+ <script src="https://code.jquery.com/jquery-3.2.1.min.js" class="pre"></script>
+
+ <h2>Getting an access token with Azure AD B2C and calling a Web API</h2>
+ <div>
+ <div id="label">Sign-in with Microsoft Azure AD B2C</div>
+ <button id="auth" onclick="login()">Login</button>
+ <button id="callApiButton" class="hidden" onclick="callApi()">Call Web API</button>
+ </div>
+
+ <pre class="response"></pre>
+
+ <script class="pre">
+ // The current application coordinates were pre-registered in a B2C tenant.
+ var applicationConfig = {
+ clientID: 'e760cab2-b9a1-4c0d-86fb-ff7084abd902',
+ authority: "https://login.microsoftonline.com/tfp/fabrikamb2c.onmicrosoft.com/b2c_1_susi",
+ b2cScopes: ["https://fabrikamb2c.onmicrosoft.com/demoapi/demo.read"],
+ webApi: 'https://fabrikamb2chello.azurewebsites.net/hello',
+ };
+ </script>
+
+ <script>
+ "use strict";
+ var clientApplication = new Msal.UserAgentApplication(applicationConfig.clientID, applicationConfig.authority, function (errorDesc, token, error, tokenType) {
+ // Called after loginRedirect or acquireTokenPopup
+ });
+
+ function login() {
+ clientApplication.loginPopup(applicationConfig.b2cScopes).then(function (idToken) {
+ clientApplication.acquireTokenSilent(applicationConfig.b2cScopes).then(function (accessToken) {
+ updateUI();
+ }, function (error) {
+ clientApplication.acquireTokenPopup(applicationConfig.b2cScopes).then(function (accessToken) {
+ updateUI();
+ }, function (error) {
+ logMessage("Error acquiring the popup:\n" + error);
+ });
+ })
+ }, function (error) {
+ logMessage("Error during login:\n" + error);
+ });
+ }
+
+ function updateUI() {
+ var userName = clientApplication.getUser().name;
+ logMessage("User '" + userName + "' logged-in");
+ var authButton = document.getElementById('auth');
+ authButton.innerHTML = 'logout';
+ authButton.setAttribute('onclick', 'logout();');
+ var label = document.getElementById('label');
+ label.innerText = "Hello " + userName;
+ var callWebApiButton = document.getElementById('callApiButton');
+ callWebApiButton.setAttribute('class', 'visible');
+ }
+
+ function callApi() {
+ clientApplication.acquireTokenSilent(applicationConfig.b2cScopes).then(function (accessToken) {
+ callApiWithAccessToken(accessToken);
+ }, function (error) {
+ clientApplication.acquireTokenPopup(applicationConfig.b2cScopes).then(function (accessToken) {
+ callApiWithAccessToken(accessToken);
+ }, function (error) {
+ logMessage("Error acquiring the access token to call the Web api:\n" + error);
+ });
+ })
+ }
+
+ function callApiWithAccessToken(accessToken) {
+ // Call the Web API with the AccessToken
+ $.ajax({
+ type: "GET",
+ url: applicationConfig.webApi,
+ headers: {
+ 'Authorization': 'Bearer ' + accessToken,
+ },
+ }).done(function (data) {
+ logMessage("Web APi returned:\n" + JSON.stringify(data));
+ })
+ .fail(function (jqXHR, textStatus) {
+ logMessage("Error calling the Web api:\n" + textStatus);
+ })
+ }
+
+ function logout() {
+ // Removes all sessions, need to call AAD endpoint to do full logout
+ clientApplication.logout();
+ }
+
+ function logMessage(s) {
+ document.body.querySelector('.response').appendChild(document.createTextNode('\n' + s));
+ }
+
+ </script>
+</body>
+</html>

devApps/VanillaJSTestApp-b2c/package.json

@@ -0,0 +1,11 @@
+{
+ "name": "msal-js-devapp-b2c",
+ "version": "1.1.0",
+ "license": "MIT",
+ "main": "server.js",
+ "dependencies": {
+ "express": "^4.12.3",
+ "morgan": "^1.5.2",
+ "path": "^0.11.14"
+ }
+}

devApps/VanillaJSTestApp-b2c/server.js

@@ -0,0 +1,29 @@
+/*
+* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
+* See LICENSE in the source repository root for complete license information.
+*/
+
+var express = require('express');
+var app = express();
+var morgan = require('morgan');
+var path = require('path');
+
+// Initialize variables.
+var port = 6420; // process.env.PORT || 8080;
+
+// Configure morgan module to log all requests.
+app.use(morgan('dev'));
+
+// Set the front-end folder to serve public assets.
+console.log(path.join(__dirname, '../../out'));
+app.use("/out", express.static(path.join(__dirname, "../../out")));
+app.use("/bower_components", express.static(path.join(__dirname, 'bower_components')));
+
+// Set up our one route to the index.html file.
+app.get('*', function (req, res) {
+ res.sendFile(path.join(__dirname + '/index.html'));
+});
+
+// Start the server.
+app.listen(port);
+console.log('Listening on port ' + port + '...'); 

devApps/VanillaJSTestApp/Readme.txt

@@ -0,0 +1,20 @@
+What are the dev apps?
+----------------------
+index_loginPopup.html shows how to send an email with the Microsoft Graph, using msal.js loginPopup()/acquireTokenSilent-acquireTokenPopup() APIs. The authentication happens in a popup window of the browser. 
+
+indexRedirect.html shows how to send an email with the Microsoft Graph, using msal.js loginRedirect()/acquireTokenSilent-acquireTokenRedirect() APIs. The page for the application is replaced by the authentication page, and when authentication has happened, the application is called back (on its redirectUri) with the user's idToken.
+
+How to run the dev apps:
+--------------------
+Pre-requisite
+- Install node.js if needed (https://nodejs.org/en/)
+
+Resolving the server.js references
+- In a command prompt, run npm install
+
+Running the sample
+- In a command prompt, run �node server.js�
+
+- Navigate to http://localhost:1530 with the browser of your choice
+
+- In the web page, click on the �Login� button

devApps/VanillaJSTestApp/index_LoginRedirect.html

@@ -13,7 +13,7 @@
 </head>
 <body>
  <!-- bluebird only needed if this page needs to run on Internet Explorer -->
- <script src="https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.3.4/bluebird.min.js" class="pre"></script> 
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.3.4/bluebird.min.js" class="pre"></script>
  <script src="out/msal.js" class="pre"></script>
  <script src="https://code.jquery.com/jquery-3.2.1.min.js" class="pre"></script>
 
@@ -38,16 +38,16 @@ <h1>Sending an email with msal.js and Microsoft Graph</h1>
  </script>
 
  <script>
- var userAgentApplication = new Msal.UserAgentApplication(applicationConfig.clientID, null, authCallback);
+ var userAgentApplication = new Msal.UserAgentApplication(applicationConfig.clientID, null, authCallback, { cacheLocation: 'localStorage' });// cacheLocation defaults to sessionStorage if not set in the constructor
  function authCallback(errorDesc, token, error, tokenType) {
  //This function is called after loginRedirect. msal object is bound to the window object after the constructor is called.
  if (token) {
- this.msal.acquireTokenSilent(applicationConfig.graphScopes).then(function (accessToken) {
+ userAgentApplication.acquireTokenSilent(applicationConfig.graphScopes).then(function (accessToken) {
  // Change button to Sign Out
  updateUI();
  }, function (error) {
  console.log(error);
- this.msal.acquireTokenPopup(applicationConfig.graphScopes).then(function (accessToken) {
+ userAgentApplication.acquireTokenPopup(applicationConfig.graphScopes).then(function (accessToken) {
  updateUI();
  }, function (error) {
  console.log(error);

lib/AadAuthority.ts

@@ -1,3 +1,26 @@
+/**
+ * Copyright (c) Microsoft Corporation
+ * All Rights Reserved
+ * MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ * software and associated documentation files (the 'Software'), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+ * OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 /// <reference path="Authority.ts" /> // this is needed to work around error TS2690
 
 namespace Msal {

lib/AccessTokenCacheItem.ts

@@ -1,3 +1,26 @@
+/**
+ * Copyright (c) Microsoft Corporation
+ * All Rights Reserved
+ * MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ * software and associated documentation files (the 'Software'), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+ * OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 namespace Msal {
  /**
  * @hidden

lib/AccessTokenKey.ts

@@ -1,3 +1,26 @@
+/**
+ * Copyright (c) Microsoft Corporation
+ * All Rights Reserved
+ * MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ * software and associated documentation files (the 'Software'), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+ * OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 namespace Msal {
  /**
  * @hidden

lib/AccessTokenValue.ts

@@ -1,3 +1,26 @@
+/**
+ * Copyright (c) Microsoft Corporation
+ * All Rights Reserved
+ * MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ * software and associated documentation files (the 'Software'), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+ * OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 namespace Msal {
  /**
  * @hidden