Merge branch 'master' into fix-telemetry-hook-race

* master: bump version to 1.2.1 (#255) print response if fail to unmarshal error (#254)
mattermost · Apr 27, 2023 · a40c300 · a40c300
2 parents 1d26a07 + c542892
commit a40c300
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/plugin.json b/plugin.json
@@ -4,9 +4,9 @@
     "description": "Microsoft Calendar Integration",
     "homepage_url": "https://mattermost.gitbook.io/plugin-mscalendar",
     "support_url": "https://github.com/mattermost/mattermost-plugin-mscalendar/issues",
-    "release_notes_url": "https://github.com/mattermost/mattermost-plugin-mscalendar/releases/tag/v1.2.0",
+    "release_notes_url": "https://github.com/mattermost/mattermost-plugin-mscalendar/releases/tag/v1.2.1",
     "icon_path": "assets/profile.svg",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "min_server_version": "6.3.0",
     "server": {
         "executables": {

diff --git a/server/manifest.go b/server/manifest.go
diff --git a/server/remote/msgraph/call.go b/server/remote/msgraph/call.go
@@ -96,10 +96,8 @@ func (c *client) call(method, path, contentType string, inBody io.Reader, out in
 	errResp := msgraph.ErrorResponse{Response: resp}
 	err = json.Unmarshal(responseData, &errResp)
 	if err != nil {
-		return responseData, errors.WithMessagef(err, "status: %s", resp.Status)
-	}
-	if err != nil {
-		return responseData, err
+		return responseData, errors.WithMessagef(err, "status: %s. response: %s", resp.Status, string(responseData))
 	}
+
 	return responseData, &errResp
 }