Merge branch 'main' into external-links-and-app-messages

for some reason it seems to not be fully updating the local repo, so increase logging and double pull

.gitea/workflows/cd-deploy.yaml

@@ -22,12 +22,14 @@ jobs:
         with:
           node-version: 20.19
 
-      - name: Verify Node Environment
+      - name: Verify Local Environment
         run: |
           which npm
           npm -v
           which node
           node -v
+          which sed
+          sed --version
 
       - name: Checkout
         uses: actions/checkout@v5
@@ -44,8 +46,14 @@ jobs:
       - name: Update Application Code
         run: |
           cd /var/www/html/milsim-site-v4
+          version=`git log -1 --format=%H`
+          echo "Current Revision: $version"
+          echo "Updating to: ${{ github.sha }}
           sudo -u nginx git reset --hard
           sudo -u nginx git pull origin main
+          sudo -u nginx git pull origin main
+          new_version=`git log -1 --format=%H`
+          echo "Sucessfully updated to: $new_version
 
       - name: Update Shared Dependencies and Fix Permissions
         run: |
@@ -65,16 +73,20 @@ jobs:
           npm install
           chown -R nginx:nginx .
 
-      - name: Build UI and Fix Permissions
+      - name: Build UI / Update Version / Fix Permissions
         run: |
           cd /var/www/html/milsim-site-v4/ui
           npm run build
+          version=`git describe --abbrev=0 --tags`
+          sed -i "s/VITE_APPLICATION_VERSION=.*/VITE_APPLICATION_VERSION=$version/" .env
           chown -R nginx:nginx .
 
-      - name: Build API and Fix Permissions
+      - name: Build API / Update Version / Fix Permissions
         run: |
           cd /var/www/html/milsim-site-v4/api
           npm run build
+          version=`git describe --abbrev=0 --tags`
+          sed -i "s/APPLICATION_VERSION=.*/APPLICATION_VERSION=$version/" .env
           chown -R nginx:nginx .
 
       - name: Reset File Permissions

.gitea/workflows/ci-deploy.yaml

@@ -22,12 +22,14 @@ jobs:
         with:
           node-version: 20.19
 
-      - name: Verify Node Environment
+      - name: Verify Local Environment
         run: |
           which npm
           npm -v
           which node
           node -v
+          which sed
+          sed --version
 
       - name: Checkout
         uses: actions/checkout@v5
@@ -65,16 +67,20 @@ jobs:
           npm install
           chown -R nginx:nginx .
 
-      - name: Build UI and Fix Permissions
+      - name: Build UI / Update Version / Fix Permissions
         run: |
           cd /var/www/html/milsim-site-v4/ui
           npm run build
+          version=`git rev-parse --short=10 HEAD`
+          sed -i "s/VITE_APPLICATION_VERSION=.*/VITE_APPLICATION_VERSION=$version/" .env
           chown -R nginx:nginx .
 
-      - name: Build API and Fix Permissions
+      - name: Build API / Update Version / Fix Permissions
         run: |
           cd /var/www/html/milsim-site-v4/api
           npm run build
+          version=`git rev-parse --short=10 HEAD`
+          sed -i "s/APPLICATION_VERSION=.*/APPLICATION_VERSION=$version/" .env
           chown -R nginx:nginx .
 
       - name: Reset File Permissions

api/.env.example

@@ -19,6 +19,8 @@ AUTH_END_SESSION_URI=
 SERVER_PORT=3000
 CLIENT_URL= # This is whatever URL the client web app is served on
 CLIENT_DOMAIN= #whatever.com
+APPLICATION_VERSION= # Should match release tag
+APPLICATION_ENVIRONMENT= # dev / prod
 
 # Glitchtip
 GLITCHTIP_DSN=

api/src/index.js

@@ -20,11 +20,14 @@ const port = process.env.SERVER_PORT;
 
 //glitchtip setup
 const sentry = require('@sentry/node');
