From afffa5f98e88648d77301dd10a065b655a12878f Mon Sep 17 00:00:00 2001
From: JoshOOOWAH <89082472387@yandex.ru>
Date: Fri, 24 May 2019 22:45:28 +0500
Subject: [PATCH] OAuth Launcher Impl

---
 Launcher/runtime/dialog/dialog.js                |  10 ++++++++++
 Launcher/runtime/dialog/images/icons/vk.png      | Bin 0 -> 2140 bytes
 .../dialog/overlay/processing/processing.js      |   6 ++++++
 Launcher/runtime/dialog/scenes/login/login.fxml  |   3 ++-
 Launcher/runtime/dialog/styles.css               |  13 ++++++++++++-
 Launcher/runtime/engine/api.js                   |   1 +
 6 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 Launcher/runtime/dialog/images/icons/vk.png

diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js
index acd7ba4b..16ce9d2f 100644
--- a/Launcher/runtime/dialog/dialog.js
+++ b/Launcher/runtime/dialog/dialog.js
@@ -298,6 +298,16 @@ function doAuth(login, rsaPassword, auth_type) {
         })
     });
 }
+function goOAuth(event) {
+    processing.resetOverlay();
+    overlay.show(processing.overlay, function (event) {
+        FunctionalBridge.getHWID.join();
+        makeOAuthRequest(function (result) {
+            openURL(result);
+            return result;
+        })
+    });
+}
 
 function doUpdate(profile, pp, accessToken) {
     var digest = profile.isUpdateFastCheck();
diff --git a/Launcher/runtime/dialog/images/icons/vk.png b/Launcher/runtime/dialog/images/icons/vk.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e422eab8a8022cc9a587d392a735c1e0e8d9af0
GIT binary patch
literal 2140
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
SXns=w0000<MNUMnLSTX}f&k9|

literal 0
HcmV?d00001

diff --git a/Launcher/runtime/dialog/overlay/processing/processing.js b/Launcher/runtime/dialog/overlay/processing/processing.js
index cfff7bc6..282340cf 100644
--- a/Launcher/runtime/dialog/overlay/processing/processing.js
+++ b/Launcher/runtime/dialog/overlay/processing/processing.js
@@ -121,6 +121,12 @@ function makeAuthRequest(login, rsaPassword, auth_type, callback) {
     task.updateMessage("Авторизация на сервере");
     startTask(task);
 }
+function makeOAuthRequest(callback) {
+    newRequestTask(new OAuthRequest(FunctionalBridge.getHWID()));
+    processing.setTaskProperties(task, callback, null, true);
+    task.updateMessage("Ожидание авторизации");
+    startTask(task);
+}
 
 function launchClient(assetHDir, clientHDir, profile, params, callback) {
     var task = newTask(function() ClientLauncher.launch(assetHDir, clientHDir,
diff --git a/Launcher/runtime/dialog/scenes/login/login.fxml b/Launcher/runtime/dialog/scenes/login/login.fxml
index a2db6ff7..a4c6bd39 100644
--- a/Launcher/runtime/dialog/scenes/login/login.fxml
+++ b/Launcher/runtime/dialog/scenes/login/login.fxml
@@ -24,7 +24,8 @@
                       </Pane>
                       <JFXTextField id="login" alignment="CENTER" focusColor="#5fd97a" layoutX="34.0" layoutY="196.0" promptText="Логин" unFocusColor="#dadada" />
                       <JFXPasswordField id="password" alignment="CENTER" focusColor="#5fd97a" layoutX="34.0" layoutY="249.0" promptText="Пароль" unFocusColor="#dadada" />
-                      <JFXButton id="goAuth" layoutX="34.0" layoutY="370.0" styleClass="auth" text="ВОЙТИ" />
+                      <JFXButton id="goAuth" layoutX="34.0" layoutY="370.0" prefWidth="145.0" styleClass="auth" text="ВОЙТИ" />
+                      <JFXButton id="goOAuth" layoutX="197.0" layoutY="365.0" prefHeight="56.0" prefWidth="57.0" styleClass="vkauth" text=" " />
                       <JFXCheckBox id="rememberchb" fx:id="savePassword" checkedColor="#5fd97a" contentDisplay="CENTER" layoutX="63.0" layoutY="297.0" prefWidth="144.0" text="Сохранить пароль" textFill="#dadada" unCheckedColor="#909090" />
                       <JFXComboBox id="authOptions" fx:id="authOptions" focusColor="#5fd97a" layoutX="34.0" layoutY="341.0" prefHeight="25.0" prefWidth="200.0" promptText="Способ авторизации" unFocusColor="#70666600">
                           <styleClass>
diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css
index d26cc8e4..3aa2b423 100644
--- a/Launcher/runtime/dialog/styles.css
+++ b/Launcher/runtime/dialog/styles.css
@@ -121,12 +121,23 @@ .auth {
     -fx-background-radius: 0;
     -fx-background-color: #5fd97a;
     -fx-text-fill: #ffffff;
-    -fx-pref-width: 200px;
+    -fx-pref-width: 145px;
     -fx-pref-height: 45px;
     -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15,0,0,3);
 }
+.vkauth {
+    -jfx-button-type: FLAT;
+    -fx-background-radius: 0;
+	-fx-font-size: 0pt;
+    -fx-background-image: url('images/icons/vk.png');
+	-fx-background-repeat: no-repeat;
+    -fx-pref-width: 55px;
+    -fx-pref-height: 55px;
+    -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15,0,0,3);
+}
 
 .auth:hover, .auth:pressed { -fx-background-color: #75e18c; }
+.vkauth:hover, .vkauth:pressed { -fx-background-color: #75e18c; }
 
 #password, #login {
     -fx-background-radius: 0;
diff --git a/Launcher/runtime/engine/api.js b/Launcher/runtime/engine/api.js
index 0b07d4fb..8a8c393a 100644
--- a/Launcher/runtime/engine/api.js
+++ b/Launcher/runtime/engine/api.js
@@ -19,6 +19,7 @@ var RequestType = RequestTypeClass.static;
 var RequestException = RequestExceptionClass.static;
 //var PingRequest = PingRequestClass.static;
 var AuthRequest = AuthRequestClass.static;
+var OAuthRequest = OAuthRequestClass.static;
 var JoinServerRequest = JoinServerRequestClass.static;
 var CheckServerRequest = CheckServerRequestClass.static;
 var UpdateRequest = UpdateRequestClass.static;