*: readme updates for v2

Documentation/api.md

@@ -107,7 +107,7 @@ Between v1 and v2, dex switched from REST to gRPC. This largely stemmed from pro
 Many arguments _against_ gRPC cite short term convenience rather than production use cases. Though this is a recognized shortcoming, dex already implements many features for developer convenience. For instance, users who wish to manually edit clients during testing can use the `staticClients` config field instead of the API.
 
 [grpc]: http://www.grpc.io/
-[api-proto]: https://github.com/coreos/dex/blob/v2.0.0-alpha.5/api/api.proto
+[api-proto]: ../api/api.proto
 [protoc]: https://github.com/google/protobuf/releases
 [protoc-gen-go]: https://github.com/golang/protobuf
 [google-apis]: https://github.com/google/apis-client-generator

Documentation/getting-started.md

@@ -0,0 +1,47 @@
+# Getting started
+
+## Building the dex binary
+
+Dex requires a Go installation and a GOPATH configured. For setting up a Go workspace, refer to the [official documentation][go-setup]. Clone it down the correct place, and simply type `make` to compile the dex binary.
+
+```
+$ git clone https://github.com/coreos/dex.git $GOPATH/src/github.com/coreos/dex
+$ cd $GOPATH/src/github.com/coreos/dex
+$ make
+```
+
+## Configuration
+
+Dex exclusively pulls configuration options from a config file. Use the [example config][example-config] file found in the `examples/` directory to start an instance of dex with an in-memory data store and a set of predefined OAuth2 clients.
+
+```
+./bin/dex serve examples/config-dev.yaml
+```
+
+The [example config][example-config] file documents many of the configuration options through inline comments. For extra config options, look at that file.
+
+## Running a client
+
+Dex operates like most other OAuth2 providers. Users are redirected from a client app to dex to login. Dex ships with an example client app (also built with the `make` command), for testing and demos.
+
+By default, the example client is configured with the same OAuth2 credentials defined in `examples/config-dev.yaml` to talk to dex. Running the example app will cause it to query dex's [discovery endpoint][oidc-discovery] and determine the OAuth2 endpoints.
+
+```
+./bin/example-app
+```
+
+Login to dex through the example app using the following steps.
+
+1. Navigate to the example app in your browser at http://localhost:5555/ in your browser.
+2. Hit "login" on the example app to be redirected to dex.
+3. Choose the "Login with Email" and enter "admin@example.com" and "password"
+4. Approve the example app's request.
+5. See the resulting token the example app claims from dex.
+
+## Further reading
+
+Check out the Documentation directory for further reading on setting up different storages, interacting with the dex API, intros for OpenID Connect, and logging in through other identity providers such as Google, GitHub, or LDAP.
+
+[go-setup]: https://golang.org/doc/install
+[example-config]: ../examples/config-dev.yaml
+[oidc-discovery]: https://openid.net/specs/openid-connect-discovery-1_0-17.html#ProviderMetadata

README.md

@@ -1,65 +1,32 @@
 # dex - A federated OpenID Connect provider
 
