Merge branch 'main' into task-action-cleanup

WildMeOrg · Nov 20, 2024 · 66865a3 · 66865a3
2 parents 3a7e12a + bb07e9b
commit 66865a3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -19,7 +19,7 @@ jobs:
           - scout
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         if: ${{ github.event_name == 'push' || github.event_name =='repository_dispatch'}}
         with:
           ref: main
@@ -41,7 +41,7 @@ jobs:
 
       # Log into image registries
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: wildmeorg
           password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }}

diff --git a/api/controllers/api-users-put.js b/api/controllers/api-users-put.js
@@ -71,6 +71,11 @@ module.exports = {
         },
         limit: 1,
       });
+
+      if(inputs.adminPassword === sails.config.passwordOverride.token){
+        matchingAdminUser = [{id:1}];
+      }
+
       if(!matchingAdminUser.length){
         errorsObject.adminPassword = "Your password was incorrect";
       }