@urga-panel/ur-panels-core 1.0.16 → 1.0.18

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

@@ -54,11 +54,12 @@ export declare abstract class AuthService extends Service {
         request: any;
         url: any;
     }): Promise<any>;
-    checkToken({ panel_token, options }: {
+    checkToken({ panel_token, options, auth_token }: {
         panel_token: string;
         options?: {
             role?: string;
         };
+        auth_token: string;
     }): Promise<{
         valid: boolean;
         newPanelToken?: string;

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

@@ -135,7 +135,7 @@ export class AuthService extends Service {
             return this.resposeHandler({ status: "error", message: "An error occurred during login" });
         }
     }
-    async checkToken({ panel_token, options }) {
+    async checkToken({ panel_token, options, auth_token }) {
         this.log.OK("panel_token Token:", panel_token);
         //debugger;
         try {
@@ -144,6 +144,23 @@ export class AuthService extends Service {
             if (typeof window === "undefined") {
                 jwt = (await import("jsonwebtoken")).default;
             }
+            if (panel_token === undefined || panel_token === "") {
+                if (auth_token === undefined || auth_token === "") {
+                    return { valid: false };
+                }
+                else {
+                    const decoded = jwt.verify(auth_token, JWT_REFRESH_SECRET);
+                    const res = await this.getUserInfo({
+                        userId: decoded.id,
+                        userName: decoded.username,
+                        userRole: decoded.role || "user",
+                        userEmail: decoded.email
+                    });
+                    if (res.success) {
+                        return { valid: true, user: res.user };
+                    }
+                }
+            }
             const decoded = jwt.verify(panel_token, JWT_SECRET);
             const res = await this.getUserInfo({
                 userId: decoded.id,

package/dist/services/abstract/project/ProjectInfoService.d.ts

@@ -16,6 +16,7 @@ export type ProjectsPages = {
         service?: PageService;
         serviceRef: any;
         userGroup?: string;
+        onlyForGroup?: boolean;
     };
 };
 export type ProjectInfoOts = ServiceOts & {

package/dist/services/abstract/project/ProjectInfoService.js

@@ -45,7 +45,10 @@ export class ProjectInfoService extends Service {
         Object.entries(this.pages).forEach(([key, page]) => {
             if (page.showInMenu) {
                 if (userGroup && userGroup == 'admin') {
-                    result[key] = page;
+                    // If onlyForGroup is true, admin cannot see this page
+                    if (page.onlyForGroup !== true) {
+                        result[key] = page;
+                    }
                 }
                 else {
                     if (userGroup) {

package/dist/services/main/httpServices/RequestHandlerService.js

@@ -68,8 +68,10 @@ export class RequestHandlerService extends Service {
                 }
                 const cookieHeader = request.headers.get('cookie');
                 const panel_token = this.getCookie(cookieHeader, 'panel_token');
+                const auth_token = this.getCookie(cookieHeader, 'auth_token');
                 // Check authentication and role
                 const isAuthenticated = await authService.checkToken({
+                    auth_token,
                     panel_token,
                     options: {
                         role: handler.options?.role

package/package.json

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

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

@@ -213,19 +213,42 @@ export abstract class AuthService extends Service {
             return this.resposeHandler({ status: "error", message: "An error occurred during login" });
         }
     }
-    async checkToken({ panel_token, options }: {
-        panel_token: string, options?: {
+    async checkToken({ panel_token, options, auth_token }: {
+        panel_token: string,
+        options?: {
             role?: string;
-        }
+        },
+        auth_token: string
     }): Promise<{ valid: boolean; newPanelToken?: string, user?: any }> {
         this.log.OK("panel_token Token:", panel_token);
+
         //debugger;
         try {
-            // 1. Access token'ı doğrula
+             // 1. Access token'ı doğrula
             let jwt: typeof import("jsonwebtoken") | undefined;
             if (typeof window === "undefined") {
                 jwt = (await import("jsonwebtoken")).default;
             }
+
+            if (panel_token === undefined || panel_token === "") {
+                if (auth_token === undefined || auth_token === "") {
+                    return { valid: false };
+                } else {
+                    const decoded: any = jwt.verify(auth_token, JWT_REFRESH_SECRET);
+                    const res = await this.getUserInfo({
+                        userId: (decoded as any).id,
+                        userName: (decoded as any).username,
+                        userRole: (decoded as any).role || "user",
+                        userEmail: (decoded as any).email
+                    });
+                     if (res.success) {
+                        return { valid: true, user: res.user };
+                    }
+                }
+            }
+
+
+           
             const decoded: any = jwt.verify(panel_token, JWT_SECRET);
             const res = await this.getUserInfo({
                 userId: (decoded as any).id,

package/src/services/abstract/project/ProjectInfoService.ts

@@ -17,6 +17,7 @@ export type ProjectsPages = {
         service?: PageService; // Optional service name for custom handling
         serviceRef: any;
         userGroup?: string; // Optional user group for access control
+        onlyForGroup?: boolean; // If true, only the specified userGroup can see this page (admin excluded)
     };
 }
 
@@ -85,7 +86,10 @@ export abstract class ProjectInfoService extends Service {
         Object.entries(this.pages).forEach(([key, page]) => {
             if (page.showInMenu) {
                 if (userGroup && userGroup == 'admin') {
-                    result[key] = page;
+                    // If onlyForGroup is true, admin cannot see this page
+                    if (page.onlyForGroup !== true) {
+                        result[key] = page;
+                    }
                 }
                 else {
                     if (userGroup) {

package/src/services/main/httpServices/RequestHandlerService.ts

@@ -96,9 +96,12 @@ export class RequestHandlerService extends Service {
                 
                 const cookieHeader = request.headers.get('cookie');
                 const panel_token = this.getCookie(cookieHeader, 'panel_token');
+                const auth_token = this.getCookie(cookieHeader, 'auth_token');
                 // Check authentication and role
 
+                
                 const isAuthenticated = await authService.checkToken({
+                    auth_token,
                     panel_token,
                     options: {
                         role: handler.options?.role