Мелкие правки

Ftrless · Apr 26, 2021 · 51539c2 · 51539c2
1 parent 0b8afef
commit 51539c2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/src/api/requests/AuthRequest.ts b/src/api/requests/AuthRequest.ts
@@ -28,7 +28,7 @@ export class AuthRequest extends AbstractRequest {
 
     async invoke(data: AuthRequestData): Promise<ResponseData> {
         const provider = App.AuthManager.getAuthProvider()
-        return await provider.emit(data.login, data.password)
+        return await provider.auth(data.login, data.password)
     }
 }
 

diff --git a/src/auth/authProviders/AbstractAuthProvider.ts b/src/auth/authProviders/AbstractAuthProvider.ts
@@ -19,8 +19,9 @@
 import { ResponseData } from "../../api/types/Response"
 import { AbstractProvider } from "../AbstractProvider"
 import { AcceptAuthProvider } from "./AcceptAuthProvider"
+
 export abstract class AbstractAuthProvider extends AbstractProvider {
-    abstract emit(...args: any[]): PromiseOr<ResponseData>
+    abstract auth(login: string, password: string): PromiseOr<AuthResponseData>
 
     public static getDefaultConfig(): AbstractAuthProviderConfig {
         return {
@@ -38,3 +39,6 @@ export interface AuthResponseData extends ResponseData {
     userUUID: string
     accessToken: string
 }
+
+// TODO Указание доп.параметров для запуска клиента при использовании различных провайдеров
+// Для работы Authlib
diff --git a/src/auth/authProviders/AcceptAuthProvider.ts b/src/auth/authProviders/AcceptAuthProvider.ts
@@ -18,15 +18,14 @@
 
 import { v4, v5 } from "uuid"
 
-import { ResponseData } from "../../api/types/Response"
-import { AbstractAuthProvider } from "./AbstractAuthProvider"
+import { AbstractAuthProvider, AuthResponseData } from "./AbstractAuthProvider"
 
 export class AcceptAuthProvider extends AbstractAuthProvider {
     static type = "accept"
 
     sessionsDB = new Map()
 
-    emit(username: string): ResponseData {
+    auth(username: string): AuthResponseData {
         const data = {
             username,
             userUUID: v5(username, "814f98b5-f66d-4456-87dc-f4eed8f6ca73"),

diff --git a/src/auth/authProviders/MojangAuthProvider.ts b/src/auth/authProviders/MojangAuthProvider.ts
@@ -24,7 +24,7 @@ import { AbstractAuthProvider, AuthResponseData } from "./AbstractAuthProvider"
 export class MojangAuthProvider extends AbstractAuthProvider {
     static type = "mojang"
 
-    async emit(login: string, password: string): Promise<AuthResponseData> {
+    async auth(login: string, password: string): Promise<AuthResponseData> {
         const data = JSON.stringify({
             agent: {
                 name: "Minecraft",

diff --git a/src/auth/authProviders/RejectAuthProvider.ts b/src/auth/authProviders/RejectAuthProvider.ts
@@ -17,7 +17,7 @@
  */
 
 import { App } from "../../LauncherServer"
-import { AbstractAuthProvider, AbstractAuthProviderConfig } from "./AbstractAuthProvider"
+import { AbstractAuthProvider, AbstractAuthProviderConfig, AuthResponseData } from "./AbstractAuthProvider"
 
 export class RejectAuthProvider extends AbstractAuthProvider {
     static type = "reject"
@@ -27,7 +27,7 @@ export class RejectAuthProvider extends AbstractAuthProvider {
             (App.ConfigManager.getConfig().auth.authProvider as RejectAuthProviderConfig).message || "Auth rejected",
     }
 
-    emit(): any {
+    auth(): AuthResponseData {
         throw {
             code: 200,
             message: this.config.message,