Survey and targeting calculation enhancements, plus API docs, also added Oauth related headers to status json #200

MattG57 · 2025-04-13T12:14:35Z

I updated all the issues that were related to this work.
I probably need to add an issue for the api docs and oauth status for traceability.

…eters, and updated the way target lines are rendered, so they are more likely to be visible.

…for later on the highcharts service

…the status endpoint

github-actions · 2025-04-13T12:14:45Z

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

Scanned Files

None

backend/src/controllers/api-docs.controller.ts

+      }
+
+      res.status(200).json(openApiSpec);
+    } catch (error) {


backend/src/services/target-calculation-service.ts

@@ -0,0 +1,900 @@
+import settingsService, { SettingsType } from './settings.service.js';


backend/src/services/target-calculation-service.ts

+}
+
+// More specific typed interfaces for metrics data
+interface MetricsData {


backend/src/services/target-calculation-service.ts

+  // Collection of logs to return with the response
+  calculationLogs: Array<{
+    name: string;
+    inputs: Record<string, any>;


backend/src/services/target-calculation-service.ts

+    name: string;
+    inputs: Record<string, any>;
+    formula: string;
+    result: any;


backend/src/services/target-calculation-service.ts

+    org: string | null, 
+    enableLogging: boolean = false,
+    includeLogsInResponse: boolean = false
+  ): Promise<{ targets: Targets; logs?: Array<any> }> {


backend/src/services/target-calculation-service.ts

+    org: string | null, 
+    enableLogging: boolean = false,
+    includeLogsInResponse: boolean = false
+  ): Promise<{ targets: Targets; logs?: Array<any> }> {


backend/src/services/target.service.ts

      const existingTargets = await Targets.findOne();

-      if (!existingTargets) {
+      if (!existingTargets || true) {


frontend/src/app/main/copilot/copilot-surveys/github.service.ts

+
+  constructor(private http: HttpClient) {}
+
+  getOrgMembers(): Observable<any[]> {


frontend/src/app/main/copilot/copilot-surveys/github.service.ts

+  constructor(private http: HttpClient) {}
+
+  getOrgMembers(): Observable<any[]> {
+    return this.http.get<any[]>(`${this.apiUrl}/members`);


...tend/src/app/main/copilot/copilot-surveys/new-copilot-survey/new-copilot-survey.component.ts

+import { MembersService, Member } from '../../../../services/api/members.service';
 import { InstallationsService } from '../../../../services/api/installations.service';
-import { catchError, map, Observable, of } from 'rxjs';
+import { BehaviorSubject, catchError, finalize, map, Observable, of, Subject, startWith, take } from 'rxjs';


...tend/src/app/main/copilot/copilot-surveys/new-copilot-survey/new-copilot-survey.component.ts

+import { MembersService, Member } from '../../../../services/api/members.service';
 import { InstallationsService } from '../../../../services/api/installations.service';
-import { catchError, map, Observable, of } from 'rxjs';
+import { BehaviorSubject, catchError, finalize, map, Observable, of, Subject, startWith, take } from 'rxjs';


...tend/src/app/main/copilot/copilot-surveys/new-copilot-survey/new-copilot-survey.component.ts

+import { MatRadioModule } from '@angular/material/radio'; // Import MatRadioModule
+import { MatCardModule } from '@angular/material/card'; // Import MatCardModule
+import { MatSliderModule } from '@angular/material/slider'; // Import MatSliderModule
+import { debounceTime, distinctUntilChanged, filter, switchMap, tap } from 'rxjs/operators';


...tend/src/app/main/copilot/copilot-surveys/new-copilot-survey/new-copilot-survey.component.ts

+import { MatRadioModule } from '@angular/material/radio'; // Import MatRadioModule
+import { MatCardModule } from '@angular/material/card'; // Import MatCardModule
+import { MatSliderModule } from '@angular/material/slider'; // Import MatSliderModule
+import { debounceTime, distinctUntilChanged, filter, switchMap, tap } from 'rxjs/operators';


...tend/src/app/main/copilot/copilot-surveys/new-copilot-survey/new-copilot-survey.component.ts

+
+      // Handle GitHub URL parsing
+      if (params['url'] && params['url'].includes('github.com')) {
+        const { org, repo, prNumber } = this.parseGitHubPRUrl(params['url']);


frontend/src/app/services/api/members.service.ts

 import { HttpClient } from '@angular/common/http';
 import { Endpoints } from '@octokit/types';
-import { catchError } from 'rxjs/operators';
+import { catchError, map, Observable, tap } from 'rxjs';


frontend/src/app/services/api/members.service.ts


-  getMemberByLogin(login: string) {
-    return this.http.get<Endpoints["GET /users/{username}"]["response"]["data"]>(`${this.apiUrl}/${login}`);
+  getMemberByLogin(login: string, exact: boolean = true) {


...tend/src/app/main/copilot/copilot-surveys/new-copilot-survey/new-copilot-survey.component.ts

+      }
+
+      // Handle GitHub URL parsing
+      if (params['url'] && params['url'].includes('github.com')) {


To fix the problem, we need to parse the URL and check the host value explicitly. This ensures that the check handles arbitrary subdomain sequences correctly and prevents bypassing the security check by embedding "github.com" in unexpected locations within the URL.

The best way to fix the problem without changing existing functionality is to use the URL constructor to parse the URL and then check the host value against a whitelist of allowed hosts. This approach ensures that only valid GitHub URLs are accepted.

We need to modify the code in the ngOnInit method to parse the URL and check the host value. We will also need to import the URL class from the standard library.

backend/src/controllers/teams.controller.ts

    try {
      const { login } = req.params;
-      const member = teamsService.getMemberByLogin(login);
+      const exact = req.query.exact === 'true';


backend/src/services/target-calculation-service.ts

+    annualTimeSavingsAsDollars: Target;
+    productivityOrThroughputBoostPercent: Target;
+  };
+  [key: string]: any; // Add this index signature


backend/src/services/target.service.ts

  }

-  async initialize() {
+  calculateTargets(settings: SettingsType, adoptions: AdoptionType[]): Promise<{ targets: Targets; logs?: any[] }> {


backend/src/services/target.service.ts

  }

-  async initialize() {
+  calculateTargets(settings: SettingsType, adoptions: AdoptionType[]): Promise<{ targets: Targets; logs?: any[] }> {


backend/src/services/target.service.ts

  }

-  async initialize() {
+  calculateTargets(settings: SettingsType, adoptions: AdoptionType[]): Promise<{ targets: Targets; logs?: any[] }> {


M1999-maestru · 2025-05-23T16:46:18Z

Hi, can someone help me with an nfcgate application to install on a Samsung android and keep my server active for money of course?

MattG57 added 5 commits April 10, 2025 12:21

added new parameters for survey repo and prno

a71d8c6

dropdown autocomplete with validation for survey userId

bb6a991

Reworked targeting, fixed som little issues with survey via url param…

73d141a

…eters, and updated the way target lines are rendered, so they are more likely to be visible.

Made some improvements to the target calc logging....added a comment …

b81f46b

…for later on the highcharts service

added swagger api docs and included oauth info if it is available to …

8169514

…the status endpoint

github-advanced-security bot found potential problems Apr 13, 2025

View reviewed changes

MattG57 added 3 commits April 13, 2025 08:46

passed req to getStatus

9fd59a8

fixed data quality issues from spiking per user charts

5f40148

fixing type issues breaking npm build

8020f0a

github-advanced-security bot found potential problems Apr 13, 2025

View reviewed changes

backend/src/controllers/teams.controller.ts

try {

const { login } = req.params;

const member = teamsService.getMemberByLogin(login);

const exact = req.query.exact === 'true';

Check failure

Code scanning / ESLint

Disallow unused variables Error

'exact' is assigned a value but never used.

more type errors needed fixing

d7ba4a5

github-advanced-security bot found potential problems Apr 13, 2025

View reviewed changes

MattG57 added 4 commits April 13, 2025 09:49

fixed type errors in target calc service

f76f771

configured more runtime memory for npm

25adfd2

listing all headers so we can diagnose/fix auth header passing

d5c62ab

increase memory to 6Gig

6df3c82

austenstone closed this pull request by merging all changes into main in 61708ee May 22, 2025

austenstone deleted the survey-and-targeting-enhancements branch May 22, 2025 14:43

@@ -158,9 +158,17 @@
                   // Handle GitHub URL parsing
-                  if (params['url'] && params['url'].includes('github.com')) {
-                    const { org, repo, prNumber } = this.parseGitHubPRUrl(params['url']);
-                    if (!params['repo'] && repo) {
-                      this.surveyForm.get('repo')?.setValue(repo);
-                    }
-                    if (!params['prno'] && prNumber) {
-                      this.surveyForm.get('prNumber')?.setValue(prNumber);
+                  if (params['url']) {
+                    try {
+                      const url = new URL(params['url']);
+                      const allowedHosts = ['github.com', 'www.github.com'];
+                      if (allowedHosts.includes(url.host)) {
+                        const { org, repo, prNumber } = this.parseGitHubPRUrl(params['url']);
+                        if (!params['repo'] && repo) {
+                          this.surveyForm.get('repo')?.setValue(repo);
+                        }
+                        if (!params['prno'] && prNumber) {
+                          this.surveyForm.get('prNumber')?.setValue(prNumber);
+                        }
+                      }
+                    } catch (e) {
+                      console.error('Invalid URL:', params['url']);
                     }

		@@ -0,0 +1,900 @@
		import settingsService, { SettingsType } from './settings.service.js';


		constructor(private http: HttpClient) {}

		getOrgMembers(): Observable<any[]> {

Uh oh!

Survey and targeting calculation enhancements, plus API docs, also added Oauth related headers to status json #200

Survey and targeting calculation enhancements, plus API docs, also added Oauth related headers to status json #200

Uh oh!

Conversation

MattG57 commented Apr 13, 2025

Uh oh!

github-actions bot commented Apr 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Dependency Review

Scanned Files

Uh oh!

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Uh oh!

Uh oh!

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Uh oh!

Copilot Autofix

Check failure

Check failure

Check failure

Check failure

Check failure

M1999-maestru commented May 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

github-actions bot commented Apr 13, 2025 •

edited

Loading