fix: Existing Hooks are replaced with new ones on restart (#33)

* fix: Hooks should attempt to update if already exists * switch method to PUT * delete and put when already exists * delete then post
netreconlab · May 28, 2023 · fbd814b · fbd814b
1 parent 7276ce7
commit fbd814b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/Sources/App/entrypoint.swift b/Sources/App/entrypoint.swift
@@ -37,11 +37,6 @@ enum Entrypoint {
         let app = Application(env)
 
         defer {
-            Task {
-                // This may not delete all because it's async
-                // Be sure to delete manually in dashboard
-                await deleteHooks(app)
-            }
             app.shutdown()
         }
 

diff --git a/Sources/ParseServerSwift/Models/HookFunction.swift b/Sources/ParseServerSwift/Models/HookFunction.swift
@@ -59,6 +59,14 @@ extension HookFunction {
                 if error.containedIn([.webhookError]) && method == .POST {
                     // swiftlint:disable:next line_length
                     configuration.logger.warning("Hook Function: \"\(String(describing: hookFunction))\"; warning: \(error); on server: \(parseServerURLString)")
+                    try await Self.method(.DELETE,
+                                          path,
+                                          name: name,
+                                          parseServerURLStrings: parseServerURLStrings)
+                    return try await Self.method(method,
+                                                 path,
+                                                 name: name,
+                                                 parseServerURLStrings: parseServerURLStrings)
                 } else {
                     // swiftlint:disable:next line_length
                     configuration.logger.error("Could not \(method) Hook Function: \"\(String(describing: hookFunction))\"; error: \(error); on server: \(parseServerURLString)")

diff --git a/Sources/ParseServerSwift/Models/HookTrigger.swift b/Sources/ParseServerSwift/Models/HookTrigger.swift
@@ -69,6 +69,16 @@ extension HookTrigger {
                 if error.containedIn([.webhookError]) && method == .POST {
                     // swiftlint:disable:next line_length
                     configuration.logger.warning("Hook Trigger: \"\(String(describing: hookTrigger))\"; warning: \(error); on server: \(parseServerURLString)")
+                    try await Self.method(.DELETE,
+                                          path,
+                                          className: className,
+                                          triggerName: triggerName,
+                                          parseServerURLStrings: parseServerURLStrings)
+                    return try await Self.method(method,
+                                                 path,
+                                                 className: className,
+                                                 triggerName: triggerName,
+                                                 parseServerURLStrings: parseServerURLStrings)
                 } else {
                     // swiftlint:disable:next line_length
                     configuration.logger.error("Could not \(method) Hook Trigger: \"\(String(describing: hookTrigger))\"; error: \(error); on server: \(parseServerURLString)")