From d3f05ae49a437d9611f9342b24c564187e4e5760 Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Tue, 5 Jan 2016 17:30:55 +0000 Subject: [PATCH 1/2] Guests can upgrade to regular accounts --- specification/modules/guest_access.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/modules/guest_access.rst b/specification/modules/guest_access.rst index cd43524b..b57abbe7 100644 --- a/specification/modules/guest_access.rst +++ b/specification/modules/guest_access.rst @@ -16,6 +16,12 @@ of the API as described the Client behaviour subsection below. Homeservers may choose not to allow this access at all to their local users, but have no information about whether users on other homeservers are guests or not. +Guest users can also upgrade their account by going through the ordinary +``register`` flow, but specifying the additional POST parameter +``guest_access_token`` containing the guest's access token. They are also +required to specify the ``username`` parameter to the value of the local part of +their username, which is otherwise optional. + This module does not fully factor in federation; it relies on individual homeservers properly adhering to the rules set out in this module, rather than allowing all homeservers to enforce the rules on each other. From f6b1b806782ec28381b9adaf147f9979bab38d7d Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Thu, 7 Jan 2016 13:18:19 +0000 Subject: [PATCH 2/2] Fix param name --- specification/application_service_api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/application_service_api.rst b/specification/application_service_api.rst index 1f442748..0429ec69 100644 --- a/specification/application_service_api.rst +++ b/specification/application_service_api.rst @@ -233,7 +233,7 @@ including the AS token on a ``/register`` request, along with a login type of Content: { type: "m.login.application_service", - user: "" + username: "" } Application services which attempt to create users or aliases *outside* of