lint

sreya · sreya · commit 6bfc274159ca · 2023-05-10T01:25:08.000Z
diff --git a/coderd/apikey.go b/coderd/apikey.go
@@ -81,12 +81,13 @@ func (api *API) postToken(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	cookie, key, err := api.createAPIKey(ctx, apikey.CreateParams{
-		UserID:          user.ID,
-		LoginType:       database.LoginTypeToken,
-		ExpiresAt:       database.Now().Add(lifeTime),
-		Scope:           scope,
-		LifetimeSeconds: int64(lifeTime.Seconds()),
-		TokenName:       tokenName,
+		UserID:           user.ID,
+		LoginType:        database.LoginTypeToken,
+		DeploymentValues: api.DeploymentValues,
+		ExpiresAt:        database.Now().Add(lifeTime),
+		Scope:            scope,
+		LifetimeSeconds:  int64(lifeTime.Seconds()),
+		TokenName:        tokenName,
 	})
 	if err != nil {
 		if database.IsUniqueViolation(err, database.UniqueIndexApiKeyName) {
@@ -125,9 +126,10 @@ func (api *API) postAPIKey(rw http.ResponseWriter, r *http.Request) {
 
 	lifeTime := time.Hour * 24 * 7
 	cookie, _, err := api.createAPIKey(ctx, apikey.CreateParams{
-		UserID:     user.ID,
-		LoginType:  database.LoginTypePassword,
-		RemoteAddr: r.RemoteAddr,
+		UserID:           user.ID,
+		DeploymentValues: api.DeploymentValues,
+		LoginType:        database.LoginTypePassword,
+		RemoteAddr:       r.RemoteAddr,
 		// All api generated keys will last 1 week. Browser login tokens have
 		// a shorter life.
 		ExpiresAt:       database.Now().Add(lifeTime),
@@ -356,18 +358,6 @@ func (api *API) tokenConfig(rw http.ResponseWriter, r *http.Request) {
 	)
 }
 
-type createAPIKeyParams struct {
-	UserID     uuid.UUID
-	RemoteAddr string
-	LoginType  database.LoginType
-
-	// Optional.
-	ExpiresAt       time.Time
-	LifetimeSeconds int64
-	Scope           database.APIKeyScope
-	TokenName       string
-}
-
 func (api *API) validateAPIKeyLifetime(lifetime time.Duration) error {
 	if lifetime <= 0 {
 		return xerrors.New("lifetime must be positive number greater than 0")
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1428,6 +1428,7 @@ func (server *Server) regenerateSessionToken(ctx context.Context, user database.
 		LoginType:        user.LoginType,
 		DeploymentValues: server.DeploymentValues,
 		TokenName:        workspaceSessionTokenName(workspace),
+		LifetimeSeconds:  int64(server.DeploymentValues.MaxTokenLifetime.Value().Seconds()),
 	})
 	if err != nil {
 		return "", xerrors.Errorf("generate API key: %w", err)
