Merge pull request #867 from SlideRuleEarth/OAuth2SupportGitHub

O auth2 support GitHub

Author: cugarteblair

.env.local

@@ -1 +1,2 @@
 BASE_URL=http://localhost:5173
+

.env.prod

@@ -1 +1,2 @@
 BASE_URL=https://client.slideruleearth.io
+

.env.test

@@ -1,5 +1,10 @@
 # compiled output
 **/dist
+
+# Python
+**/__pycache__/
+**/*.pyc
+**/*.pyo
 **/global-s3-assets
 **/regional-s3-assets
 **/open-source
@@ -25,7 +30,7 @@ witch.zip
 # misc
 **/npm-debug.log
 **/testem.log
-**/.env
+**/.env*
 # package-lock.json
 **/.vscode/settings.json
 **/setenv.sh
@@ -68,6 +73,9 @@ override.tf.json
 # Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
 # example: *tfplan*
 
+# Infracost cache
+.infracost/
+
 # Playwright
 node_modules/
 /test-results/

.gitignore

@@ -75,13 +75,13 @@ verify-s3-assets-testsliderule:
 
 
 live-update-testsliderule: ## Update the web client at testsliderule.org with new build
-	make live-update S3_BUCKET=testsliderule-webclient DOMAIN_APEX=testsliderule.org DOMAIN=testsliderule.org
+	make live-update S3_BUCKET=testsliderule-webclient DOMAIN_APEX=testsliderule.org DOMAIN=testsliderule.org 
 
 # live-update-demo-dot-slideruleearth: ## Update the web client at demo.slideruleearth.io with new build
 # 	make live-update S3_BUCKET=slideruleearth-demo-dot DOMAIN_APEX=slideruleearth.io DOMAIN=demo.slideruleearth.io
 
 live-update-client-dot-slideruleearth: ## Update the web client at client.slideruleearth.io with new build
-	make live-update S3_BUCKET=slideruleearth-webclient-dot DOMAIN_APEX=slideruleearth.io DOMAIN=client.slideruleearth.io
+	make live-update S3_BUCKET=slideruleearth-webclient-dot DOMAIN_APEX=slideruleearth.io DOMAIN=client.slideruleearth.io 
 
 convert-icons: ## Convert Maki SVG icons in src/assets/maki-svg to PNGs in public/icons
 	@echo "🔄 Converting Maki SVG icons to PNGs..."
@@ -124,13 +124,13 @@ destroy: # Destroy the web client
 
 deploy-client-to-testsliderule: ## Deploy the web client to the testsliderule.org cloudfront and update the s3 bucket
 	make deploy DOMAIN=testsliderule.org S3_BUCKET=testsliderule-webclient && \
-	make live-update DOMAIN=testsliderule.org S3_BUCKET=testsliderule-webclient DOMAIN_APEX=testsliderule.org
+	make live-update DOMAIN=testsliderule.org S3_BUCKET=testsliderule-webclient DOMAIN_APEX=testsliderule.org 
 
 destroy-client-testsliderule: ## Destroy the web client from the testsliderule.org cloudfront and remove the S3 bucket
 	make destroy DOMAIN=testsliderule.org S3_BUCKET=testsliderule-webclient DOMAIN_APEX=testsliderule.org
 
 release-live-update-to-testsliderule: src-tag-and-push ## Release the web client to the live environment NEEDS VERSION
-	make live-update DOMAIN=testsliderule.org S3_BUCKET=testsliderule-webclient DOMAIN_APEX=testsliderule.org
+	make live-update DOMAIN=testsliderule.org S3_BUCKET=testsliderule-webclient DOMAIN_APEX=testsliderule.org 
 
 # deploy-client-to-demo-dot-slideruleearth: ## Deploy the web client to the demo.slideruleearth.io cloudfront and update the s3 bucket
 # 	make deploy DOMAIN=demo.slideruleearth.io S3_BUCKET=slideruleearth-demo-dot DOMAIN_APEX=slideruleearth.io && \
@@ -222,7 +222,8 @@ check-vars:
 	@echo "   DOMAIN_APEX     = $(DOMAIN_APEX)"
 	@echo "   S3_BUCKET       = $(S3_BUCKET)"
 	@echo "   DISTRIBUTION_ID = $(DISTRIBUTION_ID)"
-	
+
+
 help: ## That's me!
 	@printf "\033[37m%-30s\033[0m %s\n" "#-----------------------------------------------------------------------------------------"
 	@printf "\033[37m%-30s\033[0m %s\n" "# Makefile Help       "

.infracost/pricing.gob

@@ -16,7 +16,7 @@ import { useRecTreeStore } from '@/stores/recTreeStore'
 import { useRoute } from 'vue-router'
 import SrClearCache from '@/components/SrClearCache.vue'
 import { useSysConfigStore } from '@/stores/sysConfigStore'
-import { useJwtStore } from '@/stores/SrJWTStore'
+import { useLegacyJwtStore } from '@/stores/SrLegacyJwtStore'
 import { useAuthDialogStore } from '@/stores/authDialogStore'
 import { useGoogleApiKeyStore } from '@/stores/googleApiKeyStore'
 import SrJsonDisplayDialog from '@/components/SrJsonDisplayDialog.vue'
