Commit 471ef38a authored by Sonia Zorba's avatar Sonia Zorba Committed by root
Browse files

Curl join call bugfix and other minor changes

parent c2fa6ce7

classes/UserHandler.php

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ class UserHandler { 
            curl_setopt($conn, CURLOPT_RETURNTRANSFER, true);

            curl_setopt($conn, CURLOPT_SSL_VERIFYPEER, true);

            curl_setopt($conn, CURLOPT_FOLLOWLOCATION, 1);

            // Setting an empty body, otherwise Content-Length will be negative and Spring will answer with 400

            curl_setopt($conn, CURLOPT_POSTFIELDS, " "); 

            curl_setopt($conn, CURLOPT_HTTPHEADER, ['Authorization: Bearer '

                . $this->getJoinAccessToken($userId1, $userId2)]);

css/style.css

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ body { 
    font-size: 42px;

}



.page-title-wrapper a {

.page-title-wrapper a, .page-title-wrapper a:visited {

    color: #fff;

}

version.txt

+1 −1
Original line number Diff line number Diff line 
2.0.1
 
 No newline at end of file
 
2.0.2

views/account-management.php

+2 −5
Original line number Diff line number Diff line
@@ -22,14 +22,11 @@ include 'include/header.php'; 
            <div class="col-sm-12">

                <a class="btn btn-success" id="join-btn" href="<?php echo $contextRoot; ?>?action=join" title="Perform an additional login to join your identities" data-toggle="tooltip" data-placement="bottom">

                    Join with another identity

                </a>

            </div>

        </div>

        <div class="row">

            <div class="col-sm-12">

                </a><br/>

                <a class="btn btn-default" id="token-issuer-btn" href="<?php echo $contextRoot; ?>/token-issuer" title="Generate tokens for CLI" data-toggle="tooltip" data-placement="bottom">

                    Token issuer

                </a>

                <br/><br/>

            </div>

        </div>

        <?php if ($admin) { ?>