From c3033200a7c497a4d17bb7f90a12e923050ef15f Mon Sep 17 00:00:00 2001
From: steel <mael.acier@ensiie.fr>
Date: Sat, 18 Jan 2025 13:06:41 +0100
Subject: [PATCH] feat: update PHP version requirement and refactor OIDC
configuration to use environment variables
---
composer.json | 4 +++-
composer.lock | 20 ++++++++++++++++++++
oidc.php | 12 +++++++-----
3 files changed, 30 insertions(+), 6 deletions(-)
create mode 100644 composer.lock
diff --git a/composer.json b/composer.json
index 761f929..d3418c6 100644
--- a/composer.json
+++ b/composer.json
@@ -6,5 +6,7 @@
"name": "steel"
}
],
- "require": {}
+ "require": {
+ "php": ">=7.4"
+ }
}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..5a0b2d1
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,20 @@
+{
+ "_readme": [
+ "This file locks the dependencies of your project to a known state",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+ "This file is @generated automatically"
+ ],
+ "content-hash": "38d7df8ed6df4a3c3606bd227efc4198",
+ "packages": [],
+ "packages-dev": [],
+ "aliases": [],
+ "minimum-stability": "stable",
+ "stability-flags": [],
+ "prefer-stable": false,
+ "prefer-lowest": false,
+ "platform": {
+ "php": ">=7.4"
+ },
+ "platform-dev": [],
+ "plugin-api-version": "2.6.0"
+}
diff --git a/oidc.php b/oidc.php
index 2d5e25f..f305526 100644
--- a/oidc.php
+++ b/oidc.php
@@ -1,9 +1,9 @@
<?php
// Remplir ces champs avec les valeurs obtenues sur AriseID Connect
-$clientId = 'f97b146f-121a-4400-a79c-7c2ecbbd87f8';
-$clientSecret = 'y6hsryRm6P~QSen~Xs0UtvkEcK';
+$clientId = getenv('AIDC_CLIENT_ID') ?: '6a028017-3100-44c6-a837-9752c3b9b8c4';
+$clientSecret = getenv('AIDC_CLIENT_SECRET') ?: 'kazgNEQ26MstoIELYeFLftkTK_';
-$oauthURLBase = 'http://oidc.127.0.0.1.nip.io:4444';
+$oauthURLBase = getenv('OAUTH_SERVER') ?: 'https://oidc.iiens.net';
// L'URL Ã laquelle on enverra d'abord l'utilisateur pour obtenir son autorisation
$authorizeURL = "{$oauthURLBase}/oauth2/auth";
// Le point d'accès à partir duquel notre serveur demandera un jeton d'accès
@@ -12,10 +12,10 @@ $tokenURL = "{$oauthURLBase}/oauth2/token";
$userinfoURL = "{$oauthURLBase}/userinfo";
// L'URL racine à utiliser pour effectuer des demandes d'API authentifiées
-$apiURLBase = 'http://api.127.0.0.1.nip.io:5000';
+$apiURLBase = getenv('API_SERVER') ?: 'https://api.iiens.net';
// L'URL de ce script, utilisé comme URL de redirection
-$baseURL = 'http://php.127.0.0.1.nip.io:8000/';
+$baseURL = getenv('BASE_URL') ?: 'http://php.127.0.0.1.nip.io:8000/';
// On lance une session afin d'avoir un endroit où stocker les données entre les redirections
session_start();
@@ -126,6 +126,8 @@ $jsonFlags = JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES
<body>
<main>
+ <?php echo $_SERVER['PHP_SELF']; ?>
+ <?php echo $_SERVER['SERVER_NAME']; ?>
<?php if (empty($_SESSION['user_id'])): ?>
<h3>Non connecté</h3>
<a href="?action=login"><button>Se connecter</button></a>
--
GitLab