fix(examplebroker): Improve wording for the regenerate code button la…

…bel (#408) The user is allowed to regenerate the login code not the QR code, so improve the wording here. Regenerate the golden files based on that This is not strictly needed, but it's better to align with ubuntu/authd-oidc-brokers#47
ubuntu · Jul 3, 2024 · dd7d4ce · dd7d4ce
2 parents d000437 + 88dc05e
commit dd7d4ce
Show file tree

Hide file tree

Showing 11 changed files with 146 additions and 50 deletions.
diff --git a/examplebroker/broker.go b/examplebroker/broker.go
@@ -350,7 +350,7 @@ func getSupportedModes(sessionInfo sessionInfo, supportedUILayouts []map[string]
 					"type":   "qrcode",
 					"label":  modeLabel,
 					"wait":   "true",
-					"button": "regenerate QR code",
+					"button": "Regenerate code",
 				}),
 			}
 

diff --git a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code
@@ -32,6 +32,9 @@
 
 
 
+
+
+
 
 
 
@@ -72,6 +75,9 @@ Gimme your password
 
 
 
+
+
+
 
 
 
@@ -112,6 +118,9 @@ Gimme your password
 
 
 
+
+
+
 
 
 
@@ -140,7 +149,10 @@ Scan the qrcode or enter the code in the login page
 ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
               1337
 
-      [ regenerate QR code ]
+        [ Regenerate code ]
+
+
+
 
 
 
@@ -180,7 +192,10 @@ Scan the qrcode or enter the code in the login page
 ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
               1337
 
-      [ regenerate QR code ]
+        [ Regenerate code ]
+
+
+
 
 
 
@@ -220,7 +235,10 @@ Scan the qrcode or enter the code in the login page
 ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
               1337
 
-      [ regenerate QR code ]
+        [ Regenerate code ]
+
+
+
 
 
 
@@ -276,6 +294,9 @@ PAM AcctMgmt() exited with success
 
 
 
+
+
+
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -316,4 +337,7 @@ PAM AcctMgmt() exited with success
 
 
 
+
+
+
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/...gration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty b/...gration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty
@@ -32,6 +32,9 @@
 
 
 
+
+
+
 
 
 
@@ -72,6 +75,9 @@ Gimme your password
 
 
 
+
+
+
 
 
 
@@ -112,6 +118,9 @@ Gimme your password
 
 
 
+
+
+
 
 
 
@@ -156,6 +165,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+                        [ Regenerate code ]
+
+
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -196,6 +208,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+                        [ Regenerate code ]
+
+
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -236,6 +251,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+                        [ Regenerate code ]
+
+
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -276,6 +294,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+PAM Authenticate() for user "user-integration-qr-code-tty" exited with success
+PAM AcctMgmt() exited with success
+>
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -316,4 +337,7 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+PAM Authenticate() for user "user-integration-qr-code-tty" exited with success
+PAM AcctMgmt() exited with success
+>
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/...tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session b/...tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session
@@ -32,6 +32,9 @@
 
 
 
+
+
+
 
 
 
@@ -72,6 +75,9 @@ Gimme your password
 
 
 
+
+
+
 
 
 
@@ -112,6 +118,9 @@ Gimme your password
 
 
 
+
+
+
 
 
 
@@ -156,6 +165,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+                        [ Regenerate code ]
+
+
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -196,6 +208,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+                        [ Regenerate code ]
+
+
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -236,6 +251,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+                        [ Regenerate code ]
+
+
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -276,6 +294,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+PAM Authenticate() for user "user-integration-qr-code-tty-session" exited with success
+PAM AcctMgmt() exited with success
+>
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -316,4 +337,7 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+PAM Authenticate() for user "user-integration-qr-code-tty-session" exited with success
+PAM AcctMgmt() exited with success
+>
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/...ration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen b/...ration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen
@@ -32,6 +32,9 @@
 
 
 
+
+
+
 
 
 
@@ -72,6 +75,9 @@ Gimme your password
 
 
 
+
+
+
 
 
 
@@ -112,6 +118,9 @@ Gimme your password
 
 
 
+
+
+
 
 
 
@@ -156,6 +165,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+                        [ Regenerate code ]
+
+
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -196,6 +208,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+                        [ Regenerate code ]
+
+
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -236,6 +251,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+                        [ Regenerate code ]
+
+
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -276,6 +294,9 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+PAM Authenticate() for user "user-integration-qr-code-screen" exited with success
+PAM AcctMgmt() exited with success
+>
 ────────────────────────────────────────────────────────────────────────────────
 > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
@@ -316,4 +337,7 @@ Scan the qrcode or enter the code in the login page
 ██████████████████████████████████████████████████████████████████
                                1337
 
+PAM Authenticate() for user "user-integration-qr-code-screen" exited with success
+PAM AcctMgmt() exited with success
+>
 ────────────────────────────────────────────────────────────────────────────────