removed hardcoded url, use SERVER_ROOT env variable now

updated to use env USERNAME instead of USER

Author: ylebre

src/Controller/AuthorizeController.php

@@ -14,7 +14,8 @@ final public function __invoke(ServerRequestInterface $request, array $args): Re
 			$response = $response->withStatus(302, "Approval required");
 
 			// FIXME: Generate a proper url for this;
-			$loginUrl = "https://localhost/login/?returnUrl=" . urlencode($_SERVER['REQUEST_URI']);
+			$baseUrl = $this->baseUrl;
+			$loginUrl = $baseUrl . "/login/?returnUrl=" . urlencode($_SERVER['REQUEST_URI']);
 			$response = $response->withHeader("Location", $loginUrl);
 			return $response;
 		}
@@ -50,7 +51,8 @@ final public function __invoke(ServerRequestInterface $request, array $args): Re
 			$response = $response->withStatus(302, "Approval required");
 
 			// FIXME: Generate a proper url for this;
-			$approvalUrl = "https://localhost/sharing/$clientId/?returnUrl=" . urlencode($_SERVER['REQUEST_URI']);
+			$baseUrl = $this->baseUrl;
+			$approvalUrl = $baseUrl . "/sharing/$clientId/?returnUrl=" . urlencode($_SERVER['REQUEST_URI']);
 			$response = $response->withHeader("Location", $approvalUrl);
 			return $response;
 		}

src/Controller/LoginController.php

@@ -22,8 +22,8 @@ final public function __invoke(ServerRequestInterface $request, array $args): Re
 		  }
           $response->getBody()->write("<h1>Already logged in as $user</h1>");
         } else if (
-			($postBody['username'] == $_ENV['USER'] && $postBody['password'] == $_ENV['PASSWORD']) ||
-			($postBody['username'] == $_SERVER['USER'] && $postBody['password'] == $_SERVER['PASSWORD'])
+			($postBody['username'] == $_ENV['USERNAME'] && $postBody['password'] == $_ENV['PASSWORD']) ||
+			($postBody['username'] == $_SERVER['USERNAME'] && $postBody['password'] == $_SERVER['PASSWORD'])
 		) {
           $user = $postBody['username'];
           $_SESSION['userid'] =  $user;

src/Controller/RegisterController.php

@@ -20,10 +20,14 @@ final public function __invoke(ServerRequestInterface $request, array $args): Re
 		$origin = $parsedOrigin['host'];
 
 		$clientId = $this->config->saveClientRegistration($origin, $clientData);
-		
+
+		// FIXME: properly generate this url;
+		$baseUrl = $this->baseUrl;
+		$clientUrl = $baseUrl . "/clients/$clientId";
+
 		$registration = array(
 			'client_id' => $clientId,
-			'registration_client_uri' => "https://localhost/clients/$clientId", // FIXME: properly generate this url;
+			'registration_client_uri' => $clientUrl,
 			'client_id_issued_at' => $clientData['client_id_issued_at'],
 			'redirect_uris' => $clientData['redirect_uris'],
 		);

src/Controller/ServerController.php

@@ -20,22 +20,21 @@ public function __construct() {
 		$this->authServerConfig = $this->createAuthServerConfig(); 
 		$this->authServerFactory = (new \Pdsinterop\Solid\Auth\Factory\AuthorizationServerFactory($this->authServerConfig))->create();		
 		$this->tokenGenerator = (new \Pdsinterop\Solid\Auth\TokenGenerator($this->authServerConfig));
-		
-//		$this->baseUrl = "https://localhost";
+		$this->baseUrl = isset($_ENV['SERVER_ROOT']) ? $_ENV['SERVER_ROOT'] : "https://localhost";
     }
 
 	public function getOpenIdEndpoints() {
 		// FIXME: would be better to base this on the available routes if possible.
-		$this->baseUrl = "https://server/"; // FIXME: generate proper urls
+		$this->baseUrl = isset($_ENV['SERVER_ROOT']) ? $_ENV['SERVER_ROOT'] : "https://localhost";
 		return [
 			'issuer' => $this->baseUrl,
-			'authorization_endpoint' => $this->baseUrl . "authorize",
-			'jwks_uri' => $this->baseUrl . "jwks",
-			"check_session_iframe" => $this->baseUrl . "session",
-			"end_session_endpoint" => $this->baseUrl . "logout",
-			"token_endpoint" => $this->baseUrl . "token",
-			"userinfo_endpoint" => $this->baseUrl . "userinfo",
-			"registration_endpoint" => $this->baseUrl . "register"
+			'authorization_endpoint' => $this->baseUrl . "/authorize",
+			'jwks_uri' => $this->baseUrl . "/jwks",
+			"check_session_iframe" => $this->baseUrl . "/session",
+			"end_session_endpoint" => $this->baseUrl . "/logout",
+			"token_endpoint" => $this->baseUrl . "/token",
+			"userinfo_endpoint" => $this->baseUrl . "/userinfo",
+			"registration_endpoint" => $this->baseUrl . "/register",
 		];
 	}
 
@@ -114,7 +113,7 @@ public function checkApproval($clientId) {
 	}
 
 	public function getProfilePage() {
-		return $this->baseUrl . "profile/card#me"; // FIXME: would be better to base this on the available routes if possible.
+		return $this->baseUrl . "/profile/card#me"; // FIXME: would be better to base this on the available routes if possible.
 	}
 
 	public function getResponseType() {