From dc0bab363eb8ea6f0cc2f411cba50bb3e3e6c0e2 Mon Sep 17 00:00:00 2001 From: Ramya Anusri <62586490+ramya18101@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:53:43 +0530 Subject: [PATCH 1/2] Support reset_email_by_code email template (#1119) * Support reset_email_by_code email template * Update unit tests * Update timeOut to 5 seconds for auth0 test login test * Update go-auth0 version to the latest --- go.mod | 14 +++++----- go.sum | 28 +++++++++---------- internal/auth/auth.go | 2 +- internal/cli/email_templates.go | 27 ++++++++++-------- test/integration/email-test-cases.yaml | 15 ++++++++++ .../integration/test-commands-test-cases.yaml | 2 +- 6 files changed, 54 insertions(+), 34 deletions(-) diff --git a/go.mod b/go.mod index f6b700b2d..dfa90d064 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ replace github.com/mholt/archiver/v3 => github.com/anchore/archiver/v3 v3.5.2 require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/PuerkitoBio/rehttp v1.4.0 - github.com/auth0/go-auth0 v1.13.0 + github.com/auth0/go-auth0 v1.14.0 github.com/briandowns/spinner v1.23.1 github.com/charmbracelet/glamour v0.8.0 github.com/fsnotify/fsnotify v1.7.0 @@ -36,11 +36,11 @@ require ( github.com/zalando/go-keyring v0.2.5 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 golang.org/x/net v0.30.0 - golang.org/x/oauth2 v0.24.0 - golang.org/x/sync v0.9.0 - golang.org/x/sys v0.27.0 - golang.org/x/term v0.26.0 - golang.org/x/text v0.20.0 + golang.org/x/oauth2 v0.25.0 + golang.org/x/sync v0.10.0 + golang.org/x/sys v0.28.0 + golang.org/x/term v0.27.0 + golang.org/x/text v0.21.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -94,7 +94,7 @@ require ( github.com/yuin/goldmark v1.7.4 // indirect github.com/yuin/goldmark-emoji v1.0.3 // indirect github.com/zclconf/go-cty v1.14.4 // indirect - golang.org/x/crypto v0.29.0 // indirect + golang.org/x/crypto v0.31.0 // indirect golang.org/x/mod v0.19.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect diff --git a/go.sum b/go.sum index 8263ad7fc..6a03822ad 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,8 @@ github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= -github.com/auth0/go-auth0 v1.13.0 h1:GA7WyGAzlKBQ2ctHcCZwVf0aiOvPd2PB3QagC5heQJg= -github.com/auth0/go-auth0 v1.13.0/go.mod h1:G3oPT7sWjmM4mHbn6qkMYEsxnwm/5PnSbo0kpPLSS0E= +github.com/auth0/go-auth0 v1.14.0 h1:T/wQGIwXylf1DnrDtDEuo/92YBnRizRcw15zXb+e3k4= +github.com/auth0/go-auth0 v1.14.0/go.mod h1:PjkjJXvHIbGPJgig9lNjlYrK2lsP5pdh3tM+VV4Dmpc= github.com/aybabtme/iocontrol v0.0.0-20150809002002-ad15bcfc95a0 h1:0NmehRCgyk5rljDQLKUO+cRJCnduDyn11+zGZIc9Z48= github.com/aybabtme/iocontrol v0.0.0-20150809002002-ad15bcfc95a0/go.mod h1:6L7zgvqo0idzI7IO8de6ZC051AfXb5ipkIJ7bIA2tGA= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= @@ -253,8 +253,8 @@ github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgr golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= -golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -269,13 +269,13 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= -golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= -golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70= +golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= -golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -289,19 +289,19 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= -golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU= -golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= -golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= diff --git a/internal/auth/auth.go b/internal/auth/auth.go index 0947600e5..81b7f57ac 100644 --- a/internal/auth/auth.go +++ b/internal/auth/auth.go @@ -128,7 +128,7 @@ var RequiredScopes = []string{ "create:rules", "delete:rules", "read:rules", "update:rules", "create:users", "delete:users", "read:users", "update:users", "read:branding", "update:branding", - "read:email_templates", "update:email_templates", + "create:email_templates", "read:email_templates", "update:email_templates", "read:email_provider", "read:flows", "read:forms", "read:flows_vault_connections", "read:connections", "update:connections", diff --git a/internal/cli/email_templates.go b/internal/cli/email_templates.go index 22988dee0..36b3401c7 100644 --- a/internal/cli/email_templates.go +++ b/internal/cli/email_templates.go @@ -14,24 +14,26 @@ import ( ) const ( - emailTemplateVerifyLink = "verify-link" - emailTemplateVerifyCode = "verify-code" - emailTemplateChangePassword = "change-password" - emailTemplateWelcome = "welcome" - emailTemplateBlockedAccount = "blocked-account" - emailTemplatePasswordBreach = "password-breach" - emailTemplateMFAEnrollment = "mfa-enrollment" - emailTemplateMFACode = "mfa-code" - emailTemplateUserInvitation = "user-invitation" + emailTemplateVerifyLink = "verify-link" + emailTemplateVerifyCode = "verify-code" + emailTemplateChangePassword = "change-password" + emailTemplateChangePasswordCode = "change-password-code" + emailTemplateWelcome = "welcome" + emailTemplateBlockedAccount = "blocked-account" + emailTemplatePasswordBreach = "password-breach" + emailTemplateMFAEnrollment = "mfa-enrollment" + emailTemplateMFACode = "mfa-code" + emailTemplateUserInvitation = "user-invitation" ) var ( emailTemplateTemplate = Argument{ Name: "Template", - Help: fmt.Sprintf("Template name. Can be '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' or '%s'", + Help: fmt.Sprintf("Template name. Can be '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' or '%s'", emailTemplateVerifyLink, emailTemplateVerifyCode, emailTemplateChangePassword, + emailTemplateChangePasswordCode, emailTemplateWelcome, emailTemplateBlockedAccount, emailTemplatePasswordBreach, @@ -89,7 +91,8 @@ var ( emailTemplateOptions = pickerOptions{ {"Verification Email (using Link)", emailTemplateVerifyLink}, {"Verification Email (using Code)", emailTemplateVerifyCode}, - {"Change Password", emailTemplateChangePassword}, + {"Change Password (using Link)", emailTemplateChangePassword}, + {"Change Password (using Code)", emailTemplateChangePasswordCode}, {"Welcome Email", emailTemplateWelcome}, {"Blocked Account Email", emailTemplateBlockedAccount}, {"Password Breach Alert", emailTemplatePasswordBreach}, @@ -304,6 +307,8 @@ func apiEmailTemplateFor(v string) string { return "verify_email_by_code" case emailTemplateChangePassword: return "reset_email" + case emailTemplateChangePasswordCode: + return "reset_email_by_code" case emailTemplateWelcome: return "welcome_email" case emailTemplateBlockedAccount: diff --git a/test/integration/email-test-cases.yaml b/test/integration/email-test-cases.yaml index 4ac89be82..8e2ac6aa6 100644 --- a/test/integration/email-test-cases.yaml +++ b/test/integration/email-test-cases.yaml @@ -155,3 +155,18 @@ tests: syntax: "liquid" urlLifetimeInSeconds: "6100" enabled: "true" + 021 - it successfully updates change-password-code email template: + command: auth0 email templates update change-password-code --enabled --body "

Change password (by code)

" --from "change-password-by-code@travel0.com" --lifetime 6100 --subject "Change password (using code)" --url "travel0.com" --force + exit-code: 0 + + 022 - it successfully shows change-password-code email template: + command: auth0 email templates show change-password-code + exit-code: 0 + stdout: + contains: + - TEMPLATE reset_email_by_code + - FROM change-password-by-code@travel0.com + - SUBJECT Change password (using code) + - RESULT URL travel0.com + - RESULT URL LIFETIME 6100 + - ENABLED ✓ \ No newline at end of file diff --git a/test/integration/test-commands-test-cases.yaml b/test/integration/test-commands-test-cases.yaml index a2c63421d..f82d9ecae 100644 --- a/test/integration/test-commands-test-cases.yaml +++ b/test/integration/test-commands-test-cases.yaml @@ -6,7 +6,7 @@ tests: # Terminate early because command will otherwise wait for in-browser # authorization stage `timeout` command provided by GNU coreutils. # On Mac install with brew install coreutils. - command: timeout 2s auth0 test login $(./test/integration/scripts/get-rwa-app-id.sh) --no-input 2>&1 + command: timeout 5s auth0 test login $(./test/integration/scripts/get-rwa-app-id.sh) --no-input 2>&1 exit-code: 124 # Timeout exit code. stdout: contains: From c1d2c52339b74e9413a7230bde72b43f49ce44ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:39:10 +0530 Subject: [PATCH 2/2] Bump rexml from 3.3.6 to 3.3.9 in /docs (#1097) Bumps [rexml](https://github.com/ruby/rexml) from 3.3.6 to 3.3.9. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.6...v3.3.9) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rajat Bajaj --- docs/Gemfile.lock | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 7bc195e9f..57c3969dc 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -248,8 +248,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.3.6) - strscan + rexml (3.3.9) rouge (3.30.0) rubyzip (2.3.2) safe_yaml (1.0.5) @@ -263,7 +262,6 @@ GEM faraday (>= 0.17.3, < 3) securerandom (0.3.1) simpleidn (0.2.3) - strscan (3.1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) typhoeus (1.4.1)