bibweb.git

@@ -39,7 +39,7 @@ if (isset($_SESSION['kundennr']) and $_SESSION['kundennr']) {

     $content .= '

         <form class="form" action="save.php" method="post">

         <input type="hidden" name="form" value="address">';

-    $content .= '<input name="fname" type="hidden" value="'.$_SESSION['fname'].'">

+    $content .= '<input name="fname" type="hidden" value="'.(isset($_SESSION['fname']) ? $_SESSION['fname'] : '').'">

            <input name="lname" type="hidden" value="'.$_SESSION['lname'].'">

           <div class="form-group form-group-lg">

             <div><input class="btn btn-primary btn-lg" type="submit" value="Weiter &gt;"></div>

@@ -1,12 +1,22 @@

 <?php

 require_once("config.php");

+$base_url = $config['api_url'];

+

+$TOKEN_FILE = '../jwt-token.json';

+$jwt = [

+    "token" => null,

+    "refresh_token" => null,

+    "exp" => time()

+];

-$jwt_token = null;

-$jwt_refresh_token = null;

+if (file_exists($TOKEN_FILE)) {

+    $jwt = json_decode(file_get_contents($TOKEN_FILE), true);

+}

+if (!$jwt['token'] || $jwt['exp'] < time()+5) {

+    // get new token

     # init API

-$base_url = $config['api_url'];

     $url = $base_url . 'login';

     $data = [

         "username" => $config['api_username'],

@@ -25,12 +35,18 @@ $context  = stream_context_create( $options );

     $result = file_get_contents( $url, false, $context );

     $response = json_decode( $result, true);

-$jwt_token = $response["token"];

-$jwt_refresh_token = $response["refresh_token"];

+    $jwt['token'] = $response["token"];

+    $jwt['refresh_token'] = $response["refresh_token"];

+    $fields = explode('.', $jwt['token']);

+    $data = json_decode(base64_decode($fields[1]), true);

+    $jwt['exp'] = $data['exp'];

+}

+

+file_put_contents($TOKEN_FILE, json_encode($jwt));

 function api_call($method, $url, $content = []) {

-    global $jwt_token;

+    global $jwt;

     global $base_url;

     $url = $base_url . $url;

     $options = array(

@@ -39,7 +55,7 @@ function api_call($method, $url, $content = []) {

         'content' => json_encode( $content ),

         'header'=>  "Content-Type: application/json\r\n" .

                     "Accept: application/json\r\n" .

-                    "Authorization: Bearer ".$jwt_token."\r\n"

+                    "Authorization: Bearer ".$jwt['token']."\r\n"

         )

     );