@@ -30,6 +30,8 @@ import { useTourStore } from '@/stores/tourStore.js'
 import { useViewportHeight } from '@/composables/useViewportHeight'
 import { useSlideruleDefaults } from '@/stores/defaultsStore'
 import { createLogger } from '@/utils/logger'
+import { usePrivacyConsentStore } from '@/stores/privacyConsentStore'
+import SrConsentBanner from '@/components/SrConsentBanner.vue'
 
 const logger = createLogger('App')
 
@@ -39,9 +41,10 @@ const toast = useToast()
 const deviceStore = useDeviceStore()
 const tourStore = useTourStore()
 const sysConfigStore = useSysConfigStore()
-const jwtStore = useJwtStore()
+const legacyJwtStore = useLegacyJwtStore()
 const authDialogStore = useAuthDialogStore()
 const googleApiKeyStore = useGoogleApiKeyStore()
+const privacyConsentStore = usePrivacyConsentStore()
 const route = useRoute()
 
 // Global login dialog state
@@ -66,16 +69,16 @@ const checkUnsupported = () => {
 }
 
 const checkPrivateClusterAuth = () => {
-  const domain = sysConfigStore.getDomain()
-  const org = sysConfigStore.getOrganization()
+  const domain = sysConfigStore.domain
+  const org = sysConfigStore.cluster
 
   // Skip check for public cluster
   if (org === 'sliderule') {
     return
   }
 
   // Check if user has valid credentials for this private cluster
-  const jwt = jwtStore.getCredentials()
+  const jwt = legacyJwtStore.getCredentials()
   if (!jwt) {
     toast.add({
       severity: 'warn',
@@ -89,10 +92,10 @@ const checkPrivateClusterAuth = () => {
 }
 
 async function fetchOrgInfo(): Promise<void> {
-  const psHost = `https://ps.${sysConfigStore.getDomain()}`
+  const psHost = `https://ps.${sysConfigStore.domain}`
   try {
     const response = await authenticatedFetch(
-      `${psHost}/api/org_num_nodes/${sysConfigStore.getOrganization()}/`,
+      `${psHost}/api/org_num_nodes/${sysConfigStore.cluster}/`,
       {
         method: 'GET',
         headers: {
@@ -105,10 +108,10 @@ async function fetchOrgInfo(): Promise<void> {
     if (response.ok) {
       const result = await response.json()
       logger.debug('fetchOrgInfo result', { result })
-      sysConfigStore.setMinNodes(result.min_nodes)
-      sysConfigStore.setCurrentNodes(result.current_nodes)
-      sysConfigStore.setMaxNodes(result.max_nodes)
-      sysConfigStore.setVersion(result.version)
+      sysConfigStore.min_nodes = result.min_nodes
+      sysConfigStore.current_nodes = result.current_nodes
+      sysConfigStore.max_nodes = result.max_nodes
+      sysConfigStore.version = result.version
     } else {
       logger.error('Failed to fetch org info', { status: response.status })
     }
@@ -120,8 +123,8 @@ async function fetchOrgInfo(): Promise<void> {
 }
 
 async function handleGlobalLogin(): Promise<void> {
-  const orgName = sysConfigStore.getOrganization()
-  const psHost = `https://ps.${sysConfigStore.getDomain()}`
+  const orgName = sysConfigStore.cluster
+  const psHost = `https://ps.${sysConfigStore.domain}`
   logger.debug('handleGlobalLogin', { username: loginUsername.value, orgName })
 
   const body = JSON.stringify({
@@ -145,7 +148,7 @@ async function handleGlobalLogin(): Promise<void> {
         refreshToken: result.refresh,
         expiration: result.expiration
       }
-      jwtStore.setJwt(sysConfigStore.getDomain(), sysConfigStore.getOrganization(), jwt)
+      legacyJwtStore.setJwt(sysConfigStore.domain, sysConfigStore.cluster, jwt)
       await fetchOrgInfo()
       toast.add({
         severity: 'success',
@@ -180,7 +183,7 @@ async function handleGlobalLogin(): Promise<void> {
 }
 
 async function resetToPublicCluster() {
-  jwtStore.clearAllJwts()
+  legacyJwtStore.clearAllJwts()
   sysConfigStore.$reset()
   loginUsername.value = ''
   loginPassword.value = ''
@@ -348,6 +351,7 @@ onMounted(async () => {
   checkUnsupported()
   checkPrivateClusterAuth()
   tourStore.checkSeen()
+  privacyConsentStore.initializeOnStartup()
   await nextTick()
 
   if (!tourStore.hasSeenIntro) {
@@ -694,6 +698,7 @@ async function handleLongTourButtonClick() {
     <div class="sliderule-content">
       <RouterView />
     </div>
+    <SrConsentBanner />
 
     <!-- Dialog for displaying version information -->
     <Dialog
@@ -834,7 +839,7 @@ async function handleLongTourButtonClick() {
     >
       <form class="sr-global-login-form" @submit.prevent="handleGlobalLogin">
         <p class="sr-login-org-info">
-          Logging in to: <strong>{{ sysConfigStore.getOrganization() }}</strong>
+          Logging in to: <strong>{{ sysConfigStore.cluster }}</strong>
         </p>
         <div class="sr-login-field">
           <label for="global-username">Username</label>