Fixed bug for decrypting app webhook

dev-scripts/dev-reset-service.sh

@@ -7,4 +7,4 @@ fi
 
 sudo docker service update captain-captain --force
 sleep 2s
-sudo docker service logs captain-captain --follow --since 10m
+sudo docker service logs captain-captain --follow --since 2m

dev-scripts/migrate-from-cdd.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Run this script on the server to migrate from CaptainDuckDuck.
-
-
-cd / && \
-docker service scale captain-captain=0 && \
-(docker service rm captain-certbot captain-nginx captain-registry || true) && \
-sleep 3s && echo "waiting." && sleep 3s && echo "waiting..." && \
-rm -rf /captain/generated && rm -rf /captain/temp && \
-tar -czvf /captain-bk-$(date +%Y_%m_%d_%H_%M_%S).tar /captain && \
-mkdir -p /captain/data && \
-mv /captain/letencrypt /captain/data/ && \
-mv /captain/nginx-shared /captain/data/ && \
-mv /captain/registry /captain/data/ && \
-mv /captain/config.conf /captain/data/ && \
-docker service update --image caprover/caprover captain-captain && \
-docker service scale captain-captain=1 && \
-docker service logs captain-captain --follow

src/injection/InjectionExtractor.ts

@@ -18,7 +18,7 @@ class InjectionExtractor {
     static extractAppAndUserForWebhook(res: Response) {
         return {
             user: res.locals.user as UserInjected,
-            appName: res.locals.namespace as string,
+            appName: res.locals.appName as string,
             app: res.locals.app as IAppDef,
         }
     }

src/user/system/CaptainManager.ts

@@ -142,9 +142,6 @@ class CaptainManager {
                     CaptainConstants.captainNetworkName
                 )
             })
-            .then(function() {
-                return loadBalancerManager.init(myNodeId, dataStore)
-            })
             .then(function() {
                 const valueIfNotExist = CaptainConstants.isDebug
                     ? DEBUG_SALT
@@ -193,6 +190,9 @@ class CaptainManager {
             .then(function() {
                 return dataStore.setEncryptionSalt(self.getCaptainSalt())
             })
+            .then(function() {
+                return loadBalancerManager.init(myNodeId, dataStore)
+            })
             .then(function() {
                 return new MigrateCaptainDuckDuck(
                     dataStore,