aacrawfi/middlware

daprdocs/content/en/concepts/components-concept.md

@@ -29,7 +29,7 @@ Service discovery components are used with the [service invocation]({{<ref "serv
 
 ## Middleware
 
-Dapr allows custom [middleware]({{<ref "middleware-concept.md">}})  to be plugged into the request processing pipeline. Middleware can perform additional actions on a request, such as authentication, encryption and message transformation before the request is routed to the user code, or before the request is returned to the client. The middleware components are used with the [service invocation]({{<ref "service-invocation-overview.md">}}) building block.
+Dapr allows custom [middleware]({{<ref "middleware.md">}})  to be plugged into the request processing pipeline. Middleware can perform additional actions on a request, such as authentication, encryption and message transformation before the request is routed to the user code, or before the request is returned to the client. The middleware components are used with the [service invocation]({{<ref "service-invocation-overview.md">}}) building block.
 
 - [Middleware implementations](https://github.com/dapr/components-contrib/tree/master/middleware)
 

daprdocs/content/en/developing-applications/middleware/middleware-overview.md → daprdocs/content/en/developing-applications/middleware.md

@@ -1,52 +1,43 @@
 ---
 type: docs
-title: "Overview"
-linkTitle: "Overview"
-description: "General overview on set up of middleware components for Dapr"
-weight: 10000
-type: docs
+title: "Middleware"
+linkTitle: "Middleware"
+weight: 50
+description: "Customize processing pipelines by adding middleware components"
+aliases:
+- /developing-applications/middleware/middleware-overview/
+- /concepts/middleware-concept/
 ---
 
-Dapr allows custom processing pipelines to be defined by chaining a series of middleware components. Middleware pipelines are defined in Dapr configuration files.
-As with other [building block components]({{< ref component-schema.md >}}), middleware components are extensible and can be found in the [components-contrib repo](https://github.com/dapr/components-contrib/tree/master/middleware/http).
+Dapr allows custom processing pipelines to be defined by chaining a series of middleware components. A request goes through all defined middleware components before it's routed to user code, and then goes through the defined middleware, in reverse order, before it's returned to the client, as shown in the following diagram.
 
-Middleware in Dapr is described using a `Component` file with the following schema:
+<img src="/images/middleware.png" width=800>
 
-```yaml
-apiVersion: dapr.io/v1alpha1
-kind: Component
-metadata:
-  name: <COMPONENT NAME>
-  namespace: <NAMESPACE>
-spec:
-  type: middleware.http.<MIDDLEWARE TYPE>
-  version: v1
-  metadata:
-  - name: <KEY>
-    value: <VALUE>
-  - name: <KEY>
-    value: <VALUE>
-...
-```
-The type of middleware is determined by the `type` field. Component setting values such as rate limits, OAuth credentials and other settings are put in the `metadata` section.
-Even though metadata values can contain secrets in plain text, it is recommended that you use a [secret store]({{< ref component-secrets.md >}}).
+## Configuring middleware pipelines
+
+When launched, a Dapr sidecar constructs a middleware processing pipeline. By default the pipeline consists of [tracing middleware]({{< ref tracing-overview.md >}}) and CORS middleware. Additional middleware, configured by a Dapr [configuration]({{< ref configuration-concept.md >}}), can be added to the pipeline in the order they are defined. The pipeline applies to all Dapr API endpoints, including state, pub/sub, service invocation, bindings, security and others.
 
-Next, a Dapr [configuration]({{< ref configuration-overview.md >}}) defines the pipeline of middleware components for your application.
+The following configuration example defines a custom pipeline that uses a [OAuth 2.0 middleware]({{< ref middleware-oauth2.md >}}) and an [uppercase middleware component]({{< ref middleware-uppercase.md >}}). In this case, all requests are authorized through the OAuth 2.0 protocol, and transformed to uppercase text, before they are forwarded to user code.
 
 ```yaml
 apiVersion: dapr.io/v1alpha1
 kind: Configuration
 metadata:
-  name: appconfig
+  name: pipeline
+  namespace: default
 spec:
   httpPipeline:
     handlers:
-    - name: <COMPONENT NAME>
-      type: middleware.http.<MIDDLEWARE TYPE>
-    - name: <COMPONENT NAME>
-      type: middleware.http.<MIDDLEWARE TYPE>
+    - name: oauth2
+      type: middleware.http.oauth2
+    - name: uppercase
+      type: middleware.http.uppercase
 ```
 
+As with other building block components, middleware components are extensible and can be found in the [supported Middleware reference]({{< ref supported-middleware >}}) and in the [components-contrib repo](https://github.com/dapr/components-contrib/tree/master/middleware/http).
+
+{{< button page="supported-middleware" text="See all middleware components">}}
+
 ## Writing a custom middleware
 
 Dapr uses [FastHTTP](https://github.com/valyala/fasthttp) to implement its HTTP server. Hence, your HTTP middleware needs to be written as a FastHTTP handler. Your middleware needs to implement a middleware interface, which defines a **GetHandler** method that returns  **fasthttp.RequestHandler** and **error**:
@@ -81,7 +72,6 @@ After the components-contrib change has been accepted, submit another pull reque
 
 ## Related links
 
-* [Middleware pipelines concept]({{< ref middleware-concept.md >}})
 * [Component schema]({{< ref component-schema.md >}})
 * [Configuration overview]({{< ref configuration-overview.md >}})
 * [Middleware quickstart](https://github.com/dapr/quickstarts/tree/master/middleware)