-if (process.env.DISABLE_GLITCHTIP) {
+if (process.env.DISABLE_GLITCHTIP === "true") {
   console.log("Glitchtip disabled")
 } else {
   let dsn = process.env.GLITCHTIP_DSN;
-  sentry.init({ dsn: dsn });
+  let release = process.env.APPLICATION_VERSION;
+  let environment = process.env.APPLICATION_ENVIRONMENT;
+  console.log(release, environment)
+  sentry.init({ dsn: dsn, release: release, environment: environment });
   console.log("Glitchtip initialized");
 }
 
@@ -58,6 +61,7 @@ const { roles, memberRoles } = require('./routes/roles');
 const { courseRouter, eventRouter } = require('./routes/course');
 const { calendarRouter } = require('./routes/calendar')
 const morgan = require('morgan');
+const { env } = require('process');
 
 app.use('/application', applicationsRouter);
 app.use('/ranks', ranks);

api/src/routes/auth.js

@@ -21,12 +21,13 @@ passport.use(new OpenIDConnectStrategy({
     scope: ['openid', 'profile']
 }, async function verify(issuer, sub, profile, jwtClaims, accessToken, refreshToken, params, cb) {
 
-    // console.log('--- OIDC verify() called ---');
+    console.log('--- OIDC verify() called ---');
-    // console.log('issuer:', issuer);
+    console.log('issuer:', issuer);
-    // console.log('sub:', sub);
+    console.log('sub:', sub);
     // console.log('profile:', JSON.stringify(profile, null, 2));
-    // console.log('id_token claims:', JSON.stringify(jwtClaims, null, 2));
+    console.log('profile:', profile);
-    // console.log('preferred_username:', jwtClaims?.preferred_username);
+    console.log('id_token claims:', JSON.stringify(jwtClaims, null, 2));
+    console.log('preferred_username:', jwtClaims?.preferred_username);
 
     const con = await pool.getConnection();
     try {

ui/.env.example

@@ -1,6 +1,8 @@
 # SITE SETTINGS
 VITE_APIHOST=
 VITE_ENVIRONMENT= # dev / prod
+VITE_APPLICATION_VERSION= # Should match release tag
+
 
 # Glitchtip
 VITE_GLITCHTIP_DSN=

ui/src/main.js

@@ -20,10 +20,12 @@ const app = createApp(App)
 app.use(createPinia())
 app.use(router)
 
-if (!import.meta.env.VITE_DISABLE_GLITCHTIP) {
+if (import.meta.env.VITE_DISABLE_GLITCHTIP === "true") {
+    console.log("Glitchtip disabled");
+} else {
     let dsn = import.meta.env.VITE_GLITCHTIP_DSN;
     let environment = import.meta.env.VITE_ENVIRONMENT;
-
+    let release = import.meta.env.VITE_APPLICATION_VERSION;
     Sentry.init({
         app,
         dsn: dsn,
@@ -32,7 +34,7 @@ if (!import.meta.env.VITE_DISABLE_GLITCHTIP) {
         ],
         tracesSampleRate: 0.01,
         environment: environment,
-        release: 'release tag'
+        release: release
     });
 }
 

ui/src/pages/Join.vue

@@ -171,9 +171,9 @@ const finalPanel = ref<'app' | 'message'>('message');
                                 <li>When prompted, choose <em>“Yes”</em> to download all associated mods.</li>
                             </ul>
                             <p>
-                                <a href="https://www.guilded.gg/Iceberg-gaming/groups/v3j2vAP3/channels/6979335e-60f7-4ab9-9590-66df69367d1e/docs/2013948655"
+                                <a href="https://docs.iceberg-gaming.com/books/member-guides/page/new-member-setup-onboarding"
                                     class="text-primary underline" target="_blank">
-                                    Click here for the full installation guide
+                                    Click here for the full installation guide (Requires Sign-in)
                                 </a>
                             </p>
                             <!-- CONTACT SECTION -->
@@ -211,7 +211,7 @@ const finalPanel = ref<'app' | 'message'>('message');
                                 our forums and introduce yourself.
                             </p>
                             <p>
-                                If you have any questions, feel free to reach out on TeamSpeak, Discord, or Guilded,
+                                If you have any questions, feel free to reach out on TeamSpeak or Discord
                                 someone
                                 will always be around to help.
                             </p>