diff --git a/lerna.json b/lerna.json index 1fb19711cd..c5e1878733 100644 --- a/lerna.json +++ b/lerna.json @@ -15,7 +15,7 @@ }, "packages": [ "lib/*", - "samples/*" + "samples/**/*" ], "version": "independent", "concurrency": 2 diff --git a/samples/MSALAngularDemoApp/.editorconfig b/samples/msal-angular-samples/MSALAngularDemoApp/.editorconfig similarity index 100% rename from samples/MSALAngularDemoApp/.editorconfig rename to samples/msal-angular-samples/MSALAngularDemoApp/.editorconfig diff --git a/samples/MSALAngularDemoApp/.gitignore b/samples/msal-angular-samples/MSALAngularDemoApp/.gitignore similarity index 100% rename from samples/MSALAngularDemoApp/.gitignore rename to samples/msal-angular-samples/MSALAngularDemoApp/.gitignore diff --git a/samples/MSALAngularDemoApp/README.md b/samples/msal-angular-samples/MSALAngularDemoApp/README.md similarity index 100% rename from samples/MSALAngularDemoApp/README.md rename to samples/msal-angular-samples/MSALAngularDemoApp/README.md diff --git a/samples/MSALAngularDemoApp/angular-cli.json b/samples/msal-angular-samples/MSALAngularDemoApp/angular-cli.json similarity index 100% rename from samples/MSALAngularDemoApp/angular-cli.json rename to samples/msal-angular-samples/MSALAngularDemoApp/angular-cli.json diff --git a/samples/MSALAngularDemoApp/package-lock.json b/samples/msal-angular-samples/MSALAngularDemoApp/package-lock.json similarity index 100% rename from samples/MSALAngularDemoApp/package-lock.json rename to samples/msal-angular-samples/MSALAngularDemoApp/package-lock.json diff --git a/samples/MSALAngularDemoApp/package.json b/samples/msal-angular-samples/MSALAngularDemoApp/package.json similarity index 100% rename from samples/MSALAngularDemoApp/package.json rename to samples/msal-angular-samples/MSALAngularDemoApp/package.json diff --git a/samples/MSALAngularDemoApp/protractor.conf.js b/samples/msal-angular-samples/MSALAngularDemoApp/protractor.conf.js similarity index 100% rename from samples/MSALAngularDemoApp/protractor.conf.js rename to samples/msal-angular-samples/MSALAngularDemoApp/protractor.conf.js diff --git a/samples/MSALAngularDemoApp/src/app/app.component.css b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.css similarity index 100% rename from samples/MSALAngularDemoApp/src/app/app.component.css rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.css diff --git a/samples/MSALAngularDemoApp/src/app/app.component.html b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.html similarity index 100% rename from samples/MSALAngularDemoApp/src/app/app.component.html rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.html diff --git a/samples/MSALAngularDemoApp/src/app/app.component.spec.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.spec.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/app.component.spec.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.spec.ts diff --git a/samples/MSALAngularDemoApp/src/app/app.component.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/app.component.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.component.ts diff --git a/samples/MSALAngularDemoApp/src/app/app.module.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.module.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/app.module.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.module.ts diff --git a/samples/MSALAngularDemoApp/src/app/app.routes.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.routes.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/app.routes.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/app.routes.ts diff --git a/samples/MSALAngularDemoApp/src/app/common/HttpServiceHelper.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/common/HttpServiceHelper.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/common/HttpServiceHelper.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/common/HttpServiceHelper.ts diff --git a/samples/MSALAngularDemoApp/src/app/error.component.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/error.component.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/error.component.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/error.component.ts diff --git a/samples/MSALAngularDemoApp/src/app/home/home.component.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/home/home.component.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/home/home.component.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/home/home.component.ts diff --git a/samples/MSALAngularDemoApp/src/app/product/product-detail.component.html b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product-detail.component.html similarity index 100% rename from samples/MSALAngularDemoApp/src/app/product/product-detail.component.html rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product-detail.component.html diff --git a/samples/MSALAngularDemoApp/src/app/product/product-detail.component.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product-detail.component.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/product/product-detail.component.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product-detail.component.ts diff --git a/samples/MSALAngularDemoApp/src/app/product/product.component.html b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product.component.html similarity index 100% rename from samples/MSALAngularDemoApp/src/app/product/product.component.html rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product.component.html diff --git a/samples/MSALAngularDemoApp/src/app/product/product.component.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product.component.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/product/product.component.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product.component.ts diff --git a/samples/MSALAngularDemoApp/src/app/product/product.service.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product.service.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/product/product.service.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product.service.ts diff --git a/samples/MSALAngularDemoApp/src/app/product/product.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/product/product.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/product/product.ts diff --git a/samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.css b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.css similarity index 100% rename from samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.css rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.css diff --git a/samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.html b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.html similarity index 100% rename from samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.html rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.html diff --git a/samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.spec.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.spec.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.spec.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.spec.ts diff --git a/samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todo-list.component.ts diff --git a/samples/MSALAngularDemoApp/src/app/todo-list/todo-list.service.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todo-list.service.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/todo-list/todo-list.service.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todo-list.service.ts diff --git a/samples/MSALAngularDemoApp/src/app/todo-list/todoList.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todoList.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/todo-list/todoList.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/todo-list/todoList.ts diff --git a/samples/MSALAngularDemoApp/src/app/user-data/user-data.component.css b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/user-data/user-data.component.css similarity index 100% rename from samples/MSALAngularDemoApp/src/app/user-data/user-data.component.css rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/user-data/user-data.component.css diff --git a/samples/MSALAngularDemoApp/src/app/user-data/user-data.component.html b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/user-data/user-data.component.html similarity index 100% rename from samples/MSALAngularDemoApp/src/app/user-data/user-data.component.html rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/user-data/user-data.component.html diff --git a/samples/MSALAngularDemoApp/src/app/user-data/user-data.component.spec.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/user-data/user-data.component.spec.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/user-data/user-data.component.spec.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/user-data/user-data.component.spec.ts diff --git a/samples/MSALAngularDemoApp/src/app/user-data/user-data.component.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/app/user-data/user-data.component.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/app/user-data/user-data.component.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/app/user-data/user-data.component.ts diff --git a/samples/MSALAngularDemoApp/src/assets/.gitkeep b/samples/msal-angular-samples/MSALAngularDemoApp/src/assets/.gitkeep similarity index 100% rename from samples/MSALAngularDemoApp/src/assets/.gitkeep rename to samples/msal-angular-samples/MSALAngularDemoApp/src/assets/.gitkeep diff --git a/samples/MSALAngularDemoApp/src/environments/environment.prod.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/environments/environment.prod.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/environments/environment.prod.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/environments/environment.prod.ts diff --git a/samples/MSALAngularDemoApp/src/environments/environment.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/environments/environment.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/environments/environment.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/environments/environment.ts diff --git a/samples/MSALAngularDemoApp/src/favicon.ico b/samples/msal-angular-samples/MSALAngularDemoApp/src/favicon.ico similarity index 100% rename from samples/MSALAngularDemoApp/src/favicon.ico rename to samples/msal-angular-samples/MSALAngularDemoApp/src/favicon.ico diff --git a/samples/MSALAngularDemoApp/src/index.html b/samples/msal-angular-samples/MSALAngularDemoApp/src/index.html similarity index 100% rename from samples/MSALAngularDemoApp/src/index.html rename to samples/msal-angular-samples/MSALAngularDemoApp/src/index.html diff --git a/samples/MSALAngularDemoApp/src/main.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/main.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/main.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/main.ts diff --git a/samples/MSALAngularDemoApp/src/polyfills.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/polyfills.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/polyfills.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/polyfills.ts diff --git a/samples/MSALAngularDemoApp/src/styles.css b/samples/msal-angular-samples/MSALAngularDemoApp/src/styles.css similarity index 100% rename from samples/MSALAngularDemoApp/src/styles.css rename to samples/msal-angular-samples/MSALAngularDemoApp/src/styles.css diff --git a/samples/MSALAngularDemoApp/src/test.ts b/samples/msal-angular-samples/MSALAngularDemoApp/src/test.ts similarity index 100% rename from samples/MSALAngularDemoApp/src/test.ts rename to samples/msal-angular-samples/MSALAngularDemoApp/src/test.ts diff --git a/samples/MSALAngularDemoApp/src/tsconfig.json b/samples/msal-angular-samples/MSALAngularDemoApp/src/tsconfig.json similarity index 100% rename from samples/MSALAngularDemoApp/src/tsconfig.json rename to samples/msal-angular-samples/MSALAngularDemoApp/src/tsconfig.json diff --git a/samples/angular6-sample-app/.editorconfig b/samples/msal-angular-samples/angular6-sample-app/.editorconfig similarity index 100% rename from samples/angular6-sample-app/.editorconfig rename to samples/msal-angular-samples/angular6-sample-app/.editorconfig diff --git a/samples/angular6-sample-app/.gitignore b/samples/msal-angular-samples/angular6-sample-app/.gitignore similarity index 100% rename from samples/angular6-sample-app/.gitignore rename to samples/msal-angular-samples/angular6-sample-app/.gitignore diff --git a/samples/angular6-sample-app/README.md b/samples/msal-angular-samples/angular6-sample-app/README.md similarity index 100% rename from samples/angular6-sample-app/README.md rename to samples/msal-angular-samples/angular6-sample-app/README.md diff --git a/samples/angular6-sample-app/angular.json b/samples/msal-angular-samples/angular6-sample-app/angular.json similarity index 100% rename from samples/angular6-sample-app/angular.json rename to samples/msal-angular-samples/angular6-sample-app/angular.json diff --git a/samples/angular6-sample-app/e2e/protractor.conf.js b/samples/msal-angular-samples/angular6-sample-app/e2e/protractor.conf.js similarity index 100% rename from samples/angular6-sample-app/e2e/protractor.conf.js rename to samples/msal-angular-samples/angular6-sample-app/e2e/protractor.conf.js diff --git a/samples/angular6-sample-app/e2e/src/app.e2e-spec.ts b/samples/msal-angular-samples/angular6-sample-app/e2e/src/app.e2e-spec.ts similarity index 100% rename from samples/angular6-sample-app/e2e/src/app.e2e-spec.ts rename to samples/msal-angular-samples/angular6-sample-app/e2e/src/app.e2e-spec.ts diff --git a/samples/angular6-sample-app/e2e/src/app.po.ts b/samples/msal-angular-samples/angular6-sample-app/e2e/src/app.po.ts similarity index 100% rename from samples/angular6-sample-app/e2e/src/app.po.ts rename to samples/msal-angular-samples/angular6-sample-app/e2e/src/app.po.ts diff --git a/samples/angular6-sample-app/e2e/tsconfig.e2e.json b/samples/msal-angular-samples/angular6-sample-app/e2e/tsconfig.e2e.json similarity index 100% rename from samples/angular6-sample-app/e2e/tsconfig.e2e.json rename to samples/msal-angular-samples/angular6-sample-app/e2e/tsconfig.e2e.json diff --git a/samples/angular6-sample-app/package-lock.json b/samples/msal-angular-samples/angular6-sample-app/package-lock.json similarity index 100% rename from samples/angular6-sample-app/package-lock.json rename to samples/msal-angular-samples/angular6-sample-app/package-lock.json diff --git a/samples/angular6-sample-app/package.json b/samples/msal-angular-samples/angular6-sample-app/package.json similarity index 100% rename from samples/angular6-sample-app/package.json rename to samples/msal-angular-samples/angular6-sample-app/package.json diff --git a/samples/angular6-sample-app/src/app/app.component.css b/samples/msal-angular-samples/angular6-sample-app/src/app/app.component.css similarity index 100% rename from samples/angular6-sample-app/src/app/app.component.css rename to samples/msal-angular-samples/angular6-sample-app/src/app/app.component.css diff --git a/samples/angular6-sample-app/src/app/app.component.html b/samples/msal-angular-samples/angular6-sample-app/src/app/app.component.html similarity index 100% rename from samples/angular6-sample-app/src/app/app.component.html rename to samples/msal-angular-samples/angular6-sample-app/src/app/app.component.html diff --git a/samples/angular6-sample-app/src/app/app.component.spec.ts b/samples/msal-angular-samples/angular6-sample-app/src/app/app.component.spec.ts similarity index 100% rename from samples/angular6-sample-app/src/app/app.component.spec.ts rename to samples/msal-angular-samples/angular6-sample-app/src/app/app.component.spec.ts diff --git a/samples/angular6-sample-app/src/app/app.component.ts b/samples/msal-angular-samples/angular6-sample-app/src/app/app.component.ts similarity index 100% rename from samples/angular6-sample-app/src/app/app.component.ts rename to samples/msal-angular-samples/angular6-sample-app/src/app/app.component.ts diff --git a/samples/angular6-sample-app/src/app/app.module.ts b/samples/msal-angular-samples/angular6-sample-app/src/app/app.module.ts similarity index 100% rename from samples/angular6-sample-app/src/app/app.module.ts rename to samples/msal-angular-samples/angular6-sample-app/src/app/app.module.ts diff --git a/samples/angular6-sample-app/src/app/app.routes.ts b/samples/msal-angular-samples/angular6-sample-app/src/app/app.routes.ts similarity index 100% rename from samples/angular6-sample-app/src/app/app.routes.ts rename to samples/msal-angular-samples/angular6-sample-app/src/app/app.routes.ts diff --git a/samples/angular6-sample-app/src/app/profile/profile.component.css b/samples/msal-angular-samples/angular6-sample-app/src/app/profile/profile.component.css similarity index 100% rename from samples/angular6-sample-app/src/app/profile/profile.component.css rename to samples/msal-angular-samples/angular6-sample-app/src/app/profile/profile.component.css diff --git a/samples/angular6-sample-app/src/app/profile/profile.component.html b/samples/msal-angular-samples/angular6-sample-app/src/app/profile/profile.component.html similarity index 100% rename from samples/angular6-sample-app/src/app/profile/profile.component.html rename to samples/msal-angular-samples/angular6-sample-app/src/app/profile/profile.component.html diff --git a/samples/angular6-sample-app/src/app/profile/profile.component.spec.ts b/samples/msal-angular-samples/angular6-sample-app/src/app/profile/profile.component.spec.ts similarity index 100% rename from samples/angular6-sample-app/src/app/profile/profile.component.spec.ts rename to samples/msal-angular-samples/angular6-sample-app/src/app/profile/profile.component.spec.ts diff --git a/samples/angular6-sample-app/src/app/profile/profile.component.ts b/samples/msal-angular-samples/angular6-sample-app/src/app/profile/profile.component.ts similarity index 100% rename from samples/angular6-sample-app/src/app/profile/profile.component.ts rename to samples/msal-angular-samples/angular6-sample-app/src/app/profile/profile.component.ts diff --git a/samples/angular6-sample-app/src/assets/.gitkeep b/samples/msal-angular-samples/angular6-sample-app/src/assets/.gitkeep similarity index 100% rename from samples/angular6-sample-app/src/assets/.gitkeep rename to samples/msal-angular-samples/angular6-sample-app/src/assets/.gitkeep diff --git a/samples/angular6-sample-app/src/browserslist b/samples/msal-angular-samples/angular6-sample-app/src/browserslist similarity index 100% rename from samples/angular6-sample-app/src/browserslist rename to samples/msal-angular-samples/angular6-sample-app/src/browserslist diff --git a/samples/angular6-sample-app/src/environments/environment.prod.ts b/samples/msal-angular-samples/angular6-sample-app/src/environments/environment.prod.ts similarity index 100% rename from samples/angular6-sample-app/src/environments/environment.prod.ts rename to samples/msal-angular-samples/angular6-sample-app/src/environments/environment.prod.ts diff --git a/samples/angular6-sample-app/src/environments/environment.ts b/samples/msal-angular-samples/angular6-sample-app/src/environments/environment.ts similarity index 100% rename from samples/angular6-sample-app/src/environments/environment.ts rename to samples/msal-angular-samples/angular6-sample-app/src/environments/environment.ts diff --git a/samples/angular6-sample-app/src/favicon.ico b/samples/msal-angular-samples/angular6-sample-app/src/favicon.ico similarity index 100% rename from samples/angular6-sample-app/src/favicon.ico rename to samples/msal-angular-samples/angular6-sample-app/src/favicon.ico diff --git a/samples/angular6-sample-app/src/index.html b/samples/msal-angular-samples/angular6-sample-app/src/index.html similarity index 100% rename from samples/angular6-sample-app/src/index.html rename to samples/msal-angular-samples/angular6-sample-app/src/index.html diff --git a/samples/angular6-sample-app/src/karma.conf.js b/samples/msal-angular-samples/angular6-sample-app/src/karma.conf.js similarity index 100% rename from samples/angular6-sample-app/src/karma.conf.js rename to samples/msal-angular-samples/angular6-sample-app/src/karma.conf.js diff --git a/samples/angular6-sample-app/src/main.ts b/samples/msal-angular-samples/angular6-sample-app/src/main.ts similarity index 100% rename from samples/angular6-sample-app/src/main.ts rename to samples/msal-angular-samples/angular6-sample-app/src/main.ts diff --git a/samples/angular6-sample-app/src/polyfills.ts b/samples/msal-angular-samples/angular6-sample-app/src/polyfills.ts similarity index 100% rename from samples/angular6-sample-app/src/polyfills.ts rename to samples/msal-angular-samples/angular6-sample-app/src/polyfills.ts diff --git a/samples/angular6-sample-app/src/styles.css b/samples/msal-angular-samples/angular6-sample-app/src/styles.css similarity index 100% rename from samples/angular6-sample-app/src/styles.css rename to samples/msal-angular-samples/angular6-sample-app/src/styles.css diff --git a/samples/angular6-sample-app/src/test.ts b/samples/msal-angular-samples/angular6-sample-app/src/test.ts similarity index 100% rename from samples/angular6-sample-app/src/test.ts rename to samples/msal-angular-samples/angular6-sample-app/src/test.ts diff --git a/samples/angular6-sample-app/src/tsconfig.app.json b/samples/msal-angular-samples/angular6-sample-app/src/tsconfig.app.json similarity index 100% rename from samples/angular6-sample-app/src/tsconfig.app.json rename to samples/msal-angular-samples/angular6-sample-app/src/tsconfig.app.json diff --git a/samples/angular6-sample-app/src/tsconfig.spec.json b/samples/msal-angular-samples/angular6-sample-app/src/tsconfig.spec.json similarity index 100% rename from samples/angular6-sample-app/src/tsconfig.spec.json rename to samples/msal-angular-samples/angular6-sample-app/src/tsconfig.spec.json diff --git a/samples/angular6-sample-app/src/tslint.json b/samples/msal-angular-samples/angular6-sample-app/src/tslint.json similarity index 100% rename from samples/angular6-sample-app/src/tslint.json rename to samples/msal-angular-samples/angular6-sample-app/src/tslint.json diff --git a/samples/angular6-sample-app/tsconfig.json b/samples/msal-angular-samples/angular6-sample-app/tsconfig.json similarity index 100% rename from samples/angular6-sample-app/tsconfig.json rename to samples/msal-angular-samples/angular6-sample-app/tsconfig.json diff --git a/samples/angular6-sample-app/tslint.json b/samples/msal-angular-samples/angular6-sample-app/tslint.json similarity index 100% rename from samples/angular6-sample-app/tslint.json rename to samples/msal-angular-samples/angular6-sample-app/tslint.json diff --git a/samples/angular7-sample-app/.editorconfig b/samples/msal-angular-samples/angular7-sample-app/.editorconfig similarity index 100% rename from samples/angular7-sample-app/.editorconfig rename to samples/msal-angular-samples/angular7-sample-app/.editorconfig diff --git a/samples/angular7-sample-app/.gitignore b/samples/msal-angular-samples/angular7-sample-app/.gitignore similarity index 100% rename from samples/angular7-sample-app/.gitignore rename to samples/msal-angular-samples/angular7-sample-app/.gitignore diff --git a/samples/angular7-sample-app/README.md b/samples/msal-angular-samples/angular7-sample-app/README.md similarity index 100% rename from samples/angular7-sample-app/README.md rename to samples/msal-angular-samples/angular7-sample-app/README.md diff --git a/samples/angular7-sample-app/angular.json b/samples/msal-angular-samples/angular7-sample-app/angular.json similarity index 100% rename from samples/angular7-sample-app/angular.json rename to samples/msal-angular-samples/angular7-sample-app/angular.json diff --git a/samples/angular7-sample-app/e2e/protractor.conf.js b/samples/msal-angular-samples/angular7-sample-app/e2e/protractor.conf.js similarity index 100% rename from samples/angular7-sample-app/e2e/protractor.conf.js rename to samples/msal-angular-samples/angular7-sample-app/e2e/protractor.conf.js diff --git a/samples/angular7-sample-app/e2e/src/app.e2e-spec.ts b/samples/msal-angular-samples/angular7-sample-app/e2e/src/app.e2e-spec.ts similarity index 100% rename from samples/angular7-sample-app/e2e/src/app.e2e-spec.ts rename to samples/msal-angular-samples/angular7-sample-app/e2e/src/app.e2e-spec.ts diff --git a/samples/angular7-sample-app/e2e/src/app.po.ts b/samples/msal-angular-samples/angular7-sample-app/e2e/src/app.po.ts similarity index 100% rename from samples/angular7-sample-app/e2e/src/app.po.ts rename to samples/msal-angular-samples/angular7-sample-app/e2e/src/app.po.ts diff --git a/samples/angular7-sample-app/e2e/tsconfig.e2e.json b/samples/msal-angular-samples/angular7-sample-app/e2e/tsconfig.e2e.json similarity index 100% rename from samples/angular7-sample-app/e2e/tsconfig.e2e.json rename to samples/msal-angular-samples/angular7-sample-app/e2e/tsconfig.e2e.json diff --git a/samples/angular7-sample-app/package-lock.json b/samples/msal-angular-samples/angular7-sample-app/package-lock.json similarity index 100% rename from samples/angular7-sample-app/package-lock.json rename to samples/msal-angular-samples/angular7-sample-app/package-lock.json diff --git a/samples/angular7-sample-app/package.json b/samples/msal-angular-samples/angular7-sample-app/package.json similarity index 100% rename from samples/angular7-sample-app/package.json rename to samples/msal-angular-samples/angular7-sample-app/package.json diff --git a/samples/angular7-sample-app/src/app/app-routing.module.ts b/samples/msal-angular-samples/angular7-sample-app/src/app/app-routing.module.ts similarity index 100% rename from samples/angular7-sample-app/src/app/app-routing.module.ts rename to samples/msal-angular-samples/angular7-sample-app/src/app/app-routing.module.ts diff --git a/samples/angular7-sample-app/src/app/app.component.css b/samples/msal-angular-samples/angular7-sample-app/src/app/app.component.css similarity index 100% rename from samples/angular7-sample-app/src/app/app.component.css rename to samples/msal-angular-samples/angular7-sample-app/src/app/app.component.css diff --git a/samples/angular7-sample-app/src/app/app.component.html b/samples/msal-angular-samples/angular7-sample-app/src/app/app.component.html similarity index 100% rename from samples/angular7-sample-app/src/app/app.component.html rename to samples/msal-angular-samples/angular7-sample-app/src/app/app.component.html diff --git a/samples/angular7-sample-app/src/app/app.component.spec.ts b/samples/msal-angular-samples/angular7-sample-app/src/app/app.component.spec.ts similarity index 100% rename from samples/angular7-sample-app/src/app/app.component.spec.ts rename to samples/msal-angular-samples/angular7-sample-app/src/app/app.component.spec.ts diff --git a/samples/angular7-sample-app/src/app/app.component.ts b/samples/msal-angular-samples/angular7-sample-app/src/app/app.component.ts similarity index 100% rename from samples/angular7-sample-app/src/app/app.component.ts rename to samples/msal-angular-samples/angular7-sample-app/src/app/app.component.ts diff --git a/samples/angular7-sample-app/src/app/app.module.ts b/samples/msal-angular-samples/angular7-sample-app/src/app/app.module.ts similarity index 100% rename from samples/angular7-sample-app/src/app/app.module.ts rename to samples/msal-angular-samples/angular7-sample-app/src/app/app.module.ts diff --git a/samples/angular7-sample-app/src/app/profile/profile.component.css b/samples/msal-angular-samples/angular7-sample-app/src/app/profile/profile.component.css similarity index 100% rename from samples/angular7-sample-app/src/app/profile/profile.component.css rename to samples/msal-angular-samples/angular7-sample-app/src/app/profile/profile.component.css diff --git a/samples/angular7-sample-app/src/app/profile/profile.component.html b/samples/msal-angular-samples/angular7-sample-app/src/app/profile/profile.component.html similarity index 100% rename from samples/angular7-sample-app/src/app/profile/profile.component.html rename to samples/msal-angular-samples/angular7-sample-app/src/app/profile/profile.component.html diff --git a/samples/angular7-sample-app/src/app/profile/profile.component.spec.ts b/samples/msal-angular-samples/angular7-sample-app/src/app/profile/profile.component.spec.ts similarity index 100% rename from samples/angular7-sample-app/src/app/profile/profile.component.spec.ts rename to samples/msal-angular-samples/angular7-sample-app/src/app/profile/profile.component.spec.ts diff --git a/samples/angular7-sample-app/src/app/profile/profile.component.ts b/samples/msal-angular-samples/angular7-sample-app/src/app/profile/profile.component.ts similarity index 100% rename from samples/angular7-sample-app/src/app/profile/profile.component.ts rename to samples/msal-angular-samples/angular7-sample-app/src/app/profile/profile.component.ts diff --git a/samples/angular7-sample-app/src/assets/.gitkeep b/samples/msal-angular-samples/angular7-sample-app/src/assets/.gitkeep similarity index 100% rename from samples/angular7-sample-app/src/assets/.gitkeep rename to samples/msal-angular-samples/angular7-sample-app/src/assets/.gitkeep diff --git a/samples/angular7-sample-app/src/browserslist b/samples/msal-angular-samples/angular7-sample-app/src/browserslist similarity index 100% rename from samples/angular7-sample-app/src/browserslist rename to samples/msal-angular-samples/angular7-sample-app/src/browserslist diff --git a/samples/angular7-sample-app/src/environments/environment.prod.ts b/samples/msal-angular-samples/angular7-sample-app/src/environments/environment.prod.ts similarity index 100% rename from samples/angular7-sample-app/src/environments/environment.prod.ts rename to samples/msal-angular-samples/angular7-sample-app/src/environments/environment.prod.ts diff --git a/samples/angular7-sample-app/src/environments/environment.ts b/samples/msal-angular-samples/angular7-sample-app/src/environments/environment.ts similarity index 100% rename from samples/angular7-sample-app/src/environments/environment.ts rename to samples/msal-angular-samples/angular7-sample-app/src/environments/environment.ts diff --git a/samples/angular7-sample-app/src/favicon.ico b/samples/msal-angular-samples/angular7-sample-app/src/favicon.ico similarity index 100% rename from samples/angular7-sample-app/src/favicon.ico rename to samples/msal-angular-samples/angular7-sample-app/src/favicon.ico diff --git a/samples/angular7-sample-app/src/index.html b/samples/msal-angular-samples/angular7-sample-app/src/index.html similarity index 100% rename from samples/angular7-sample-app/src/index.html rename to samples/msal-angular-samples/angular7-sample-app/src/index.html diff --git a/samples/angular7-sample-app/src/karma.conf.js b/samples/msal-angular-samples/angular7-sample-app/src/karma.conf.js similarity index 100% rename from samples/angular7-sample-app/src/karma.conf.js rename to samples/msal-angular-samples/angular7-sample-app/src/karma.conf.js diff --git a/samples/angular7-sample-app/src/main.ts b/samples/msal-angular-samples/angular7-sample-app/src/main.ts similarity index 100% rename from samples/angular7-sample-app/src/main.ts rename to samples/msal-angular-samples/angular7-sample-app/src/main.ts diff --git a/samples/angular7-sample-app/src/polyfills.ts b/samples/msal-angular-samples/angular7-sample-app/src/polyfills.ts similarity index 100% rename from samples/angular7-sample-app/src/polyfills.ts rename to samples/msal-angular-samples/angular7-sample-app/src/polyfills.ts diff --git a/samples/angular7-sample-app/src/styles.css b/samples/msal-angular-samples/angular7-sample-app/src/styles.css similarity index 100% rename from samples/angular7-sample-app/src/styles.css rename to samples/msal-angular-samples/angular7-sample-app/src/styles.css diff --git a/samples/angular7-sample-app/src/test.ts b/samples/msal-angular-samples/angular7-sample-app/src/test.ts similarity index 100% rename from samples/angular7-sample-app/src/test.ts rename to samples/msal-angular-samples/angular7-sample-app/src/test.ts diff --git a/samples/angular7-sample-app/src/tsconfig.app.json b/samples/msal-angular-samples/angular7-sample-app/src/tsconfig.app.json similarity index 100% rename from samples/angular7-sample-app/src/tsconfig.app.json rename to samples/msal-angular-samples/angular7-sample-app/src/tsconfig.app.json diff --git a/samples/angular7-sample-app/src/tsconfig.spec.json b/samples/msal-angular-samples/angular7-sample-app/src/tsconfig.spec.json similarity index 100% rename from samples/angular7-sample-app/src/tsconfig.spec.json rename to samples/msal-angular-samples/angular7-sample-app/src/tsconfig.spec.json diff --git a/samples/angular7-sample-app/src/tslint.json b/samples/msal-angular-samples/angular7-sample-app/src/tslint.json similarity index 100% rename from samples/angular7-sample-app/src/tslint.json rename to samples/msal-angular-samples/angular7-sample-app/src/tslint.json diff --git a/samples/angular7-sample-app/tsconfig.json b/samples/msal-angular-samples/angular7-sample-app/tsconfig.json similarity index 100% rename from samples/angular7-sample-app/tsconfig.json rename to samples/msal-angular-samples/angular7-sample-app/tsconfig.json diff --git a/samples/angular7-sample-app/tslint.json b/samples/msal-angular-samples/angular7-sample-app/tslint.json similarity index 100% rename from samples/angular7-sample-app/tslint.json rename to samples/msal-angular-samples/angular7-sample-app/tslint.json diff --git a/samples/angular8-sample-app/.editorconfig b/samples/msal-angular-samples/angular8-sample-app/.editorconfig similarity index 100% rename from samples/angular8-sample-app/.editorconfig rename to samples/msal-angular-samples/angular8-sample-app/.editorconfig diff --git a/samples/angular8-sample-app/.gitignore b/samples/msal-angular-samples/angular8-sample-app/.gitignore similarity index 100% rename from samples/angular8-sample-app/.gitignore rename to samples/msal-angular-samples/angular8-sample-app/.gitignore diff --git a/samples/angular8-sample-app/README.md b/samples/msal-angular-samples/angular8-sample-app/README.md similarity index 100% rename from samples/angular8-sample-app/README.md rename to samples/msal-angular-samples/angular8-sample-app/README.md diff --git a/samples/angular8-sample-app/angular.json b/samples/msal-angular-samples/angular8-sample-app/angular.json similarity index 100% rename from samples/angular8-sample-app/angular.json rename to samples/msal-angular-samples/angular8-sample-app/angular.json diff --git a/samples/angular8-sample-app/browserslist b/samples/msal-angular-samples/angular8-sample-app/browserslist similarity index 100% rename from samples/angular8-sample-app/browserslist rename to samples/msal-angular-samples/angular8-sample-app/browserslist diff --git a/samples/angular8-sample-app/e2e/protractor.conf.js b/samples/msal-angular-samples/angular8-sample-app/e2e/protractor.conf.js similarity index 100% rename from samples/angular8-sample-app/e2e/protractor.conf.js rename to samples/msal-angular-samples/angular8-sample-app/e2e/protractor.conf.js diff --git a/samples/angular8-sample-app/e2e/src/app.e2e-spec.ts b/samples/msal-angular-samples/angular8-sample-app/e2e/src/app.e2e-spec.ts similarity index 100% rename from samples/angular8-sample-app/e2e/src/app.e2e-spec.ts rename to samples/msal-angular-samples/angular8-sample-app/e2e/src/app.e2e-spec.ts diff --git a/samples/angular8-sample-app/e2e/src/app.po.ts b/samples/msal-angular-samples/angular8-sample-app/e2e/src/app.po.ts similarity index 100% rename from samples/angular8-sample-app/e2e/src/app.po.ts rename to samples/msal-angular-samples/angular8-sample-app/e2e/src/app.po.ts diff --git a/samples/angular8-sample-app/e2e/tsconfig.json b/samples/msal-angular-samples/angular8-sample-app/e2e/tsconfig.json similarity index 100% rename from samples/angular8-sample-app/e2e/tsconfig.json rename to samples/msal-angular-samples/angular8-sample-app/e2e/tsconfig.json diff --git a/samples/angular8-sample-app/karma.conf.js b/samples/msal-angular-samples/angular8-sample-app/karma.conf.js similarity index 100% rename from samples/angular8-sample-app/karma.conf.js rename to samples/msal-angular-samples/angular8-sample-app/karma.conf.js diff --git a/samples/angular8-sample-app/package-lock.json b/samples/msal-angular-samples/angular8-sample-app/package-lock.json similarity index 100% rename from samples/angular8-sample-app/package-lock.json rename to samples/msal-angular-samples/angular8-sample-app/package-lock.json diff --git a/samples/angular8-sample-app/package.json b/samples/msal-angular-samples/angular8-sample-app/package.json similarity index 100% rename from samples/angular8-sample-app/package.json rename to samples/msal-angular-samples/angular8-sample-app/package.json diff --git a/samples/angular8-sample-app/src/app/app-routing.module.ts b/samples/msal-angular-samples/angular8-sample-app/src/app/app-routing.module.ts similarity index 100% rename from samples/angular8-sample-app/src/app/app-routing.module.ts rename to samples/msal-angular-samples/angular8-sample-app/src/app/app-routing.module.ts diff --git a/samples/angular8-sample-app/src/app/app.component.css b/samples/msal-angular-samples/angular8-sample-app/src/app/app.component.css similarity index 100% rename from samples/angular8-sample-app/src/app/app.component.css rename to samples/msal-angular-samples/angular8-sample-app/src/app/app.component.css diff --git a/samples/angular8-sample-app/src/app/app.component.html b/samples/msal-angular-samples/angular8-sample-app/src/app/app.component.html similarity index 100% rename from samples/angular8-sample-app/src/app/app.component.html rename to samples/msal-angular-samples/angular8-sample-app/src/app/app.component.html diff --git a/samples/angular8-sample-app/src/app/app.component.spec.ts b/samples/msal-angular-samples/angular8-sample-app/src/app/app.component.spec.ts similarity index 100% rename from samples/angular8-sample-app/src/app/app.component.spec.ts rename to samples/msal-angular-samples/angular8-sample-app/src/app/app.component.spec.ts diff --git a/samples/angular8-sample-app/src/app/app.component.ts b/samples/msal-angular-samples/angular8-sample-app/src/app/app.component.ts similarity index 100% rename from samples/angular8-sample-app/src/app/app.component.ts rename to samples/msal-angular-samples/angular8-sample-app/src/app/app.component.ts diff --git a/samples/angular8-sample-app/src/app/app.module.ts b/samples/msal-angular-samples/angular8-sample-app/src/app/app.module.ts similarity index 100% rename from samples/angular8-sample-app/src/app/app.module.ts rename to samples/msal-angular-samples/angular8-sample-app/src/app/app.module.ts diff --git a/samples/angular8-sample-app/src/app/profile/profile.component.css b/samples/msal-angular-samples/angular8-sample-app/src/app/profile/profile.component.css similarity index 100% rename from samples/angular8-sample-app/src/app/profile/profile.component.css rename to samples/msal-angular-samples/angular8-sample-app/src/app/profile/profile.component.css diff --git a/samples/angular8-sample-app/src/app/profile/profile.component.html b/samples/msal-angular-samples/angular8-sample-app/src/app/profile/profile.component.html similarity index 100% rename from samples/angular8-sample-app/src/app/profile/profile.component.html rename to samples/msal-angular-samples/angular8-sample-app/src/app/profile/profile.component.html diff --git a/samples/angular8-sample-app/src/app/profile/profile.component.spec.ts b/samples/msal-angular-samples/angular8-sample-app/src/app/profile/profile.component.spec.ts similarity index 100% rename from samples/angular8-sample-app/src/app/profile/profile.component.spec.ts rename to samples/msal-angular-samples/angular8-sample-app/src/app/profile/profile.component.spec.ts diff --git a/samples/angular8-sample-app/src/app/profile/profile.component.ts b/samples/msal-angular-samples/angular8-sample-app/src/app/profile/profile.component.ts similarity index 100% rename from samples/angular8-sample-app/src/app/profile/profile.component.ts rename to samples/msal-angular-samples/angular8-sample-app/src/app/profile/profile.component.ts diff --git a/samples/angular8-sample-app/src/assets/.gitkeep b/samples/msal-angular-samples/angular8-sample-app/src/assets/.gitkeep similarity index 100% rename from samples/angular8-sample-app/src/assets/.gitkeep rename to samples/msal-angular-samples/angular8-sample-app/src/assets/.gitkeep diff --git a/samples/angular8-sample-app/src/environments/environment.prod.ts b/samples/msal-angular-samples/angular8-sample-app/src/environments/environment.prod.ts similarity index 100% rename from samples/angular8-sample-app/src/environments/environment.prod.ts rename to samples/msal-angular-samples/angular8-sample-app/src/environments/environment.prod.ts diff --git a/samples/angular8-sample-app/src/environments/environment.ts b/samples/msal-angular-samples/angular8-sample-app/src/environments/environment.ts similarity index 100% rename from samples/angular8-sample-app/src/environments/environment.ts rename to samples/msal-angular-samples/angular8-sample-app/src/environments/environment.ts diff --git a/samples/angular8-sample-app/src/favicon.ico b/samples/msal-angular-samples/angular8-sample-app/src/favicon.ico similarity index 100% rename from samples/angular8-sample-app/src/favicon.ico rename to samples/msal-angular-samples/angular8-sample-app/src/favicon.ico diff --git a/samples/angular8-sample-app/src/index.html b/samples/msal-angular-samples/angular8-sample-app/src/index.html similarity index 100% rename from samples/angular8-sample-app/src/index.html rename to samples/msal-angular-samples/angular8-sample-app/src/index.html diff --git a/samples/angular8-sample-app/src/main.ts b/samples/msal-angular-samples/angular8-sample-app/src/main.ts similarity index 100% rename from samples/angular8-sample-app/src/main.ts rename to samples/msal-angular-samples/angular8-sample-app/src/main.ts diff --git a/samples/angular8-sample-app/src/polyfills.ts b/samples/msal-angular-samples/angular8-sample-app/src/polyfills.ts similarity index 100% rename from samples/angular8-sample-app/src/polyfills.ts rename to samples/msal-angular-samples/angular8-sample-app/src/polyfills.ts diff --git a/samples/angular8-sample-app/src/styles.css b/samples/msal-angular-samples/angular8-sample-app/src/styles.css similarity index 100% rename from samples/angular8-sample-app/src/styles.css rename to samples/msal-angular-samples/angular8-sample-app/src/styles.css diff --git a/samples/angular8-sample-app/src/test.ts b/samples/msal-angular-samples/angular8-sample-app/src/test.ts similarity index 100% rename from samples/angular8-sample-app/src/test.ts rename to samples/msal-angular-samples/angular8-sample-app/src/test.ts diff --git a/samples/angular8-sample-app/tsconfig.app.json b/samples/msal-angular-samples/angular8-sample-app/tsconfig.app.json similarity index 100% rename from samples/angular8-sample-app/tsconfig.app.json rename to samples/msal-angular-samples/angular8-sample-app/tsconfig.app.json diff --git a/samples/angular8-sample-app/tsconfig.json b/samples/msal-angular-samples/angular8-sample-app/tsconfig.json similarity index 100% rename from samples/angular8-sample-app/tsconfig.json rename to samples/msal-angular-samples/angular8-sample-app/tsconfig.json diff --git a/samples/angular8-sample-app/tsconfig.spec.json b/samples/msal-angular-samples/angular8-sample-app/tsconfig.spec.json similarity index 100% rename from samples/angular8-sample-app/tsconfig.spec.json rename to samples/msal-angular-samples/angular8-sample-app/tsconfig.spec.json diff --git a/samples/angular8-sample-app/tslint.json b/samples/msal-angular-samples/angular8-sample-app/tslint.json similarity index 100% rename from samples/angular8-sample-app/tslint.json rename to samples/msal-angular-samples/angular8-sample-app/tslint.json diff --git a/samples/angular9-sample-app/.editorconfig b/samples/msal-angular-samples/angular9-sample-app/.editorconfig similarity index 100% rename from samples/angular9-sample-app/.editorconfig rename to samples/msal-angular-samples/angular9-sample-app/.editorconfig diff --git a/samples/angular9-sample-app/.gitignore b/samples/msal-angular-samples/angular9-sample-app/.gitignore similarity index 100% rename from samples/angular9-sample-app/.gitignore rename to samples/msal-angular-samples/angular9-sample-app/.gitignore diff --git a/samples/angular9-sample-app/README.md b/samples/msal-angular-samples/angular9-sample-app/README.md similarity index 100% rename from samples/angular9-sample-app/README.md rename to samples/msal-angular-samples/angular9-sample-app/README.md diff --git a/samples/angular9-sample-app/angular.json b/samples/msal-angular-samples/angular9-sample-app/angular.json similarity index 100% rename from samples/angular9-sample-app/angular.json rename to samples/msal-angular-samples/angular9-sample-app/angular.json diff --git a/samples/angular9-sample-app/browserslist b/samples/msal-angular-samples/angular9-sample-app/browserslist similarity index 100% rename from samples/angular9-sample-app/browserslist rename to samples/msal-angular-samples/angular9-sample-app/browserslist diff --git a/samples/angular9-sample-app/e2e/protractor.conf.js b/samples/msal-angular-samples/angular9-sample-app/e2e/protractor.conf.js similarity index 100% rename from samples/angular9-sample-app/e2e/protractor.conf.js rename to samples/msal-angular-samples/angular9-sample-app/e2e/protractor.conf.js diff --git a/samples/angular9-sample-app/e2e/src/app.e2e-spec.ts b/samples/msal-angular-samples/angular9-sample-app/e2e/src/app.e2e-spec.ts similarity index 100% rename from samples/angular9-sample-app/e2e/src/app.e2e-spec.ts rename to samples/msal-angular-samples/angular9-sample-app/e2e/src/app.e2e-spec.ts diff --git a/samples/angular9-sample-app/e2e/src/app.po.ts b/samples/msal-angular-samples/angular9-sample-app/e2e/src/app.po.ts similarity index 100% rename from samples/angular9-sample-app/e2e/src/app.po.ts rename to samples/msal-angular-samples/angular9-sample-app/e2e/src/app.po.ts diff --git a/samples/angular9-sample-app/e2e/tsconfig.json b/samples/msal-angular-samples/angular9-sample-app/e2e/tsconfig.json similarity index 100% rename from samples/angular9-sample-app/e2e/tsconfig.json rename to samples/msal-angular-samples/angular9-sample-app/e2e/tsconfig.json diff --git a/samples/angular9-sample-app/karma.conf.js b/samples/msal-angular-samples/angular9-sample-app/karma.conf.js similarity index 100% rename from samples/angular9-sample-app/karma.conf.js rename to samples/msal-angular-samples/angular9-sample-app/karma.conf.js diff --git a/samples/angular9-sample-app/package-lock.json b/samples/msal-angular-samples/angular9-sample-app/package-lock.json similarity index 100% rename from samples/angular9-sample-app/package-lock.json rename to samples/msal-angular-samples/angular9-sample-app/package-lock.json diff --git a/samples/angular9-sample-app/package.json b/samples/msal-angular-samples/angular9-sample-app/package.json similarity index 100% rename from samples/angular9-sample-app/package.json rename to samples/msal-angular-samples/angular9-sample-app/package.json diff --git a/samples/angular9-sample-app/src/app/app-routing.module.ts b/samples/msal-angular-samples/angular9-sample-app/src/app/app-routing.module.ts similarity index 100% rename from samples/angular9-sample-app/src/app/app-routing.module.ts rename to samples/msal-angular-samples/angular9-sample-app/src/app/app-routing.module.ts diff --git a/samples/angular9-sample-app/src/app/app.component.css b/samples/msal-angular-samples/angular9-sample-app/src/app/app.component.css similarity index 100% rename from samples/angular9-sample-app/src/app/app.component.css rename to samples/msal-angular-samples/angular9-sample-app/src/app/app.component.css diff --git a/samples/angular9-sample-app/src/app/app.component.html b/samples/msal-angular-samples/angular9-sample-app/src/app/app.component.html similarity index 100% rename from samples/angular9-sample-app/src/app/app.component.html rename to samples/msal-angular-samples/angular9-sample-app/src/app/app.component.html diff --git a/samples/angular9-sample-app/src/app/app.component.spec.ts b/samples/msal-angular-samples/angular9-sample-app/src/app/app.component.spec.ts similarity index 100% rename from samples/angular9-sample-app/src/app/app.component.spec.ts rename to samples/msal-angular-samples/angular9-sample-app/src/app/app.component.spec.ts diff --git a/samples/angular9-sample-app/src/app/app.component.ts b/samples/msal-angular-samples/angular9-sample-app/src/app/app.component.ts similarity index 100% rename from samples/angular9-sample-app/src/app/app.component.ts rename to samples/msal-angular-samples/angular9-sample-app/src/app/app.component.ts diff --git a/samples/angular9-sample-app/src/app/app.module.ts b/samples/msal-angular-samples/angular9-sample-app/src/app/app.module.ts similarity index 100% rename from samples/angular9-sample-app/src/app/app.module.ts rename to samples/msal-angular-samples/angular9-sample-app/src/app/app.module.ts diff --git a/samples/angular9-sample-app/src/app/home/home.component.css b/samples/msal-angular-samples/angular9-sample-app/src/app/home/home.component.css similarity index 100% rename from samples/angular9-sample-app/src/app/home/home.component.css rename to samples/msal-angular-samples/angular9-sample-app/src/app/home/home.component.css diff --git a/samples/angular9-sample-app/src/app/home/home.component.html b/samples/msal-angular-samples/angular9-sample-app/src/app/home/home.component.html similarity index 100% rename from samples/angular9-sample-app/src/app/home/home.component.html rename to samples/msal-angular-samples/angular9-sample-app/src/app/home/home.component.html diff --git a/samples/angular9-sample-app/src/app/home/home.component.spec.ts b/samples/msal-angular-samples/angular9-sample-app/src/app/home/home.component.spec.ts similarity index 100% rename from samples/angular9-sample-app/src/app/home/home.component.spec.ts rename to samples/msal-angular-samples/angular9-sample-app/src/app/home/home.component.spec.ts diff --git a/samples/angular9-sample-app/src/app/home/home.component.ts b/samples/msal-angular-samples/angular9-sample-app/src/app/home/home.component.ts similarity index 100% rename from samples/angular9-sample-app/src/app/home/home.component.ts rename to samples/msal-angular-samples/angular9-sample-app/src/app/home/home.component.ts diff --git a/samples/angular9-sample-app/src/app/profile/profile.component.css b/samples/msal-angular-samples/angular9-sample-app/src/app/profile/profile.component.css similarity index 100% rename from samples/angular9-sample-app/src/app/profile/profile.component.css rename to samples/msal-angular-samples/angular9-sample-app/src/app/profile/profile.component.css diff --git a/samples/angular9-sample-app/src/app/profile/profile.component.html b/samples/msal-angular-samples/angular9-sample-app/src/app/profile/profile.component.html similarity index 100% rename from samples/angular9-sample-app/src/app/profile/profile.component.html rename to samples/msal-angular-samples/angular9-sample-app/src/app/profile/profile.component.html diff --git a/samples/angular9-sample-app/src/app/profile/profile.component.spec.ts b/samples/msal-angular-samples/angular9-sample-app/src/app/profile/profile.component.spec.ts similarity index 100% rename from samples/angular9-sample-app/src/app/profile/profile.component.spec.ts rename to samples/msal-angular-samples/angular9-sample-app/src/app/profile/profile.component.spec.ts diff --git a/samples/angular9-sample-app/src/app/profile/profile.component.ts b/samples/msal-angular-samples/angular9-sample-app/src/app/profile/profile.component.ts similarity index 100% rename from samples/angular9-sample-app/src/app/profile/profile.component.ts rename to samples/msal-angular-samples/angular9-sample-app/src/app/profile/profile.component.ts diff --git a/samples/angular9-sample-app/src/assets/.gitkeep b/samples/msal-angular-samples/angular9-sample-app/src/assets/.gitkeep similarity index 100% rename from samples/angular9-sample-app/src/assets/.gitkeep rename to samples/msal-angular-samples/angular9-sample-app/src/assets/.gitkeep diff --git a/samples/angular9-sample-app/src/environments/environment.prod.ts b/samples/msal-angular-samples/angular9-sample-app/src/environments/environment.prod.ts similarity index 100% rename from samples/angular9-sample-app/src/environments/environment.prod.ts rename to samples/msal-angular-samples/angular9-sample-app/src/environments/environment.prod.ts diff --git a/samples/angular9-sample-app/src/environments/environment.ts b/samples/msal-angular-samples/angular9-sample-app/src/environments/environment.ts similarity index 100% rename from samples/angular9-sample-app/src/environments/environment.ts rename to samples/msal-angular-samples/angular9-sample-app/src/environments/environment.ts diff --git a/samples/angular9-sample-app/src/favicon.ico b/samples/msal-angular-samples/angular9-sample-app/src/favicon.ico similarity index 100% rename from samples/angular9-sample-app/src/favicon.ico rename to samples/msal-angular-samples/angular9-sample-app/src/favicon.ico diff --git a/samples/angular9-sample-app/src/index.html b/samples/msal-angular-samples/angular9-sample-app/src/index.html similarity index 100% rename from samples/angular9-sample-app/src/index.html rename to samples/msal-angular-samples/angular9-sample-app/src/index.html diff --git a/samples/angular9-sample-app/src/main.ts b/samples/msal-angular-samples/angular9-sample-app/src/main.ts similarity index 100% rename from samples/angular9-sample-app/src/main.ts rename to samples/msal-angular-samples/angular9-sample-app/src/main.ts diff --git a/samples/angular9-sample-app/src/polyfills.ts b/samples/msal-angular-samples/angular9-sample-app/src/polyfills.ts similarity index 100% rename from samples/angular9-sample-app/src/polyfills.ts rename to samples/msal-angular-samples/angular9-sample-app/src/polyfills.ts diff --git a/samples/angular9-sample-app/src/styles.css b/samples/msal-angular-samples/angular9-sample-app/src/styles.css similarity index 100% rename from samples/angular9-sample-app/src/styles.css rename to samples/msal-angular-samples/angular9-sample-app/src/styles.css diff --git a/samples/angular9-sample-app/src/test.ts b/samples/msal-angular-samples/angular9-sample-app/src/test.ts similarity index 100% rename from samples/angular9-sample-app/src/test.ts rename to samples/msal-angular-samples/angular9-sample-app/src/test.ts diff --git a/samples/angular9-sample-app/tsconfig.app.json b/samples/msal-angular-samples/angular9-sample-app/tsconfig.app.json similarity index 100% rename from samples/angular9-sample-app/tsconfig.app.json rename to samples/msal-angular-samples/angular9-sample-app/tsconfig.app.json diff --git a/samples/angular9-sample-app/tsconfig.json b/samples/msal-angular-samples/angular9-sample-app/tsconfig.json similarity index 100% rename from samples/angular9-sample-app/tsconfig.json rename to samples/msal-angular-samples/angular9-sample-app/tsconfig.json diff --git a/samples/angular9-sample-app/tsconfig.spec.json b/samples/msal-angular-samples/angular9-sample-app/tsconfig.spec.json similarity index 100% rename from samples/angular9-sample-app/tsconfig.spec.json rename to samples/msal-angular-samples/angular9-sample-app/tsconfig.spec.json diff --git a/samples/angular9-sample-app/tslint.json b/samples/msal-angular-samples/angular9-sample-app/tslint.json similarity index 100% rename from samples/angular9-sample-app/tslint.json rename to samples/msal-angular-samples/angular9-sample-app/tslint.json diff --git a/samples/MsalAngularjsDemoApp/.deployment b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/.deployment similarity index 100% rename from samples/MsalAngularjsDemoApp/.deployment rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/.deployment diff --git a/samples/MsalAngularjsDemoApp/App/Content/app.css b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Content/app.css similarity index 100% rename from samples/MsalAngularjsDemoApp/App/Content/app.css rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Content/app.css diff --git a/samples/MsalAngularjsDemoApp/App/Images/no_photo.png b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Images/no_photo.png similarity index 100% rename from samples/MsalAngularjsDemoApp/App/Images/no_photo.png rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Images/no_photo.png diff --git a/samples/MsalAngularjsDemoApp/App/Scripts/homeCtrl.js b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Scripts/homeCtrl.js similarity index 100% rename from samples/MsalAngularjsDemoApp/App/Scripts/homeCtrl.js rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Scripts/homeCtrl.js diff --git a/samples/MsalAngularjsDemoApp/App/Scripts/todoListCtrl.js b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Scripts/todoListCtrl.js similarity index 100% rename from samples/MsalAngularjsDemoApp/App/Scripts/todoListCtrl.js rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Scripts/todoListCtrl.js diff --git a/samples/MsalAngularjsDemoApp/App/Scripts/todoListSvc.js b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Scripts/todoListSvc.js similarity index 100% rename from samples/MsalAngularjsDemoApp/App/Scripts/todoListSvc.js rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Scripts/todoListSvc.js diff --git a/samples/MsalAngularjsDemoApp/App/Scripts/userProfileCtrl.js b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Scripts/userProfileCtrl.js similarity index 100% rename from samples/MsalAngularjsDemoApp/App/Scripts/userProfileCtrl.js rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Scripts/userProfileCtrl.js diff --git a/samples/MsalAngularjsDemoApp/App/Views/Home.html b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Views/Home.html similarity index 100% rename from samples/MsalAngularjsDemoApp/App/Views/Home.html rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Views/Home.html diff --git a/samples/MsalAngularjsDemoApp/App/Views/TodoList.html b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Views/TodoList.html similarity index 100% rename from samples/MsalAngularjsDemoApp/App/Views/TodoList.html rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Views/TodoList.html diff --git a/samples/MsalAngularjsDemoApp/App/Views/UserProfile.html b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Views/UserProfile.html similarity index 100% rename from samples/MsalAngularjsDemoApp/App/Views/UserProfile.html rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/App/Views/UserProfile.html diff --git a/samples/MsalAngularjsDemoApp/README.md b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/README.md similarity index 100% rename from samples/MsalAngularjsDemoApp/README.md rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/README.md diff --git a/samples/MsalAngularjsDemoApp/app.js b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/app.js similarity index 100% rename from samples/MsalAngularjsDemoApp/app.js rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/app.js diff --git a/samples/MsalAngularjsDemoApp/bundle.js b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/bundle.js similarity index 100% rename from samples/MsalAngularjsDemoApp/bundle.js rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/bundle.js diff --git a/samples/MsalAngularjsDemoApp/deploy.cmd b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/deploy.cmd similarity index 100% rename from samples/MsalAngularjsDemoApp/deploy.cmd rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/deploy.cmd diff --git a/samples/MsalAngularjsDemoApp/index.html b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/index.html similarity index 100% rename from samples/MsalAngularjsDemoApp/index.html rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/index.html diff --git a/samples/MsalAngularjsDemoApp/package-lock.json b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/package-lock.json similarity index 100% rename from samples/MsalAngularjsDemoApp/package-lock.json rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/package-lock.json diff --git a/samples/MsalAngularjsDemoApp/package.json b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/package.json similarity index 100% rename from samples/MsalAngularjsDemoApp/package.json rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/package.json diff --git a/samples/MsalAngularjsDemoApp/webpack.config.js b/samples/msal-angularjs-samples/MsalAngularjsDemoApp/webpack.config.js similarity index 100% rename from samples/MsalAngularjsDemoApp/webpack.config.js rename to samples/msal-angularjs-samples/MsalAngularjsDemoApp/webpack.config.js diff --git a/samples/VanillaJSTestApp/.babelrc b/samples/msal-browser-samples/VanillaJSTestApp2.0/.babelrc similarity index 100% rename from samples/VanillaJSTestApp/.babelrc rename to samples/msal-browser-samples/VanillaJSTestApp2.0/.babelrc diff --git a/samples/VanillaJSTestApp/.mocharc.json b/samples/msal-browser-samples/VanillaJSTestApp2.0/.mocharc.json similarity index 100% rename from samples/VanillaJSTestApp/.mocharc.json rename to samples/msal-browser-samples/VanillaJSTestApp2.0/.mocharc.json diff --git a/samples/VanillaJSTestApp2.0/Readme.md b/samples/msal-browser-samples/VanillaJSTestApp2.0/Readme.md similarity index 94% rename from samples/VanillaJSTestApp2.0/Readme.md rename to samples/msal-browser-samples/VanillaJSTestApp2.0/Readme.md index 7f831c262f..a6604568cd 100644 --- a/samples/VanillaJSTestApp2.0/Readme.md +++ b/samples/msal-browser-samples/VanillaJSTestApp2.0/Readme.md @@ -8,7 +8,7 @@ This developer sample is used to run basic use cases for the MSAL library. You c ### Pre-requisites - Ensure [all pre-requisites](../../lib/msal-browser/README.md#prerequisites) have been completed to run msal-browser. - Install node.js if needed (https://nodejs.org/en/). -- Build the `msal-browser` project with instructions provided in the [`README.md`](../../lib/msal-browser/README.md) or using the command `npm run build:package`. +- Build the `msal-browser` project with instructions provided in the [`README.md`](../../../lib/msal-browser/README.md) or using the command `npm run build:package`. ### Configure the application - Open `./app//authConfig.js` in an editor. diff --git a/samples/VanillaJSTestApp2.0/app/default/auth.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/auth.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/default/auth.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/auth.js diff --git a/samples/VanillaJSTestApp2.0/app/default/authConfig.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/authConfig.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/default/authConfig.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/authConfig.js diff --git a/samples/VanillaJSTestApp2.0/app/default/graph.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/graph.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/default/graph.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/graph.js diff --git a/samples/VanillaJSTestApp2.0/app/default/index.html b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/index.html similarity index 98% rename from samples/VanillaJSTestApp2.0/app/default/index.html rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/index.html index 902c3ed213..bd9217ef27 100644 --- a/samples/VanillaJSTestApp2.0/app/default/index.html +++ b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/index.html @@ -7,7 +7,7 @@ - + diff --git a/samples/VanillaJSTestApp2.0/app/default/test/browser.spec.ts b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/test/browser.spec.ts similarity index 100% rename from samples/VanillaJSTestApp2.0/app/default/test/browser.spec.ts rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/test/browser.spec.ts diff --git a/samples/VanillaJSTestApp2.0/app/default/ui.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/ui.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/default/ui.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/default/ui.js diff --git a/samples/VanillaJSTestApp2.0/app/multipleResources/auth.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/auth.js similarity index 96% rename from samples/VanillaJSTestApp2.0/app/multipleResources/auth.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/auth.js index 4498862d9f..76b6d66502 100644 --- a/samples/VanillaJSTestApp2.0/app/multipleResources/auth.js +++ b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/auth.js @@ -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]); } } } diff --git a/samples/VanillaJSTestApp2.0/app/multipleResources/authConfig.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/authConfig.js similarity index 94% rename from samples/VanillaJSTestApp2.0/app/multipleResources/authConfig.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/authConfig.js index 1b44cbecab..00d17aa980 100644 --- a/samples/VanillaJSTestApp2.0/app/multipleResources/authConfig.js +++ b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/authConfig.js @@ -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/" }; diff --git a/samples/VanillaJSTestApp2.0/app/multipleResources/graph.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/graph.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/multipleResources/graph.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/graph.js diff --git a/samples/VanillaJSTestApp2.0/app/multipleResources/index.html b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/index.html similarity index 98% rename from samples/VanillaJSTestApp2.0/app/multipleResources/index.html rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/index.html index d828abef88..7439169548 100644 --- a/samples/VanillaJSTestApp2.0/app/multipleResources/index.html +++ b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/index.html @@ -7,7 +7,7 @@ - + diff --git a/samples/VanillaJSTestApp2.0/app/multipleResources/test/multiple_resources.spec.ts b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/test/multiple_resources.spec.ts similarity index 95% rename from samples/VanillaJSTestApp2.0/app/multipleResources/test/multiple_resources.spec.ts rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/test/multiple_resources.spec.ts index e305e5aea1..2284e40485 100644 --- a/samples/VanillaJSTestApp2.0/app/multipleResources/test/multiple_resources.spec.ts +++ b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/test/multiple_resources.spec.ts @@ -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); }); }); diff --git a/samples/VanillaJSTestApp2.0/app/multipleResources/ui.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/ui.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/multipleResources/ui.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/multipleResources/ui.js diff --git a/samples/VanillaJSTestApp2.0/app/onPageLoad/auth.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/auth.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/onPageLoad/auth.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/auth.js diff --git a/samples/VanillaJSTestApp2.0/app/onPageLoad/authConfig.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/authConfig.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/onPageLoad/authConfig.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/authConfig.js diff --git a/samples/VanillaJSTestApp2.0/app/onPageLoad/graph.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/graph.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/onPageLoad/graph.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/graph.js diff --git a/samples/VanillaJSTestApp2.0/app/ssoSilent/index.html b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/index.html similarity index 98% rename from samples/VanillaJSTestApp2.0/app/ssoSilent/index.html rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/index.html index 902c3ed213..bd9217ef27 100644 --- a/samples/VanillaJSTestApp2.0/app/ssoSilent/index.html +++ b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/index.html @@ -7,7 +7,7 @@ - + diff --git a/samples/VanillaJSTestApp2.0/app/onPageLoad/test/template.spec.ts b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/test/template.spec.ts similarity index 100% rename from samples/VanillaJSTestApp2.0/app/onPageLoad/test/template.spec.ts rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/test/template.spec.ts diff --git a/samples/VanillaJSTestApp2.0/app/onPageLoad/ui.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/ui.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/onPageLoad/ui.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/onPageLoad/ui.js diff --git a/samples/VanillaJSTestApp2.0/app/sample_template/index.html b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/sample_template/index.html similarity index 100% rename from samples/VanillaJSTestApp2.0/app/sample_template/index.html rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/sample_template/index.html diff --git a/samples/VanillaJSTestApp2.0/app/sample_template/test/template.spec.ts b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/sample_template/test/template.spec.ts similarity index 100% rename from samples/VanillaJSTestApp2.0/app/sample_template/test/template.spec.ts rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/sample_template/test/template.spec.ts diff --git a/samples/VanillaJSTestApp2.0/app/ssoSilent/auth.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/auth.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/ssoSilent/auth.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/auth.js diff --git a/samples/VanillaJSTestApp2.0/app/ssoSilent/authConfig.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/authConfig.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/ssoSilent/authConfig.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/authConfig.js diff --git a/samples/VanillaJSTestApp2.0/app/ssoSilent/graph.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/graph.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/ssoSilent/graph.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/graph.js diff --git a/samples/VanillaJSTestApp2.0/app/onPageLoad/index.html b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/index.html similarity index 98% rename from samples/VanillaJSTestApp2.0/app/onPageLoad/index.html rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/index.html index 902c3ed213..bd9217ef27 100644 --- a/samples/VanillaJSTestApp2.0/app/onPageLoad/index.html +++ b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/index.html @@ -7,7 +7,7 @@ - + diff --git a/samples/VanillaJSTestApp2.0/app/ssoSilent/test/template.spec.ts b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/test/template.spec.ts similarity index 100% rename from samples/VanillaJSTestApp2.0/app/ssoSilent/test/template.spec.ts rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/test/template.spec.ts diff --git a/samples/VanillaJSTestApp2.0/app/ssoSilent/ui.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/ui.js similarity index 100% rename from samples/VanillaJSTestApp2.0/app/ssoSilent/ui.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/app/ssoSilent/ui.js diff --git a/samples/VanillaJSTestApp/e2eTests/LabClient.ts b/samples/msal-browser-samples/VanillaJSTestApp2.0/e2eTests/LabClient.ts similarity index 100% rename from samples/VanillaJSTestApp/e2eTests/LabClient.ts rename to samples/msal-browser-samples/VanillaJSTestApp2.0/e2eTests/LabClient.ts diff --git a/samples/VanillaJSTestApp2.0/e2eTests/testRunner.ts b/samples/msal-browser-samples/VanillaJSTestApp2.0/e2eTests/testRunner.ts similarity index 98% rename from samples/VanillaJSTestApp2.0/e2eTests/testRunner.ts rename to samples/msal-browser-samples/VanillaJSTestApp2.0/e2eTests/testRunner.ts index c32629740f..a58ca533f3 100644 --- a/samples/VanillaJSTestApp2.0/e2eTests/testRunner.ts +++ b/samples/msal-browser-samples/VanillaJSTestApp2.0/e2eTests/testRunner.ts @@ -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); diff --git a/samples/VanillaJSTestApp/e2eTests/testSetup.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/e2eTests/testSetup.js similarity index 100% rename from samples/VanillaJSTestApp/e2eTests/testSetup.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/e2eTests/testSetup.js diff --git a/samples/VanillaJSTestApp2.0/package-lock.json b/samples/msal-browser-samples/VanillaJSTestApp2.0/package-lock.json similarity index 100% rename from samples/VanillaJSTestApp2.0/package-lock.json rename to samples/msal-browser-samples/VanillaJSTestApp2.0/package-lock.json diff --git a/samples/VanillaJSTestApp2.0/package.json b/samples/msal-browser-samples/VanillaJSTestApp2.0/package.json similarity index 93% rename from samples/VanillaJSTestApp2.0/package.json rename to samples/msal-browser-samples/VanillaJSTestApp2.0/package.json index 719dd55aac..9384417ba8 100644 --- a/samples/VanillaJSTestApp2.0/package.json +++ b/samples/msal-browser-samples/VanillaJSTestApp2.0/package.json @@ -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" }, diff --git a/samples/VanillaJSTestApp/server.js b/samples/msal-browser-samples/VanillaJSTestApp2.0/server.js similarity index 95% rename from samples/VanillaJSTestApp/server.js rename to samples/msal-browser-samples/VanillaJSTestApp2.0/server.js index 49562f7c6d..b2a53e1ce1 100644 --- a/samples/VanillaJSTestApp/server.js +++ b/samples/msal-browser-samples/VanillaJSTestApp2.0/server.js @@ -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); diff --git a/samples/VanillaJSTestApp/tsconfig.base.json b/samples/msal-browser-samples/VanillaJSTestApp2.0/tsconfig.base.json similarity index 100% rename from samples/VanillaJSTestApp/tsconfig.base.json rename to samples/msal-browser-samples/VanillaJSTestApp2.0/tsconfig.base.json diff --git a/samples/VanillaJSTestApp/tsconfig.json b/samples/msal-browser-samples/VanillaJSTestApp2.0/tsconfig.json similarity index 100% rename from samples/VanillaJSTestApp/tsconfig.json rename to samples/msal-browser-samples/VanillaJSTestApp2.0/tsconfig.json diff --git a/samples/ModuleSample/Readme.txt b/samples/msal-core-samples/ModuleSample/Readme.txt similarity index 100% rename from samples/ModuleSample/Readme.txt rename to samples/msal-core-samples/ModuleSample/Readme.txt diff --git a/samples/ModuleSample/index_LoginPopup.html b/samples/msal-core-samples/ModuleSample/index_LoginPopup.html similarity index 100% rename from samples/ModuleSample/index_LoginPopup.html rename to samples/msal-core-samples/ModuleSample/index_LoginPopup.html diff --git a/samples/ModuleSample/package-lock.json b/samples/msal-core-samples/ModuleSample/package-lock.json similarity index 100% rename from samples/ModuleSample/package-lock.json rename to samples/msal-core-samples/ModuleSample/package-lock.json diff --git a/samples/ModuleSample/package.json b/samples/msal-core-samples/ModuleSample/package.json similarity index 100% rename from samples/ModuleSample/package.json rename to samples/msal-core-samples/ModuleSample/package.json diff --git a/samples/ModuleSample/server.js b/samples/msal-core-samples/ModuleSample/server.js similarity index 100% rename from samples/ModuleSample/server.js rename to samples/msal-core-samples/ModuleSample/server.js diff --git a/samples/ModuleSample/src/components/index.tsx b/samples/msal-core-samples/ModuleSample/src/components/index.tsx similarity index 100% rename from samples/ModuleSample/src/components/index.tsx rename to samples/msal-core-samples/ModuleSample/src/components/index.tsx diff --git a/samples/ModuleSample/tsconfig.json b/samples/msal-core-samples/ModuleSample/tsconfig.json similarity index 100% rename from samples/ModuleSample/tsconfig.json rename to samples/msal-core-samples/ModuleSample/tsconfig.json diff --git a/samples/ModuleSample/webpack.config.js b/samples/msal-core-samples/ModuleSample/webpack.config.js similarity index 100% rename from samples/ModuleSample/webpack.config.js rename to samples/msal-core-samples/ModuleSample/webpack.config.js diff --git a/samples/UnifiedCacheTestApp/ADAL.html b/samples/msal-core-samples/UnifiedCacheTestApp/ADAL.html similarity index 100% rename from samples/UnifiedCacheTestApp/ADAL.html rename to samples/msal-core-samples/UnifiedCacheTestApp/ADAL.html diff --git a/samples/UnifiedCacheTestApp/MSAL.html b/samples/msal-core-samples/UnifiedCacheTestApp/MSAL.html similarity index 100% rename from samples/UnifiedCacheTestApp/MSAL.html rename to samples/msal-core-samples/UnifiedCacheTestApp/MSAL.html diff --git a/samples/UnifiedCacheTestApp/README.md b/samples/msal-core-samples/UnifiedCacheTestApp/README.md similarity index 100% rename from samples/UnifiedCacheTestApp/README.md rename to samples/msal-core-samples/UnifiedCacheTestApp/README.md diff --git a/samples/UnifiedCacheTestApp/adal/adal.js b/samples/msal-core-samples/UnifiedCacheTestApp/adal/adal.js similarity index 100% rename from samples/UnifiedCacheTestApp/adal/adal.js rename to samples/msal-core-samples/UnifiedCacheTestApp/adal/adal.js diff --git a/samples/UnifiedCacheTestApp/index.html b/samples/msal-core-samples/UnifiedCacheTestApp/index.html similarity index 100% rename from samples/UnifiedCacheTestApp/index.html rename to samples/msal-core-samples/UnifiedCacheTestApp/index.html diff --git a/samples/UnifiedCacheTestApp/package-lock.json b/samples/msal-core-samples/UnifiedCacheTestApp/package-lock.json similarity index 100% rename from samples/UnifiedCacheTestApp/package-lock.json rename to samples/msal-core-samples/UnifiedCacheTestApp/package-lock.json diff --git a/samples/UnifiedCacheTestApp/package.json b/samples/msal-core-samples/UnifiedCacheTestApp/package.json similarity index 100% rename from samples/UnifiedCacheTestApp/package.json rename to samples/msal-core-samples/UnifiedCacheTestApp/package.json diff --git a/samples/UnifiedCacheTestApp/server.js b/samples/msal-core-samples/UnifiedCacheTestApp/server.js similarity index 91% rename from samples/UnifiedCacheTestApp/server.js rename to samples/msal-core-samples/UnifiedCacheTestApp/server.js index 8d4dab4050..461a5506e0 100644 --- a/samples/UnifiedCacheTestApp/server.js +++ b/samples/msal-core-samples/UnifiedCacheTestApp/server.js @@ -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. diff --git a/samples/VanillaJSTestApp-b2c/Readme.md b/samples/msal-core-samples/VanillaJSTestApp-b2c/Readme.md similarity index 100% rename from samples/VanillaJSTestApp-b2c/Readme.md rename to samples/msal-core-samples/VanillaJSTestApp-b2c/Readme.md diff --git a/samples/VanillaJSTestApp2.0/.babelrc b/samples/msal-core-samples/VanillaJSTestApp/.babelrc similarity index 100% rename from samples/VanillaJSTestApp2.0/.babelrc rename to samples/msal-core-samples/VanillaJSTestApp/.babelrc diff --git a/samples/VanillaJSTestApp2.0/.mocharc.json b/samples/msal-core-samples/VanillaJSTestApp/.mocharc.json similarity index 100% rename from samples/VanillaJSTestApp2.0/.mocharc.json rename to samples/msal-core-samples/VanillaJSTestApp/.mocharc.json diff --git a/samples/VanillaJSTestApp/Readme.md b/samples/msal-core-samples/VanillaJSTestApp/Readme.md similarity index 89% rename from samples/VanillaJSTestApp/Readme.md rename to samples/msal-core-samples/VanillaJSTestApp/Readme.md index d472daa881..d659d0bda7 100644 --- a/samples/VanillaJSTestApp/Readme.md +++ b/samples/msal-core-samples/VanillaJSTestApp/Readme.md @@ -6,9 +6,9 @@ This developer sample is used to run basic use cases for the MSAL library. You c ## How to run the sample: ### Pre-requisites -- Ensure [all pre-requisites](../../lib/msal-core/README.md#pre-requisites) have been completed to run msal-core. +- Ensure [all pre-requisites](../../../lib/msal-core/README.md#pre-requisites) have been completed to run msal-core. - Install node.js if needed (https://nodejs.org/en/). -- Build the `msal-core` project with instructions provided in the [`README.md`](../../lib/msal-core/README.md) or using the command `npm run build:package`. +- Build the `msal-core` project with instructions provided in the [`README.md`](../../../lib/msal-core/README.md) or using the command `npm run build:package`. ### Configure the application - Open `./app//authConfig.js` in an editor. diff --git a/samples/VanillaJSTestApp/app/default/auth.js b/samples/msal-core-samples/VanillaJSTestApp/app/default/auth.js similarity index 100% rename from samples/VanillaJSTestApp/app/default/auth.js rename to samples/msal-core-samples/VanillaJSTestApp/app/default/auth.js diff --git a/samples/VanillaJSTestApp/app/default/authConfig.js b/samples/msal-core-samples/VanillaJSTestApp/app/default/authConfig.js similarity index 100% rename from samples/VanillaJSTestApp/app/default/authConfig.js rename to samples/msal-core-samples/VanillaJSTestApp/app/default/authConfig.js diff --git a/samples/VanillaJSTestApp/app/default/graph.js b/samples/msal-core-samples/VanillaJSTestApp/app/default/graph.js similarity index 100% rename from samples/VanillaJSTestApp/app/default/graph.js rename to samples/msal-core-samples/VanillaJSTestApp/app/default/graph.js diff --git a/samples/VanillaJSTestApp/app/default/graphConfig.js b/samples/msal-core-samples/VanillaJSTestApp/app/default/graphConfig.js similarity index 100% rename from samples/VanillaJSTestApp/app/default/graphConfig.js rename to samples/msal-core-samples/VanillaJSTestApp/app/default/graphConfig.js diff --git a/samples/VanillaJSTestApp/app/default/index.html b/samples/msal-core-samples/VanillaJSTestApp/app/default/index.html similarity index 100% rename from samples/VanillaJSTestApp/app/default/index.html rename to samples/msal-core-samples/VanillaJSTestApp/app/default/index.html diff --git a/samples/VanillaJSTestApp/app/default/test/browser.spec.ts b/samples/msal-core-samples/VanillaJSTestApp/app/default/test/browser.spec.ts similarity index 100% rename from samples/VanillaJSTestApp/app/default/test/browser.spec.ts rename to samples/msal-core-samples/VanillaJSTestApp/app/default/test/browser.spec.ts diff --git a/samples/VanillaJSTestApp/app/default/ui.js b/samples/msal-core-samples/VanillaJSTestApp/app/default/ui.js similarity index 100% rename from samples/VanillaJSTestApp/app/default/ui.js rename to samples/msal-core-samples/VanillaJSTestApp/app/default/ui.js diff --git a/samples/VanillaJSTestApp/app/get_access_token_interactively/auth.js b/samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/auth.js similarity index 100% rename from samples/VanillaJSTestApp/app/get_access_token_interactively/auth.js rename to samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/auth.js diff --git a/samples/VanillaJSTestApp/app/get_access_token_interactively/authConfig.js b/samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/authConfig.js similarity index 100% rename from samples/VanillaJSTestApp/app/get_access_token_interactively/authConfig.js rename to samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/authConfig.js diff --git a/samples/VanillaJSTestApp/app/get_access_token_interactively/graph.js b/samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/graph.js similarity index 100% rename from samples/VanillaJSTestApp/app/get_access_token_interactively/graph.js rename to samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/graph.js diff --git a/samples/VanillaJSTestApp/app/get_access_token_interactively/index.html b/samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/index.html similarity index 100% rename from samples/VanillaJSTestApp/app/get_access_token_interactively/index.html rename to samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/index.html diff --git a/samples/VanillaJSTestApp/app/get_access_token_interactively/test/browser.spec.ts b/samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/test/browser.spec.ts similarity index 100% rename from samples/VanillaJSTestApp/app/get_access_token_interactively/test/browser.spec.ts rename to samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/test/browser.spec.ts diff --git a/samples/VanillaJSTestApp/app/get_access_token_interactively/ui.js b/samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/ui.js similarity index 100% rename from samples/VanillaJSTestApp/app/get_access_token_interactively/ui.js rename to samples/msal-core-samples/VanillaJSTestApp/app/get_access_token_interactively/ui.js diff --git a/samples/VanillaJSTestApp/app/sample_template/index.html b/samples/msal-core-samples/VanillaJSTestApp/app/sample_template/index.html similarity index 100% rename from samples/VanillaJSTestApp/app/sample_template/index.html rename to samples/msal-core-samples/VanillaJSTestApp/app/sample_template/index.html diff --git a/samples/VanillaJSTestApp/app/sample_template/test/template.spec.ts b/samples/msal-core-samples/VanillaJSTestApp/app/sample_template/test/template.spec.ts similarity index 100% rename from samples/VanillaJSTestApp/app/sample_template/test/template.spec.ts rename to samples/msal-core-samples/VanillaJSTestApp/app/sample_template/test/template.spec.ts diff --git a/samples/VanillaJSTestApp2.0/e2eTests/LabClient.ts b/samples/msal-core-samples/VanillaJSTestApp/e2eTests/LabClient.ts similarity index 100% rename from samples/VanillaJSTestApp2.0/e2eTests/LabClient.ts rename to samples/msal-core-samples/VanillaJSTestApp/e2eTests/LabClient.ts diff --git a/samples/VanillaJSTestApp/e2eTests/testRunner.ts b/samples/msal-core-samples/VanillaJSTestApp/e2eTests/testRunner.ts similarity index 98% rename from samples/VanillaJSTestApp/e2eTests/testRunner.ts rename to samples/msal-core-samples/VanillaJSTestApp/e2eTests/testRunner.ts index 22b07333ca..445dc24ec8 100644 --- a/samples/VanillaJSTestApp/e2eTests/testRunner.ts +++ b/samples/msal-core-samples/VanillaJSTestApp/e2eTests/testRunner.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); diff --git a/samples/VanillaJSTestApp2.0/e2eTests/testSetup.js b/samples/msal-core-samples/VanillaJSTestApp/e2eTests/testSetup.js similarity index 100% rename from samples/VanillaJSTestApp2.0/e2eTests/testSetup.js rename to samples/msal-core-samples/VanillaJSTestApp/e2eTests/testSetup.js diff --git a/samples/VanillaJSTestApp/package-lock.json b/samples/msal-core-samples/VanillaJSTestApp/package-lock.json similarity index 100% rename from samples/VanillaJSTestApp/package-lock.json rename to samples/msal-core-samples/VanillaJSTestApp/package-lock.json diff --git a/samples/VanillaJSTestApp/package.json b/samples/msal-core-samples/VanillaJSTestApp/package.json similarity index 94% rename from samples/VanillaJSTestApp/package.json rename to samples/msal-core-samples/VanillaJSTestApp/package.json index 17b21f1454..bf62fb7475 100644 --- a/samples/VanillaJSTestApp/package.json +++ b/samples/msal-core-samples/VanillaJSTestApp/package.json @@ -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" }, diff --git a/samples/VanillaJSTestApp2.0/server.js b/samples/msal-core-samples/VanillaJSTestApp/server.js similarity index 95% rename from samples/VanillaJSTestApp2.0/server.js rename to samples/msal-core-samples/VanillaJSTestApp/server.js index 81cff16cd4..598ef9c786 100644 --- a/samples/VanillaJSTestApp2.0/server.js +++ b/samples/msal-core-samples/VanillaJSTestApp/server.js @@ -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); diff --git a/samples/VanillaJSTestApp2.0/tsconfig.base.json b/samples/msal-core-samples/VanillaJSTestApp/tsconfig.base.json similarity index 100% rename from samples/VanillaJSTestApp2.0/tsconfig.base.json rename to samples/msal-core-samples/VanillaJSTestApp/tsconfig.base.json diff --git a/samples/VanillaJSTestApp2.0/tsconfig.json b/samples/msal-core-samples/VanillaJSTestApp/tsconfig.json similarity index 100% rename from samples/VanillaJSTestApp2.0/tsconfig.json rename to samples/msal-core-samples/VanillaJSTestApp/tsconfig.json diff --git a/samples/react-sample-app/.env b/samples/msal-core-samples/react-sample-app/.env similarity index 100% rename from samples/react-sample-app/.env rename to samples/msal-core-samples/react-sample-app/.env diff --git a/samples/react-sample-app/.gitignore b/samples/msal-core-samples/react-sample-app/.gitignore similarity index 100% rename from samples/react-sample-app/.gitignore rename to samples/msal-core-samples/react-sample-app/.gitignore diff --git a/samples/react-sample-app/.npmrc b/samples/msal-core-samples/react-sample-app/.npmrc similarity index 100% rename from samples/react-sample-app/.npmrc rename to samples/msal-core-samples/react-sample-app/.npmrc diff --git a/samples/react-sample-app/CRA_README.md b/samples/msal-core-samples/react-sample-app/CRA_README.md similarity index 100% rename from samples/react-sample-app/CRA_README.md rename to samples/msal-core-samples/react-sample-app/CRA_README.md diff --git a/samples/react-sample-app/README.md b/samples/msal-core-samples/react-sample-app/README.md similarity index 100% rename from samples/react-sample-app/README.md rename to samples/msal-core-samples/react-sample-app/README.md diff --git a/samples/react-sample-app/package-lock.json b/samples/msal-core-samples/react-sample-app/package-lock.json similarity index 100% rename from samples/react-sample-app/package-lock.json rename to samples/msal-core-samples/react-sample-app/package-lock.json diff --git a/samples/react-sample-app/package.json b/samples/msal-core-samples/react-sample-app/package.json similarity index 100% rename from samples/react-sample-app/package.json rename to samples/msal-core-samples/react-sample-app/package.json diff --git a/samples/react-sample-app/public/auth.html b/samples/msal-core-samples/react-sample-app/public/auth.html similarity index 100% rename from samples/react-sample-app/public/auth.html rename to samples/msal-core-samples/react-sample-app/public/auth.html diff --git a/samples/react-sample-app/public/favicon.ico b/samples/msal-core-samples/react-sample-app/public/favicon.ico similarity index 100% rename from samples/react-sample-app/public/favicon.ico rename to samples/msal-core-samples/react-sample-app/public/favicon.ico diff --git a/samples/react-sample-app/public/index.html b/samples/msal-core-samples/react-sample-app/public/index.html similarity index 100% rename from samples/react-sample-app/public/index.html rename to samples/msal-core-samples/react-sample-app/public/index.html diff --git a/samples/react-sample-app/public/manifest.json b/samples/msal-core-samples/react-sample-app/public/manifest.json similarity index 100% rename from samples/react-sample-app/public/manifest.json rename to samples/msal-core-samples/react-sample-app/public/manifest.json diff --git a/samples/react-sample-app/src/App.css b/samples/msal-core-samples/react-sample-app/src/App.css similarity index 100% rename from samples/react-sample-app/src/App.css rename to samples/msal-core-samples/react-sample-app/src/App.css diff --git a/samples/react-sample-app/src/App.js b/samples/msal-core-samples/react-sample-app/src/App.js similarity index 100% rename from samples/react-sample-app/src/App.js rename to samples/msal-core-samples/react-sample-app/src/App.js diff --git a/samples/react-sample-app/src/App.test.js b/samples/msal-core-samples/react-sample-app/src/App.test.js similarity index 100% rename from samples/react-sample-app/src/App.test.js rename to samples/msal-core-samples/react-sample-app/src/App.test.js diff --git a/samples/react-sample-app/src/AuthProvider.js b/samples/msal-core-samples/react-sample-app/src/AuthProvider.js similarity index 100% rename from samples/react-sample-app/src/AuthProvider.js rename to samples/msal-core-samples/react-sample-app/src/AuthProvider.js diff --git a/samples/react-sample-app/src/auth-utils.js b/samples/msal-core-samples/react-sample-app/src/auth-utils.js similarity index 100% rename from samples/react-sample-app/src/auth-utils.js rename to samples/msal-core-samples/react-sample-app/src/auth-utils.js diff --git a/samples/react-sample-app/src/index.css b/samples/msal-core-samples/react-sample-app/src/index.css similarity index 100% rename from samples/react-sample-app/src/index.css rename to samples/msal-core-samples/react-sample-app/src/index.css diff --git a/samples/react-sample-app/src/index.js b/samples/msal-core-samples/react-sample-app/src/index.js similarity index 100% rename from samples/react-sample-app/src/index.js rename to samples/msal-core-samples/react-sample-app/src/index.js diff --git a/samples/msal-node-auth-code/data/cache.json b/samples/msal-node-samples/msal-node-auth-code/data/cache.json similarity index 100% rename from samples/msal-node-auth-code/data/cache.json rename to samples/msal-node-samples/msal-node-auth-code/data/cache.json diff --git a/samples/msal-node-auth-code/index.js b/samples/msal-node-samples/msal-node-auth-code/index.js similarity index 100% rename from samples/msal-node-auth-code/index.js rename to samples/msal-node-samples/msal-node-auth-code/index.js diff --git a/samples/msal-node-auth-code/package-lock.json b/samples/msal-node-samples/msal-node-auth-code/package-lock.json similarity index 100% rename from samples/msal-node-auth-code/package-lock.json rename to samples/msal-node-samples/msal-node-auth-code/package-lock.json diff --git a/samples/msal-node-auth-code/package.json b/samples/msal-node-samples/msal-node-auth-code/package.json similarity index 77% rename from samples/msal-node-auth-code/package.json rename to samples/msal-node-samples/msal-node-auth-code/package.json index 07ec38695e..0adb68f60c 100644 --- a/samples/msal-node-auth-code/package.json +++ b/samples/msal-node-samples/msal-node-auth-code/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "start": "node index.js", - "build:package": "cd ../../lib/msal-common && npm run build && cd ../msal-node && npm run build", + "build:package": "cd ../../../lib/msal-common && npm run build && cd ../msal-node && npm run build", "start:build": "npm run build:package && npm start" }, "author": "Microsoft", diff --git a/samples/msal-node-device-code/NodeCache.txt b/samples/msal-node-samples/msal-node-device-code/NodeCache.txt similarity index 100% rename from samples/msal-node-device-code/NodeCache.txt rename to samples/msal-node-samples/msal-node-device-code/NodeCache.txt diff --git a/samples/msal-node-device-code/index.js b/samples/msal-node-samples/msal-node-device-code/index.js similarity index 100% rename from samples/msal-node-device-code/index.js rename to samples/msal-node-samples/msal-node-device-code/index.js diff --git a/samples/msal-node-device-code/package-lock.json b/samples/msal-node-samples/msal-node-device-code/package-lock.json similarity index 100% rename from samples/msal-node-device-code/package-lock.json rename to samples/msal-node-samples/msal-node-device-code/package-lock.json diff --git a/samples/msal-node-device-code/package.json b/samples/msal-node-samples/msal-node-device-code/package.json similarity index 78% rename from samples/msal-node-device-code/package.json rename to samples/msal-node-samples/msal-node-device-code/package.json index 36db34f3fe..b6c1adf94c 100644 --- a/samples/msal-node-device-code/package.json +++ b/samples/msal-node-samples/msal-node-device-code/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "start": "node index.js", - "build:package": "cd ../../lib/msal-common && npm run build && cd ../msal-node && npm run build", + "build:package": "cd ../../../lib/msal-common && npm run build && cd ../msal-node && npm run build", "start:build": "npm run build:package && npm start" }, "author": "", diff --git a/samples/msal-node-refresh-token/NodeCache.txt b/samples/msal-node-samples/msal-node-refresh-token/NodeCache.txt similarity index 100% rename from samples/msal-node-refresh-token/NodeCache.txt rename to samples/msal-node-samples/msal-node-refresh-token/NodeCache.txt diff --git a/samples/msal-node-refresh-token/index.js b/samples/msal-node-samples/msal-node-refresh-token/index.js similarity index 100% rename from samples/msal-node-refresh-token/index.js rename to samples/msal-node-samples/msal-node-refresh-token/index.js diff --git a/samples/msal-node-refresh-token/package-lock.json b/samples/msal-node-samples/msal-node-refresh-token/package-lock.json similarity index 100% rename from samples/msal-node-refresh-token/package-lock.json rename to samples/msal-node-samples/msal-node-refresh-token/package-lock.json diff --git a/samples/msal-node-refresh-token/package.json b/samples/msal-node-samples/msal-node-refresh-token/package.json similarity index 100% rename from samples/msal-node-refresh-token/package.json rename to samples/msal-node-samples/msal-node-refresh-token/package.json