Merge pull request #1855 from AzureAD/sample-folders-change

Update sample folder structure

Author: Prithvi Kanherkar

lerna.json

@@ -15,7 +15,7 @@
   },
   "packages": [
     "lib/*",
-    "samples/*"
+    "samples/**/*"
   ],
   "version": "independent",
   "concurrency": 2

samples/MSALAngularDemoApp/.editorconfig renamed to samples/msal-angular-samples/MSALAngularDemoApp/.editorconfig

@@ -7,7 +7,7 @@
 
     <!-- IE support: add promises polyfill before msal.js  -->    
     <script type="text/javascript" src="//cdn.jsdelivr.net/npm/[email protected]/js/browser/bluebird.min.js"></script>
-    <script src="../lib/msal-browser.js"></script>
+    <script src="../../lib/msal-browser.js"></script>
 
     <!-- adding Bootstrap 4 for UI components  -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">

samples/MSALAngularDemoApp/.gitignore renamed to samples/msal-angular-samples/MSALAngularDemoApp/.gitignore

@@ -25,7 +25,6 @@ function handleResponse(resp) {
     if (resp !== null) {
         username = resp.account.username;
         showWelcomeMessage(resp.account);
-        getTokenRedirect(tokenRequest, resp.account);
     } else {
         // need to call getAccount here?
         const currentAccounts = myMSALObj.getAllAccounts();
@@ -36,7 +35,6 @@ function handleResponse(resp) {
         } else if (currentAccounts.length === 1) {
             username = currentAccounts[0].username;
             showWelcomeMessage(currentAccounts[0]);
-            getTokenRedirect(tokenRequest, currentAccounts[0]);
         }
     }
 }

samples/MSALAngularDemoApp/README.md renamed to samples/msal-angular-samples/MSALAngularDemoApp/README.md

@@ -12,7 +12,7 @@ const msalConfig = {
 
 // Add here scopes for id token to be used at MS Identity Platform endpoints.
 const loginRequest = {
-    scopes: ["User.Read", "https://msidlab0.spoppe.com/user.read"],
+    scopes: ["User.Read"],
     redirectUri: "http://localhost:30662/"
 };
 

samples/MSALAngularDemoApp/angular-cli.json renamed to samples/msal-angular-samples/MSALAngularDemoApp/angular-cli.json

@@ -7,7 +7,7 @@
 
     <!-- IE support: add promises polyfill before msal.js  -->    
     <script type="text/javascript" src="//cdn.jsdelivr.net/npm/[email protected]/js/browser/bluebird.min.js"></script>
-    <script src="../lib/msal-browser.js"></script>
+    <script src="../../lib/msal-browser.js"></script>
 
     <!-- adding Bootstrap 4 for UI components  -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">

samples/MSALAngularDemoApp/package-lock.json renamed to samples/msal-angular-samples/MSALAngularDemoApp/package-lock.json

@@ -49,7 +49,7 @@ async function enterCredentials(page: puppeteer.Page, testName: string): Promise
     await page.click("#idSIButton9");
 }
 
