@urga-panel/ur-panels-core 1.0.12 → 1.0.13

package/dist/services/abstract/authServices/AuthService.d.ts

@@ -22,10 +22,11 @@ export declare abstract class AuthService extends Service {
     constructor(ots: AuthOts);
     protected abstract saveToken(token: string): Promise<void>;
     protected abstract clearToken(): Promise<void>;
-    protected abstract getUserInfo({ userId, userName, userRole }: {
+    protected abstract getUserInfo({ userId, userName, userRole, userEmail }: {
         userId?: string;
         userName?: string;
         userRole?: string;
+        userEmail?: string;
     }): Promise<{
         success: boolean;
         message?: string;
@@ -46,8 +47,8 @@ export declare abstract class AuthService extends Service {
         request: any;
         url: any;
     }): Promise<any>;
-    loginRequest({ username, password, params, request, url }: {
-        username: any;
+    loginRequest({ email, password, params, request, url }: {
+        email: any;
         password: any;
         params: any;
         request: any;

package/dist/services/abstract/authServices/AuthService.js

@@ -70,7 +70,7 @@ export class AuthService extends Service {
         }
     }
     // Define methods specific to AuthService here
-    async loginRequest({ username, password, params, request, url }) {
+    async loginRequest({ email, password, params, request, url }) {
         //const { username, password } = params;
         // Kullanıcı adı veya şifre eksikse
         //debugger;
@@ -79,10 +79,10 @@ export class AuthService extends Service {
             // const username = formData.get('username');
             // const password = formData.get('password');
             //debugger;
-            if (!username || !password) {
-                return this.resposeHandler({ status: "fail", message: "Kullanıcı adı ve şifre gereklidir" });
+            if (!email || !password) {
+                return this.resposeHandler({ status: "fail", message: "Email ve şifre gereklidir" });
             }
-            const result = await this.getUserInfo({ userName: username });
+            const result = await this.getUserInfo({ userEmail: email });
             if (result.success) {
                 let jwt;
                 if (typeof window === "undefined") {
@@ -148,7 +148,8 @@ export class AuthService extends Service {
             const res = await this.getUserInfo({
                 userId: decoded.id,
                 userName: decoded.username,
-                userRole: decoded.role || "user" // Varsayılan rol
+                userRole: decoded.role || "user",
+                userEmail: decoded.email
             });
             const newPanelToken = jwt.sign({
                 id: decoded.id,
@@ -205,7 +206,8 @@ export class AuthService extends Service {
                 const res = await this.getUserInfo({
                     userId: (decodedRefresh as any).id,
                     userName: (decodedRefresh as any).username,
-                    userRole: (decodedRefresh as any).role || "user" // Varsayılan rol
+                    userRole: (decodedRefresh as any).role || "user",
+                    userEmail: (decodedRefresh as any).email
                 });
 
                 if (!res.success) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urga-panel/ur-panels-core",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/services/abstract/authServices/AuthService.ts

@@ -66,10 +66,11 @@ export abstract class AuthService extends Service {
     // Abstract methods for platform-specific logic
     protected abstract saveToken(token: string): Promise<void>;
     protected abstract clearToken(): Promise<void>;
-    protected abstract getUserInfo({ userId, userName, userRole }: {
+    protected abstract getUserInfo({ userId, userName, userRole, userEmail }: {
         userId?: string;
         userName?: string;
         userRole?: string;
+        userEmail?: string; // added for email-based lookup
     }): Promise<{
         success: boolean;
         message?: string;
@@ -119,7 +120,7 @@ export abstract class AuthService extends Service {
     }
 
     // Define methods specific to AuthService here
-    async loginRequest({ username, password, params, request, url }): Promise<any> {
+    async loginRequest({ email, password, params, request, url }): Promise<any> {
         //const { username, password } = params;
         // Kullanıcı adı veya şifre eksikse
         //debugger;
@@ -128,11 +129,11 @@ export abstract class AuthService extends Service {
             // const username = formData.get('username');
             // const password = formData.get('password');
             //debugger;
-            if (!username || !password) {
-                return this.resposeHandler({ status: "fail", message: "Kullanıcı adı ve şifre gereklidir" });
+            if (!email || !password) {
+                return this.resposeHandler({ status: "fail", message: "Email ve şifre gereklidir" });
             }
 
-            const result = await this.getUserInfo({ userName: username });
+            const result = await this.getUserInfo({ userEmail: email });
 
             if (result.success) {
                 let jwt: typeof import("jsonwebtoken") | undefined;
@@ -229,7 +230,8 @@ export abstract class AuthService extends Service {
             const res = await this.getUserInfo({
                 userId: (decoded as any).id,
                 userName: (decoded as any).username,
-                userRole: (decoded as any).role || "user" // Varsayılan rol
+                userRole: (decoded as any).role || "user",
+                userEmail: (decoded as any).email
             });
 
             const newPanelToken = jwt.sign(
@@ -293,7 +295,8 @@ export abstract class AuthService extends Service {
                 const res = await this.getUserInfo({
                     userId: (decodedRefresh as any).id,
                     userName: (decodedRefresh as any).username,
-                    userRole: (decodedRefresh as any).role || "user" // Varsayılan rol
+                    userRole: (decodedRefresh as any).role || "user",
+                    userEmail: (decodedRefresh as any).email
                 });
 
                 if (!res.success) {