From 49f3d28ae9ccd1973d05d78fa636cf8e18ab17e6 Mon Sep 17 00:00:00 2001
From: Elizabeth Cray <liz@cray.lgbt>
Date: Sun, 8 May 2022 00:15:19 +0000
Subject: [PATCH] Tidy Up

---
 auth/index.php          | 5 -----
 index.js                | 4 ++--
 index.html => index.php | 7 +++++--
 3 files changed, 7 insertions(+), 9 deletions(-)
 rename index.html => index.php (91%)

diff --git a/auth/index.php b/auth/index.php
index 33bee80..ea24aa5 100644
--- a/auth/index.php
+++ b/auth/index.php
@@ -58,15 +58,11 @@ if (isset($_REQUEST["act"])){
                     curl_setopt($request, CURLOPT_POST, 1);
                     curl_setopt($request, CURLOPT_URL, "https://hackers.town/oauth/token");
                     curl_setopt($request, CURLOPT_RETURNTRANSFER, 1);
-                    // $reqirectUri = "urn:ietf:wg:oauth:2.0:oob";
                     $reqirectUri = "https://tty.hackers.town/auth";
                     $options = "grant_type=authorization_code&code=".$MastCode."&client_id=".$config->oauth->key."&client_secret=".$config->oauth->secret."&scope=read:accounts&redirect_uri=".$reqirectUri;
                     curl_setopt($request, CURLOPT_POSTFIELDS, $options);
-                    // echo $options;
-                    // echo json_encode($request);
                     $response = curl_exec($request);
                     curl_close($request);
-                    // echo $response;
                     $Auth = json_decode($response);
                     if(isset($Auth->token_type)){
                         // Valid Auth?
@@ -161,7 +157,6 @@ if (isset($_REQUEST["act"])){
                     </form>
                 </div>
                 <div class="row copyright">
-                    <!-- TODO: Make this file PHP and make the canary dependent on /etc/ttyserver/canary -->
                     <?php 
                         if (file_exists("/etc/ttyserver/canary")){
                             echo "Canary";
diff --git a/index.js b/index.js
index 4ba8e26..4f0e7aa 100644
--- a/index.js
+++ b/index.js
@@ -1,4 +1,4 @@
-const DEBUG = true;
+const DEBUG = false;
 var isMobile = false;
 
 const dbp = (msg) => {
@@ -173,7 +173,7 @@ const beginOauth = () => {
   $.ajax({
     url: "https://tty.hackers.town/auth?act=id"
   }).then((data) => {
-    dbd(table);
+    dbd(data);
     if(data.id){
       var redirect = "https://hackers.town/oauth/authorize?"+
         "response_type=code&client_id="+data.id+"&redirect_uri="+
diff --git a/index.html b/index.php
similarity index 91%
rename from index.html
rename to index.php
index de8b18b..cd89cfa 100644
--- a/index.html
+++ b/index.php
@@ -32,8 +32,11 @@
                     <button id="bttn" class="keyButton" onclick="beginOauth()">Create Account</button>
                 </div>
                 <div class="row copyright">
-                    <!-- TODO: Make this file PHP and make the canary dependent on /etc/ttyserver/canary -->
-                    Canary
+                    <?php 
+                        if (file_exists("/etc/ttyserver/canary")){
+                            echo "Canary";
+                        }
+                    ?>
                     <br>
                     Copyright ©️ 2022 Elizabeth Anne Cray
                 </div>