-describe.skip("Browser tests", function () {
+describe("Browser tests", function () {
     this.timeout(0);
     this.retries(1);
 
@@ -81,7 +81,7 @@ describe.skip("Browser tests", function () {
         await browser.close();
     });
 
-    it.skip("Performs loginRedirect and acquires 2 tokens", async () => {
+    it("Performs loginRedirect and acquires 2 tokens", async () => {
         const testName = "multipleResources";
         // Home Page
         await takeScreenshot(page, testName, `samplePageInit`);
@@ -110,6 +110,6 @@ describe.skip("Browser tests", function () {
         await page.waitForSelector("#second-resource-div");
         await takeScreenshot(page, testName, `secondToken`);
         sessionStorage = await page.evaluate(() =>  Object.assign({}, window.sessionStorage));
-        expect(Object.keys(sessionStorage).length).to.be.eq(4);
+        expect(Object.keys(sessionStorage).length).to.be.eq(5);
     });
 });

samples/MSALAngularDemoApp/package.json renamed to samples/msal-angular-samples/MSALAngularDemoApp/package.json

@@ -7,7 +7,7 @@
 
     <!-- IE support: add promises polyfill before msal.js  -->    
     <script type="text/javascript" src="//cdn.jsdelivr.net/npm/[email protected]/js/browser/bluebird.min.js"></script>
-    <script src="../lib/msal-browser.js"></script>
+    <script src="../../lib/msal-browser.js"></script>
 
     <!-- adding Bootstrap 4 for UI components  -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">

samples/MSALAngularDemoApp/protractor.conf.js renamed to samples/msal-angular-samples/MSALAngularDemoApp/protractor.conf.js

@@ -7,7 +7,7 @@
 
     <!-- IE support: add promises polyfill before msal.js  -->    
     <script type="text/javascript" src="//cdn.jsdelivr.net/npm/[email protected]/js/browser/bluebird.min.js"></script>
-    <script src="../lib/msal-browser.js"></script>
+    <script src="../../lib/msal-browser.js"></script>
 
     <!-- adding Bootstrap 4 for UI components  -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">

samples/MSALAngularDemoApp/src/app/app.component.css renamed to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.css

@@ -53,7 +53,7 @@ function runMochaTests(sampleIndex: number) {
     app.use(morgan('dev'));
 
     // Set the front-end folder to serve public assets.
-    app.use("/lib", express.static(path.join(PARENT_DIR, "../../lib/msal-browser/lib")));
+    app.use("/lib", express.static(path.join(PARENT_DIR, "../../../lib/msal-browser/lib")));
 
     let sampleName = sampleFolders[sampleIndex];
     const mocha = createMochaObject(sampleName);

samples/MSALAngularDemoApp/src/app/app.component.html renamed to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.html

@@ -6,7 +6,7 @@
   "main": "server.js",
   "scripts": {
     "start": "node server.js",
-    "build:package": "cd ../../lib/msal-browser && npm run build:all",
+    "build:package": "cd ../../../lib/msal-browser && npm run build:all",
     "start:build": "npm run build:package && npm start",
     "test:e2e": "ts-node ./e2eTests/testRunner.ts"
   },

samples/MSALAngularDemoApp/src/app/app.component.spec.ts renamed to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.spec.ts

@@ -38,7 +38,7 @@ if (argv.p) {
 app.use(morgan('dev'));
 
 // Set the front-end folder to serve public assets.
-app.use("/dist", express.static(path.join(__dirname, "../../lib/msal-core/dist")));
+app.use("/lib", express.static(path.join(__dirname, "../../../lib/msal-browser/lib")));
 
 const sampleName = argv.sample;
 const isSample = sampleFolders.includes(sampleName);

samples/MSALAngularDemoApp/src/app/app.component.ts renamed to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.ts

@@ -15,7 +15,7 @@ var port = 1530; // process.env.PORT || 8080;
 app.use(morgan('dev'));
 
 // Set the front-end folder to serve public assets.
-app.use("/dist", express.static(path.join(__dirname, "../../lib/msal-core/dist")));
+app.use("/dist", express.static(path.join(__dirname, "../../../lib/msal-core/dist")));
 app.use('/adal', express.static(__dirname + '/adal'));
 
 // Set up our one route to the index.html file.

samples/MSALAngularDemoApp/src/app/app.module.ts renamed to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.module.ts

@@ -53,7 +53,7 @@ function runMochaTests(sampleIndex: number) {
     app.use(morgan('dev'));
 
     // Set the front-end folder to serve public assets.
-    app.use("/dist", express.static(path.join(PARENT_DIR, "../../lib/msal-core/dist")));
+    app.use("/dist", express.static(path.join(PARENT_DIR, "../../../lib/msal-core/dist")));
 
     let sampleName = sampleFolders[sampleIndex];
     const mocha = createMochaObject(sampleName);

samples/MSALAngularDemoApp/src/app/app.routes.ts renamed to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.routes.ts

@@ -6,7 +6,7 @@
   "main": "server.js",
   "scripts": {
     "start": "node server.js",
-    "build:package": "cd ../../lib/msal-core && npm run build",
+    "build:package": "cd ../../../lib/msal-core && npm run build",
     "start:build": "npm run build:package && npm start",
     "test:e2e": "ts-node ./e2eTests/testRunner.ts"
   },

samples/MSALAngularDemoApp/src/app/common/HttpServiceHelper.ts renamed to samples/msal-angular-samples/MSALAngularDemoApp/src/app/common/HttpServiceHelper.ts

@@ -38,7 +38,7 @@ if (argv.p) {
 app.use(morgan('dev'));
 
 // Set the front-end folder to serve public assets.
-app.use("/lib", express.static(path.join(__dirname, "../../lib/msal-browser/lib")));
+app.use("/dist", express.static(path.join(__dirname, "../../../lib/msal-core/dist")));
 
 const sampleName = argv.sample;
 const isSample = sampleFolders.includes(sampleName);