Merge branch 'main' into oauth

coder · kylecarbs · Apr 23, 2022 · Apr 15, 2022 · Apr 17, 2022 · Apr 17, 2022
commit aa9e5b7541a0c885ab2f03266da33432bbcd7bdf
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -35,14 +35,18 @@ type Options struct {
 	Pubsub    database.Pubsub
 
 	AgentConnectionUpdateFrequency time.Duration
-	AWSCertificates                awsidentity.Certificates
-	AzureCertificates              x509.VerifyOptions
-	GoogleTokenValidator           *idtoken.Validator
-	GithubOAuth2Config             *GithubOAuth2Config
-	ICEServers                     []webrtc.ICEServer
-	SecureAuthCookie               bool
-	SSHKeygenAlgorithm             gitsshkey.Algorithm
-	TURNServer                     *turnconn.Server
+	// APIRateLimit is the minutely throughput rate limit per user or ip.
+	// Setting a rate limit <0 will disable the rate limiter across the entire
+	// app. Specific routes may have their own limiters.
+	APIRateLimit         int
+	AWSCertificates      awsidentity.Certificates
+	AzureCertificates    x509.VerifyOptions
+	GoogleTokenValidator *idtoken.Validator
+	GithubOAuth2Config   *GithubOAuth2Config
+	ICEServers           []webrtc.ICEServer
+	SecureAuthCookie     bool
+	SSHKeygenAlgorithm   gitsshkey.Algorithm
+	TURNServer           *turnconn.Server
 }
 
 // New constructs the Coder API into an HTTP handler.

diff --git a/coderd/users.go b/coderd/users.go
@@ -832,16 +832,6 @@ func generateAPIKeyIDSecret() (id string, secret string, err error) {
 	return id, secret, nil
 }
 
-func convertUser(user database.User) codersdk.User {
-	return codersdk.User{
-		ID:        user.ID,
-		Email:     user.Email,
-		CreatedAt: user.CreatedAt,
-		Username:  user.Username,
-		Name:      user.Name,
-	}
-}
-
 func (api *api) createAPIKey(rw http.ResponseWriter, r *http.Request, params database.InsertAPIKeyParams) (string, bool) {
 	keyID, keySecret, err := generateAPIKeyIDSecret()
 	if err != nil {
@@ -952,3 +942,21 @@ func (api *api) createUser(ctx context.Context, req codersdk.CreateUserRequest)
 		return nil
 	})
 }
+
+func convertUser(user database.User) codersdk.User {
+	return codersdk.User{
+		ID:        user.ID,
+		Email:     user.Email,
+		CreatedAt: user.CreatedAt,
+		Username:  user.Username,
+		Name:      user.Name,
+	}
+}
+
+func convertUsers(users []database.User) []codersdk.User {
+	converted := make([]codersdk.User, 0, len(users))
+	for _, u := range users {
+		converted = append(converted, convertUser(u))
+	}
+	return converted
+}
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -132,7 +132,7 @@ export interface CreateWorkspaceRequest {
   readonly name: string
 }
 
-// From codersdk/users.go:81:6.
+// From codersdk/users.go:96:6.
 export interface AuthMethods {
   readonly password: boolean
   readonly github: boolean