From 1ec31ec6b447aeba32d7a539e64d140b9be54486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 21 Nov 2019 12:42:51 +0100
Subject: [PATCH] return user on auth
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
---
 cs3/authprovider/v0alpha/authprovider.proto |  5 +++-
 cs3/gateway/v0alpha/gateway.proto           |  6 ++--
 cs3/userprovider/v0alpha/resources.proto    |  5 ++--
 docs/index.html                             | 31 ++++++++-------------
 4 files changed, 23 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 docs/index.html

diff --git a/cs3/authprovider/v0alpha/authprovider.proto b/cs3/authprovider/v0alpha/authprovider.proto
index 6af30ae2..f45dce5d 100644
--- a/cs3/authprovider/v0alpha/authprovider.proto
+++ b/cs3/authprovider/v0alpha/authprovider.proto
@@ -30,6 +30,7 @@ option php_namespace = "CS3\\AuthProviderV0Alpha";
 
 import "cs3/rpc/status.proto";
 import "cs3/types/types.proto";
+import "cs3/userprovider/v0alpha/resources.proto";
 
 service AuthProviderService {
   rpc Authenticate(AuthenticateRequest) returns (AuthenticateResponse);
@@ -42,6 +43,8 @@ message AuthenticateRequest {
 }
 
 message AuthenticateResponse {
+  reserved 2;
+  reserved "user_id";
   cs3.rpc.Status status = 1;
-  cs3.types.UserId user_id = 2;
+  cs3.userproviderv0alpha.User user = 3;
 }
diff --git a/cs3/gateway/v0alpha/gateway.proto b/cs3/gateway/v0alpha/gateway.proto
index 7d384d7f..75123383 100644
--- a/cs3/gateway/v0alpha/gateway.proto
+++ b/cs3/gateway/v0alpha/gateway.proto
@@ -283,6 +283,8 @@ message AuthenticateRequest {
 }
 
 message AuthenticateResponse {
+  reserved 4;
+  reserved "user_id";
   // REQUIRED.
   // The response status.
   cs3.rpc.Status status = 1;
@@ -293,8 +295,8 @@ message AuthenticateResponse {
   // The access token.
   string token = 3;
   // REQUIRED.
-  // The user id.
-  cs3.types.UserId user_id = 4;
+  // The user.
+  cs3.userproviderv0alpha.User user = 5;
 }
 
 message WhoAmIRequest {
diff --git a/cs3/userprovider/v0alpha/resources.proto b/cs3/userprovider/v0alpha/resources.proto
index cc6cb54d..9937eadf 100644
--- a/cs3/userprovider/v0alpha/resources.proto
+++ b/cs3/userprovider/v0alpha/resources.proto
@@ -31,12 +31,13 @@ option php_namespace = "CS3\\UserProviderV0Alpha";
 import "cs3/types/types.proto";
 
 message User {
+  reserved 2, 3;
+  reserved "issuer", "subject";
   cs3.types.UserId id = 1;
-  string issuer = 2;
-  string subject = 3;
   string username = 4;
   string mail = 5;
   string display_name = 6;
   repeated string groups = 7;
   cs3.types.Opaque opaque = 8;
+  bool mail_verified = 9;
 }
diff --git a/docs/index.html b/docs/index.html
old mode 100644
new mode 100755
index 6b58037f..cf92dfd6
--- a/docs/index.html
+++ b/docs/index.html
@@ -2290,8 +2290,8 @@ <h3 id="cs3.authproviderv0alpha.AuthenticateResponse">AuthenticateResponse</h3>
                 </tr>
               
                 <tr>
-                  <td>user_id</td>
-                  <td><a href="#cs3.types.UserId">cs3.types.UserId</a></td>
+                  <td>user</td>
+                  <td><a href="#cs3.userproviderv0alpha.User">cs3.userproviderv0alpha.User</a></td>
                   <td></td>
                   <td><p> </p></td>
                 </tr>
@@ -2677,11 +2677,11 @@ <h3 id="cs3.gatewayv0alpha.AuthenticateResponse">AuthenticateResponse</h3>
                 </tr>
               
                 <tr>
-                  <td>user_id</td>
-                  <td><a href="#cs3.types.UserId">cs3.types.UserId</a></td>
+                  <td>user</td>
+                  <td><a href="#cs3.userproviderv0alpha.User">cs3.userproviderv0alpha.User</a></td>
                   <td></td>
                   <td><p>REQUIRED.
-The user id. </p></td>
+The user. </p></td>
                 </tr>
               
             </tbody>
@@ -8929,20 +8929,6 @@ <h3 id="cs3.userproviderv0alpha.User">User</h3>
                   <td><p> </p></td>
                 </tr>
               
-                <tr>
-                  <td>issuer</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p> </p></td>
-                </tr>
-              
-                <tr>
-                  <td>subject</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p> </p></td>
-                </tr>
-              
                 <tr>
                   <td>username</td>
                   <td><a href="#string">string</a></td>
@@ -8978,6 +8964,13 @@ <h3 id="cs3.userproviderv0alpha.User">User</h3>
                   <td><p> </p></td>
                 </tr>
               
+                <tr>
+                  <td>mail_verified</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
             </tbody>
           </table>