Merge pull request #10 from CESNET/csp

Improvements and bug fixes
rciam · Apr 27, 2023 · 29d5067 · 29d5067
2 parents 60e2449 + dd120e4
commit 29d5067
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -70,7 +70,8 @@ $issuer = "https://example.com/oidc/";
 $clientId = "some-client-id";
 $clientSecret = "some-client-secret";  // comment if you are using PKCE
 // $pkceCodeChallengeMethod = "S256";   // uncomment to use PKCE
-$redirectUrl = "http://localhost/simple-oidc-client-php/refreshtoken.php";
+$redirectPage = "refreshtoken.php";  // select between "refreshtoken.php" and "auth.php"
+$redirectUrl = "http://localhost/simple-oidc-client-php/" . $redirectPage;
 // add scopes as keys and a friendly message of the scope as value
 $scopesDefine = array(
     'openid' => 'log in using your identity',
@@ -125,7 +126,7 @@ Let’s go quickly through the settings:
   - `info`
   - `error`
   - `success`
-  - `warn`
+  - `warning`
 - `allowIntrospection` required, define to show/hide the introspection command
 - `enableActiveTokensTable` required, define to show/hide the Active Refresh
   Token table in `refreshtoken.php`
diff --git a/composer.json b/composer.json
@@ -8,7 +8,8 @@
         "ext-curl": "*",
         "twbs/bootstrap": "^4.0",
         "paragonie/random_compat":"2.0.19",
-        "components/jquery": "^3.3"
+        "components/jquery": "^3.3",
+        "components/font-awesome": "^5.15"
     },
     "archive" : {
         "exclude" : [

diff --git a/resources/templates/footer.php b/resources/templates/footer.php
@@ -1,5 +1,5 @@
-    <script src="vendor/components/jquery/jquery.js"></script>
-    <script src="vendor/twbs/bootstrap/dist/js/bootstrap.js"></script>
+    <script src="vendor/components/jquery/jquery.min.js"></script>
+    <script src="vendor/twbs/bootstrap/dist/js/bootstrap.min.js"></script>
     <script>
         $("#accessTokenMenu").find('.btn-copy').click(function() {
             $(this).closest('div').find('input').select();

diff --git a/resources/templates/header.php b/resources/templates/header.php
@@ -5,9 +5,9 @@
     <?php require 'config.php'; ?>
     <title><?php echo $title; ?></title>
     <meta content="text/html; charset=utf-8" />
-    <link rel="stylesheet" href="vendor/twbs/bootstrap/dist/css/bootstrap.css" />
+    <link rel="stylesheet" href="vendor/twbs/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="public/css/banner.css" />
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.13.0/css/all.css" integrity="sha384-Bfad6CLCknfcloXFOyFnlgtENryhrpZCe29RTifKEixXQZ38WheV+i/6YWSzkz3V" crossorigin="anonymous" />
+    <link rel="stylesheet" href="vendor/components/font-awesome/css/all.min.css" />
 </head>
 
 <body>

diff --git a/src/MitreIdConnectUtils.php b/src/MitreIdConnectUtils.php
@@ -2,7 +2,7 @@
 
 function getMetadata($issuer)
 {
-    $url = $issuer . "/.well-known/openid-configuration/";
+    $url = rtrim($issuer, "/") . "/.well-known/openid-configuration/";
     return json_decode(http($url));
 }