merge develop into main (#84)

Author: stefanvit

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [1.11.1] - 2024-11-26
+### Fixed
+- User survey responses not accessible [#78](https://github.com/rokwire/surveys-building-block/issues/78)
+
 ## [1.11.0] - 2024-10-07
 ### Added
 - Consolidate the information, and make it accessible with a single API call [#79](https://github.com/rokwire/surveys-building-block/issues/79)

SECURITY.md

@@ -6,8 +6,8 @@ Patches for **Surveys Building Block** in this repository will only be applied t
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.11.0   | :white_check_mark: |
-| < 1.11.0 | :x:                |
+| 1.11.1   | :white_check_mark: |
+| < 1.11.1 | :x:                |
 
 ## Reporting a Bug or Vulnerability
 

driver/web/apis_admin.go

@@ -296,7 +296,9 @@ func (h AdminAPIsHandler) createSurvey(l *logs.Log, r *http.Request, claims *tok
 	items.CreatorID = claims.Subject
 	items.OrgID = claims.OrgID
 	items.AppID = claims.AppID
-	items.Type = "user"
+	if items.Type == "" {
+		items.Type = "user"
+	}
 
 	item := surveyRequestToSurvey(items)
 
@@ -330,7 +332,9 @@ func (h AdminAPIsHandler) updateSurvey(l *logs.Log, r *http.Request, claims *tok
 	items.CreatorID = claims.Subject
 	items.OrgID = claims.OrgID
 	items.AppID = claims.AppID
-	items.Type = "user"
+	if items.Type == "" {
+		items.Type = "user"
+	}
 
 	item := updateSurveyRequestToSurvey(items, id)
 

driver/web/docs/gen/def.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.3
 info:
   title: Rokwire Surveys Building Block API
   description: Surveys Building Block API Documentation
-  version: 1.11.0
+  version: 1.11.1
 servers:
   - url: 'https://api.rokwire.illinois.edu/surveys'
     description: Production server

driver/web/docs/index.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.3
 info:
   title: Rokwire Surveys Building Block API
   description: Surveys Building Block API Documentation
-  version: 1.11.0
+  version: 1.11.1
 servers:
   - url: 'https://api.rokwire.illinois.edu/surveys'
     description: Production server