From cf0ee1357798cd176b5b485d6de846e055a53b7f Mon Sep 17 00:00:00 2001 From: Waldek Mastykarz Date: Fri, 16 Jun 2023 14:41:03 +0200 Subject: [PATCH] Renames to Microsoft 365 Developer Proxy (#273) --- .github/CODEOWNERS | 2 +- .github/ISSUE_TEMPLATE/bug.yml | 6 ++--- .github/dependabot.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .../workflows/codeql-required-workaround.yml | 2 +- .github/workflows/create-release.yml | 8 +++--- .../workflows/dotnet-required-workaround.yml | 2 +- .github/workflows/dotnet.yml | 8 +++--- .vscode/launch.json | 4 +-- .vscode/tasks.json | 6 ++--- CONTRIBUTING.md | 8 +++--- README.md | 18 ++++++------- .../BaseProxyPlugin.cs | 2 +- .../FuncExtensions.cs | 2 +- .../ILogger.cs | 2 +- .../IProxyConfiguration.cs | 2 +- .../IProxyPlugin.cs | 2 +- .../PluginEvents.cs | 2 +- .../ProxyUtils.cs | 2 +- .../ResponseState.cs | 2 +- .../UrlToWatch.cs | 2 +- .../m365-developer-proxy-abstractions.csproj | 2 +- .../Behavior/RateLimitingPlugin.cs | 4 +-- .../Behavior/RetryAfterPlugin.cs | 4 +-- .../GenericErrorResponse.cs | 2 +- .../GraphErrorObjects.cs | 2 +- .../GraphUtils.cs | 2 +- .../Guidance/CachingGuidancePlugin.cs | 4 +-- .../GraphBetaSupportGuidancePlugin.cs | 6 ++--- .../GraphClientRequestIdGuidancePlugin.cs | 6 ++--- .../Guidance/GraphSdkGuidancePlugin.cs | 4 +-- .../Guidance/GraphSelectGuidancePlugin.cs | 6 ++--- .../Guidance/ODataPagingGuidancePlugin.cs | 6 ++--- .../MessageUtils.cs | 4 +-- .../MockResponses/MockResponse.cs | 2 +- .../MockResponses/MockResponsePlugin.cs | 4 +-- .../MockResponses/MockResponsesLoader.cs | 4 +-- .../GenericErrorResponsesLoader.cs | 4 +-- .../RandomErrors/GenericRandomErrorPlugin.cs | 4 +-- .../RandomErrors/GraphRandomErrorPlugin.cs | 4 +-- .../RequestLogs/ExecutionSummaryPlugin.cs | 6 ++--- .../RequestLogs/MinimalPermissionsPlugin.cs | 6 ++--- .../m365-developer-proxy-plugins.csproj | 6 ++--- ...oper-proxy.sln => m365-developer-proxy.sln | 6 ++--- .../.vscode/launch.json | 2 +- .../.vscode/tasks.json | 6 ++--- .../CertificateDiskCache.cs | 4 +-- .../ConsoleLogger.cs | 4 +-- .../PluginLoadContext.cs | 2 +- .../PluginLoader.cs | 4 +-- .../Program.cs | 4 +-- .../Properties/launchSettings.json | 0 .../ProxyCommandHandler.cs | 4 +-- .../ProxyConfiguration.cs | 6 ++--- .../ProxyContext.cs | 4 +-- .../ProxyEngine.cs | 10 ++++---- .../ProxyHost.cs | 10 ++++---- .../UpdateNotification.cs | 6 ++--- .../m365-developer-proxy.csproj | 12 ++++----- .../m365proxyrc.json | 24 +++++++++--------- .../picture.jpg | Bin .../microsoft-graph-rate-limiting.json | 2 +- .../presets/microsoft-graph.json | 14 +++++----- .../responses.json | 0 .../responses.sample.json | 0 samples/img/microsoft.png | Bin 0 -> 640 bytes samples/index.html | 6 ++--- samples/nosdk.html | 4 +-- samples/withsdk.html | 4 +-- specs/console-output.md | 2 +- specs/execution-summary.md | 4 +-- specs/metered-guidance-errors.md | 2 +- specs/multi-url-support.md | 4 +-- specs/plugins.md | 4 +-- 74 files changed, 166 insertions(+), 166 deletions(-) rename {msgraph-developer-proxy-abstractions => m365-developer-proxy-abstractions}/BaseProxyPlugin.cs (95%) rename {msgraph-developer-proxy-abstractions => m365-developer-proxy-abstractions}/FuncExtensions.cs (94%) rename {msgraph-developer-proxy-abstractions => m365-developer-proxy-abstractions}/ILogger.cs (95%) rename {msgraph-developer-proxy-abstractions => m365-developer-proxy-abstractions}/IProxyConfiguration.cs (91%) rename {msgraph-developer-proxy-abstractions => m365-developer-proxy-abstractions}/IProxyPlugin.cs (87%) rename {msgraph-developer-proxy-abstractions => m365-developer-proxy-abstractions}/PluginEvents.cs (99%) rename {msgraph-developer-proxy-abstractions => m365-developer-proxy-abstractions}/ProxyUtils.cs (99%) rename {msgraph-developer-proxy-abstractions => m365-developer-proxy-abstractions}/ResponseState.cs (92%) rename {msgraph-developer-proxy-abstractions => m365-developer-proxy-abstractions}/UrlToWatch.cs (81%) rename msgraph-developer-proxy-abstractions/msgraph-developer-proxy-abstractions.csproj => m365-developer-proxy-abstractions/m365-developer-proxy-abstractions.csproj (89%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/Behavior/RateLimitingPlugin.cs (98%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/Behavior/RetryAfterPlugin.cs (96%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/GenericErrorResponse.cs (90%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/GraphErrorObjects.cs (94%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/GraphUtils.cs (92%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/Guidance/CachingGuidancePlugin.cs (95%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/Guidance/GraphBetaSupportGuidancePlugin.cs (89%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/Guidance/GraphClientRequestIdGuidancePlugin.cs (91%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/Guidance/GraphSdkGuidancePlugin.cs (92%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/Guidance/GraphSelectGuidancePlugin.cs (91%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/Guidance/ODataPagingGuidancePlugin.cs (95%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/MessageUtils.cs (86%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/MockResponses/MockResponse.cs (90%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/MockResponses/MockResponsePlugin.cs (98%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/MockResponses/MockResponsesLoader.cs (96%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/RandomErrors/GenericErrorResponsesLoader.cs (96%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/RandomErrors/GenericRandomErrorPlugin.cs (98%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/RandomErrors/GraphRandomErrorPlugin.cs (98%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/RequestLogs/ExecutionSummaryPlugin.cs (98%) rename {msgraph-developer-proxy-plugins => m365-developer-proxy-plugins}/RequestLogs/MinimalPermissionsPlugin.cs (97%) rename msgraph-developer-proxy-plugins/msgraph-developer-proxy-plugins.csproj => m365-developer-proxy-plugins/m365-developer-proxy-plugins.csproj (84%) rename msgraph-developer-proxy.sln => m365-developer-proxy.sln (76%) rename {msgraph-developer-proxy => m365-developer-proxy}/.vscode/launch.json (91%) rename {msgraph-developer-proxy => m365-developer-proxy}/.vscode/tasks.json (80%) rename {msgraph-developer-proxy => m365-developer-proxy}/CertificateDiskCache.cs (97%) rename {msgraph-developer-proxy => m365-developer-proxy}/ConsoleLogger.cs (99%) rename {msgraph-developer-proxy => m365-developer-proxy}/PluginLoadContext.cs (95%) rename {msgraph-developer-proxy => m365-developer-proxy}/PluginLoader.cs (98%) rename {msgraph-developer-proxy => m365-developer-proxy}/Program.cs (89%) rename {msgraph-developer-proxy => m365-developer-proxy}/Properties/launchSettings.json (100%) rename {msgraph-developer-proxy => m365-developer-proxy}/ProxyCommandHandler.cs (98%) rename {msgraph-developer-proxy => m365-developer-proxy}/ProxyConfiguration.cs (84%) rename {msgraph-developer-proxy => m365-developer-proxy}/ProxyContext.cs (84%) rename {msgraph-developer-proxy => m365-developer-proxy}/ProxyEngine.cs (98%) rename {msgraph-developer-proxy => m365-developer-proxy}/ProxyHost.cs (92%) rename {msgraph-developer-proxy => m365-developer-proxy}/UpdateNotification.cs (93%) rename msgraph-developer-proxy/msgraph-developer-proxy.csproj => m365-developer-proxy/m365-developer-proxy.csproj (84%) rename msgraph-developer-proxy/mgdprc.json => m365-developer-proxy/m365proxyrc.json (79%) rename {msgraph-developer-proxy => m365-developer-proxy}/picture.jpg (100%) rename {msgraph-developer-proxy => m365-developer-proxy}/presets/microsoft-graph-rate-limiting.json (89%) rename {msgraph-developer-proxy => m365-developer-proxy}/presets/microsoft-graph.json (70%) rename {msgraph-developer-proxy => m365-developer-proxy}/responses.json (100%) rename {msgraph-developer-proxy => m365-developer-proxy}/responses.sample.json (100%) create mode 100644 samples/img/microsoft.png diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e9f70df5..2f289d75 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @microsoftgraph/msgraph-developer-proxy-write \ No newline at end of file +* @microsoft/m365-developer-proxy-write \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 913d9b27..0569667c 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -38,13 +38,13 @@ body: validations: required: true - type: input - id: mgdpversion + id: m365proxyversion attributes: - label: Microsoft Graph Developer Proxy Version + label: Microsoft 365 Developer Proxy Version description: | Provide the version of the proxy you are using. - Execute `mgdp --version` in your terminal to identify your version + Execute `m365proxy --version` in your terminal to identify your version validations: required: true - type: dropdown diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4d5f9a9c..d5a7bff0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,7 @@ version: 2 updates: - package-ecosystem: nuget - directory: "/msgraph-developer-proxy" + directory: "/m365-developer-proxy" schedule: interval: daily open-pull-requests-limit: 5 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2f38f2e9..c695a6e9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,7 +25,7 @@ on: jobs: analyze: name: Analyze - runs-on: [self-hosted, 1ES.Pool=1es-graphdevx-ubuntu-github-latest] + runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/.github/workflows/codeql-required-workaround.yml b/.github/workflows/codeql-required-workaround.yml index 94e60f6c..94b77966 100644 --- a/.github/workflows/codeql-required-workaround.yml +++ b/.github/workflows/codeql-required-workaround.yml @@ -13,6 +13,6 @@ on: jobs: analyze: #names must match the original workflow name: Analyze (csharp) - runs-on: [self-hosted, 1ES.Pool=1es-graphdevx-ubuntu-github-latest] + runs-on: ubuntu-latest steps: - run: 'echo "No CodeQL Analysis required"' \ No newline at end of file diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index ced87054..43e4ea40 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -15,7 +15,7 @@ jobs: - linux-x64 - osx-x64 env: - release: 'msgraph-developer-proxy-${{ matrix.architecture }}-${{ github.ref_name }}' + release: 'm365-developer-proxy-${{ matrix.architecture }}-${{ github.ref_name }}' steps: - uses: actions/checkout@v3 - name: Setup .NET @@ -23,11 +23,11 @@ jobs: with: dotnet-version: 7.0.x - name: Publish ${{ matrix.architecture }} - run: dotnet publish ./msgraph-developer-proxy/msgraph-developer-proxy.csproj -c Release -p:PublishSingleFile=true -r ${{ matrix.architecture }} --self-contained -o ./${{ env.release }} + run: dotnet publish ./m365-developer-proxy/m365-developer-proxy.csproj -c Release -p:PublishSingleFile=true -r ${{ matrix.architecture }} --self-contained -o ./${{ env.release }} - name: Build plugins - run: dotnet build ./msgraph-developer-proxy-plugins/msgraph-developer-proxy-plugins.csproj -c Release -r ${{ matrix.architecture }} --no-self-contained + run: dotnet build ./m365-developer-proxy-plugins/m365-developer-proxy-plugins.csproj -c Release -r ${{ matrix.architecture }} --no-self-contained - name: Add plugins to output - run: cp ./msgraph-developer-proxy/bin/Release/net7.0/${{ matrix.architecture }}/GraphProxyPlugins ./${{ env.release }} -r + run: cp ./m365-developer-proxy/bin/Release/net7.0/${{ matrix.architecture }}/GraphProxyPlugins ./${{ env.release }} -r - name: Remove unnecessary files run: | pushd diff --git a/.github/workflows/dotnet-required-workaround.yml b/.github/workflows/dotnet-required-workaround.yml index 0666bfee..435c6730 100644 --- a/.github/workflows/dotnet-required-workaround.yml +++ b/.github/workflows/dotnet-required-workaround.yml @@ -12,6 +12,6 @@ on: jobs: build: - runs-on: [self-hosted, 1ES.Pool=1es-graphdevx-ubuntu-github-latest] + runs-on: ubuntu-latest steps: - run: 'echo "No build required"' \ No newline at end of file diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 8b76bd13..e54d8784 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: [self-hosted, 1ES.Pool=1es-graphdevx-ubuntu-github-latest] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -23,12 +23,12 @@ jobs: - name: Restore workloads run: dotnet workload restore - name: Restore dependencies - run: dotnet restore msgraph-developer-proxy.sln + run: dotnet restore m365-developer-proxy.sln - name: Build - run: dotnet build msgraph-developer-proxy.sln --no-restore + run: dotnet build m365-developer-proxy.sln --no-restore # We really should have tests, putting these steps here for when we have a build process # - name: Test - # run: dotnet test msgraph-developer-proxy.sln --no-build --verbosity normal --collect:"XPlat Code Coverage" + # run: dotnet test m365-developer-proxy.sln --no-build --verbosity normal --collect:"XPlat Code Coverage" # - name: Install report generator # run: dotnet tool install --global dotnet-reportgenerator-globaltool # - name: Generate coverage report diff --git a/.vscode/launch.json b/.vscode/launch.json index 0dff9232..d8162b4d 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,9 +10,9 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/msgraph-developer-proxy/bin/Debug/net7.0/mgdp.dll", + "program": "${workspaceFolder}/m365-developer-proxy/bin/Debug/net7.0/m365proxy.dll", "args": [], - "cwd": "${workspaceFolder}/msgraph-developer-proxy/bin/Debug/net7.0", + "cwd": "${workspaceFolder}/m365-developer-proxy/bin/Debug/net7.0", // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console "console": "integratedTerminal", "stopAtEntry": false, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index ea9e0986..08596f61 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,7 +7,7 @@ "type": "process", "args": [ "build", - "${workspaceFolder}/msgraph-developer-proxy.sln", + "${workspaceFolder}/m365-developer-proxy.sln", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -19,7 +19,7 @@ "type": "process", "args": [ "publish", - "${workspaceFolder}/msgraph-developer-proxy.sln", + "${workspaceFolder}/m365-developer-proxy.sln", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -33,7 +33,7 @@ "watch", "run", "--project", - "${workspaceFolder}/msgraph-developer-proxy.sln" + "${workspaceFolder}/m365-developer-proxy.sln" ], "problemMatcher": "$msCompile" } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4a2003fb..616e42d9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,14 +1,14 @@ -# Contributing to the Microsoft Developer Proxy +# Contributing to the Microsoft 365 Developer Proxy -The best way to contribute initially is to download and try the Microsoft Graph Developer Proxy and then give us your feedback, both positive and negative, this will help us shape the future direction of this tool. At present we are not accepting community code contributions but will be opening up to accept pull requests in the future. +The best way to contribute initially is to download and try the Microsoft 365 Developer Proxy and then give us your feedback, both positive and negative, this will help us shape the future direction of this tool. At present we are not accepting community code contributions but will be opening up to accept pull requests in the future. ## Our foundation -The Microsoft Graph Developer Proxy is built with .NET 6 and uses the [Titanium.Web.Proxy](https://github.com/justcoding121/titanium-web-proxy). +The Microsoft 365 Developer Proxy is built with .NET 6 and uses the [Titanium.Web.Proxy](https://github.com/justcoding121/titanium-web-proxy). ## Reporting issues and suggesting new features -Please use [GitHub Issues](https://github.com/microsoftgraph/msgraph-developer-proxy/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) for bug reports and feature request. +Please use [GitHub Issues](https://github.com/microsoft/m365-developer-proxy/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) for bug reports and feature request. We highly recommend you browse existing issues first. diff --git a/README.md b/README.md index 77fc199a..98f6d2f0 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@

- Microsoft Graph Developer Proxy -
Microsoft Graph Developer Proxy
+ Microsoft 365 Developer Proxy +
Microsoft 365 Developer Proxy

- Build with Microsoft Graph. Reliably + Build with Microsoft Graph. Reliably

- + Download Now

Get started | - Documentation + Documentation

@@ -41,7 +41,7 @@

-Microsoft Graph Developer Proxy is a command line tool for testing Microsoft Graph and other APIs. +Microsoft 365 Developer Proxy is a command line tool for testing Microsoft Graph and other APIs. It aims to provide a better way to test applications. @@ -55,14 +55,14 @@ Identify and fix issues in your code before they reach production. ## Get started -Begin with our [tutorial](https://github.com/microsoftgraph/msgraph-developer-proxy/wiki/Get-started). It will guide you through the installation process and running the proxy for the first time. +Begin with our [tutorial](https://github.com/microsoft/m365-developer-proxy/wiki/Get-started). It will guide you through the installation process and running the proxy for the first time. ## Example Fail requests (with a 50% chance) and respond with `429 Too Many Requests` or `503 Service Unavailable`: ``` -mgdp --failure-rate 50 --no-mocks --allowed-errors 429 503 +m365proxy --failure-rate 50 --no-mocks --allowed-errors 429 503 ``` ## Features @@ -99,7 +99,7 @@ This project may contain trademarks or logos for projects, products, or services ## Community Preview -We are working on getting the General Availability (GA) version published within the calendar year 2023. The current state of the Microsoft Graph Developer Proxy enables our team to be transparent and provide more insights on the upcoming features and to provide our worldwide ecosystem an option to directly influence the future of our capabilities. [Your feedback is more than welcome](https://github.com/microsoftgraph/msgraph-developer-proxy/issues)! You can expect many more new features within the upcoming months before a version that is officially ready for production use and fully supported. +We are working on getting the General Availability (GA) version published within the calendar year 2023. The current state of the Microsoft 365 Developer Proxy enables our team to be transparent and provide more insights on the upcoming features and to provide our worldwide ecosystem an option to directly influence the future of our capabilities. [Your feedback is more than welcome](https://github.com/microsoft/m365-developer-proxy/issues)! You can expect many more new features within the upcoming months before a version that is officially ready for production use and fully supported. ## A Microsoft Hackathon 2022 Project diff --git a/msgraph-developer-proxy-abstractions/BaseProxyPlugin.cs b/m365-developer-proxy-abstractions/BaseProxyPlugin.cs similarity index 95% rename from msgraph-developer-proxy-abstractions/BaseProxyPlugin.cs rename to m365-developer-proxy-abstractions/BaseProxyPlugin.cs index e41e7314..b7cd11fb 100644 --- a/msgraph-developer-proxy-abstractions/BaseProxyPlugin.cs +++ b/m365-developer-proxy-abstractions/BaseProxyPlugin.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration; -namespace Microsoft.Graph.DeveloperProxy.Abstractions; +namespace Microsoft365.DeveloperProxy.Abstractions; public abstract class BaseProxyPlugin: IProxyPlugin { protected ISet? _urlsToWatch; diff --git a/msgraph-developer-proxy-abstractions/FuncExtensions.cs b/m365-developer-proxy-abstractions/FuncExtensions.cs similarity index 94% rename from msgraph-developer-proxy-abstractions/FuncExtensions.cs rename to m365-developer-proxy-abstractions/FuncExtensions.cs index 1dc296a3..15a130d4 100644 --- a/msgraph-developer-proxy-abstractions/FuncExtensions.cs +++ b/m365-developer-proxy-abstractions/FuncExtensions.cs @@ -6,7 +6,7 @@ using Titanium.Web.Proxy; using Titanium.Web.Proxy.EventArguments; -namespace Microsoft.Graph.DeveloperProxy.Abstractions; +namespace Microsoft365.DeveloperProxy.Abstractions; public static class FuncExtensions { diff --git a/msgraph-developer-proxy-abstractions/ILogger.cs b/m365-developer-proxy-abstractions/ILogger.cs similarity index 95% rename from msgraph-developer-proxy-abstractions/ILogger.cs rename to m365-developer-proxy-abstractions/ILogger.cs index 1f55359b..0e9101df 100644 --- a/msgraph-developer-proxy-abstractions/ILogger.cs +++ b/m365-developer-proxy-abstractions/ILogger.cs @@ -3,7 +3,7 @@ using System.Runtime.Serialization; using Titanium.Web.Proxy.EventArguments; -namespace Microsoft.Graph.DeveloperProxy.Abstractions; +namespace Microsoft365.DeveloperProxy.Abstractions; public enum MessageType { Normal, diff --git a/msgraph-developer-proxy-abstractions/IProxyConfiguration.cs b/m365-developer-proxy-abstractions/IProxyConfiguration.cs similarity index 91% rename from msgraph-developer-proxy-abstractions/IProxyConfiguration.cs rename to m365-developer-proxy-abstractions/IProxyConfiguration.cs index c09a6154..fd907c01 100644 --- a/msgraph-developer-proxy-abstractions/IProxyConfiguration.cs +++ b/m365-developer-proxy-abstractions/IProxyConfiguration.cs @@ -3,7 +3,7 @@ using System.Runtime.Serialization; -namespace Microsoft.Graph.DeveloperProxy.Abstractions; +namespace Microsoft365.DeveloperProxy.Abstractions; public enum LabelMode { [EnumMember(Value = "text")] diff --git a/msgraph-developer-proxy-abstractions/IProxyPlugin.cs b/m365-developer-proxy-abstractions/IProxyPlugin.cs similarity index 87% rename from msgraph-developer-proxy-abstractions/IProxyPlugin.cs rename to m365-developer-proxy-abstractions/IProxyPlugin.cs index 33213091..e3955d0e 100644 --- a/msgraph-developer-proxy-abstractions/IProxyPlugin.cs +++ b/m365-developer-proxy-abstractions/IProxyPlugin.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration; -namespace Microsoft.Graph.DeveloperProxy.Abstractions; +namespace Microsoft365.DeveloperProxy.Abstractions; public interface IProxyPlugin { string Name { get; } diff --git a/msgraph-developer-proxy-abstractions/PluginEvents.cs b/m365-developer-proxy-abstractions/PluginEvents.cs similarity index 99% rename from msgraph-developer-proxy-abstractions/PluginEvents.cs rename to m365-developer-proxy-abstractions/PluginEvents.cs index 7b0526ee..dba86c54 100644 --- a/msgraph-developer-proxy-abstractions/PluginEvents.cs +++ b/m365-developer-proxy-abstractions/PluginEvents.cs @@ -6,7 +6,7 @@ using Titanium.Web.Proxy.EventArguments; using Titanium.Web.Proxy.Http; -namespace Microsoft.Graph.DeveloperProxy.Abstractions; +namespace Microsoft365.DeveloperProxy.Abstractions; public interface IProxyContext { IProxyConfiguration Configuration { get; } diff --git a/msgraph-developer-proxy-abstractions/ProxyUtils.cs b/m365-developer-proxy-abstractions/ProxyUtils.cs similarity index 99% rename from msgraph-developer-proxy-abstractions/ProxyUtils.cs rename to m365-developer-proxy-abstractions/ProxyUtils.cs index 345ea1f3..3fea365e 100644 --- a/msgraph-developer-proxy-abstractions/ProxyUtils.cs +++ b/m365-developer-proxy-abstractions/ProxyUtils.cs @@ -5,7 +5,7 @@ using Titanium.Web.Proxy.Http; using Titanium.Web.Proxy.Models; -namespace Microsoft.Graph.DeveloperProxy.Abstractions; +namespace Microsoft365.DeveloperProxy.Abstractions; class ParsedSample { public string QueryVersion { get; set; } = string.Empty; diff --git a/msgraph-developer-proxy-abstractions/ResponseState.cs b/m365-developer-proxy-abstractions/ResponseState.cs similarity index 92% rename from msgraph-developer-proxy-abstractions/ResponseState.cs rename to m365-developer-proxy-abstractions/ResponseState.cs index 6e04cb4c..a46875d9 100644 --- a/msgraph-developer-proxy-abstractions/ResponseState.cs +++ b/m365-developer-proxy-abstractions/ResponseState.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace Microsoft.Graph.DeveloperProxy.Abstractions; +namespace Microsoft365.DeveloperProxy.Abstractions; public class ResponseState { /// diff --git a/msgraph-developer-proxy-abstractions/UrlToWatch.cs b/m365-developer-proxy-abstractions/UrlToWatch.cs similarity index 81% rename from msgraph-developer-proxy-abstractions/UrlToWatch.cs rename to m365-developer-proxy-abstractions/UrlToWatch.cs index 17130d8d..bbd3ab22 100644 --- a/msgraph-developer-proxy-abstractions/UrlToWatch.cs +++ b/m365-developer-proxy-abstractions/UrlToWatch.cs @@ -1,6 +1,6 @@ using System.Text.RegularExpressions; -namespace Microsoft.Graph.DeveloperProxy.Abstractions; +namespace Microsoft365.DeveloperProxy.Abstractions; public class UrlToWatch { public bool Exclude { get; } diff --git a/msgraph-developer-proxy-abstractions/msgraph-developer-proxy-abstractions.csproj b/m365-developer-proxy-abstractions/m365-developer-proxy-abstractions.csproj similarity index 89% rename from msgraph-developer-proxy-abstractions/msgraph-developer-proxy-abstractions.csproj rename to m365-developer-proxy-abstractions/m365-developer-proxy-abstractions.csproj index 79f4589e..3338df5d 100644 --- a/msgraph-developer-proxy-abstractions/msgraph-developer-proxy-abstractions.csproj +++ b/m365-developer-proxy-abstractions/m365-developer-proxy-abstractions.csproj @@ -2,7 +2,7 @@ net7.0 - Microsoft.Graph.DeveloperProxy.Abstractions + Microsoft365.DeveloperProxy.Abstractions enable enable 0.8.0 diff --git a/msgraph-developer-proxy-plugins/Behavior/RateLimitingPlugin.cs b/m365-developer-proxy-plugins/Behavior/RateLimitingPlugin.cs similarity index 98% rename from msgraph-developer-proxy-plugins/Behavior/RateLimitingPlugin.cs rename to m365-developer-proxy-plugins/Behavior/RateLimitingPlugin.cs index f83ebafb..4adbaa5c 100644 --- a/msgraph-developer-proxy-plugins/Behavior/RateLimitingPlugin.cs +++ b/m365-developer-proxy-plugins/Behavior/RateLimitingPlugin.cs @@ -2,14 +2,14 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.Net; using System.Text.Json; using System.Text.RegularExpressions; using Titanium.Web.Proxy.Http; using Titanium.Web.Proxy.Models; -namespace Microsoft.Graph.DeveloperProxy.Plugins.Behavior; +namespace Microsoft365.DeveloperProxy.Plugins.Behavior; public class RateLimitConfiguration { public string HeaderLimit { get; set; } = "RateLimit-Limit"; diff --git a/msgraph-developer-proxy-plugins/Behavior/RetryAfterPlugin.cs b/m365-developer-proxy-plugins/Behavior/RetryAfterPlugin.cs similarity index 96% rename from msgraph-developer-proxy-plugins/Behavior/RetryAfterPlugin.cs rename to m365-developer-proxy-plugins/Behavior/RetryAfterPlugin.cs index b01be55f..468bd2c5 100644 --- a/msgraph-developer-proxy-plugins/Behavior/RetryAfterPlugin.cs +++ b/m365-developer-proxy-plugins/Behavior/RetryAfterPlugin.cs @@ -2,14 +2,14 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.Net; using System.Text.Json; using System.Text.RegularExpressions; using Titanium.Web.Proxy.Http; using Titanium.Web.Proxy.Models; -namespace Microsoft.Graph.DeveloperProxy.Plugins.Behavior; +namespace Microsoft365.DeveloperProxy.Plugins.Behavior; public class RetryAfterPlugin : BaseProxyPlugin { diff --git a/msgraph-developer-proxy-plugins/GenericErrorResponse.cs b/m365-developer-proxy-plugins/GenericErrorResponse.cs similarity index 90% rename from msgraph-developer-proxy-plugins/GenericErrorResponse.cs rename to m365-developer-proxy-plugins/GenericErrorResponse.cs index 2c296f09..6584b57f 100644 --- a/msgraph-developer-proxy-plugins/GenericErrorResponse.cs +++ b/m365-developer-proxy-plugins/GenericErrorResponse.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace Microsoft.Graph.DeveloperProxy.Plugins; +namespace Microsoft365.DeveloperProxy.Plugins; public class GenericErrorResponse { [JsonPropertyName("statusCode")] diff --git a/msgraph-developer-proxy-plugins/GraphErrorObjects.cs b/m365-developer-proxy-plugins/GraphErrorObjects.cs similarity index 94% rename from msgraph-developer-proxy-plugins/GraphErrorObjects.cs rename to m365-developer-proxy-plugins/GraphErrorObjects.cs index cd6f5fc7..1e9fb31b 100644 --- a/msgraph-developer-proxy-plugins/GraphErrorObjects.cs +++ b/m365-developer-proxy-plugins/GraphErrorObjects.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace Microsoft.Graph.DeveloperProxy.Plugins; +namespace Microsoft365.DeveloperProxy.Plugins; public class GraphErrorResponseBody { [JsonPropertyName("error")] diff --git a/msgraph-developer-proxy-plugins/GraphUtils.cs b/m365-developer-proxy-plugins/GraphUtils.cs similarity index 92% rename from msgraph-developer-proxy-plugins/GraphUtils.cs rename to m365-developer-proxy-plugins/GraphUtils.cs index 15858ec2..9751f57a 100644 --- a/msgraph-developer-proxy-plugins/GraphUtils.cs +++ b/m365-developer-proxy-plugins/GraphUtils.cs @@ -3,7 +3,7 @@ using Titanium.Web.Proxy.Http; -namespace Microsoft.Graph.DeveloperProxy.Plugins; +namespace Microsoft365.DeveloperProxy.Plugins; public class GraphUtils { diff --git a/msgraph-developer-proxy-plugins/Guidance/CachingGuidancePlugin.cs b/m365-developer-proxy-plugins/Guidance/CachingGuidancePlugin.cs similarity index 95% rename from msgraph-developer-proxy-plugins/Guidance/CachingGuidancePlugin.cs rename to m365-developer-proxy-plugins/Guidance/CachingGuidancePlugin.cs index 9f9bf4a0..1c5c30bf 100644 --- a/msgraph-developer-proxy-plugins/Guidance/CachingGuidancePlugin.cs +++ b/m365-developer-proxy-plugins/Guidance/CachingGuidancePlugin.cs @@ -2,10 +2,10 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using Titanium.Web.Proxy.Http; -namespace Microsoft.Graph.DeveloperProxy.Plugins.Guidance; +namespace Microsoft365.DeveloperProxy.Plugins.Guidance; public class CachingGuidancePluginConfiguration { diff --git a/msgraph-developer-proxy-plugins/Guidance/GraphBetaSupportGuidancePlugin.cs b/m365-developer-proxy-plugins/Guidance/GraphBetaSupportGuidancePlugin.cs similarity index 89% rename from msgraph-developer-proxy-plugins/Guidance/GraphBetaSupportGuidancePlugin.cs rename to m365-developer-proxy-plugins/Guidance/GraphBetaSupportGuidancePlugin.cs index c2d689bf..d60ebc1f 100644 --- a/msgraph-developer-proxy-plugins/Guidance/GraphBetaSupportGuidancePlugin.cs +++ b/m365-developer-proxy-plugins/Guidance/GraphBetaSupportGuidancePlugin.cs @@ -2,10 +2,10 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using Titanium.Web.Proxy.Http; -namespace Microsoft.Graph.DeveloperProxy.Plugins.Guidance; +namespace Microsoft365.DeveloperProxy.Plugins.Guidance; public class GraphBetaSupportGuidancePlugin : BaseProxyPlugin { public override string Name => nameof(GraphBetaSupportGuidancePlugin); @@ -27,6 +27,6 @@ private async Task AfterResponse(object? sender, ProxyResponseArgs e) { _logger?.LogRequest(BuildBetaSupportMessage(request), MessageType.Warning, new LoggingContext(e.Session)); } - private static string GetBetaSupportGuidanceUrl() => "https://aka.ms/graph/proxy/guidance/beta-support"; + private static string GetBetaSupportGuidanceUrl() => "https://aka.ms/m365/proxy/guidance/beta-support"; private static string[] BuildBetaSupportMessage(Request r) => new[] { $"Don't use beta APIs in production because they can change or be deprecated.", $"More info at {GetBetaSupportGuidanceUrl()}" }; } diff --git a/msgraph-developer-proxy-plugins/Guidance/GraphClientRequestIdGuidancePlugin.cs b/m365-developer-proxy-plugins/Guidance/GraphClientRequestIdGuidancePlugin.cs similarity index 91% rename from msgraph-developer-proxy-plugins/Guidance/GraphClientRequestIdGuidancePlugin.cs rename to m365-developer-proxy-plugins/Guidance/GraphClientRequestIdGuidancePlugin.cs index 6ceae494..d9f31534 100644 --- a/msgraph-developer-proxy-plugins/Guidance/GraphClientRequestIdGuidancePlugin.cs +++ b/m365-developer-proxy-plugins/Guidance/GraphClientRequestIdGuidancePlugin.cs @@ -2,10 +2,10 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using Titanium.Web.Proxy.Http; -namespace Microsoft.Graph.DeveloperProxy.Plugins.Guidance; +namespace Microsoft365.DeveloperProxy.Plugins.Guidance; public class GraphClientRequestIdGuidancePlugin : BaseProxyPlugin { @@ -39,7 +39,7 @@ private static bool WarnNoClientRequestId(Request request) => ProxyUtils.IsGraphRequest(request) && !request.Headers.HeaderExists("client-request-id"); - private static string GetClientRequestIdGuidanceUrl() => "https://aka.ms/graph/proxy/guidance/client-request-id"; + private static string GetClientRequestIdGuidanceUrl() => "https://aka.ms/m365/proxy/guidance/client-request-id"; private static string[] BuildAddClientRequestIdMessage(Request r) => new[] { $"To help Microsoft investigate errors, to each request to Microsoft Graph", "add the client-request-id header with a unique GUID.", diff --git a/msgraph-developer-proxy-plugins/Guidance/GraphSdkGuidancePlugin.cs b/m365-developer-proxy-plugins/Guidance/GraphSdkGuidancePlugin.cs similarity index 92% rename from msgraph-developer-proxy-plugins/Guidance/GraphSdkGuidancePlugin.cs rename to m365-developer-proxy-plugins/Guidance/GraphSdkGuidancePlugin.cs index b2880107..d5de8fb1 100644 --- a/msgraph-developer-proxy-plugins/Guidance/GraphSdkGuidancePlugin.cs +++ b/m365-developer-proxy-plugins/Guidance/GraphSdkGuidancePlugin.cs @@ -2,10 +2,10 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using Titanium.Web.Proxy.Http; -namespace Microsoft.Graph.DeveloperProxy.Plugins.Guidance; +namespace Microsoft365.DeveloperProxy.Plugins.Guidance; public class GraphSdkGuidancePlugin : BaseProxyPlugin { public override string Name => nameof(GraphSdkGuidancePlugin); diff --git a/msgraph-developer-proxy-plugins/Guidance/GraphSelectGuidancePlugin.cs b/m365-developer-proxy-plugins/Guidance/GraphSelectGuidancePlugin.cs similarity index 91% rename from msgraph-developer-proxy-plugins/Guidance/GraphSelectGuidancePlugin.cs rename to m365-developer-proxy-plugins/Guidance/GraphSelectGuidancePlugin.cs index 59f45912..0a4858b5 100644 --- a/msgraph-developer-proxy-plugins/Guidance/GraphSelectGuidancePlugin.cs +++ b/m365-developer-proxy-plugins/Guidance/GraphSelectGuidancePlugin.cs @@ -2,10 +2,10 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using Titanium.Web.Proxy.Http; -namespace Microsoft.Graph.DeveloperProxy.Plugins.Guidance; +namespace Microsoft365.DeveloperProxy.Plugins.Guidance; public class GraphSelectGuidancePlugin : BaseProxyPlugin { public override string Name => nameof(GraphSelectGuidancePlugin); @@ -31,6 +31,6 @@ private static bool WarnNoSelect(Request request) => !request.Url.Contains("$select", StringComparison.OrdinalIgnoreCase) && !request.Url.Contains("%24select", StringComparison.OrdinalIgnoreCase); - private static string GetSelectParameterGuidanceUrl() => "https://aka.ms/graph/proxy/guidance/select"; + private static string GetSelectParameterGuidanceUrl() => "https://aka.ms/m365/proxy/guidance/select"; private static string[] BuildUseSelectMessage(Request r) => new[] { $"To improve performance of your application, use the $select parameter.", $"More info at {GetSelectParameterGuidanceUrl()}" }; } diff --git a/msgraph-developer-proxy-plugins/Guidance/ODataPagingGuidancePlugin.cs b/m365-developer-proxy-plugins/Guidance/ODataPagingGuidancePlugin.cs similarity index 95% rename from msgraph-developer-proxy-plugins/Guidance/ODataPagingGuidancePlugin.cs rename to m365-developer-proxy-plugins/Guidance/ODataPagingGuidancePlugin.cs index 81c24729..7834bc6f 100644 --- a/msgraph-developer-proxy-plugins/Guidance/ODataPagingGuidancePlugin.cs +++ b/m365-developer-proxy-plugins/Guidance/ODataPagingGuidancePlugin.cs @@ -2,11 +2,11 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.Text.Json; using System.Xml.Linq; -namespace Microsoft.Graph.DeveloperProxy.Plugins.Guidance; +namespace Microsoft365.DeveloperProxy.Plugins.Guidance; public class ODataPagingGuidancePlugin : BaseProxyPlugin { @@ -129,6 +129,6 @@ private static bool IsODataPagingUrl(Uri uri) => private static string[] BuildIncorrectPagingUrlMessage() => new[] { "This paging URL seems to be created manually and is not aligned with paging information from the API.", "This could lead to incorrect data in your app.", - "For more information about paging see https://aka.ms/graph/proxy/guidance/paging" + "For more information about paging see https://aka.ms/m365/proxy/guidance/paging" }; } diff --git a/msgraph-developer-proxy-plugins/MessageUtils.cs b/m365-developer-proxy-plugins/MessageUtils.cs similarity index 86% rename from msgraph-developer-proxy-plugins/MessageUtils.cs rename to m365-developer-proxy-plugins/MessageUtils.cs index ac163b3e..5f099547 100644 --- a/msgraph-developer-proxy-plugins/MessageUtils.cs +++ b/m365-developer-proxy-plugins/MessageUtils.cs @@ -3,7 +3,7 @@ using Titanium.Web.Proxy.Http; -namespace Microsoft.Graph.DeveloperProxy.Plugins; +namespace Microsoft365.DeveloperProxy.Plugins; internal class MessageUtils { public static string[] BuildUseSdkForErrorsMessage(Request r) => new[] { "To handle API errors more easily, use the Microsoft Graph SDK.", $"More info at {GetMoveToSdkUrl(r)}" }; @@ -16,6 +16,6 @@ public static string[] BuildUseSdkMessage(Request r) => new[] { public static string GetMoveToSdkUrl(Request request) { // TODO: return language-specific guidance links based on the language detected from the User-Agent - return "https://aka.ms/graph/proxy/guidance/move-to-js-sdk"; + return "https://aka.ms/m365/proxy/guidance/move-to-js-sdk"; } } diff --git a/msgraph-developer-proxy-plugins/MockResponses/MockResponse.cs b/m365-developer-proxy-plugins/MockResponses/MockResponse.cs similarity index 90% rename from msgraph-developer-proxy-plugins/MockResponses/MockResponse.cs rename to m365-developer-proxy-plugins/MockResponses/MockResponse.cs index e4242719..f73fb4a6 100644 --- a/msgraph-developer-proxy-plugins/MockResponses/MockResponse.cs +++ b/m365-developer-proxy-plugins/MockResponses/MockResponse.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace Microsoft.Graph.DeveloperProxy.Plugins.MocksResponses; +namespace Microsoft365.DeveloperProxy.Plugins.MocksResponses; public class MockResponse { [JsonPropertyName("url")] diff --git a/msgraph-developer-proxy-plugins/MockResponses/MockResponsePlugin.cs b/m365-developer-proxy-plugins/MockResponses/MockResponsePlugin.cs similarity index 98% rename from msgraph-developer-proxy-plugins/MockResponses/MockResponsePlugin.cs rename to m365-developer-proxy-plugins/MockResponses/MockResponsePlugin.cs index 42be61a8..30958cb5 100644 --- a/msgraph-developer-proxy-plugins/MockResponses/MockResponsePlugin.cs +++ b/m365-developer-proxy-plugins/MockResponses/MockResponsePlugin.cs @@ -2,7 +2,7 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.CommandLine; using System.CommandLine.Invocation; using System.Net; @@ -13,7 +13,7 @@ using Titanium.Web.Proxy.Http; using Titanium.Web.Proxy.Models; -namespace Microsoft.Graph.DeveloperProxy.Plugins.MocksResponses; +namespace Microsoft365.DeveloperProxy.Plugins.MocksResponses; internal class MockResponseConfiguration { public bool NoMocks { get; set; } = false; diff --git a/msgraph-developer-proxy-plugins/MockResponses/MockResponsesLoader.cs b/m365-developer-proxy-plugins/MockResponses/MockResponsesLoader.cs similarity index 96% rename from msgraph-developer-proxy-plugins/MockResponses/MockResponsesLoader.cs rename to m365-developer-proxy-plugins/MockResponses/MockResponsesLoader.cs index 4a96e697..1268f24a 100644 --- a/msgraph-developer-proxy-plugins/MockResponses/MockResponsesLoader.cs +++ b/m365-developer-proxy-plugins/MockResponses/MockResponsesLoader.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.Text.Json; using System.IO; -namespace Microsoft.Graph.DeveloperProxy.Plugins.MocksResponses; +namespace Microsoft365.DeveloperProxy.Plugins.MocksResponses; internal class MockResponsesLoader : IDisposable { private readonly ILogger _logger; diff --git a/msgraph-developer-proxy-plugins/RandomErrors/GenericErrorResponsesLoader.cs b/m365-developer-proxy-plugins/RandomErrors/GenericErrorResponsesLoader.cs similarity index 96% rename from msgraph-developer-proxy-plugins/RandomErrors/GenericErrorResponsesLoader.cs rename to m365-developer-proxy-plugins/RandomErrors/GenericErrorResponsesLoader.cs index 43512135..902c6363 100644 --- a/msgraph-developer-proxy-plugins/RandomErrors/GenericErrorResponsesLoader.cs +++ b/m365-developer-proxy-plugins/RandomErrors/GenericErrorResponsesLoader.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.Text.Json; -namespace Microsoft.Graph.DeveloperProxy.Plugins.RandomErrors; +namespace Microsoft365.DeveloperProxy.Plugins.RandomErrors; internal class GenericErrorResponsesLoader : IDisposable { private readonly ILogger _logger; diff --git a/msgraph-developer-proxy-plugins/RandomErrors/GenericRandomErrorPlugin.cs b/m365-developer-proxy-plugins/RandomErrors/GenericRandomErrorPlugin.cs similarity index 98% rename from msgraph-developer-proxy-plugins/RandomErrors/GenericRandomErrorPlugin.cs rename to m365-developer-proxy-plugins/RandomErrors/GenericRandomErrorPlugin.cs index 8d727079..9ebe07d9 100644 --- a/msgraph-developer-proxy-plugins/RandomErrors/GenericRandomErrorPlugin.cs +++ b/m365-developer-proxy-plugins/RandomErrors/GenericRandomErrorPlugin.cs @@ -2,7 +2,7 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.Net; using System.Text.Json; using System.Text.Json.Serialization; @@ -10,7 +10,7 @@ using Titanium.Web.Proxy.Http; using Titanium.Web.Proxy.Models; -namespace Microsoft.Graph.DeveloperProxy.Plugins.RandomErrors; +namespace Microsoft365.DeveloperProxy.Plugins.RandomErrors; internal enum GenericRandomErrorFailMode { Throttled, Random, diff --git a/msgraph-developer-proxy-plugins/RandomErrors/GraphRandomErrorPlugin.cs b/m365-developer-proxy-plugins/RandomErrors/GraphRandomErrorPlugin.cs similarity index 98% rename from msgraph-developer-proxy-plugins/RandomErrors/GraphRandomErrorPlugin.cs rename to m365-developer-proxy-plugins/RandomErrors/GraphRandomErrorPlugin.cs index cd442a47..dbbbc565 100644 --- a/msgraph-developer-proxy-plugins/RandomErrors/GraphRandomErrorPlugin.cs +++ b/m365-developer-proxy-plugins/RandomErrors/GraphRandomErrorPlugin.cs @@ -2,7 +2,7 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.CommandLine; using System.CommandLine.Invocation; using System.Net; @@ -12,7 +12,7 @@ using Titanium.Web.Proxy.Http; using Titanium.Web.Proxy.Models; -namespace Microsoft.Graph.DeveloperProxy.Plugins.RandomErrors; +namespace Microsoft365.DeveloperProxy.Plugins.RandomErrors; internal enum GraphRandomErrorFailMode { Throttled, Random, diff --git a/msgraph-developer-proxy-plugins/RequestLogs/ExecutionSummaryPlugin.cs b/m365-developer-proxy-plugins/RequestLogs/ExecutionSummaryPlugin.cs similarity index 98% rename from msgraph-developer-proxy-plugins/RequestLogs/ExecutionSummaryPlugin.cs rename to m365-developer-proxy-plugins/RequestLogs/ExecutionSummaryPlugin.cs index 387cf954..ccc2860e 100644 --- a/msgraph-developer-proxy-plugins/RequestLogs/ExecutionSummaryPlugin.cs +++ b/m365-developer-proxy-plugins/RequestLogs/ExecutionSummaryPlugin.cs @@ -2,12 +2,12 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.CommandLine; using System.CommandLine.Invocation; using System.Text.Json.Serialization; -namespace Microsoft.Graph.DeveloperProxy.Plugins.RequestLogs; +namespace Microsoft365.DeveloperProxy.Plugins.RequestLogs; internal enum SummaryGroupBy { @@ -224,7 +224,7 @@ private string[] GetReportTitle() { return new string[] { - "# Microsoft Graph Developer Proxy execution summary", + "# Microsoft 365 Developer Proxy execution summary", "", $"Date: {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}", "" diff --git a/msgraph-developer-proxy-plugins/RequestLogs/MinimalPermissionsPlugin.cs b/m365-developer-proxy-plugins/RequestLogs/MinimalPermissionsPlugin.cs similarity index 97% rename from msgraph-developer-proxy-plugins/RequestLogs/MinimalPermissionsPlugin.cs rename to m365-developer-proxy-plugins/RequestLogs/MinimalPermissionsPlugin.cs index b598a220..868020dc 100644 --- a/msgraph-developer-proxy-plugins/RequestLogs/MinimalPermissionsPlugin.cs +++ b/m365-developer-proxy-plugins/RequestLogs/MinimalPermissionsPlugin.cs @@ -2,13 +2,13 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.Diagnostics.CodeAnalysis; using System.Net.Http.Json; using System.Text.Json; using System.Text.Json.Serialization; -namespace Microsoft.Graph.DeveloperProxy.Plugins.RequestLogs; +namespace Microsoft365.DeveloperProxy.Plugins.RequestLogs; internal enum PermissionsType { @@ -150,7 +150,7 @@ private async void AfterRecordingStop(object? sender, RecordingArgs e) _logger?.LogWarn("This plugin is in preview and may not return the correct results."); _logger?.LogWarn("Please review the permissions and test your app before using them in production."); - _logger?.LogWarn("If you have any feedback, please open an issue at https://aka.ms/graph/proxy/issue."); + _logger?.LogWarn("If you have any feedback, please open an issue at https://aka.ms/m365/proxy/issue."); _logger?.LogInfo(""); await DetermineMinimalScopes(endpoints); diff --git a/msgraph-developer-proxy-plugins/msgraph-developer-proxy-plugins.csproj b/m365-developer-proxy-plugins/m365-developer-proxy-plugins.csproj similarity index 84% rename from msgraph-developer-proxy-plugins/msgraph-developer-proxy-plugins.csproj rename to m365-developer-proxy-plugins/m365-developer-proxy-plugins.csproj index 1a972486..782bd96d 100644 --- a/msgraph-developer-proxy-plugins/msgraph-developer-proxy-plugins.csproj +++ b/m365-developer-proxy-plugins/m365-developer-proxy-plugins.csproj @@ -1,7 +1,7 @@  net7.0 - Microsoft.Graph.DeveloperProxy.Plugins + Microsoft365.DeveloperProxy.Plugins enable enable true @@ -23,7 +23,7 @@ - + false runtime @@ -36,7 +36,7 @@ the build starts, which may miss files created during the build. --> - + \ No newline at end of file diff --git a/msgraph-developer-proxy.sln b/m365-developer-proxy.sln similarity index 76% rename from msgraph-developer-proxy.sln rename to m365-developer-proxy.sln index 15f1806b..720dc4ac 100644 --- a/msgraph-developer-proxy.sln +++ b/m365-developer-proxy.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.3.32901.215 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msgraph-developer-proxy", "msgraph-developer-proxy\msgraph-developer-proxy.csproj", "{A1047491-5E52-4755-B5D7-17B3774E35FC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "m365-developer-proxy", "m365-developer-proxy\m365-developer-proxy.csproj", "{A1047491-5E52-4755-B5D7-17B3774E35FC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1CC1EC7F-4839-43C8-9980-9BCB19609FA9}" ProjectSection(SolutionItems) = preProject @@ -12,9 +12,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution settings.editorconfig = settings.editorconfig EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msgraph-developer-proxy-plugins", "msgraph-developer-proxy-plugins\msgraph-developer-proxy-plugins.csproj", "{CEEEAB75-B242-47CC-9956-2C4311EF010A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "m365-developer-proxy-plugins", "m365-developer-proxy-plugins\m365-developer-proxy-plugins.csproj", "{CEEEAB75-B242-47CC-9956-2C4311EF010A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msgraph-developer-proxy-abstractions", "msgraph-developer-proxy-abstractions\msgraph-developer-proxy-abstractions.csproj", "{E9AADB3C-A855-4E1A-8D91-036FC0EAC85A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "m365-developer-proxy-abstractions", "m365-developer-proxy-abstractions\m365-developer-proxy-abstractions.csproj", "{E9AADB3C-A855-4E1A-8D91-036FC0EAC85A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/msgraph-developer-proxy/.vscode/launch.json b/m365-developer-proxy/.vscode/launch.json similarity index 91% rename from msgraph-developer-proxy/.vscode/launch.json rename to m365-developer-proxy/.vscode/launch.json index ba9b4f23..532be8a7 100644 --- a/msgraph-developer-proxy/.vscode/launch.json +++ b/m365-developer-proxy/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/bin/Debug/net7.0/msgraph-developer-proxy.dll", + "program": "${workspaceFolder}/bin/Debug/net7.0/m365-developer-proxy.dll", "args": [], "cwd": "${workspaceFolder}", // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console diff --git a/msgraph-developer-proxy/.vscode/tasks.json b/m365-developer-proxy/.vscode/tasks.json similarity index 80% rename from msgraph-developer-proxy/.vscode/tasks.json rename to m365-developer-proxy/.vscode/tasks.json index 06830457..99ffc361 100644 --- a/msgraph-developer-proxy/.vscode/tasks.json +++ b/m365-developer-proxy/.vscode/tasks.json @@ -7,7 +7,7 @@ "type": "process", "args": [ "build", - "${workspaceFolder}/msgraph-developer-proxy.csproj", + "${workspaceFolder}/m365-developer-proxy.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -19,7 +19,7 @@ "type": "process", "args": [ "publish", - "${workspaceFolder}/msgraph-developer-proxy.csproj", + "${workspaceFolder}/m365-developer-proxy.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -33,7 +33,7 @@ "watch", "run", "--project", - "${workspaceFolder}/msgraph-developer-proxy.csproj" + "${workspaceFolder}/m365-developer-proxy.csproj" ], "problemMatcher": "$msCompile" } diff --git a/msgraph-developer-proxy/CertificateDiskCache.cs b/m365-developer-proxy/CertificateDiskCache.cs similarity index 97% rename from msgraph-developer-proxy/CertificateDiskCache.cs rename to m365-developer-proxy/CertificateDiskCache.cs index 84b1bea9..31a84797 100644 --- a/msgraph-developer-proxy/CertificateDiskCache.cs +++ b/m365-developer-proxy/CertificateDiskCache.cs @@ -3,14 +3,14 @@ using Titanium.Web.Proxy.Helpers; using Titanium.Web.Proxy.Network; -namespace Microsoft.Graph.DeveloperProxy; +namespace Microsoft365.DeveloperProxy; // based on https://github.com/justcoding121/titanium-web-proxy/blob/9e71608d204e5b67085656dd6b355813929801e4/src/Titanium.Web.Proxy/Certificates/Cache/DefaultCertificateDiskCache.cs public sealed class CertificateDiskCache : ICertificateCache { private const string DefaultCertificateDirectoryName = "crts"; private const string DefaultCertificateFileExtension = ".pfx"; private const string DefaultRootCertificateFileName = "rootCert" + DefaultCertificateFileExtension; - private const string ProxyConfigurationFolderName = "msgraph-developer-proxy"; + private const string ProxyConfigurationFolderName = "m365-developer-proxy"; private string? rootCertificatePath; diff --git a/msgraph-developer-proxy/ConsoleLogger.cs b/m365-developer-proxy/ConsoleLogger.cs similarity index 99% rename from msgraph-developer-proxy/ConsoleLogger.cs rename to m365-developer-proxy/ConsoleLogger.cs index db81185a..8df12adf 100644 --- a/msgraph-developer-proxy/ConsoleLogger.cs +++ b/m365-developer-proxy/ConsoleLogger.cs @@ -2,9 +2,9 @@ // Licensed under the MIT License. using System.Text; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; -namespace Microsoft.Graph.DeveloperProxy; +namespace Microsoft365.DeveloperProxy; public class ConsoleLogger : ILogger { private readonly ConsoleColor _color; diff --git a/msgraph-developer-proxy/PluginLoadContext.cs b/m365-developer-proxy/PluginLoadContext.cs similarity index 95% rename from msgraph-developer-proxy/PluginLoadContext.cs rename to m365-developer-proxy/PluginLoadContext.cs index 214a6877..d30cab70 100644 --- a/msgraph-developer-proxy/PluginLoadContext.cs +++ b/m365-developer-proxy/PluginLoadContext.cs @@ -4,7 +4,7 @@ using System.Reflection; using System.Runtime.Loader; -namespace Microsoft.Graph.DeveloperProxy; +namespace Microsoft365.DeveloperProxy; class PluginLoadContext : AssemblyLoadContext { private readonly AssemblyDependencyResolver _resolver; diff --git a/msgraph-developer-proxy/PluginLoader.cs b/m365-developer-proxy/PluginLoader.cs similarity index 98% rename from msgraph-developer-proxy/PluginLoader.cs rename to m365-developer-proxy/PluginLoader.cs index fd1fbf93..2033ac2e 100644 --- a/msgraph-developer-proxy/PluginLoader.cs +++ b/m365-developer-proxy/PluginLoader.cs @@ -2,11 +2,11 @@ // Licensed under the MIT License using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.Reflection; using System.Text.RegularExpressions; -namespace Microsoft.Graph.DeveloperProxy; +namespace Microsoft365.DeveloperProxy; internal class PluginLoaderResult { public ISet UrlsToWatch { get; } diff --git a/msgraph-developer-proxy/Program.cs b/m365-developer-proxy/Program.cs similarity index 89% rename from msgraph-developer-proxy/Program.cs rename to m365-developer-proxy/Program.cs index f5f3c71b..8b2cca4d 100644 --- a/msgraph-developer-proxy/Program.cs +++ b/m365-developer-proxy/Program.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using Microsoft.Graph.DeveloperProxy; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy; +using Microsoft365.DeveloperProxy.Abstractions; using System.CommandLine; PluginEvents pluginEvents = new PluginEvents(); diff --git a/msgraph-developer-proxy/Properties/launchSettings.json b/m365-developer-proxy/Properties/launchSettings.json similarity index 100% rename from msgraph-developer-proxy/Properties/launchSettings.json rename to m365-developer-proxy/Properties/launchSettings.json diff --git a/msgraph-developer-proxy/ProxyCommandHandler.cs b/m365-developer-proxy/ProxyCommandHandler.cs similarity index 98% rename from msgraph-developer-proxy/ProxyCommandHandler.cs rename to m365-developer-proxy/ProxyCommandHandler.cs index 98c984fe..16b0ec79 100644 --- a/msgraph-developer-proxy/ProxyCommandHandler.cs +++ b/m365-developer-proxy/ProxyCommandHandler.cs @@ -2,11 +2,11 @@ // Licensed under the MIT License. using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.CommandLine; using System.CommandLine.Invocation; -namespace Microsoft.Graph.DeveloperProxy; +namespace Microsoft365.DeveloperProxy; public class ProxyCommandHandler : ICommandHandler { public Option Port { get; set; } diff --git a/msgraph-developer-proxy/ProxyConfiguration.cs b/m365-developer-proxy/ProxyConfiguration.cs similarity index 84% rename from msgraph-developer-proxy/ProxyConfiguration.cs rename to m365-developer-proxy/ProxyConfiguration.cs index 64217308..9a2a3ff7 100644 --- a/msgraph-developer-proxy/ProxyConfiguration.cs +++ b/m365-developer-proxy/ProxyConfiguration.cs @@ -2,9 +2,9 @@ // Licensed under the MIT License. using System.Text.Json.Serialization; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; -namespace Microsoft.Graph.DeveloperProxy; +namespace Microsoft365.DeveloperProxy; public class ProxyConfiguration: IProxyConfiguration { [JsonPropertyName("port")] @@ -21,6 +21,6 @@ public class ProxyConfiguration: IProxyConfiguration { public IEnumerable WatchProcessNames { get; set; } = new List(); [JsonPropertyName("rate")] public int Rate { get; set; } = 50; - public string ConfigFile { get; set; } = "mgdprc.json"; + public string ConfigFile { get; set; } = "m365proxyrc.json"; } diff --git a/msgraph-developer-proxy/ProxyContext.cs b/m365-developer-proxy/ProxyContext.cs similarity index 84% rename from msgraph-developer-proxy/ProxyContext.cs rename to m365-developer-proxy/ProxyContext.cs index ec9cc29f..178801ee 100644 --- a/msgraph-developer-proxy/ProxyContext.cs +++ b/m365-developer-proxy/ProxyContext.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License.using Microsoft.Extensions.Configuration; -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; -namespace Microsoft.Graph.DeveloperProxy; +namespace Microsoft365.DeveloperProxy; internal class ProxyContext : IProxyContext { diff --git a/msgraph-developer-proxy/ProxyEngine.cs b/m365-developer-proxy/ProxyEngine.cs similarity index 98% rename from msgraph-developer-proxy/ProxyEngine.cs rename to m365-developer-proxy/ProxyEngine.cs index b6a8a7e7..3286ada5 100644 --- a/msgraph-developer-proxy/ProxyEngine.cs +++ b/m365-developer-proxy/ProxyEngine.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.Diagnostics; using System.Net; using System.Reflection; @@ -12,7 +12,7 @@ using Titanium.Web.Proxy.Http; using Titanium.Web.Proxy.Models; -namespace Microsoft.Graph.DeveloperProxy; +namespace Microsoft365.DeveloperProxy; public class ProxyEngine { private readonly PluginEvents _pluginEvents; @@ -62,7 +62,7 @@ public ProxyEngine(ProxyConfiguration config, ISet urlsToWatch, Plug public async Task Run(CancellationToken? cancellationToken) { if (!_urlsToWatch.Any()) { - _logger.LogInfo("No URLs to watch configured. Please add URLs to watch in the mgdprc.json config file."); + _logger.LogInfo("No URLs to watch configured. Please add URLs to watch in the m365proxyrc.json config file."); return; } @@ -107,7 +107,7 @@ public async Task Run(CancellationToken? cancellationToken) { _logger.LogWarn("Configure your operating system to use this proxy's port and address"); } - _logger.LogInfo("Press CTRL+C to stop the Microsoft Graph Developer Proxy"); + _logger.LogInfo("Press CTRL+C to stop the Microsoft 365 Developer Proxy"); _logger.LogInfo(""); Console.CancelKeyPress += Console_CancelKeyPress; @@ -145,7 +145,7 @@ private void ReadKeys() { } if (key == ConsoleKey.C) { Console.Clear(); - Console.WriteLine("Press CTRL+C to stop the Microsoft Graph Developer Proxy"); + Console.WriteLine("Press CTRL+C to stop the Microsoft 365 Developer Proxy"); Console.WriteLine(""); } } while (key != ConsoleKey.Escape); diff --git a/msgraph-developer-proxy/ProxyHost.cs b/m365-developer-proxy/ProxyHost.cs similarity index 92% rename from msgraph-developer-proxy/ProxyHost.cs rename to m365-developer-proxy/ProxyHost.cs index 46c906fb..a615121c 100644 --- a/msgraph-developer-proxy/ProxyHost.cs +++ b/m365-developer-proxy/ProxyHost.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using Microsoft.Graph.DeveloperProxy.Abstractions; +using Microsoft365.DeveloperProxy.Abstractions; using System.CommandLine; using System.Text.RegularExpressions; -namespace Microsoft.Graph.DeveloperProxy; +namespace Microsoft365.DeveloperProxy; internal class ProxyHost { private Option _portOption; @@ -17,7 +17,7 @@ internal class ProxyHost { private Option _rateOption; private static bool _configFileResolved = false; - private static string _configFile = "mgdprc.json"; + private static string _configFile = "m365proxyrc.json"; public static string ConfigFile { get { if (_configFileResolved) { @@ -49,7 +49,7 @@ public static string ConfigFile { // if there's no config file in the current working folder // fall back to the default config file in the app folder if (!File.Exists(_configFile)) { - _configFile = "~appFolder/mgdprc.json"; + _configFile = "~appFolder/m365proxyrc.json"; } } @@ -109,7 +109,7 @@ public RootCommand GetRootCommand() { // `ProxyCommandHandler.Configuration`. As such, it's always set here _configFileOption! }; - command.Description = "Microsoft Graph Developer Proxy is a command line tool that simulates real world behaviors of Microsoft Graph and other APIs, locally."; + command.Description = "Microsoft 365 Developer Proxy is a command line tool that simulates real world behaviors of Microsoft Graph and other APIs, locally."; return command; } diff --git a/msgraph-developer-proxy/UpdateNotification.cs b/m365-developer-proxy/UpdateNotification.cs similarity index 93% rename from msgraph-developer-proxy/UpdateNotification.cs rename to m365-developer-proxy/UpdateNotification.cs index 04f20759..b8b03187 100644 --- a/msgraph-developer-proxy/UpdateNotification.cs +++ b/m365-developer-proxy/UpdateNotification.cs @@ -5,7 +5,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace Microsoft.Graph.DeveloperProxy; +namespace Microsoft365.DeveloperProxy; internal class ReleaseInfo { [JsonPropertyName("name")] @@ -18,7 +18,7 @@ public ReleaseInfo() { } internal static class UpdateNotification { - private static readonly string releasesUrl = "https://api.github.com/repos/microsoftgraph/msgraph-developer-proxy/releases"; + private static readonly string releasesUrl = "https://api.github.com/repos/microsoft/m365-developer-proxy/releases"; /// /// Checks if a new version of the proxy is available. @@ -54,7 +54,7 @@ private static Version GetCurrentVersion() { private static async Task GetLatestRelease() { var http = new HttpClient(); // GitHub API requires user agent to be set - http.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("msgraph-developer-proxy", "1.0")); + http.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("m365-developer-proxy", "1.0")); var response = await http.GetStringAsync(releasesUrl); var releases = JsonSerializer.Deserialize(response); diff --git a/msgraph-developer-proxy/msgraph-developer-proxy.csproj b/m365-developer-proxy/m365-developer-proxy.csproj similarity index 84% rename from msgraph-developer-proxy/msgraph-developer-proxy.csproj rename to m365-developer-proxy/m365-developer-proxy.csproj index 67cedab4..dd0b31e4 100644 --- a/msgraph-developer-proxy/msgraph-developer-proxy.csproj +++ b/m365-developer-proxy/m365-developer-proxy.csproj @@ -3,15 +3,15 @@ Exe net7.0 - Microsoft.Graph.DeveloperProxy + Microsoft365.DeveloperProxy enable enable LICENSE - Microsoft Graph Developer Proxy + Microsoft 365 Developer Proxy 0.8.0 Microsoft - Microsoft Graph Developer Proxy - mgdp + Microsoft 365 Developer Proxy + m365proxy README.md @@ -36,11 +36,11 @@ - + - + Always diff --git a/msgraph-developer-proxy/mgdprc.json b/m365-developer-proxy/m365proxyrc.json similarity index 79% rename from msgraph-developer-proxy/mgdprc.json rename to m365-developer-proxy/m365proxyrc.json index 554721ab..bbb54c73 100644 --- a/msgraph-developer-proxy/mgdprc.json +++ b/m365-developer-proxy/m365proxyrc.json @@ -3,12 +3,12 @@ { "name": "RetryAfterPlugin", "enabled": true, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll" + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll" }, { "name": "GraphSelectGuidancePlugin", "enabled": true, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "urlsToWatch": [ "https://graph.microsoft.com/v1.0/*", "https://graph.microsoft.com/beta/*", @@ -23,7 +23,7 @@ { "name": "GraphBetaSupportGuidancePlugin", "enabled": true, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "urlsToWatch": [ "https://graph.microsoft.com/beta/*", "https://graph.microsoft.us/beta/*", @@ -34,7 +34,7 @@ { "name": "GraphSdkGuidancePlugin", "enabled": true, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "urlsToWatch": [ "https://graph.microsoft.com/v1.0/*", "https://graph.microsoft.com/beta/*", @@ -49,12 +49,12 @@ { "name": "ODataPagingGuidancePlugin", "enabled": true, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll" + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll" }, { "name": "GraphClientRequestIdGuidancePlugin", "enabled": true, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "urlsToWatch": [ "https://graph.microsoft.com/v1.0/*", "https://graph.microsoft.com/beta/*", @@ -69,37 +69,37 @@ { "name": "CachingGuidancePlugin", "enabled": true, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "configSection": "cachingGuidance" }, { "name": "RateLimitingPlugin", "enabled": false, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "configSection": "rateLimiting" }, { "name": "MockResponsePlugin", "enabled": true, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "configSection": "mocksPlugin" }, { "name": "GraphRandomErrorPlugin", "enabled": true, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "configSection": "graphRandomErrorsPlugin" }, { "name": "ExecutionSummaryPlugin", "enabled": false, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "configSection": "executionSummaryPlugin" }, { "name": "MinimalPermissionsPlugin", "enabled": true, - "pluginPath": "GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "configSection": "minimalPermissionsPlugin" } ], diff --git a/msgraph-developer-proxy/picture.jpg b/m365-developer-proxy/picture.jpg similarity index 100% rename from msgraph-developer-proxy/picture.jpg rename to m365-developer-proxy/picture.jpg diff --git a/msgraph-developer-proxy/presets/microsoft-graph-rate-limiting.json b/m365-developer-proxy/presets/microsoft-graph-rate-limiting.json similarity index 89% rename from msgraph-developer-proxy/presets/microsoft-graph-rate-limiting.json rename to m365-developer-proxy/presets/microsoft-graph-rate-limiting.json index 111635cf..277b2241 100644 --- a/msgraph-developer-proxy/presets/microsoft-graph-rate-limiting.json +++ b/m365-developer-proxy/presets/microsoft-graph-rate-limiting.json @@ -3,7 +3,7 @@ { "name": "RateLimitingPlugin", "enabled": true, - "pluginPath": "~appFolder\\GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll" + "pluginPath": "~appFolder\\GraphProxyPlugins\\m365-developer-proxy-plugins.dll" } ], "urlsToWatch": [ diff --git a/msgraph-developer-proxy/presets/microsoft-graph.json b/m365-developer-proxy/presets/microsoft-graph.json similarity index 70% rename from msgraph-developer-proxy/presets/microsoft-graph.json rename to m365-developer-proxy/presets/microsoft-graph.json index 872edc0d..cc2076a8 100644 --- a/msgraph-developer-proxy/presets/microsoft-graph.json +++ b/m365-developer-proxy/presets/microsoft-graph.json @@ -3,12 +3,12 @@ { "name": "GraphSelectGuidancePlugin", "enabled": true, - "pluginPath": "~appFolder\\GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll" + "pluginPath": "~appFolder\\GraphProxyPlugins\\m365-developer-proxy-plugins.dll" }, { "name": "GraphBetaSupportGuidancePlugin", "enabled": true, - "pluginPath": "~appFolder\\GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "~appFolder\\GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "urlsToWatch": [ "https://graph.microsoft.com/beta/*", "https://graph.microsoft.us/beta/*", @@ -19,28 +19,28 @@ { "name": "GraphSdkGuidancePlugin", "enabled": true, - "pluginPath": "~appFolder\\GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll" + "pluginPath": "~appFolder\\GraphProxyPlugins\\m365-developer-proxy-plugins.dll" }, { "name": "ODataPagingGuidancePlugin", "enabled": true, - "pluginPath": "~appFolder\\GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll" + "pluginPath": "~appFolder\\GraphProxyPlugins\\m365-developer-proxy-plugins.dll" }, { "name": "GraphClientRequestIdGuidancePlugin", "enabled": true, - "pluginPath": "~appFolder\\GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll" + "pluginPath": "~appFolder\\GraphProxyPlugins\\m365-developer-proxy-plugins.dll" }, { "name": "GraphRandomErrorPlugin", "enabled": true, - "pluginPath": "~appFolder\\GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "~appFolder\\GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "configSection": "graphRandomErrorsPlugin" }, { "name": "ExecutionSummaryPlugin", "enabled": true, - "pluginPath": "~appFolder\\GraphProxyPlugins\\msgraph-developer-proxy-plugins.dll", + "pluginPath": "~appFolder\\GraphProxyPlugins\\m365-developer-proxy-plugins.dll", "configSection": "executionSummaryPlugin" } ], diff --git a/msgraph-developer-proxy/responses.json b/m365-developer-proxy/responses.json similarity index 100% rename from msgraph-developer-proxy/responses.json rename to m365-developer-proxy/responses.json diff --git a/msgraph-developer-proxy/responses.sample.json b/m365-developer-proxy/responses.sample.json similarity index 100% rename from msgraph-developer-proxy/responses.sample.json rename to m365-developer-proxy/responses.sample.json diff --git a/samples/img/microsoft.png b/samples/img/microsoft.png new file mode 100644 index 0000000000000000000000000000000000000000..68f668cca1862e6313ccd536694eca921bef402b GIT binary patch literal 640 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yaTa()7BevL9RXp+soH$f3=B+0 zo-U3d6}R5rQuJdElxV#eZM3SXW!17t8=80NF$A@*II@ZFkkBp`p_1l|SplK#hZY2M z=rKr{F<8&An^f6m>Hc4`(0KkVPoVKY&~Q(3icD?%{QYW@vsV|-zP!Bu_O|BTxniEv zmaR&vtDm`jTl2CHj*nG@tIP623XHeZn!4ZrFD%{Y;Gm!&Ai%-F!otMF*x2B}0K|lZ z7{Dq~RACB1%|lj&Aq2M-p$bLlhx@EUyL~53+-dbas9>}ICZkYMc43HrYfUwFRsD%l zk({-<`1hSTZ*TF{%`2XmlD10gTJ!3fZL(A9Jmb}7-q>8cT4lGg`DPVG-P03oNb#gTe~DWM4f{UWLt literal 0 HcmV?d00001 diff --git a/samples/index.html b/samples/index.html index 1b89a52d..19bbbfbf 100644 --- a/samples/index.html +++ b/samples/index.html @@ -7,7 +7,7 @@ - Microsoft Graph Developer Proxy + Microsoft 365 Developer Proxy @@ -23,10 +23,10 @@ Microsoft Graph

- Microsoft Graph Developer Proxy + Microsoft 365 Developer Proxy

- Samples to use to test the Microsoft Graph Developer Proxy functionality + Samples to use to test the Microsoft 365 Developer Proxy functionality