From 63ec9c90f511cfdbe4a7154fe1fe7058dea113b6 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 3 Jul 2018 14:20:44 +0200 Subject: [PATCH 1/2] Document the login name during the login flow Signed-off-by: Morris Jobke --- developer_manual/client_apis/LoginFlow/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/developer_manual/client_apis/LoginFlow/index.rst b/developer_manual/client_apis/LoginFlow/index.rst index d65704b22..a6f01ffbe 100644 --- a/developer_manual/client_apis/LoginFlow/index.rst +++ b/developer_manual/client_apis/LoginFlow/index.rst @@ -44,10 +44,10 @@ On the final login the server will do a redirect to a url of the following forma .. code:: - nc://login/server:&user:&password: + nc://login/server:&user:&password: * server: The address of the server to connect to. The server may specify a protocol (http or https). If no protocol is specified the client will assume https. -* username: The username that the client must use to login +* loginname: The username that the client must use to login. **Note:** Keep in mind that this is the loginname and could be different from the username. For example the email address could be used to login but not for generating the webdav URL. You could fetch the actual username from the OCS API endpoint ... . * password: The password that the client must use to login and store securely This information will be used by the client to create a new account. From 07abdb201edc48b22c7b1f791e4e0cd0cbb5f76f Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 7 Dec 2018 17:00:13 +0100 Subject: [PATCH 2/2] Add url --- developer_manual/client_apis/LoginFlow/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developer_manual/client_apis/LoginFlow/index.rst b/developer_manual/client_apis/LoginFlow/index.rst index a6f01ffbe..84e1721a1 100644 --- a/developer_manual/client_apis/LoginFlow/index.rst +++ b/developer_manual/client_apis/LoginFlow/index.rst @@ -47,7 +47,7 @@ On the final login the server will do a redirect to a url of the following forma nc://login/server:&user:&password: * server: The address of the server to connect to. The server may specify a protocol (http or https). If no protocol is specified the client will assume https. -* loginname: The username that the client must use to login. **Note:** Keep in mind that this is the loginname and could be different from the username. For example the email address could be used to login but not for generating the webdav URL. You could fetch the actual username from the OCS API endpoint ... . +* loginname: The username that the client must use to login. **Note:** Keep in mind that this is the loginname and could be different from the username. For example the email address could be used to login but not for generating the webdav URL. You could fetch the actual username from the OCS API endpoint :code:`/ocs/v1.php/cloud/user`. * password: The password that the client must use to login and store securely This information will be used by the client to create a new account.