-![Caution image](Documentation/img/caution.png)
+[![GoDoc](https://godoc.org/github.com/coreos/dex?status.svg)](https://godoc.org/github.com/coreos/dex)
 
-__This is an experimental version of dex that is likely to change in
-incompatible ways.__
+![logo](Documentation/logos/dex-horizontal-color.png)
 
-dex is an OAuth2 server that presents clients with a low overhead framework for
-identifying users while leveraging existing identity services such as Google
-Accounts, FreeIPA, GitHub, etc, for actual authentication. dex sits between your
-applications and an identity service, providing a backend agnostic flavor of
-OAuth2 called [OpenID Connect](https://openid.net/connect/), a spec will allows
-dex to support:
+Dex is an OpenID Connect server that allows users to login through upstream identity providers. Clients use a standards-based OAuth2 flow to login users, while the actual authentication is performed by established user management systems such as Google, GitHub, FreeIPA, etc.
 
-* Short-lived, signed tokens with predefined fields (such as email) issued on
-behalf of users.
-* Well known discovery of OAuth2 endpoints.
+[OpenID Connect][openid-connect] is a flavor of OAuth that builds on top of OAuth2 using the JOSE standards. This allows dex to provide:
+
+* Short-lived, signed tokens with standard fields (such as email) issued on behalf of users.
+* "well-known" discovery of OAuth2 endpoints.
 * OAuth2 mechanisms such as refresh tokens and revocation for long term access.
 * Automatic signing key rotation.
 
-Any system which can query dex can cryptographically verify a users identity
-based on these tokens, allowing authentication events to be passed between
-backend services.
+Standards-based token responses allows applications to interact with any OpenID Connect server instead of writing backend specific "access_token" dances. Systems that can already consume ID Tokens issued by dex include:
 
-One such application that consumes OpenID Connect tokens is the [Kubernetes](
-http://kubernetes.io/) API server, allowing dex to provide identity for any
-Kubernetes clusters.
+* [Kubernetes][kubernetes]
+* [Amazon STS][amazon-sts]
 
-## Getting started
+## Documentation
 
-dex requires a Go installation and a GOPATH configured. Clone it down the
-correct place, and simply type `make` to compile dex.
+* [Getting started](Documentation/getting-started.md)
+* [Storage options](Documentation/storage.md)
+* [Intro to OpenID Connect](Documentation/openid-connect.md)
+* [gRPC API](Documentation/api.md)
+* Identity provider logins (coming soon!)
+* Client libraries (coming soon!)
 
-```
-git clone https://github.com/coreos/dex.git $GOPATH/src/github.com/coreos/dex
-cd $GOPATH/src/github.com/coreos/dex
-git checkout dev
-make
-```
-
-dex is a single, scalable binary that pulls all configuration from a config
-file (no command line flags at the moment). Use one of the config files defined
-in the `examples` folder to start up dex with an in-memory data store.
-
-```
-./bin/dex serve examples/config-dev.yaml
-```
-
-dex allows OAuth2 clients to be defined statically through the config file. In
-another window, run the `example-app` (an OAuth2 client). By default this is
-configured to use the client ID and secret defined in the config file.
-
-```
-./bin/example-app
-```
-
-Then to interact with dex, like any other OAuth2 provider, you must first visit
-a client app, then be prompted to login through dex. This can be achieved using
-the following steps:
-
-1. Navigate to http://localhost:5555/ in your browser.
-2. Hit "login" on the example app to be redirected to dex.
-3. Choose the "Login with Email" and enter "admin@example.com" and "password"
-4. Approve the example app's request.
-5. See the resulting token the example app claims from dex.
+[openid-connect]: https://openid.net/connect/
+[kubernetes]: http://kubernetes.io/docs/admin/authentication/#openid-connect-tokens
+[amazon-sts]: https://docs.aws.amazon.com/STS/latest/APIReference/Welcome.html

examples/config-dev.yaml

@@ -1,29 +1,38 @@
 # The base path of dex and the external name of the OpenID Connect service.
-# Clients use this value to do discovery.
+# This is the canonical URL that all clients MUST use to refer to dex. If a
+# path is provided, dex's HTTP service will listen at a non-root URL.
 issuer: http://127.0.0.1:5556/dex
 
 # The storage configuration determines where dex stores its state. Supported
 # options include SQL flavors and Kubernetes third party resources.
+#
+# See the storage document at Documentation/storage.md for further information.
 storage:
   type: sqlite3
   config:
     file: examples/dex.db
 
-# Configuration for the
+# Configuration for the HTTP endpoints.
 web:
   http: 127.0.0.1:5556
-  # HTTPS options are also supported:
+  # Uncomment for HTTPS options.
   # https: 127.0.0.1:5554
   # tlsCert: /etc/dex/tls.crt
   # tlsKey: /etc/dex/tls.key
 
-# Uncomment this block to enable the gRPC API.
+# Uncomment this block to enable the gRPC API. This values MUST be different
+# from the HTTP endpoints.
 # grpc:
 #   addr: 127.0.0.1:5557
 #   tlsCert: /etc/dex/grpc.crt
 #   tlsKey: /etc/dex/grpc.key
 #   tlsClientCA: /etc/dex/client.crt
 
+# Uncomment this block to enable configuration for the expiration time durations.
+# expiry:
+#   signingKeys: "6h"
+#   idTokens: "24h"
+
 # Instead of reading from an external storage, use this list of clients.
 #
 # If this option isn't choosen clients may be added through the gRPC API.
@@ -43,12 +52,12 @@ connectors:
 #   name: Google
 #   config:
 #     issuer: https://accounts.google.com
-#     #  Config values starting with a "$" will read from the environment.
+#     # Connector config values starting with a "$" will read from the environment.
 #     clientID: $GOOGLE_CLIENT_ID
 #     clientSecret: $GOOGLE_CLIENT_SECRET
-#     redirectURI: http://127.0.0.1:5556/dex/callback/google
+#     redirectURI: http://127.0.0.1:5556/dex/google
 
-# Let dex keep a list of passwords which can be used to login the user
+# Let dex keep a list of passwords which can be used to login to dex.
 enablePasswordDB: true
 
 # A static list of passwords to login the end user. By identifying here, dex
@@ -61,8 +70,3 @@ staticPasswords:
   hash: "$2a$10$33EMT0cVYVlPy6WAMCLsceLYjWhuHpbz5yuZxu/GAFj03J9Lytjuy"
   username: "admin"
   userID: "08a8684b-db88-4b73-90a9-3cd1661f5466"
-
-# Uncomment this block to enable configuration for the expiration time durations.
-# expiry:
-#   signingKeys: "6h"
-#   idTokens: "24h"