Switched to public API for authentication and a horrible device auth implementation for unsecured connections.

Updated Flashii URLs.
Add vendor dir to .gitignore.
2024-11-20 02:43:47 +00:00 · 2024-11-19 22:47:36 +00:00 · 2024-11-19 22:43:08 +00:00 · 2024-11-19 22:42:42 +00:00
32 changed files with 277 additions and 143 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,4 @@
 /config/config-db.php
 /public/robots.txt
 /.debug
+/vendor
--- a/ajaxchat.php
+++ b/ajaxchat.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 define('AJAX_CHAT_PATH', __DIR__);
 define('AJAX_CHAT_DEBUG', is_file(AJAX_CHAT_PATH . '/.debug'));

@ -20,17 +22,4 @@ if(AJAX_CHAT_DEBUG) {
 }

 // Include Class libraries:
-require_once AJAX_CHAT_PATH . '/src/AJAXChat.php';
-require_once AJAX_CHAT_PATH . '/src/AJAXChatDataBase.php';
-require_once AJAX_CHAT_PATH . '/src/AJAXChatMySQLiDataBase.php';
-require_once AJAX_CHAT_PATH . '/src/AJAXChatMySQLiQuery.php';
-require_once AJAX_CHAT_PATH . '/src/AJAXChatEncoding.php';
-require_once AJAX_CHAT_PATH . '/src/AJAXChatString.php';
-require_once AJAX_CHAT_PATH . '/src/AJAXChatFileSystem.php';
-require_once AJAX_CHAT_PATH . '/src/AJAXChatHTTPHeader.php';
-require_once AJAX_CHAT_PATH . '/src/AJAXChatLanguage.php';
-require_once AJAX_CHAT_PATH . '/src/AJAXChatTemplate.php';
-require_once AJAX_CHAT_PATH . '/src/SockChatAuth.php';
-require_once AJAX_CHAT_PATH . '/src/CustomAJAXChat.php';
-require_once AJAX_CHAT_PATH . '/src/CustomAJAXChatShoutBox.php';
-require_once AJAX_CHAT_PATH . '/src/CustomAJAXChatInterface.php';
+require_once AJAX_CHAT_PATH . '/vendor/autoload.php';
--- a/composer.json
+++ b/composer.json
@ -0,0 +1,10 @@
+{
+    "autoload": {
+        "psr-4": {
+            "AJAXChat\\": "src"
+        }
+    },
+    "require": {
+        "flashii/apii": "^0.2"
+    }
+}
--- a/composer.lock
+++ b/composer.lock
@ -0,0 +1,56 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "1eb898418ab7dcf8d2a4021ae3915e34",
+    "packages": [
+        {
+            "name": "flashii/apii",
+            "version": "v0.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://patchii.net/flashii/apii-php.git",
+                "reference": "6a93d31375dd7e75ff9264f3024f2208ce602f49"
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.12",
+                "phpunit/phpunit": "^10.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Flashii\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "bsd-3-clause-clear"
+            ],
+            "authors": [
+                {
+                    "name": "flashwave",
+                    "email": "packagist@flash.moe",
+                    "homepage": "https://flash.moe",
+                    "role": "mom"
+                }
+            ],
+            "description": "Client library for the Flashii.net API.",
+            "homepage": "https://api.flashii.net",
+            "time": "2024-11-16T16:03:42+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.6.0"
+}
--- a/config/config.php
+++ b/config/config.php
@ -41,17 +41,19 @@ $config['flashiiString'] = 'Flashii';
 $config['flashiiSecret'] = 'woomy';
 $config['flashiiAuth']['login'] = 'https://flashii.net/auth/login.php';
 $config['flashiiAuth']['verify'] = 'https://flashii.net/_sockchat/verify';
-$config['flashiiUrl']['home'] = 'https://flashii.net/';
-$config['flashiiUrl']['news'] = 'https://flashii.net/news.php';
+$config['flashiiUrl']['home'] = 'https://flashii.net';
+$config['flashiiUrl']['news'] = 'https://flashii.net/news';
 $config['flashiiUrl']['members'] = 'https://flashii.net/members.php';
 $config['flashiiUrl']['donate'] = 'https://flashii.net/donate.php';
 $config['flashiiUrl']['status'] = 'https://status.flashii.net';
 $config['flashiiUrl']['feedback'] = 'https://flashii.net/forum';
