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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/services/abstract/authServices/AuthService.d.ts +5 -3
  2. package/dist/services/abstract/authServices/AuthService.js +14 -6
  3. package/package.json +1 -1
  4. package/src/services/abstract/authServices/AuthService.ts +17 -7
package/dist/services/abstract/authServices/AuthService.d.ts CHANGED
@@ -22,10 +22,11 @@ export declare abstract class AuthService extends Service {
22
22
  constructor(ots: AuthOts);
23
23
  protected abstract saveToken(token: string): Promise<void>;
24
24
  protected abstract clearToken(): Promise<void>;
25
- protected abstract getUserInfo({ userId, userName, userRole }: {
25
+ protected abstract getUserInfo({ userId, userName, userRole, userEmail }: {
26
26
  userId?: string;
27
27
  userName?: string;
28
28
  userRole?: string;
29
+ userEmail?: string;
29
30
  }): Promise<{
30
31
  success: boolean;
31
32
  message?: string;
@@ -33,6 +34,7 @@ export declare abstract class AuthService extends Service {
33
34
  id: number;
34
35
  username: string;
35
36
  password: string;
37
+ email?: string;
36
38
  role?: string;
37
39
  databaseId?: string;
38
40
  databases?: string[];
@@ -45,8 +47,8 @@ export declare abstract class AuthService extends Service {
45
47
  request: any;
46
48
  url: any;
47
49
  }): Promise<any>;
48
- loginRequest({ username, password, params, request, url }: {
49
- username: any;
50
+ loginRequest({ email, password, params, request, url }: {
51
+ email: any;
50
52
  password: any;
51
53
  params: any;
52
54
  request: any;
package/dist/services/abstract/authServices/AuthService.js CHANGED
@@ -70,7 +70,7 @@ export class AuthService extends Service {
70
70
  }
71
71
  }
72
72
  // Define methods specific to AuthService here
73
- async loginRequest({ username, password, params, request, url }) {
73
+ async loginRequest({ email, password, params, request, url }) {
74
74
  //const { username, password } = params;
75
75
  // Kullanıcı adı veya şifre eksikse
76
76
  //debugger;
@@ -79,10 +79,10 @@ export class AuthService extends Service {
79
79
  // const username = formData.get('username');
80
80
  // const password = formData.get('password');
81
81
  //debugger;
82
- if (!username || !password) {
83
- return this.resposeHandler({ status: "fail", message: "Kullanıcı adı ve şifre gereklidir" });
82
+ if (!email || !password) {
83
+ return this.resposeHandler({ status: "fail", message: "Email ve şifre gereklidir" });
84
84
  }
85
- const result = await this.getUserInfo({ userName: username });
85
+ const result = await this.getUserInfo({ userEmail: email });
86
86
  if (result.success) {
87
87
  let jwt;
88
88
  if (typeof window === "undefined") {
@@ -101,6 +101,7 @@ export class AuthService extends Service {
101
101
  id: result.user.id,
102
102
  username: result.user.username,
103
103
  role: result.user.role,
104
+ email: result.user.email, // include email
104
105
  databaseId: result.user.databaseId,
105
106
  databases: result.user.databases // databaseId eklendi
106
107
  }, JWT_SECRET, { expiresIn: '15m' });
@@ -109,6 +110,7 @@ export class AuthService extends Service {
109
110
  id: result.user.id,
110
111
  username: result.user.username,
111
112
  role: result.user.role,
113
+ email: result.user.email, // include email
112
114
  databaseId: result.user.databaseId,
113
115
  databases: result.user.databases // databaseId eklendi
114
116
  }, JWT_REFRESH_SECRET, { expiresIn: '7d' });
@@ -146,12 +148,14 @@ export class AuthService extends Service {
146
148
  const res = await this.getUserInfo({
147
149
  userId: decoded.id,
148
150
  userName: decoded.username,
149
- userRole: decoded.role || "user" // Varsayılan rol
151
+ userRole: decoded.role || "user",
152
+ userEmail: decoded.email
150
153
  });
151
154
  const newPanelToken = jwt.sign({
152
155
  id: decoded.id,
153
156
  username: decoded.username,
154
157
  role: decoded.role,
158
+ email: decoded.email, // include email
155
159
  databases: decoded.databases // databases eklendi
156
160
  }, JWT_REFRESH_SECRET, { expiresIn: '7d' });
157
161
  /*
@@ -202,7 +206,8 @@ export class AuthService extends Service {
202
206
  const res = await this.getUserInfo({
203
207
  userId: (decodedRefresh as any).id,
204
208
  userName: (decodedRefresh as any).username,
205
- userRole: (decodedRefresh as any).role || "user" // Varsayılan rol
209
+ userRole: (decodedRefresh as any).role || "user",
210
+ userEmail: (decodedRefresh as any).email
206
211
  });
207
212
 
208
213
  if (!res.success) {
@@ -225,6 +230,7 @@ export class AuthService extends Service {
225
230
  id: decodedRefresh.id,
226
231
  username: decodedRefresh.username,
227
232
  role: decodedRefresh.role,
233
+ email: decodedRefresh.email, // include email
228
234
  databaseId: decodedRefresh.databaseId, // databaseId eklendi
229
235
  databases: decodedRefresh.databases // databases eklendi
230
236
  },
@@ -236,6 +242,7 @@ export class AuthService extends Service {
236
242
  id: decodedRefresh.id,
237
243
  username: decodedRefresh.username,
238
244
  role: decodedRefresh.role,
245
+ email: decodedRefresh.email, // include email
239
246
  databaseId: decodedRefresh.databaseId, // databaseId eklendi
240
247
  databases: decodedRefresh.databases // databases eklendi
241
248
  },
@@ -287,6 +294,7 @@ export class AuthService extends Service {
287
294
  id: user?.id || null,
288
295
  username: user?.username || null,
289
296
  role: user?.role || null,
297
+ email: user?.email || null, // include email
290
298
  databaseId: user?.databaseId || null, // databaseId eklendi
291
299
  databases: user?.databases || null // databases eklendi
292
300
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@urga-panel/ur-panels-core",
3
- "version": "1.0.11",
3
+ "version": "1.0.13",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/services/abstract/authServices/AuthService.ts CHANGED
@@ -66,10 +66,11 @@ export abstract class AuthService extends Service {
66
66
  // Abstract methods for platform-specific logic
67
67
  protected abstract saveToken(token: string): Promise<void>;
68
68
  protected abstract clearToken(): Promise<void>;
69
- protected abstract getUserInfo({ userId, userName, userRole }: {
69
+ protected abstract getUserInfo({ userId, userName, userRole, userEmail }: {
70
70
  userId?: string;
71
71
  userName?: string;
72
72
  userRole?: string;
73
+ userEmail?: string; // added for email-based lookup
73
74
  }): Promise<{
74
75
  success: boolean;
75
76
  message?: string;
@@ -77,6 +78,7 @@ export abstract class AuthService extends Service {
77
78
  id: number;
78
79
  username: string;
79
80
  password: string; // Optional password field for internal use
81
+ email?: string; // Optional email field
80
82
  role?: string; // Optional role field
81
83
  databaseId?: string; // Optional database ID field
82
84
  databases?: string[]; // Optional databases field
@@ -118,7 +120,7 @@ export abstract class AuthService extends Service {
118
120
  }
119
121
 
120
122
  // Define methods specific to AuthService here
121
- async loginRequest({ username, password, params, request, url }): Promise<any> {
123
+ async loginRequest({ email, password, params, request, url }): Promise<any> {
122
124
  //const { username, password } = params;
123
125
  // Kullanıcı adı veya şifre eksikse
124
126
  //debugger;
@@ -127,11 +129,11 @@ export abstract class AuthService extends Service {
127
129
  // const username = formData.get('username');
128
130
  // const password = formData.get('password');
129
131
  //debugger;
130
- if (!username || !password) {
131
- return this.resposeHandler({ status: "fail", message: "Kullanıcı adı ve şifre gereklidir" });
132
+ if (!email || !password) {
133
+ return this.resposeHandler({ status: "fail", message: "Email ve şifre gereklidir" });
132
134
  }
133
135
 
134
- const result = await this.getUserInfo({ userName: username });
136
+ const result = await this.getUserInfo({ userEmail: email });
135
137
 
136
138
  if (result.success) {
137
139
  let jwt: typeof import("jsonwebtoken") | undefined;
@@ -154,6 +156,7 @@ export abstract class AuthService extends Service {
154
156
  id: result.user.id,
155
157
  username: result.user.username,
156
158
  role: result.user.role,
159
+ email: result.user.email, // include email
157
160
  databaseId: result.user.databaseId,
158
161
  databases: result.user.databases // databaseId eklendi
159
162
  },
@@ -167,6 +170,7 @@ export abstract class AuthService extends Service {
167
170
  id: result.user.id,
168
171
  username: result.user.username,
169
172
  role: result.user.role,
173
+ email: result.user.email, // include email
170
174
  databaseId: result.user.databaseId,
171
175
  databases: result.user.databases // databaseId eklendi
172
176
  },
@@ -226,7 +230,8 @@ export abstract class AuthService extends Service {
226
230
  const res = await this.getUserInfo({
227
231
  userId: (decoded as any).id,
228
232
  userName: (decoded as any).username,
229
- userRole: (decoded as any).role || "user" // Varsayılan rol
233
+ userRole: (decoded as any).role || "user",
234
+ userEmail: (decoded as any).email
230
235
  });
231
236
 
232
237
  const newPanelToken = jwt.sign(
@@ -234,6 +239,7 @@ export abstract class AuthService extends Service {
234
239
  id: decoded.id,
235
240
  username: decoded.username,
236
241
  role: decoded.role,
242
+ email: decoded.email, // include email
237
243
  databases: decoded.databases // databases eklendi
238
244
  },
239
245
  JWT_REFRESH_SECRET,
@@ -289,7 +295,8 @@ export abstract class AuthService extends Service {
289
295
  const res = await this.getUserInfo({
290
296
  userId: (decodedRefresh as any).id,
291
297
  userName: (decodedRefresh as any).username,
292
- userRole: (decodedRefresh as any).role || "user" // Varsayılan rol
298
+ userRole: (decodedRefresh as any).role || "user",
299
+ userEmail: (decodedRefresh as any).email
293
300
  });
294
301
 
295
302
  if (!res.success) {
@@ -312,6 +319,7 @@ export abstract class AuthService extends Service {
312
319
  id: decodedRefresh.id,
313
320
  username: decodedRefresh.username,
314
321
  role: decodedRefresh.role,
322
+ email: decodedRefresh.email, // include email
315
323
  databaseId: decodedRefresh.databaseId, // databaseId eklendi
316
324
  databases: decodedRefresh.databases // databases eklendi
317
325
  },
@@ -323,6 +331,7 @@ export abstract class AuthService extends Service {
323
331
  id: decodedRefresh.id,
324
332
  username: decodedRefresh.username,
325
333
  role: decodedRefresh.role,
334
+ email: decodedRefresh.email, // include email
326
335
  databaseId: decodedRefresh.databaseId, // databaseId eklendi
327
336
  databases: decodedRefresh.databases // databases eklendi
328
337
  },
@@ -376,6 +385,7 @@ export abstract class AuthService extends Service {
376
385
  id: user?.id || null,
377
386
  username: user?.username || null,
378
387
  role: user?.role || null,
388
+ email: user?.email || null, // include email
379
389
  databaseId: user?.databaseId || null, // databaseId eklendi
380
390
  databases: user?.databases || null // databases eklendi
381
391
  }