Merge branch 'master' into self-updater

Signed-off-by: Sourya Vatsyayan <sourya@deepsource.io>

Author: sourya-deepsource

command/auth/login/login.go

@@ -113,7 +113,7 @@ func (opts *LoginOptions) Run() (err error) {
 		return opts.startPATLoginFlow(svc, cfg, opts.PAT)
 	}
 
-	if !opts.TokenExpired {
+	if !opts.TokenExpired && cfg.Token != "" {
 		var msg string
 		if opts.User != "" {
 			msg = fmt.Sprintf("You're already logged into DeepSource as %s. Do you want to re-authenticate?", opts.User)

internal/services/report/service.go

@@ -205,6 +205,11 @@ func (s *Service) parseReportResponse(responseBody []byte, opts Options, warning
 	}
 
 	if !queryResponse.Data.CreateArtifact.Ok {
+		if queryResponse.Data.CreateArtifact.Error == "" {
+			err := fmt.Errorf("reporting failed with empty error, raw response: %s", string(responseBody))
+			s.capture(err)
+			return nil, err
+		}
 		err := errors.New(queryResponse.Data.CreateArtifact.Error)
 		s.capture(err)
 		return nil, fmt.Errorf("Reporting failed: %s", queryResponse.Data.CreateArtifact.Error)

internal/services/report/service_test.go

@@ -283,6 +283,92 @@ func TestReportSkipCertVerification(t *testing.T) {
 	assert.Error(t, err)
 }
 
+func TestReportCreateArtifactError(t *testing.T) {
+	tempDir := t.TempDir()
+	artifactPath := filepath.Join(tempDir, "coverage.xml")
+	assert.NoError(t, os.WriteFile(artifactPath, []byte("<coverage/>"), 0o644))
+
+	httpClient := &mockHTTPClient{DoFunc: func(req *http.Request) (*http.Response, error) {
+		body, _ := io.ReadAll(req.Body)
+		_ = req.Body.Close()
+		if bytes.Contains(body, []byte("ArtifactMetadataInput")) {
+			payload := `{"data":{"__type":{"inputFields":[]}}}`
+			return httpResponse(200, payload), nil
+		}
+		if bytes.Contains(body, []byte("createArtifact")) {
+			payload := `{"data":{"createArtifact":{"ok":false,"message":"","error":"Invalid repository"}}}`
+			return httpResponse(200, payload), nil
+		}
+		return httpResponse(400, `{"error":"unexpected"}`), nil
+	}}
+
+	git := adapters.NewMockGitClient()
+	git.SetHead("abc123", "")
+	env := adapters.NewMockEnvironment()
+	env.Set("DEEPSOURCE_DSN", "https://token@localhost:8080")
+
+	svc := NewService(ServiceDeps{
+		GitClient:   git,
+		HTTPClient:  httpClient,
+		FileSystem:  adapters.NewOSFileSystem(),
+		Environment: env,
+		Sentry:      adapters.NewNoOpSentry(),
+		Output:      adapters.NewBufferOutput(),
+		Workdir:     func() (string, error) { return tempDir, nil },
+	})
+
+	_, err := svc.Report(context.Background(), Options{
+		Analyzer:  "test-coverage",
+		Key:       "python",
+		ValueFile: artifactPath,
+	})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Invalid repository")
+}
+
+func TestReportCreateArtifactEmptyError(t *testing.T) {
+	tempDir := t.TempDir()
+	artifactPath := filepath.Join(tempDir, "coverage.xml")
+	assert.NoError(t, os.WriteFile(artifactPath, []byte("<coverage/>"), 0o644))
+
+	httpClient := &mockHTTPClient{DoFunc: func(req *http.Request) (*http.Response, error) {
+		body, _ := io.ReadAll(req.Body)
+		_ = req.Body.Close()
+		if bytes.Contains(body, []byte("ArtifactMetadataInput")) {
+			payload := `{"data":{"__type":{"inputFields":[]}}}`
+			return httpResponse(200, payload), nil
+		}
+		if bytes.Contains(body, []byte("createArtifact")) {
+			payload := `{"data":{"createArtifact":{"ok":false,"message":"","error":""}}}`
+			return httpResponse(200, payload), nil
+		}
+		return httpResponse(400, `{"error":"unexpected"}`), nil
+	}}
+
+	git := adapters.NewMockGitClient()
+	git.SetHead("abc123", "")
+	env := adapters.NewMockEnvironment()
+	env.Set("DEEPSOURCE_DSN", "https://token@localhost:8080")
+
+	svc := NewService(ServiceDeps{
+		GitClient:   git,
+		HTTPClient:  httpClient,
+		FileSystem:  adapters.NewOSFileSystem(),
+		Environment: env,
+		Sentry:      adapters.NewNoOpSentry(),
+		Output:      adapters.NewBufferOutput(),
+		Workdir:     func() (string, error) { return tempDir, nil },
+	})
+
+	_, err := svc.Report(context.Background(), Options{
+		Analyzer:  "test-coverage",
+		Key:       "python",
+		ValueFile: artifactPath,
+	})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "raw response")
+}
+
 func TestCaptureSkipsUserErrors(t *testing.T) {
 	captured := false
 	mockSentry := &captureSentry{onCapture: func(_ error) { captured = true }}