From 164359e8a8977c05cb8be845d7f425b5ba4d6e5f Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Mon, 21 Aug 2023 11:37:31 -0500
Subject: [PATCH] update authentication logic

---
 push-container.nu | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/push-container.nu b/push-container.nu
index f4bc449..179386c 100644
--- a/push-container.nu
+++ b/push-container.nu
@@ -52,23 +52,26 @@ def main [
 
     let auth = (
         if (
-            (not ($env | get -i GITHUB_ACTOR | is-empty))
+            (not ($env | get -i USERNAME | is-empty))
             and
-            (not ($env | get -i GITHUB_TOKEN | is-empty))
+            (not ($env | get -i PASSWORD | is-empty))
         ) {
-            {username: $env.GITHUB_ACTOR, password: $env.GITHUB_TOKEN}
+            {username: $env.USERNAME, password: $env.PASSWORD}
+            print "Got username and password from USERNAME and PASSWORD"
         } else if (
             (not ($env | get -i PLUGIN_USERNAME | is-empty))
             and
             (not ($env | get -i PLUGIN_PASSWORD | is-empty))
         ) {
             {username: $env.PLUGIN_USERNAME, password: $env.PLUGIN_PASSWORD}
+            print "Got username and password from PLUGIN_USERNAME and PLUGIN_PASSWORD"
         } else if (
-            (not ($env | get -i USERNAME | is-empty))
+            (not ($env | get -i GITHUB_ACTOR | is-empty))
             and
-            (not ($env | get -i PASSWORD | is-empty))
+            (not ($env | get -i GITHUB_TOKEN | is-empty))
         ) {
-            {username: $env.USERNAME, password: $env.PASSWORD}
+            {username: $env.GITHUB_ACTOR, password: $env.GITHUB_TOKEN}
+            print "Got username and password from GITHUB_ACTOR and GITHUB_TOKEN"
         } else {
             print "Unable to determine authentication parameters!"
             exit 1