Updated schema to reflect id and name changes to Users and Tenants
Change-Id: I45523888930c8237e60a98873aac1279a0c8ae30
This commit is contained in:
parent
acd108bef4
commit
6a0b030107
|
@ -54,7 +54,7 @@
|
|||
<complexType name="Tenants">
|
||||
<sequence>
|
||||
<element name="tenant" type="identity:Tenant" maxOccurs="100"/>
|
||||
<!--<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
|
||||
<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
|
||||
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
|
||||
</sequence>
|
||||
<anyAttribute namespace="##other" processContents="lax"/>
|
||||
|
@ -82,6 +82,7 @@
|
|||
xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
An ID uniquely identifying the tenant. This usually comes from the back-end store.
|
||||
This value is guaranteed to be unique and immutable (it will never change).
|
||||
</p>
|
||||
</xsd:documentation>
|
||||
</annotation>
|
||||
|
@ -92,7 +93,7 @@
|
|||
xml:lang="EN"
|
||||
xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
The name of the tenant.
|
||||
The name of the tenant. This is guaranteed to be unique, bit it can change.
|
||||
</p>
|
||||
</xsd:documentation>
|
||||
</annotation>
|
||||
|
|
|
@ -44,11 +44,55 @@
|
|||
</element>
|
||||
|
||||
<!-- Complex Types -->
|
||||
<complexType name="User">
|
||||
<attribute name="id" type="xsd:ID" use="optional"/>
|
||||
<attribute name="defaultTenantId" type="xsd:string" use="optional"/>
|
||||
<complexType name="User"><attribute name="id" type="xsd:ID" use="required">
|
||||
<annotation>
|
||||
<xsd:documentation
|
||||
xml:lang="EN"
|
||||
xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
An automatically generated, unique, immutable (it will never change) identifier
|
||||
for the user. This is generated by the backend this user is stored in.
|
||||
</p>
|
||||
</xsd:documentation>
|
||||
</annotation>
|
||||
</attribute>
|
||||
<attribute name="username" type="xsd:string" use="required">
|
||||
<annotation>
|
||||
<xsd:documentation
|
||||
xml:lang="EN"
|
||||
xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
A unique, mutable (it can change) user name that may be used by the user
|
||||
an identifier when presenting credentials.
|
||||
</p>
|
||||
</xsd:documentation>
|
||||
</annotation>
|
||||
</attribute>
|
||||
<attribute name="email" type="xsd:string" use="optional"/>
|
||||
<attribute name="enabled" type="xsd:boolean" default="true" use="optional"/>
|
||||
<attribute name="enabled" type="xsd:boolean" default="true" use="optional">
|
||||
<annotation>
|
||||
<xsd:documentation
|
||||
xml:lang="EN"
|
||||
xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
A true/false value that determines if the user may authenticate or not.
|
||||
If enabled is false, the user will not be able to authenticate.
|
||||
How this value is stored or generated is dependent on the backend in use.
|
||||
</p>
|
||||
</xsd:documentation>
|
||||
</annotation>
|
||||
</attribute>
|
||||
<attribute name="display-name" type="xsd:string" use="optional">
|
||||
<annotation>
|
||||
<xsd:documentation
|
||||
xml:lang="EN"
|
||||
xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
A human-readable, friendly name for use in user interfaces.
|
||||
</p>
|
||||
</xsd:documentation>
|
||||
</annotation>
|
||||
</attribute>
|
||||
<attribute name="updated" type="xsd:dateTime" use="optional">
|
||||
<annotation>
|
||||
<xsd:documentation
|
||||
|
|
|
@ -186,7 +186,7 @@
|
|||
<complexType name="EndpointTemplateList">
|
||||
<sequence>
|
||||
<element name="endpointTemplate" type="identity:EndpointTemplate" minOccurs="0" maxOccurs="unbounded"/>
|
||||
<!-- TODO(Ziad): resolve conflict <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
|
||||
<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
|
||||
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
|
||||
</sequence>
|
||||
<anyAttribute namespace="##other" processContents="lax"/>
|
||||
|
@ -195,7 +195,7 @@
|
|||
<complexType name="EndpointList">
|
||||
<sequence>
|
||||
<element name="endpoint" type="identity:Endpoint" minOccurs="0" maxOccurs="unbounded"/>
|
||||
<!-- TODO(Ziad): resolve conflict <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
|
||||
<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
|
||||
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
|
||||
</sequence>
|
||||
<anyAttribute namespace="##other" processContents="lax"/>
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
<!-- Complex Types -->
|
||||
<complexType name="Role">
|
||||
<sequence>
|
||||
<!-- TODO(Ziad): resolve conflict <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
|
||||
<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
|
||||
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
|
||||
</sequence>
|
||||
<attribute name="id" type="xsd:string" use="required"/>
|
||||
|
@ -59,7 +59,7 @@
|
|||
<complexType name="RoleList">
|
||||
<sequence>
|
||||
<element name="role" type="identity:Role" minOccurs="0" maxOccurs="unbounded"/>
|
||||
<!-- TODO(Ziad): resolve conflict <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
|
||||
<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
|
||||
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
|
||||
</sequence>
|
||||
<anyAttribute namespace="##other" processContents="lax"/>
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
xml:lang="EN"
|
||||
xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
The name of the tenant.
|
||||
The name of the tenant. This is guaranteed to be unique, but may change.
|
||||
</p>
|
||||
</xsd:documentation>
|
||||
</annotation>
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
<element name="roles" type="identity:RoleList" />
|
||||
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
|
||||
</sequence>
|
||||
<attribute name="tenantId" type="xsd:string" use="optional"/>
|
||||
<attribute name="id" type="xsd:string"/>
|
||||
<attribute name="username" type="xsd:string"/>
|
||||
<anyAttribute namespace="##other" processContents="lax"/>
|
||||
</complexType>
|
||||
|
|
|
@ -45,10 +45,55 @@
|
|||
|
||||
<!-- Complex Types -->
|
||||
<complexType name="User">
|
||||
<attribute name="id" type="xsd:ID" use="optional"/>
|
||||
<attribute name="defaultTenantId" type="xsd:string" use="optional"/>
|
||||
<attribute name="id" type="xsd:ID" use="required">
|
||||
<annotation>
|
||||
<xsd:documentation
|
||||
xml:lang="EN"
|
||||
xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
An automatically generated, unique, immutable (it will never change) identifier
|
||||
for the user. This is generated by the backend this user is stored in.
|
||||
</p>
|
||||
</xsd:documentation>
|
||||
</annotation>
|
||||
</attribute>
|
||||
<attribute name="username" type="xsd:string" use="required">
|
||||
<annotation>
|
||||
<xsd:documentation
|
||||
xml:lang="EN"
|
||||
xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
A unique, mutable (it can change) user name that may be used by the user
|
||||
an identifier when presenting credentials.
|
||||
</p>
|
||||
</xsd:documentation>
|
||||
</annotation>
|
||||
</attribute>
|
||||
<attribute name="email" type="xsd:string" use="optional"/>
|
||||
<attribute name="enabled" type="xsd:boolean" default="true" use="optional"/>
|
||||
<attribute name="enabled" type="xsd:boolean" default="true" use="optional">
|
||||
<annotation>
|
||||
<xsd:documentation
|
||||
xml:lang="EN"
|
||||
xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
A true/false value that determines if the user may authenticate or not.
|
||||
If enabled is false, the user will not be able to authenticate.
|
||||
How this value is stored or generated is dependent on the backend in use.
|
||||
</p>
|
||||
</xsd:documentation>
|
||||
</annotation>
|
||||
</attribute>
|
||||
<attribute name="display-name" type="xsd:string" use="optional">
|
||||
<annotation>
|
||||
<xsd:documentation
|
||||
xml:lang="EN"
|
||||
xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
A human-readable, friendly name for use in user interfaces.
|
||||
</p>
|
||||
</xsd:documentation>
|
||||
</annotation>
|
||||
</attribute>
|
||||
<attribute name="updated" type="xsd:dateTime" use="optional">
|
||||
<annotation>
|
||||
<xsd:documentation
|
||||
|
@ -78,7 +123,7 @@
|
|||
<complexType name="UserList">
|
||||
<sequence>
|
||||
<element name="user" type="identity:User" minOccurs="0" maxOccurs="unbounded"/>
|
||||
<!--<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />-->
|
||||
<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
|
||||
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
|
||||
</sequence>
|
||||
<anyAttribute namespace="##other" processContents="lax"/>
|
||||
|
|
Loading…
Reference in New Issue