rebase and changes

Signed-off-by: Vedansh Saini <[email protected]>

Author: vedansh-5

src/popup.html

@@ -112,6 +112,10 @@ <h6 class="text-base font-semibold">Scrum Report</h6>
 				<div id="settingsSection" class="tab-content hidden">
 
 					<div class="">
+						<div>
+							<h4>Your Github Token</h4>
+							<input id="githubToken" type="text" class="w-full border-2 border-gray-200 bg-gray-200 rounded-xl text-gray-800  p-2 my-2" placeholder="Required for making authenticated requests">
+						</div>
 						<p class="text-sm font-medium">Enter cache TTL <span class="text-sm text-gray-800 font-normal">(in minutes)</span>
 							<span class="tooltip-container">
 								<i class="fa fa-question-circle question-icon"></i>

src/scripts/main.js

@@ -1,5 +1,6 @@
 let enableToggleElement = document.getElementById('enable');
 let githubUsernameElement = document.getElementById('githubUsername');
+let githubTokenElement = document.getElementById('githubToken');
 let cacheInputElement = document.getElementById('cacheInput');
 let projectNameElement = document.getElementById('projectName');
 let lastWeekContributionElement = document.getElementById('lastWeekContribution');
@@ -23,11 +24,15 @@ function handleBodyOnLoad() {
 			'lastWeekContribution',
 			'yesterdayContribution',
 			'cacheInput',
+			'githubToken',
 		],
 		(items) => {
 			if (items.githubUsername) {
 				githubUsernameElement.value = items.githubUsername;
 			}
+			if (items.githubToken) {
+				githubTokenElement.value = items.githubToken;
+			}
 			if (items.projectName) {
 				projectNameElement.value = items.projectName;
 			}
@@ -206,6 +211,10 @@ function handleGithubUsernameChange() {
 	let value = githubUsernameElement.value;
 	chrome.storage.local.set({ githubUsername: value });
 }
+function handleGithubTokenChange() {
+	let value = githubTokenElement.value;
+	chrome.storage.local.set({ githubToken: value });
+}
 function handleProjectNameChange() {
 	let value = projectNameElement.value;
 	chrome.storage.local.set({ projectName: value });
@@ -235,6 +244,7 @@ function handleUserReasonChange() {
 }
 enableToggleElement.addEventListener('change', handleEnableChange);
 githubUsernameElement.addEventListener('keyup', handleGithubUsernameChange);
+githubTokenElement.addEventListener('keyup', handleGithubTokenChange);
 cacheInputElement.addEventListener('keyup', handleCacheInputChange);
 projectNameElement.addEventListener('keyup', handleProjectNameChange);
 startingDateElement.addEventListener('change', handleStartingDateChange);

src/scripts/popup.js

@@ -80,6 +80,7 @@ document.addEventListener('DOMContentLoaded', function() {
             'showOpenLabel',
             'scrumReport',
             'githubUsername',
+            'githubToken',
             'projectName',
             'settingsToggle',
         ];

src/scripts/scrumHelper.js

@@ -10,6 +10,7 @@ function allIncluded(outputTarget = 'email') {
 	let startingDate = '';
 	let endingDate = '';
 	let githubUsername = '';
+	let githubToken = '';
 	let projectName = '';
 	let lastWeekArray = [];
 	let nextWeekArray = [];
@@ -40,6 +41,7 @@ function allIncluded(outputTarget = 'email') {
 		chrome.storage.local.get(
 			[
 				'githubUsername',
+				'githubToken',
 				'projectName',
 				'enableToggle',
 				'startingDate',
@@ -100,6 +102,9 @@ function allIncluded(outputTarget = 'email') {
 					if (items.projectName) {
 						projectName = items.projectName;
 					}
+					if(items.githubToken){
+						githubToken = items.githubToken;
+					}
 					if (items.cacheInput) {
 						cacheInput = items.cacheInput;
 					}
@@ -334,6 +339,18 @@ function allIncluded(outputTarget = 'email') {
 			githubCache.fetching = true;
 			githubCache.cacheKey = cacheKey;
 
+			const headers = {
+				'Accept' : 'application/vnd.github.v3+json',
+			};
+
+			if(githubToken) {
+				log('Making authenticated requests.');
+				headers['Authorization'] = `token ${githubToken}`;
+
+			} else {
+				log('Making public requests');
+			}
+			
 			let issueUrl = `https://api.github.com/search/issues?q=author%3A${githubUsername}+org%3Afossasia+created%3A${startingDate}..${endingDate}&per_page=100`;
 			let prUrl = `https://api.github.com/search/issues?q=commenter%3A${githubUsername}+org%3Afossasia+updated%3A${startingDate}..${endingDate}&per_page=100`;
 			let userUrl = `https://api.github.com/users/${githubUsername}`;
@@ -343,11 +360,17 @@ function allIncluded(outputTarget = 'email') {
 				await new Promise(res => setTimeout(res, 500));
 
 				const [issuesRes, prRes, userRes ] = await Promise.all([
-					fetch(issueUrl),
-					fetch(prUrl),
-					fetch(userUrl),
+					fetch(issueUrl, { headers }),
+					fetch(prUrl, { headers }),
+					fetch(userUrl, { headers }),
 				]);
 
+				if (issuesRes.status === 401 || prRes.status === 401 || userRes.status === 401 ||
+					issuesRes.status === 403 || prRes.status === 403 || userRes.status === 403) {
+					showInvalidTokenMessage();
+					return;
+				}
+
 				if(!issuesRes.ok) throw new Error(`Error fetching Github issues: ${issuesRes.status} ${issuesRes.statusText}`);
 				if(!prRes.ok) throw new Error(`Error fetching Github PR review data: ${prRes.status} ${prRes.statusText}`);
 				if(!userRes.ok) throw new Error(`Error fetching Github userdata: ${userRes.status} ${userRes.statusText}`);
@@ -372,6 +395,14 @@ function allIncluded(outputTarget = 'email') {
 				githubCache.queue.forEach(({ reject }) => reject(err));
 				githubCache.queue = [];
 				githubCache.fetching = false;
+
+				if(outputTarget === 'popup') {
+					const generateBtn = document.getElementById('generateReport');
+					if(generateBtn) {
+						generateBtn.innerHTML = '<i class="fa fa-refresh"></i> Generate Report';
+                        generateBtn.disabled = false;
+					}
+				}
 				throw err;
 			} finally {
 				githubCache.fetching = false;
@@ -399,7 +430,21 @@ function allIncluded(outputTarget = 'email') {
 		}
 		verifyCacheStatus();
 
-		
+		function showInvalidTokenMessage() {
+            if(outputTarget === 'popup') {
+                const reportDiv = document.getElementById('scrumReport');
+                if(reportDiv){
+                    reportDiv.innerHTML = '<div class="error-message" style="color: #dc2626; font-weight: bold; padding: 10px;">Invalid or expired GitHub token. Please check your token in the settings and try again.</div>';
+                    const generateBtn = document.getElementById('generateReport');
+                    if (generateBtn) {
+                        generateBtn.innerHTML = '<i class="fa fa-refresh"></i> Generate Report';
+                        generateBtn.disabled = false;
+                    }
+                } else {
+                    alert('Invalid or expired GitHub token. Please check your token in the extension popup and try again.');
+                }
+            }
+        }
 
 		function processGithubData(data) {
 			log('Processing Github data');