diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2023-05-12 09:01:58 +0000 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2023-05-12 09:01:58 +0000 |
| commit | c72ca61ef7402e335d5bea58c0a518af6f4cad92 (patch) | |
| tree | 515ca7aece89bcc4c7648f05590b511a6352ca73 /cmd | |
| parent | b961dc8ec5cbc6a486ec80b07d40743f67d3a92b (diff) | |
| parent | 51b79bdb4ae60b1850989cca8eb4190d785408b0 (diff) | |
| download | gitlab-shell-c72ca61ef7402e335d5bea58c0a518af6f4cad92.tar.gz | |
Merge branch 'add_default_ttl_for_personal_access_tokens' into 'main'
Configure a default ttl for personal access tokens
Closes #640
See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/736
Merged-by: Igor Drozdov <idrozdov@gitlab.com>
Approved-by: James Fargher <proglottis@gmail.com>
Approved-by: Igor Drozdov <idrozdov@gitlab.com>
Co-authored-by: Joe Woodward <jwoodward@gitlab.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gitlab-sshd/acceptance_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/gitlab-sshd/acceptance_test.go b/cmd/gitlab-sshd/acceptance_test.go index acd6991..1d366ff 100644 --- a/cmd/gitlab-sshd/acceptance_test.go +++ b/cmd/gitlab-sshd/acceptance_test.go @@ -357,7 +357,7 @@ func TestPersonalAccessTokenSuccess(t *testing.T) { handler := customHandler{ url: "/api/v4/internal/personal_access_token", caller: func(w http.ResponseWriter, _ *http.Request) { - fmt.Fprint(w, `{"success": true, "token": "testtoken", "scopes": ["api"], "expires_at": ""}`) + fmt.Fprint(w, `{"success": true, "token": "testtoken", "scopes": ["api"], "expires_at": "9001-01-01"}`) }, } client := runSSHD(t, successAPI(t, handler)) @@ -368,7 +368,7 @@ func TestPersonalAccessTokenSuccess(t *testing.T) { output, err := session.Output("personal_access_token test api") require.NoError(t, err) - require.Equal(t, "Token: testtoken\nScopes: api\nExpires: never\n", string(output)) + require.Equal(t, "Token: testtoken\nScopes: api\nExpires: 9001-01-01\n", string(output)) } func TestTwoFactorAuthRecoveryCodesSuccess(t *testing.T) { |