-$config['flashiiUrl']['changelog'] = 'https://flashii.net/changelog.php';
-$config['flashiiUrl']['rules'] = 'https://flashii.net/info.php/rules';
-$config['flashiiUrl']['terms'] = 'https://flashii.net/info.php/terms';
-$config['flashiiUrl']['contact'] = 'https://flashii.net/info.php/contact';
-$config['flashiiUrl']['test'] = 'https://test.flashii.net';
+$config['flashiiUrl']['changelog'] = 'https://flashii.net/changelog';
+$config['flashiiUrl']['rules'] = 'https://flashii.net/info/rules';
+$config['flashiiUrl']['contact'] = 'https://flashii.net/info/contact';
+$config['flashiiId']['api'] = '';
+$config['flashiiId']['id'] = '';
+$config['flashiiId']['clientId'] = '';
+$config['flashiiId']['clientSecret'] = '';

 if(is_file(AJAX_CHAT_PATH . '/config/config-db.php'))
    include_once AJAX_CHAT_PATH . '/config/config-db.php';
--- a/lang/en.php
+++ b/lang/en.php
@ -119,3 +119,5 @@ $lang['logsTime']                       = 'Time';
 $lang['logsSearch']                     = 'Search';
 $lang['logsPrivateChannels']            = 'Private Channels';
 $lang['logsPrivateMessages']            = 'Private Messages';
+$lang['fidAuthzRequestFailed']          = 'Could not request authorization code.';
+$lang['fidAuthzTokenFailed']            = 'Could not complete authorization request, please try again.';
--- a/public/css/Black.ajaxchat.css
+++ b/public/css/Black.ajaxchat.css
@ -17,6 +17,8 @@
 		color:#f0f0f0;
 		border: 1px solid #808080;
 		background-image: linear-gradient(to bottom, #222, #000);
+		background-image: -moz-linear-gradient(to bottom, #222, #000);
+		background-image: -webkit-linear-gradient(top, #222, #000);
 	}
 	#content select, #loginForm select, #loginForm input, #content textarea {
 		background-color:#000;
@ -95,4 +97,4 @@
 		background-color:#212121;
 		color:#FFF;
 	}
-}
+}
--- a/public/css/Blue.ajaxchat.css
+++ b/public/css/Blue.ajaxchat.css
@ -20,6 +20,7 @@
 		color:#f0f0f0;
 		border: 1px solid #808080;
 		background-image: linear-gradient(to bottom, #002545, #000);
+		background-image: -moz-linear-gradient(to bottom, #002545, #000);
 		background-image: -webkit-linear-gradient(top, #002545, #000);
 	}
 	#content select, #loginForm select, #loginForm input, #content textarea {
@ -103,4 +104,4 @@
 		background-color:#0D355D;
 		color:#FFF;
 	}
-}
+}
--- a/public/css/Halext.ajaxchat.css
+++ b/public/css/Halext.ajaxchat.css
@ -18,7 +18,9 @@
 	 
 	#loginContent {
 		background-color: #000000;
