Merge pull request #5106 from 2403905/issue-11004-2

Fix the OCM invite response message on bad request

Author: 2403905

changelog/unreleased/fix-ocm-invite-bad-request.md

@@ -0,0 +1,6 @@
+Bugfix: Fix the OCM invite response message on bad request
+
+Fix the OCM invite response message on bad request.
+
+https://github.com/cs3org/reva/pull/5106
+https://github.com/owncloud/ocis/issues/11004

internal/http/services/sciencemesh/token.go

@@ -223,13 +223,13 @@ func (h *tokenHandler) AcceptInvite(w http.ResponseWriter, r *http.Request) {
 		reqres.WriteError(w, r, reqres.APIErrorServerError, "error sending a grpc forward invite request", err)
 		return
 	}
-	if forwardInviteResponse.Status.Code != rpc.Code_CODE_OK {
-		switch forwardInviteResponse.Status.Code {
+	if forwardInviteResponse.GetStatus().GetCode() != rpc.Code_CODE_OK {
+		switch forwardInviteResponse.GetStatus().GetCode() {
 		case rpc.Code_CODE_NOT_FOUND:
 			reqres.WriteError(w, r, reqres.APIErrorNotFound, "token not found", nil)
 			return
 		case rpc.Code_CODE_INVALID_ARGUMENT:
-			reqres.WriteError(w, r, reqres.APIErrorInvalidParameter, "token has expired", nil)
+			reqres.WriteError(w, r, reqres.APIErrorInvalidParameter, forwardInviteResponse.GetStatus().GetMessage(), nil)
 			return
 		case rpc.Code_CODE_ALREADY_EXISTS:
 			reqres.WriteError(w, r, reqres.APIErrorAlreadyExist, "user already known", nil)
@@ -238,7 +238,8 @@ func (h *tokenHandler) AcceptInvite(w http.ResponseWriter, r *http.Request) {
 			reqres.WriteError(w, r, reqres.APIErrorUnauthenticated, "remote service not trusted", nil)
 			return
 		default:
-			reqres.WriteError(w, r, reqres.APIErrorServerError, "unexpected error: "+forwardInviteResponse.Status.Message, errors.New(forwardInviteResponse.Status.Message))
+			log.Err(errors.New(forwardInviteResponse.GetStatus().GetMessage())).Msg("unexpected error")
+			reqres.WriteError(w, r, reqres.APIErrorServerError, "unexpected error", nil)
 			return
 		}
 	}