Merge v4.3.3 FSC v2, NTP for time

Author: TwinFan

.github/workflows/build.yml

@@ -11,6 +11,10 @@ env:
   PRJ_NAME:     LiveTraffic            # The plugin's name, expected to be the .xpl file's name and used as the plugin folder name
   # On master branches or when explicitely tagged we build prod versions, otherwise BETA
   version_beta: ${{ (github.ref != 'refs/heads/master' && github.ref_type != 'tag') && '1' || '0' }}      
+  FSC_PROD_CLIENT_SECRET: ${{ secrets.FSC_PROD_CLIENT_SECRET }}
+  FSC_PROD_CLIENT_ID: ${{ secrets.FSC_PROD_CLIENT_ID }}
+  FSC_STAGING_CLIENT_SECRET: ${{ secrets.FSC_STAGING_CLIENT_SECRET }}
+  FSC_STAGING_CLIENT_ID: ${{ secrets.FSC_STAGING_CLIENT_ID }}
 
 jobs:
   #####################################

.gitignore

@@ -4,6 +4,9 @@
 .vs/
 .vscode/
 
+# Environment variables (secrets)
+.env
+
 # Build directories
 build*/*
 
@@ -19,4 +22,4 @@ xcuserdata/
 *.pbxuser
 
 # MS Office Temporary Files
-~$*
+~$*

CMakeLists.txt

@@ -1,6 +1,6 @@
 # LiveTraffic - Set up to be used in the provided docker environment to build lin, mac, and win
 
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 
 # Mac: Need to tell early on that we want a cross platform build
 if(DEFINED ENV{platform})
@@ -23,7 +23,7 @@ endif()
 set(CMAKE_BUILD_TYPE RelWithDebInfo)
 
 project(LiveTraffic
-        VERSION 4.3.2
+        VERSION 4.3.3
         DESCRIPTION "LiveTraffic X-Plane plugin")
 set(VERSION_BETA 0)
 
@@ -47,6 +47,46 @@ if (VERSION_BETA)
     message("             BETA Version")
 endif()
 
+#
+# MARK: Build Configuration from Environment Variables
+#
+
+# FSCharter OAuth Configuration
+# These can be set via environment variables or CMake cache variables
+# For GitHub Actions, set these as repository secrets
+# For local builds, set environment variables before running cmake
+
+# Production environment
+if(DEFINED ENV{FSC_PROD_CLIENT_ID})
+    set(FSC_PROD_CLIENT_ID "$ENV{FSC_PROD_CLIENT_ID}" CACHE STRING "FSCharter production client ID")
+else()
+    set(FSC_PROD_CLIENT_ID "3" CACHE STRING "FSCharter production client ID")
+endif()
+if(DEFINED ENV{FSC_PROD_CLIENT_SECRET})
+    set(FSC_PROD_CLIENT_SECRET "$ENV{FSC_PROD_CLIENT_SECRET}" CACHE STRING "FSCharter production client secret (base64)")
+else()
+    # Default fallback value, is handled specifically by LiveTraffic code
+    set(FSC_PROD_CLIENT_SECRET "INOP" CACHE STRING "FSCharter production client secret (base64)")
+endif()
+
+# Staging environment
+if(DEFINED ENV{FSC_STAGING_CLIENT_ID})
+    set(FSC_STAGING_CLIENT_ID "$ENV{FSC_STAGING_CLIENT_ID}" CACHE STRING "FSCharter staging client ID")
+else()
+    set(FSC_STAGING_CLIENT_ID "3" CACHE STRING "FSCharter staging client ID")
+endif()
+if(DEFINED ENV{FSC_STAGING_CLIENT_SECRET})
+    set(FSC_STAGING_CLIENT_SECRET "$ENV{FSC_STAGING_CLIENT_SECRET}" CACHE STRING "FSCharter staging client secret (base64)")
+else()
+    # Default fallback value, is handled specifically by LiveTraffic code
+    set(FSC_STAGING_CLIENT_SECRET "INOP" CACHE STRING "FSCharter staging client secret (base64)")
+endif()
+
+string(SUBSTRING "${FSC_PROD_CLIENT_SECRET}" 0 10 _short_secret)    
+message("FSCharter Production          = Client ID: ${FSC_PROD_CLIENT_ID}, Client Secret: ${_short_secret}")
+string(SUBSTRING "${FSC_STAGING_CLIENT_SECRET}" 0 10 _short_secret)
+message("FSCharter Staging             = Client ID: ${FSC_STAGING_CLIENT_ID}, Client Secret: ${_short_secret}")
+
 # By default we build Release with Debug Info (and strip the debug info in post-processing)
 if ((NOT DEFINED CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL ""))
     set(CMAKE_BUILD_TYPE RelWithDebInfo)
@@ -271,6 +311,18 @@ if (APPLE)
         COMPILE_OPTIONS "-Wno-deprecated-declarations")
 endif()
 
+# FSCharter OAuth Configuration
+# We keep them restricted to the one file for which they are relevat to reduce log output clutter.
+set_property(
+    SOURCE
+        Src/LTFSCharter.cpp
+    PROPERTY COMPILE_DEFINITIONS
+        FSC_PROD_CLIENT_ID=${FSC_PROD_CLIENT_ID}
+        FSC_PROD_CLIENT_SECRET="${FSC_PROD_CLIENT_SECRET}"
+        FSC_STAGING_CLIENT_ID=${FSC_STAGING_CLIENT_ID}
+        FSC_STAGING_CLIENT_SECRET="${FSC_STAGING_CLIENT_SECRET}"
+)
+
 ################################################################################
 # Define pre-compiled header
 ################################################################################

Data/FSCharter/.env.example

@@ -0,0 +1,19 @@
+# LiveTraffic Build Environment Variables for FSCharter secrets
+# Copy this file to .env and fill in your values for local development
+# For GitHub Actions, configure these as repository secrets
+
+# ============================================================================
+# FSCharter OAuth Configuration
+# ============================================================================
+# These values are used to authenticate with FSCharter's API
+# The client secrets should be Base64 encoded
+
+# Production Environment
+# Server: v2.fscharter.net (not configurable via env var)
+export FSC_PROD_CLIENT_ID=3
+export FSC_PROD_CLIENT_SECRET=<BASE64_ENCODED_SECRET>
+
+# Staging Environment
+# Server: staging.fscharter.net (not configurable via env var)
+export FSC_STAGING_CLIENT_ID=3
+export FSC_STAGING_CLIENT_SECRET=<BASE64_ENCODED_SECRET>