Upload files to ''

index.php

@@ -78,7 +78,6 @@ $function_exclude = ["Help","img","script","msb"];
             <button id="fbBtn" class="ts primary button" onClick="toggleFunctionBar();"><i class="tasks icon"></i><span class="localtext" localtext="index/button/desktop">Activate Virtual Desktop</span></button>
 			<button id="extDt" class="nvdio ts info button" onClick="extFunctionBar();"><i class="tasks icon"></i><span class="localtext" localtext="index/button/extdesktop">Extend Desktop</span></button>
 			<button class="ts button" OnClick="window.location.href='logout.php';"><i class="log out icon"></i><span class="localtext" localtext="index/button/logout">Logout</span></button>
-			<button class="ts button" OnClick="window.location.href='oauthlogout.php';"><i class="log out icon"></i><span class="localtext" localtext="index/button/adfslogout">Logout ADFS</span></button>
 			</div>
             <br>
             <br>

oauth.php

@@ -1,6 +1,5 @@
 <?php
 	session_start();
-
 	$url = 'https://adfs.alanyeung.co/adfs/oauth2/token';
     $fields = array(
         'grant_type' => 'authorization_code',
@@ -20,15 +19,17 @@
 	$jwt = explode('.',  $data['id_token']);
 	$userinfo = [];
 	$userinfo = json_decode(base64_decode($jwt[1]), true);
-	//if($userinfo == []){
+	if($userinfo == []){
+		echo "Error!";
 		//header('Location: https://adfs.alanyeung.co/adfs/oauth2/authorize?client_id=c5c68c24-153c-4bf5-90e7-7552baea7f39&redirect_uri=https%3A%2F%2Faroz.alanyeung.co%2FAOB%2Foauth.php&scope=openid&response_type=code&response_mode=form_post&nonce=tacv8wxjk5');
-	//}else{
+	}else{
 		//print_r($userinfo);
 		header('aoAuth: oAUTH');
+		$_SESSION["method"] = "ADFS";
 		$_SESSION["login"] = $userinfo["upn"];
 		setcookie("username",$userinfo["upn"],time()+ 172800 );
 		setcookie("password","OAuthADFS",time()+ 172800 );
 		//print_r($userinfo);
 		echo '<script>localStorage.ArOZusername = "'.$userinfo["upn"].'";window.location = "./index.php"</script>';
-	//}
+	}
 ?>

oauthgithub.php

@@ -1,4 +1,5 @@
 <?php
+session_start();
 //demo https://aroz.alanyeung.co/oauth.php
 //please go to https://github.com/settings/applications/ to get the client_id and client_secret, pleae remind that the redirect_uri must be same as github.com
 $baselink = "https://github.com/login/oauth"; //do not change it
@@ -43,11 +44,15 @@ if(isset($_GET["code"])){
 	));
     $result = curl_exec($chs);
     curl_close($chs);
+	$userinfo = [];
 	$userinfo = json_decode($result,true);
-	//print_r($userinfo);
-	session_start();
-	$_SESSION["login"] = $userinfo["login"];
-	setcookie("username",$userinfo["login"],time()+ 172800 );
-	setcookie("password","OAuthGithub",time()+ 172800 );
-	echo '<script>localStorage.ArOZusername = "'.$userinfo["login"].'";window.location = "./index.php"</script>';
+	if($userinfo == []){
+		echo "Error!";
+	}else{
+		$_SESSION["method"] = "Github";
+		$_SESSION["login"] = $userinfo["login"];
+		setcookie("username",$userinfo["login"],time()+ 172800 );
+		setcookie("password","OAuthGithub",time()+ 172800 );
+		echo '<script>localStorage.ArOZusername = "'.$userinfo["login"].'";window.location = "./index.php"</script>';
+	}
 }