-		background-image: -linear-gradient(to bottom, #4c3b52, #000000);
+		background-image: linear-gradient(to bottom, #4c3b52, #000000);
+		background-image: -moz-linear-gradient(to bottom, #4c3b52, #000000);
+		background-image: -webkit-linear-gradient(top, #4c3b52, #000000);
 		color: #999999;
 	}
 	#loginContent h1 {
@ -42,6 +44,8 @@
 	#content {
 		background-color: #000000;
 		background-image: linear-gradient(to bottom, #4c3b52, #000000);
+		background-image: -moz-linear-gradient(to bottom, #4c3b52, #000000);
+		background-image: -webkit-linear-gradient(top, #4c3b52, #000000);
 		color: #999999;
 	}
 	#content h1 {
@ -105,4 +109,4 @@
 	#content #settingsContainer #settingsList input.playback {
 		background: url('../images/playback.png') no-repeat;
 	}
-}
+}
--- a/public/css/Nico.ajaxchat.css
+++ b/public/css/Nico.ajaxchat.css
@ -17,6 +17,7 @@
 		color:#f0f0f0;
 		border: 1px solid #808080;
 		background-image: linear-gradient(to bottom, #110033, #000000);
+		background-image: -moz-linear-gradient(to bottom, #110033, #000000);
 		background-image: -webkit-linear-gradient(top, #110033, #000000);
 	}
 	#loginContent #loginButton {
@ -24,6 +25,7 @@
 		color:#f0f0f0;
 		border: 1px solid #808080;
 		background-image: linear-gradient(to bottom, #110033, #000000);
+		background-image: -moz-linear-gradient(to bottom, #110033, #000000);
 		background-image: -webkit-linear-gradient(top, #110033, #000000);
 	}
 	#loginContent input {
@ -133,4 +135,4 @@
 	#content .cmod {
 		color: #0033FF;
 	}*/
-}
+}
--- a/public/css/chatlogin.css
+++ b/public/css/chatlogin.css
@ -15,7 +15,10 @@ h3 {
 	font-size: 15px;
 	padding: 2px;
 	margin: 10px;
-	background: linear-gradient(180deg, #900, #600) #700;
+	background-color: #700;
+	background-image: linear-gradient(to bottom, #900, #600);
+	background-image: -moz-linear-gradient(to bottom, #900, #600);
+	background-image: -webkit-linear-gradient(top, #900, #600);
 }

 div.copyright {
@ -66,4 +69,4 @@ a {

 a:hover {
 	text-shadow: 0px 0px 1em #F1F1F1;
-}
+}
--- a/public/css/mio.css
+++ b/public/css/mio.css
@ -14,7 +14,11 @@ body {
 	margin: 0px;
 	padding: 0px;
 	font-family: Verdana, Arial, Helvetica, sans-serif;
-	background: linear-gradient(180deg, #C2AFFE, #FBEEFF) repeat-x scroll center top #FBEEFF;
+	background-color: #fbeeff;
+	background-image: linear-gradient(to bottom, #c2affe, #fbeeff);
+	background-image: -moz-linear-gradient(to bottom, #c2affe, #fbeeff);
+	background-image: -webkit-linear-gradient(top, #c2affe, #fbeeff);
+	background-repeat: repeat-x;
 	background-size: auto 200px;
 	text-align: center;
 }
@ -23,7 +27,7 @@ img.logo {
 	height: 150px;
 	width: 450px;
 	border: 0px;
-	background: url('https://static.flash.moe/logos/logo.png') no-repeat scroll left top transparent;
+	background: url('//static.flash.moe/logos/logo.png') no-repeat scroll left top transparent;
 	background-size: cover;
 }

@ -424,7 +428,7 @@ div.ucp_avatar_cont {
 	height: 23px;
 	width: 23px;
 	border: 0px;
-	background: url('https://static.flash.moe/images/window-sprite.png') no-repeat scroll 0px 0px transparent;
+	background: url('//static.flash.moe/images/window-sprite.png') no-repeat scroll 0px 0px transparent;
 }

 .maxbutton {
@ -432,7 +436,7 @@ div.ucp_avatar_cont {
 	height: 23px;
 	width: 23px;
 	border: 0px;
-	background: url('https://static.flash.moe/images/window-sprite.png') no-repeat scroll 0px -23px transparent;
+	background: url('//static.flash.moe/images/window-sprite.png') no-repeat scroll 0px -23px transparent;
 }

 .minbutton {
@ -440,7 +444,7 @@ div.ucp_avatar_cont {
 	height: 23px;
 	width: 23px;
 	border: 0px;
-	background: url('https://static.flash.moe/images/window-sprite.png') no-repeat scroll 0px -46px transparent;
+	background: url('//static.flash.moe/images/window-sprite.png') no-repeat scroll 0px -46px transparent;
 }

 .donate-btn {
@ -448,7 +452,7 @@ div.ucp_avatar_cont {
 	height: 26px;
 	width: 90px;
 	border: 0px;
-	background: url('https://static.flash.moe/images/donate-btn.png') no-repeat scroll 0px 0px transparent;
+	background: url('//static.flash.moe/images/donate-btn.png') no-repeat scroll 0px 0px transparent;
 }

 div.topLeftBar {
@ -848,4 +852,4 @@ div#recaptcha_image {
 }
 .news-comments-container {
    margin: 5px auto 0px;
-}
+}
--- a/public/css/mobile.ajaxchat.css
+++ b/public/css/mobile.ajaxchat.css
@ -357,6 +357,7 @@
 		color:#f0f0f0;
 		border: 1px solid #808080;
 		background-image: linear-gradient(to bottom, #222, #000);
+		background-image: -moz-linear-gradient(to bottom, #222, #000);
 		background-image: -webkit-linear-gradient(top, #222, #000);
 	}
 	#content select, #loginForm select, #loginForm input, #content textarea {
@ -436,4 +437,4 @@
 		background-color:#212121;
 		color:#FFF;
 	}
-}
+}
--- a/public/css/mobiledev.ajaxchat.css
+++ b/public/css/mobiledev.ajaxchat.css
@ -331,6 +331,8 @@
 	color: #f0f0f0;
 	border: 1px solid #808080;
 	background-image: linear-gradient(to bottom, #222, #000);
+	background-image: -moz-linear-gradient(to bottom, #222, #000);
+	background-image: -webkit-linear-gradient(top, #222, #000);
 }
 #content select, #loginForm select, #loginForm input, #content textarea {
 	background-color: #000;
@ -407,4 +409,4 @@
 #content #onlineListContainer h3, #content #helpContainer h3, #content #settingsContainer h3 {
 	background-color: #212121;
 	color: #FFF;
-}
+}
--- a/public/css/yuuno.css
+++ b/public/css/yuuno.css
@ -15,7 +15,11 @@ html {
 }
 body {
    font: 12px/20px Verdana, sans-serif;
-    background: linear-gradient(180deg, #C2AFFE, #FBEEFF) no-repeat scroll left top #FBEEFF;
+    background-color: #fbeeff;
+    background-repeat: no-repeat;
+    background-image: linear-gradient(to bottom, #c2affe, #fbeeff);
+    background-image: -moz-linear-gradient(to bottom, #c2affe, #fbeeff);
+    background-image: -webkit-linear-gradient(top, #c2affe, #fbeeff);
    background-size: cover;
    color: #000;
    height: 100%;
@ -118,7 +122,7 @@ a.default:active {
 }
 a.gotop {
    display: inline-block;
-    background: url('https://static.flash.moe/images/arrow.png') #111;
+    background: url('//static.flash.moe/images/arrow.png') #111;
    color: #FFF;
    width: 60px;
    height: 60px;
@ -192,7 +196,9 @@ a.gotop:active {
 /* Site Header Styling */
 .header {
    text-align: center;
-    background: linear-gradient(180deg, #C2AFFE, #CCBAFE);
+    background-image: linear-gradient(to bottom, #c2affe, #ccbafe);
+    background-image: -moz-linear-gradient(to bottom, #c2affe, #ccbafe);
+    background-image: -webkit-linear-gradient(top, #c2affe, #ccbafe);
    box-shadow: 0 0 5px #8364A1;
 }
 /*.header .logo {
@ -349,7 +355,10 @@ a.gotop:active {
    width: 100%;
    padding-top: 10px;
    padding-bottom: 30px;
-    background: linear-gradient(180deg, #9475B2 0%, #FBEEFF 20%, #C2AFFE 100%) #C2AFFE;
+    background-color: #c2affe;
+    background-image: linear-gradient(to bottom, #9475B2 0%, #FBEEFF 20%, #C2AFFE 100%);
+    background-image: -moz-linear-gradient(to bottom, #9475B2 0%, #FBEEFF 20%, #C2AFFE 100%);
+    background-image: -webkit-linear-gradient(top, #9475B2 0%, #FBEEFF 20%, #C2AFFE 100%);
    position: absolute;
    bottom: 0;
 }
@ -537,7 +546,7 @@ a.gotop:active {
    font-weight: 700;
    font-size: 20px;
    color: #306;
-    background: linear-gradient(90deg, rgba(148,117,178,.7), rgba(148,117,178,0)) #C2AFFE;
+    background: linear-gradient(90deg, rgba(148,117,178,.7), rgba(148,117,178,0));
    border-radius: 2px;
 }
 .content-right .head,
@ -558,7 +567,10 @@ a.gotop:active {
    text-align: center;
    border-radius: 5px;
    font-weight: 100;
-    background: linear-gradient(180deg, #874399, #35245E) #874399;
+    background-color: #874399;
+    background-image: linear-gradient(to bottom, #874399, #35245E);
+    background-image: -moz-linear-gradient(to bottom, #874399, #35245E);
+    background-image: -webkit-linear-gradient(top, #874399, #35245E);
    transition: text-shadow .25s;
    color: #FFF;
    font-size: 16px;
@ -570,7 +582,10 @@ a.gotop:active {
    cursor: pointer;
 }
 .content-right .registerbutton {
-    background: linear-gradient(180deg, #874399, #35245E) #874399;
+    background-color: #874399;
+    background-image: linear-gradient(to bottom, #874399, #35245E);
+    background-image: -moz-linear-gradient(to bottom, #874399, #35245E);
+    background-image: -webkit-linear-gradient(top, #874399, #35245E);
 }
 .button.profileOption {
    width: auto !important;
--- a/public/index.php
+++ b/public/index.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 if(!empty($_GET['common'])) {
    $domain = (strpos($_SERVER['HTTP_HOST'], 'flashii.net') ? 'flashii' : 'edgii');
    $commonUrl = 'https://futami.' . $domain . '.net/common.json';
@ -155,4 +157,4 @@ if(!empty($_GET['common'])) {
 require_once __DIR__ . '/../ajaxchat.php';

 // Initialize the chat:
-$ajaxChat = new CustomAJAXChat();
+$ajaxChat = new CustomAJAXChat;
--- a/public/js/chat.js
+++ b/public/js/chat.js
@ -2410,7 +2410,7 @@ var ajaxChat = {
 	
 	replaceCommandWhois: function(textParts) {
 		return	'<span class="chatBotMessage">'
-				+ this.lang['whois'].replace(/%s/, textParts[1]) + ' <a target="_blank" href="https://flash.moe/whois/'
+				+ this.lang['whois'].replace(/%s/, textParts[1]) + ' <a target="_blank" href="//flash.moe/whois/'
 				+ textParts[2]
 				+ '">'
 				+ textParts[2]
@ -3002,4 +3002,4 @@ var ajaxChat = {
 		return true;
 	}

-}
+}
--- a/src/AJAXChat.php
+++ b/src/AJAXChat.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 // Ajax Chat backend logic:
 class AJAXChat {

--- a/src/AJAXChatDataBase.php
+++ b/src/AJAXChatDataBase.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 // Class to initialize the DataBase connection:
 class AJAXChatDataBase {

--- a/src/AJAXChatDataBaseMySQLi.php
+++ b/src/AJAXChatDataBaseMySQLi.php
@ -7,6 +7,10 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
+use mysqli;
+
 // Class to initialize the MySQL DataBase connection:
 class AJAXChatDataBaseMySQLi {

--- a/src/AJAXChatEncoding.php
+++ b/src/AJAXChatEncoding.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 // Class to provide static encoding methods
 class AJAXChatEncoding {

--- a/src/AJAXChatFileSystem.php
+++ b/src/AJAXChatFileSystem.php
@ -7,9 +7,10 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 // Class to provide methods for file system access:
 class AJAXChatFileSystem {
-
    public static function getFileContents($file) {
        if(function_exists('file_get_contents')) {
            return file_get_contents($file);
@ -17,5 +18,4 @@ class AJAXChatFileSystem {
            return(implode('', file($file)));
        }
    }
-
 }
--- a/src/AJAXChatHTTPHeader.php
+++ b/src/AJAXChatHTTPHeader.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 // Class to manage HTTP header
 class AJAXChatHTTPHeader {

--- a/src/AJAXChatLanguage.php
+++ b/src/AJAXChatLanguage.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 class AJAXChatLanguage {

    private $_regExpAcceptLangCode;
--- a/src/AJAXChatMySQLiQuery.php
+++ b/src/AJAXChatMySQLiQuery.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 // Class to perform SQL (MySQLi) queries:
 class AJAXChatMySQLiQuery {

--- a/src/AJAXChatString.php
+++ b/src/AJAXChatString.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 // Class to provide multibyte enabled string methods
 class AJAXChatString {

--- a/src/AJAXChatTemplate.php
+++ b/src/AJAXChatTemplate.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 // Class to handle HTML templates
 class AJAXChatTemplate {

@ -188,9 +190,7 @@ EOF;
    <a href="{$this->ajaxChat->getConfig('flashiiUrl', 'feedback')}">Feedback</a> |
    <a href="{$this->ajaxChat->getConfig('flashiiUrl', 'changelog')}">Changelog</a> |
    <a href="{$this->ajaxChat->getConfig('flashiiUrl', 'rules')}">Rules &amp; Info</a> |
-    <a href="{$this->ajaxChat->getConfig('flashiiUrl', 'terms')}">Terms of Service</a> |
    <a href="{$this->ajaxChat->getConfig('flashiiUrl', 'contact')}">Contact</a> |
-    <a href="{$this->ajaxChat->getConfig('flashiiUrl', 'test')}">DevSite</a> |
    <a href="?view=legacy">Legacy Login</a>
 </div><br />
 EOF;
@ -303,7 +303,11 @@ HTML;
    function getErrorMessageTags() {
        $errorMessages = '';
        foreach($this->ajaxChat->getInfoMessages('error') as $error) {
-            $errorMessages .= '<h3 class="miotitle">'.$this->ajaxChat->htmlEncode($this->ajaxChat->getLang($error)).'</h3>';
+            $html = $this->ajaxChat->getLang($error);
+            if($error !== 'errorInvalidUser')
+                $html = $this->ajaxChat->htmlEncode($html);
+
+            $errorMessages .= '<h3 class="miotitle">'.$html.'</h3>';
        }
        return $errorMessages;
    }
--- a/src/CustomAJAXChat.php
+++ b/src/CustomAJAXChat.php
@ -7,52 +7,110 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
+use Flashii\{FlashiiClient,FlashiiUrls};
+use Flashii\Credentials\{BasicCredentials,BearerCredentials,MisuzuCredentials};
+
 class CustomAJAXChat extends AJAXChat {

    // Returns an associative array containing userName, userID and userRole
    // Returns null if login is invalid
    function getValidLoginUserData() {
-        if(empty($_COOKIE['msz_auth'])) {
-            header('Location: ' . $this->getConfig('flashiiAuth', 'login'));
-            exit;
-        }
-
-        $userInfo = SockChatAuth::attempt(
-            $this->getConfig('flashiiAuth', 'verify'),
-            $this->getConfig('flashiiSecret'),
-            (string)filter_input(INPUT_COOKIE, 'msz_auth')
+        // TODO: this sucks
+        $urls = new FlashiiUrls(
+            (fn() => (($url = $this->getConfig('flashiiId', 'api')) === '' ? FlashiiUrls::PROD_API_URL : $url))(),
+            (fn() => (($url = $this->getConfig('flashiiId', 'id')) === '' ? FlashiiUrls::PROD_ID_URL : $url))()
        );

-        if($userInfo->success) {
-            // Check if we have a valid registered user:
+        if(filter_has_var(INPUT_SERVER, 'HTTPS')) {
+            $authToken = trim((string)filter_input(INPUT_COOKIE, 'msz_auth'));
+            if($authToken === '') {
+                header('Location: ' . $this->getConfig('flashiiAuth', 'login'));
+                exit;
+            }

-            $chatUser = [
-                'userID' => $userInfo->user_id,
-                'userName' => $userInfo->username,
-                'userRole' => AJAX_CHAT_GUEST,
-            ];
-
-            // sock chat auth doesn't actually return role ids lol
-            if($userInfo->colour_raw === 0xEE9400)
-                $chatUser['userRole'] = DONATOR;
-            elseif($userInfo->colour_raw === 0x0099FF)
-                $chatUser['userRole'] = CMOD;
-            elseif($userInfo->colour_raw === 0x7353C4)
-                $chatUser['userRole'] = PURPLE;
-            elseif($userInfo->colour_raw === 0x9E8DA7)
-                $chatUser['userRole'] = BOTS;
-            elseif($userInfo->rank >= 10)
-                $chatUser['userRole'] = AJAX_CHAT_ADMIN;
-            elseif($userInfo->rank >= 5)
-                $chatUser['userRole'] = AJAX_CHAT_MODERATOR;
-            elseif($userInfo->rank >= 1)
-                $chatUser['userRole'] = AJAX_CHAT_USER;
-
-            return $chatUser;
+            $flashii = new FlashiiClient('AJAX Chat', new MisuzuCredentials($authToken), $urls);
        } else {
-            // Guest users:
-            return $this->getGuestUser();
+            $flashii = new FlashiiClient('AJAX Chat', new BasicCredentials(
+                $this->getConfig('flashiiId', 'clientId'),
+                $this->getConfig('flashiiId', 'clientSecret')
+            ), $urls);
+
+            $doPoll = true;
+            $expiresIn = (int)$this->getSessionVar('fidDeviceExpiresIn');
+            if($expiresIn < time()) {
+                $this->regenerateSessionID();
+
+                $doPoll = false;
+                $request = $flashii->oauth2()->requestAuthorize('identify');
+                if($request instanceof \Flashii\OAuth2\OAuth2AuthorizationRequest) {
+                    $this->setSessionVar('fidDeviceCode', $request->getDeviceCode());
+                    $this->setSessionVar('fidDeviceUserCode', $request->getUserCode());
+                    $this->setSessionVar('fidDeviceExpiresIn', time() + $request->getExpiresIn());
+                    $this->setSessionVar('fidDevicePollInterval', $request->getInterval());
+                    $this->setSessionVar('fidDeviceUri', $request->getVerificationUri());
+                    $this->setSessionVar('fidDeviceUriFull', $request->getVerificationUriComplete());
+                } else
+                    $this->addInfoMessage('fidAuthzRequestFailed');
+            }
+
+            $deviceCode = $this->getSessionVar('fidDeviceCode');
+            if(!empty($deviceCode)) {
+                if($doPoll) {
+                    $token = $flashii->oauth2()->tokenWithDeviceCode($deviceCode);
+                    if($token instanceof \Flashii\OAuth2\OAuth2Token)
+                        $flashii = $flashii->forkWithAccessToken($token->getAccessToken());
+                    else {
+                        if($token->getCode() !== 'slow_down') {
+                            $this->setSessionVar('fidDeviceExpiresIn', 0);
+                            $this->regenerateSessionID();
+                        }
+
+                        $this->addInfoMessage('fidAuthzTokenFailed');
+                    }
+                }
+
+                $this->getLang(); // load language
+                $this->_lang['errorInvalidUser'] = sprintf(
+                    $this->_lang['fidPoll'] ?? 'You need to approve the login attempt! If your browser supports HTTPS <a href="%s" target="_blank" rel="noopener">click here</a>, or go to %s on a device that does and enter <code>%s</code> and press the Login button again.',
+                    $this->getSessionVar('fidDeviceUriFull'),
+                    $this->getSessionVar('fidDeviceUri'),
+                    $this->getSessionVar('fidDeviceUserCode')
+                );
+            }
        }
+
+        // Check if we have a valid registered user:
+        $userInfo = $flashii->v1()->me();
+
+        // Guest users:
+        if($userInfo === null)
+            return $this->getGuestUser();
+
+        $chatUser = [
+            'userID' => $userInfo->getId(),
+            'userName' => $userInfo->getName(),
+        ];
+
+        if($userInfo->hasRole('admin'))
+            $chatUser['userRole'] = AJAX_CHAT_ADMIN;
+        elseif($userInfo->hasRole('gmod'))
+            $chatUser['userRole'] = AJAX_CHAT_MODERATOR;
+        elseif($userInfo->hasRole('dev'))
+            $chatUser['userRole'] = PURPLE;
+        elseif($userInfo->hasRole('bot'))
+            $chatUser['userRole'] = BOTS;
+        elseif($userInfo->hasRole('tenshi'))
+            $chatUser['userRole'] = DONATOR;
+        elseif($userInfo->hasRole('og') || $userInfo->getId() === '72')
+            $chatUser['userRole'] = CMOD; // OGs are blue here i guess lol
+        elseif($userInfo->getRank() > 0)
+            $chatUser['userRole'] = AJAX_CHAT_USER;
+        else
+            $chatUser['userRole'] = AJAX_CHAT_GUEST;
+
+        return $chatUser;
    }

    // Store the channels the current user has access to
--- a/src/CustomAJAXChatInterface.php
+++ b/src/CustomAJAXChatInterface.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 class CustomAJAXChatInterface extends CustomAJAXChat {

    function initialize() {
--- a/src/CustomAJAXChatShoutBox.php
+++ b/src/CustomAJAXChatShoutBox.php
@ -7,6 +7,8 @@
 * @link https://blueimp.net/ajax/
 */

+namespace AJAXChat;
+
 class CustomAJAXChatShoutBox extends CustomAJAXChat {

    function initialize() {
--- a/src/SockChatAuth.php
+++ b/src/SockChatAuth.php
@ -1,50 +0,0 @@
-<?php
-final class SockChatAuth {
-    public static function attempt(string $endPoint, string $secret, string $cookie): object {
-        if(!empty($cookie)) {
-            $method = 'Misuzu';
-            $signature = sprintf('verify#%s#%s#%s', $method, $cookie, $_SERVER['REMOTE_ADDR']);
-            $signature = hash_hmac('sha256', $signature, $secret);
-
-            $login = curl_init($endPoint);
-            curl_setopt_array($login, [
-                CURLOPT_AUTOREFERER => false,
-                CURLOPT_FAILONERROR => false,
-                CURLOPT_FOLLOWLOCATION => true,
-                CURLOPT_HEADER => false,
-                CURLOPT_POST => true,
-                CURLOPT_POSTFIELDS => http_build_query([
-                    'method' => $method,
-                    'token' => $cookie,
-                    'ipaddr' => $_SERVER['REMOTE_ADDR'],
-                ], '', '&', PHP_QUERY_RFC3986),
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_TCP_FASTOPEN => true,
-                CURLOPT_CONNECTTIMEOUT => 2,
-                CURLOPT_MAXREDIRS => 2,
-                CURLOPT_PROTOCOLS => CURLPROTO_HTTPS,
-                CURLOPT_TIMEOUT => 5,
-                CURLOPT_USERAGENT => 'AJAX Chat',
-                CURLOPT_HTTPHEADER => [
-                    'Content-Type: application/x-www-form-urlencoded',
-                    'X-SharpChat-Signature: ' . $signature,
-                ],
-            ]);
-            $userInfo = json_decode(curl_exec($login));
-            curl_close($login);
-        }
-
-        if(empty($userInfo->success)) {
-            $userInfo = new stdClass;
-            $userInfo->success = false;
-            $userInfo->user_id = 0;
-            $userInfo->username = 'Anonymous';
-            $userInfo->colour_raw = 0x40000000;
-            $userInfo->rank = 0;
-            $userInfo->hierarchy = 0;
-            $userInfo->perms = 0;
-        }
-
-        return $userInfo;
-    }
-}
--- a/template/legacyLogin.html
+++ b/template/legacyLogin.html
@ -23,7 +23,9 @@

 		div.toplogo {
 			font-size: 30px;
-			background-image: linear-gradient(180deg, #190015/*#2F426C#FF2400*/, transparent);
+			background-image: linear-gradient(to bottom, #190015/*#2F426C#FF2400*/, transparent);
+			background-image: -moz-linear-gradient(to bottom, #190015/*#2F426C#FF2400*/, transparent);
+			background-image: -webkit-linear-gradient(top, #190015/*#2F426C#FF2400*/, transparent);
 			padding-left: 10px;
 			padding-right: 10px;
 			font-family: "Century Gothic", Gothic, sans-serif;
@ -72,11 +74,15 @@
 		div.topmenu a:hover {
 			text-shadow: 0px 0px 8px #F1F1F1;
 			background-image: linear-gradient(to bottom, #8800BB, transparent);
+			background-image: -moz-linear-gradient(to bottom, #8800BB, transparent);
+			background-image: -webkit-linear-gradient(top, #8800BB, transparent);
 		}

 		div.topmenu a:active {
 			text-shadow: 0px 0px 8px #0042FF;
 			background-image: linear-gradient(to bottom, #440077, transparent);
+			background-image: -moz-linear-gradient(to bottom, #440077, transparent);
+			background-image: -webkit-linear-gradient(top, #440077, transparent);
 		}
 	</style>
 	[STYLE_SHEETS/]
@ -158,13 +164,11 @@
 				<a href="[CONF]flashiiUrl.feedback[/CONF]">Feedback</a> | 
 				<a href="[CONF]flashiiUrl.changelog[/CONF]">Changelog</a> | 
 				<a href="[CONF]flashiiUrl.rules[/CONF]">Rules &amp; Info</a> | 
-				<a href="[CONF]flashiiUrl.terms[/CONF]">Terms of Service</a> | 
-				<a href="[CONF]flashiiUrl.contact[/CONF]">Contact</a> | 
-				<a href="[CONF]flashiiUrl.test[/CONF]">DevSite</a> | 
+				<a href="[CONF]flashiiUrl.contact[/CONF]">Contact</a> |
 				<a href="./">Classic Login</a>
 			</div>
 		</div>
 	</div>
 </body>

-</html>
+</html>
Author	SHA1	Message	Date
flashwave	d0cab7054f	Switched to public API for authentication and a horrible device auth implementation for unsecured connections.	2024-11-20 02:43:47 +00:00
flashwave	951ec95ca2	Updated Flashii URLs.	2024-11-19 22:47:36 +00:00
flashwave	ca5e4ebcf3	Add vendor dir to .gitignore.	2024-11-19 22:43:08 +00:00
flashwave	b5acf69035	Use composer for class loading.	2024-11-19 22:42:42 +00:00