Merge branch 'feature/user_verification_docs' into develop

[finishes #109267688] https://www.pivotaltracker.com/story/show/109267688 Signed-off-by: Paul Warren <paul.warren@emc.com>
cloudfoundry · Jan 13, 2016 · 0ce270d · 0ce270d
2 parents 0c349f4 + 72df3ed
commit 0ce270d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/docs/UAA-APIs.rst b/docs/UAA-APIs.rst
@@ -1399,6 +1399,8 @@ See `SCIM - Creating Resources`__
 
 __ http://www.simplecloud.info/specs/draft-scim-api-01.html#create-resource
 
+New users are automatically verified by default.  Unverified users can be created by specifying their `verified: false` property in the request body of the `POST` to `/Users`, as shown in the example below. Unverified users must then go through the verification process. Obtaining a verification link (to send to the user) is outlined in the section `Verify User Links: GET /Users/{id}/verify-link`_. Users may then use this link to complete the verification process, at which point they'll be able to login.
+
 ================  ==========================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================
 Request           ``POST /Users``
 Header            Authorization Bearer token

diff --git a/uaa/src/main/resources/uaa.yml b/uaa/src/main/resources/uaa.yml
@@ -160,10 +160,6 @@ oauth:
       - roles
       - user_attributes
 
-# Allow unverified users to log in. Defaults to true
-#allowUnverifiedUsers: false
-
-
 # Default token signing key. Each installation MUST provide a unique key
 # in order for tokens to be usable only on that installation.
 #jwt: