fix: use aws region env var and prevent username changes

UnlockedLabs · Jan 14, 2025 · 628f24c · 628f24c
1 parent dae0366
commit 628f24c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/backend/src/handlers/user_handler.go b/backend/src/handlers/user_handler.go
@@ -220,9 +220,8 @@ func (srv *Server) handleUpdateUser(w http.ResponseWriter, r *http.Request, log
 		return newDatabaseServiceError(err)
 	}
 	if toUpdate.Username != user.Username && user.Username != "" {
-		if srv.Db.UsernameExists(user.Username) {
-			return newBadRequestServiceError(err, "userexists")
-		}
+		// usernames are immutable
+		return newBadRequestServiceError(errors.New("username cannot be updated"), "username")
 	}
 	invalidUser := validateUser(&user)
 	if invalidUser != "" {

diff --git a/backend/src/handlers/user_handler_test.go b/backend/src/handlers/user_handler_test.go
@@ -151,6 +151,7 @@ func TestCreateUser(t *testing.T) {
 func TestUpdateUser(t *testing.T) {
 	httpTests := []httpTest{
 		{"TestNonAdminCannotUpdateUser", "student", getUpdateUserForm(), http.StatusUnauthorized, ""},
+		{"TestAdminCannotUpdateUsername", "admin", getUpdateUsernameForm(), http.StatusBadRequest, ""},
 		{"TestAdminCanUpdateUser", "admin", getUpdateUserForm(), http.StatusOK, ""},
 		{"TestAdminUpdateUserNameValidationFailed", "admin", getUserWithBadCharsForm(), http.StatusBadRequest, ""},
 		{"TestAdminUpdateUserNameExits", "admin", getUserWhereNameExistsAlreadyForm(), http.StatusBadRequest, ""},
@@ -367,7 +368,7 @@ func getBadUserWithNoNameForm() map[string]any {
 	return form
 }
 
-func getUpdateUserForm() map[string]any {
+func getUpdateUsernameForm() map[string]any {
 	form := make(map[string]any)
 	form["username"] = "testUpdate"
 	form["name_first"] = "testUpdate"
@@ -376,3 +377,13 @@ func getUpdateUserForm() map[string]any {
 	form["role"] = "admin"
 	return form
 }
+
+func getUpdateUserForm() map[string]any {
+	form := make(map[string]any)
+	form["username"] = ""
+	form["name_first"] = "testUpdate"
+	form["name_last"] = "testUpdate"
+	form["email"] = "testUpdate"
+	form["role"] = "admin"
+	return form
+}
diff --git a/provider-middleware/video_dl.go b/provider-middleware/video_dl.go
@@ -43,7 +43,7 @@ func NewVideoService(prov *models.OpenContentProvider, db *gorm.DB, body *map[st
 	var svc *s3.Client = nil
 	if bucketName != "" {
 		logger().Info("s3 bucket found, creating client")
-		cfg, err := config.LoadDefaultConfig(context.Background(), config.WithClientLogMode(aws.LogRequest|aws.LogResponseWithBody), config.WithRegion("us-west-2"))
+		cfg, err := config.LoadDefaultConfig(context.Background(), config.WithClientLogMode(aws.LogRequest|aws.LogResponseWithBody), config.WithRegion(os.Getenv("AWS_REGION")))
 		if err != nil {
 			logger().Fatal(err)
 		}