diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md new file mode 100644 index 0000000..5e96d8f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -0,0 +1,29 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +# Steps to reproduce + +> What steps can reproduce the defect? +> Please share the setup, commandline for vstest.console, sample project, target +> framework etc. + +## Expected behavior + +> Share the expected output + +## Actual behavior + +> What is the behavior observed? + +## Diagnostic logs + +> Please share test platform diagnostics logs. +> The logs may contain test assembly paths, kindly review and mask those before sharing. + +## Environment + +> Please share additional details about your environment. +> Version \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md new file mode 100644 index 0000000..b9bec0c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -0,0 +1,19 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- + +# Feature Request + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I am always frustrated when [...] + +**Describe the solution you would like** +A clear and concise description of what you want to happen. + +**Describe alternatives you have considered** +A clear and concise description of any alternative solutions or features you have considered. + +**Additional context** +Add any other context or screenshots about the feature request here. \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ddc7f75 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,7 @@ +# Description + +Please add a meaningful description for this change. Ensure the PR has required unit tests. + +## Related issue + +Kindly link any related issues (e.g. Fixes #xyz). \ No newline at end of file diff --git a/.gitignore b/.gitignore index 61fdd38..d30cfcb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # User-specific files *.suo @@ -40,9 +42,11 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX +# .NET Core project.lock.json +project.fragment.lock.json artifacts/ +**/Properties/launchSettings.json *_i.c *_p.c @@ -109,6 +113,10 @@ _TeamCity* # DotCover is a Code Coverage Tool *.dotCover +# Visual Studio code coverage results +*.coverage +*.coveragexml + # NCrunch _NCrunch_* .*crunch*.local.xml @@ -158,7 +166,7 @@ PublishScripts/ !**/packages/build/ # Uncomment if necessary however generally it will be regenerated when needed #!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files +# NuGet v3's project.json files produces more ignorable files *.nuget.props *.nuget.targets @@ -188,9 +196,9 @@ ClientBin/ *~ *.dbmdl *.dbproj.schemaview +*.jfm *.pfx *.publishsettings -node_modules/ orleans.codegen.cs # Since there are multiple workflows, uncomment next line to ignore bower_components @@ -211,6 +219,7 @@ UpgradeLog*.htm # SQL Server files *.mdf *.ldf +*.ndf # Business Intelligence projects *.rdl.data @@ -225,6 +234,10 @@ FakesAssemblies/ # Node.js Tools for Visual Studio .ntvs_analysis.dat +node_modules/ + +# Typescript v1 declaration files +typings/ # Visual Studio 6 build log *.plg @@ -232,6 +245,9 @@ FakesAssemblies/ # Visual Studio 6 workspace options file *.opt +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts @@ -249,4 +265,31 @@ paket-files/ # JetBrains Rider .idea/ -*.sln.iml \ No newline at end of file +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# Visual Studio Code +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 7f2fba5..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,13 +0,0 @@ -## Partner-Center-Explorer Changelog - - -# 0.0.1 (3/24/2018) - -*Features* -* No new features - -*Bug Fixes* -* [Authentication loop](https://github.com/Microsoft/Partner-Center-Explorer/issues/3) whenever an authentication failure occurred - -*Breaking Changes* -* None \ No newline at end of file diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md deleted file mode 100644 index ae6d0e6..0000000 --- a/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,5 +0,0 @@ -### Expected behavior - -### Actual behavior - -### Steps to reproduce the problem \ No newline at end of file diff --git a/Partner-Center-Explorer.sln b/Partner-Center-Explorer.sln index a9d10b7..a339e9f 100644 --- a/Partner-Center-Explorer.sln +++ b/Partner-Center-Explorer.sln @@ -9,10 +9,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject azuredeploy.json = azuredeploy.json azuredeploy.param.json = azuredeploy.param.json - CHANGELOG.md = CHANGELOG.md CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md CONTRIBUTING.md = CONTRIBUTING.md - ISSUE_TEMPLATE.md = ISSUE_TEMPLATE.md LICENSE = LICENSE README.md = README.md EndProjectSection diff --git a/azuredeploy.json b/azuredeploy.json index de2e463..7fcacb1 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -64,17 +64,23 @@ "description": "The size of the new Azure Redis Cache instance." } }, + "partnerCenterAccountId": { + "type": "string", + "metadata": { + "description": "Account identifier value from the Azure AD application configured to access the Partner Center API." + } + }, "partnerCenterApplicationId": { "type": "string", - "minLength": 1 + "metadata": { + "description": "Application identifier value from the Azure AD application configured to access the Partner Center API." + } }, "partnerCenterApplicationSecret": { - "type": "string", - "minLength": 1 - }, - "partnerCenterApplicationTenantId": { - "type": "string", - "minLength": 1 + "type": "securestring", + "metadata": { + "description": "Secret key for the Azure AD application configured to access the Partner Center API." + } }, "repoUrl": { "type": "string", @@ -220,8 +226,8 @@ "ApplicationTenantId": "[parameters('applicationTenantId')]", "KeyVaultEndpoint": "[concat('https://', variables('keyVaultName'), '.vault.azure.net')]", "InstrumentationKey": "[reference(concat('Microsoft.Insights/components/', parameters('webSiteName'))).InstrumentationKey]", - "PartnerCenterApplicationId": "[parameters('partnerCenterApplicationId')]", - "PartnerCenterApplicationTenantId": "[parameters('partnerCenterApplicationTenantId')]" + "PartnerCenterAccountId": "[parameters('partnerCenterAccountId')]", + "PartnerCenterApplicationId": "[parameters('partnerCenterApplicationId')]" } } ] diff --git a/azuredeploy.param.json b/azuredeploy.param.json index 0039d60..8cb475c 100644 --- a/azuredeploy.param.json +++ b/azuredeploy.param.json @@ -7,11 +7,9 @@ }, "applicationSecret": { "value": "" - }, "applicationTenantId": { "value": "" - }, "branch": { "value": "master" @@ -25,15 +23,15 @@ "cacheSKUCapacity": { "value": 0 }, + "partnerCenterAccountId": { + "value": "" + }, "partnerCenterApplicationId": { "value": "" }, "partnerCenterApplicationSecret": { "value": "" }, - "partnerCenterApplicationTenantId": { - "value": "" - }, "repoUrl": { "value": "https://github.com/Microsoft/Partner-Center-Explorer" }, diff --git a/src/Explorer/App_Start/BundleConfig.cs b/src/Explorer/App_Start/BundleConfig.cs index ca3f31a..a9cbcc2 100644 --- a/src/Explorer/App_Start/BundleConfig.cs +++ b/src/Explorer/App_Start/BundleConfig.cs @@ -11,7 +11,7 @@ namespace Microsoft.Store.PartnerCenter.Explorer /// /// Configures the bundles used by the application. /// - public class BundleConfig + public static class BundleConfig { /// /// Registers the bundles. diff --git a/src/Explorer/App_Start/FilterConfig.cs b/src/Explorer/App_Start/FilterConfig.cs index 6fbfc5a..923d6bb 100644 --- a/src/Explorer/App_Start/FilterConfig.cs +++ b/src/Explorer/App_Start/FilterConfig.cs @@ -13,7 +13,7 @@ namespace Microsoft.Store.PartnerCenter.Explorer /// /// Configures the application filters. /// - public class FilterConfig + public static class FilterConfig { /// /// Registers the global filters. @@ -21,7 +21,7 @@ namespace Microsoft.Store.PartnerCenter.Explorer /// The global filter collection. public static void RegisterGlobalFilters(GlobalFilterCollection filters) { - filters.Add(new AuthenticationFilter()); + filters.Add(new AuthenticationFilterAttribute()); filters.Add(new TelemetryHandleErrorAttribute()); } } diff --git a/src/Explorer/App_Start/RouteConfig.cs b/src/Explorer/App_Start/RouteConfig.cs index fe13af3..2478b10 100644 --- a/src/Explorer/App_Start/RouteConfig.cs +++ b/src/Explorer/App_Start/RouteConfig.cs @@ -12,7 +12,7 @@ namespace Microsoft.Store.PartnerCenter.Explorer /// /// Configures routing for the application. /// - public class RouteConfig + public static class RouteConfig { /// /// Registers the routes for the application. diff --git a/src/Explorer/App_Start/Startup.Auth.cs b/src/Explorer/App_Start/Startup.Auth.cs index a803ba4..e43a1dc 100644 --- a/src/Explorer/App_Start/Startup.Auth.cs +++ b/src/Explorer/App_Start/Startup.Auth.cs @@ -10,8 +10,8 @@ namespace Microsoft.Store.PartnerCenter.Explorer using System.Collections.Generic; using System.Threading.Tasks; using global::Owin; - using Logic; using IdentityModel.Tokens; + using Logic; using Models; using Owin.Security; using Owin.Security.Cookies; diff --git a/src/Explorer/ApplicationInsights.config b/src/Explorer/ApplicationInsights.config index 11100ee..79dadc7 100644 --- a/src/Explorer/ApplicationInsights.config +++ b/src/Explorer/ApplicationInsights.config @@ -59,6 +59,33 @@ --> + + + + @@ -85,8 +112,14 @@ + + + + false + + 5 @@ -96,25 +129,6 @@ 5 Event - - - true - - - false - - 1 - - 3 - - 50 - - 24:00:00 - - 30 - - true -