refactor: refactor secret creation and update logic

- Modify the function `CreateOrUpdateOrgSecret` in `routers/api/v1/org/action.go`
- Replace the call to `secret_model.UpdateSecret` with `secret_model.CreateOrUpdateSecret`
- Remove the block of code that handles the case when the secret is not found
- Remove the call to `secret_model.InsertEncryptedSecret`
- Add a new variable `isCreated` to check if the secret was created or updated
- Update the error handling for the function `CreateOrUpdateOrgSecret`
- Modify the function `CreateOrUpdateSecret` in `routers/api/v1/repo/action.go`
- Replace the call to `secret_model.UpdateSecret` with `secret_model.CreateOrUpdateSecret`
- Remove the block of code that handles the case when the secret is not found
- Remove the call to `secret_model.InsertEncryptedSecret`
- Add a new variable `isCreated` to check if the secret was created or updated
- Update the error handling for the function `CreateOrUpdateSecret`

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

Author: appleboy

routers/api/v1/org/action.go

@@ -112,22 +112,13 @@ func CreateOrUpdateOrgSecret(ctx *context.APIContext) {
 		return
 	}
 	opt := web.GetForm(ctx).(*api.CreateOrUpdateSecretOption)
-	err := secret_model.UpdateSecret(
-		ctx, ctx.Org.Organization.ID, 0, secretName, opt.Data,
-	)
-	if secret_model.IsErrSecretNotFound(err) {
-		_, err := secret_model.InsertEncryptedSecret(
-			ctx, ctx.Org.Organization.ID, 0, secretName, actions.ReserveLineBreakForTextarea(opt.Data),
-		)
-		if err != nil {
-			ctx.Error(http.StatusInternalServerError, "InsertEncryptedSecret", err)
-			return
-		}
-		ctx.Status(http.StatusCreated)
+	isCreated, err := secret_model.CreateOrUpdateSecret(ctx, ctx.Org.Organization.ID, 0, secretName, opt.Data)
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "CreateOrUpdateSecret", err)
 		return
 	}
-	if err != nil {
-		ctx.Error(http.StatusInternalServerError, "UpdateSecret", err)
+	if isCreated {
+		ctx.Status(http.StatusCreated)
 		return
 	}
 

routers/api/v1/repo/action.go

@@ -61,22 +61,13 @@ func CreateOrUpdateSecret(ctx *context.APIContext) {
 		return
 	}
 	opt := web.GetForm(ctx).(*api.CreateOrUpdateSecretOption)
-	err := secret_model.UpdateSecret(
-		ctx, owner.ID, repo.ID, secretName, opt.Data,
-	)
-	if secret_model.IsErrSecretNotFound(err) {
-		_, err := secret_model.InsertEncryptedSecret(
-			ctx, owner.ID, repo.ID, secretName, actions.ReserveLineBreakForTextarea(opt.Data),
-		)
-		if err != nil {
-			ctx.Error(http.StatusInternalServerError, "InsertEncryptedSecret", err)
-			return
-		}
-		ctx.Status(http.StatusCreated)
+	isCreated, err := secret_model.CreateOrUpdateSecret(ctx, owner.ID, repo.ID, secretName, opt.Data)
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "CreateOrUpdateSecret", err)
 		return
 	}
-	if err != nil {
-		ctx.Error(http.StatusInternalServerError, "UpdateSecret", err)
+	if isCreated {
+		ctx.Status(http.StatusCreated)
 		return
 	}