xanzy#1210 move custom token into context

context.go

@@ -0,0 +1,25 @@
+package gitlab
+
+import "context"
+
+type key uint8
+
+const optKey key = iota
+
+func WithToken(ctx context.Context, token string) context.Context {
+	return context.WithValue(ctx, optKey, token)
+}
+
+func TokenFromContext(ctx context.Context) *string {
+	val := ctx.Value(optKey)
+	if val == nil {
+		return nil
+	}
+
+	opt, ok := val.(string)
+	if !ok {
+		return nil
+	}
+
+	return &opt
+}

gitlab.go

@@ -747,20 +747,30 @@ func (c *Client) Do(req *retryablehttp.Request, v interface{}) (*Response, error
 	// silently as the limiter will be disabled in case of an error.
 	c.configureLimiterOnce.Do(func() { c.configureLimiter(req.Context()) })
 
+	ctx := req.Context()
+
 	// Wait will block until the limiter can obtain a new token.
-	err := c.limiter.Wait(req.Context())
+	err := c.limiter.Wait(ctx)
 	if err != nil {
 		return nil, err
 	}
 
+	var token string
+	c.tokenLock.RLock()
+	token = c.token
+	c.tokenLock.RUnlock()
+
+	authToken := TokenFromContext(ctx)
+	if authToken != nil {
+		token = *authToken
+	}
+
 	// Set the correct authentication header. If using basic auth, then check
 	// if we already have a token and if not first authenticate and get one.
 	var basicAuthToken string
 	switch c.authType {
-	case BasicAuth:
-		c.tokenLock.RLock()
-		basicAuthToken = c.token
-		c.tokenLock.RUnlock()
+	case basicAuth:
+		basicAuthToken = token
 		if basicAuthToken == "" {
 			// If we don't have a token yet, we first need to request one.
 			basicAuthToken, err = c.requestOAuthToken(req.Context(), basicAuthToken)
@@ -769,18 +779,12 @@ func (c *Client) Do(req *retryablehttp.Request, v interface{}) (*Response, error
 			}
 		}
 		req.Header.Set("Authorization", "Bearer "+basicAuthToken)
-	case JobToken:
-		if values := req.Header.Values("JOB-TOKEN"); len(values) == 0 {
-			req.Header.Set("JOB-TOKEN", c.token)
-		}
-	case OAuthToken:
-		if values := req.Header.Values("Authorization"); len(values) == 0 {
-			req.Header.Set("Authorization", "Bearer "+c.token)
-		}
-	case PrivateToken:
-		if values := req.Header.Values("PRIVATE-TOKEN"); len(values) == 0 {
-			req.Header.Set("PRIVATE-TOKEN", c.token)
-		}
+	case jobToken:
+		req.Header.Set("JOB-TOKEN", token)
+	case oAuthToken:
+		req.Header.Set("Authorization", "Bearer "+token)
+	case privateToken:
+		req.Header.Set("PRIVATE-TOKEN", token)
 	}
 
 	resp, err := c.client.Do(req)
@@ -943,14 +947,3 @@ func parseError(raw interface{}) string {
 		return fmt.Sprintf("failed to parse unexpected error type: %T", raw)
 	}
 }
-
-// WithToken сhanges the token, but does not change the authorization method.
-// For change authorization method create new Client.
-func (c *Client) WithToken(token string) *Client {
-	c.tokenLock.Lock()
-	defer c.tokenLock.Unlock()
-
-	c.token = token
-
-	return c
-}