rez_core 6.5.11 → 6.5.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.
- package/dist/module/user/entity/user-session.entity.js +2 -3
- package/dist/module/user/entity/user-session.entity.js.map +1 -1
- package/dist/module/user/repository/userSession.repository.d.ts +1 -0
- package/dist/module/user/repository/userSession.repository.js +3 -0
- package/dist/module/user/repository/userSession.repository.js.map +1 -1
- package/dist/module/user/service/user-session.service.d.ts +1 -0
- package/dist/module/user/service/user-session.service.js +4 -1
- package/dist/module/user/service/user-session.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/user/entity/user-session.entity.ts +3 -4
- package/src/module/user/repository/userSession.repository.ts +5 -1
- package/src/module/user/service/user-session.service.ts +8 -3
|
@@ -35,9 +35,8 @@ __decorate([
|
|
|
35
35
|
__metadata("design:type", String)
|
|
36
36
|
], UserSession.prototype, "login_id", void 0);
|
|
37
37
|
__decorate([
|
|
38
|
-
(0, typeorm_1.
|
|
39
|
-
name: 'login_time'
|
|
40
|
-
nullable: true,
|
|
38
|
+
(0, typeorm_1.CreateDateColumn)({
|
|
39
|
+
name: 'login_time'
|
|
41
40
|
}),
|
|
42
41
|
__metadata("design:type", Date)
|
|
43
42
|
], UserSession.prototype, "login_time", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-session.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user-session.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"user-session.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user-session.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAmF;AAG5E,IAAM,WAAW,GAAjB,MAAM,WAAW;CAoEvB,CAAA;AApEY,kCAAW;AAEtB;IADC,IAAA,gCAAsB,GAAE;;uCACd;AAOX;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,sBAAsB;QAC5B,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,KAAK;KACZ,CAAC;;yDAC2B;AAO7B;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,EAAE;KACX,CAAC;;6CACe;AAKjB;IAHC,IAAA,0BAAgB,EAAC;QAChB,IAAI,EAAE,YAAY;KACnB,CAAC;8BACU,IAAI;+CAAC;AAMjB;IAJC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;KACf,CAAC;8BACW,IAAI;gDAAC;AAOlB;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,GAAG;KACZ,CAAC;;gDACkB;AAOpB;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,QAAQ;KACf,CAAC;;4CACc;AAQhB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,IAAI;KACb,CAAC;;iDACmB;AAMrB;IAJC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;KACf,CAAC;8BACW,IAAI;gDAAC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC1B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACjC;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACjC;sBAnEA,WAAW;IADvB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;GACxB,WAAW,CAoEvB"}
|
|
@@ -6,5 +6,6 @@ export declare class UserSessionRepository {
|
|
|
6
6
|
findBySessionKey(sessionKey: string): Promise<UserSession | null>;
|
|
7
7
|
findActiveSessionByUserId(userId: number): Promise<UserSession | null>;
|
|
8
8
|
saveSession(session: UserSession): Promise<UserSession>;
|
|
9
|
+
fetchUserFcmToken(user_id: number): Promise<UserSession | null>;
|
|
9
10
|
logoutSession(sessionKey: string): Promise<void>;
|
|
10
11
|
}
|
|
@@ -32,6 +32,9 @@ let UserSessionRepository = class UserSessionRepository {
|
|
|
32
32
|
async saveSession(session) {
|
|
33
33
|
return this.userSessionRepo.save(session);
|
|
34
34
|
}
|
|
35
|
+
async fetchUserFcmToken(user_id) {
|
|
36
|
+
return await this.userSessionRepo.findOne({ where: { user_id }, select: ['fcm_token'], order: { login_time: 'DESC' } });
|
|
37
|
+
}
|
|
35
38
|
async logoutSession(sessionKey) {
|
|
36
39
|
await this.userSessionRepo.update({ session_key: sessionKey }, { is_session_loggedout: 1, logout_time: new Date() });
|
|
37
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userSession.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/userSession.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,uEAA4D;AAC5D,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAEU,eAAwC;QAAxC,oBAAe,GAAf,eAAe,CAAyB;
|
|
1
|
+
{"version":3,"file":"userSession.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/userSession.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,uEAA4D;AAC5D,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAEU,eAAwC;QAAxC,oBAAe,GAAf,eAAe,CAAyB;IAC9C,CAAC;IAEL,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC5C,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAClC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAoB;QACpC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAe;QACrC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC1H,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB;QACpC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAC/B,EAAE,WAAW,EAAE,UAAU,EAAE,EAC3B,EAAE,oBAAoB,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,EAAE,CACrD,CAAC;IACJ,CAAC;CACF,CAAA;AA9BY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACL,oBAAU;GAH1B,qBAAqB,CA8BjC"}
|
|
@@ -19,6 +19,7 @@ export declare class UserSessionService {
|
|
|
19
19
|
createSession(user: any, app_id?: number, accessInfo?: any, appcode?: string): Promise<string>;
|
|
20
20
|
findBySessionKey(sessionKey: string): Promise<UserSession | null>;
|
|
21
21
|
updateSession(userSession: UserSession): Promise<void>;
|
|
22
|
+
fetchUserFcmToken(user_id: number): Promise<UserSession | null>;
|
|
22
23
|
switchCurrentLevelService(currentUser: any, data: any): Promise<{
|
|
23
24
|
success: boolean;
|
|
24
25
|
accessToken: string;
|
|
@@ -40,7 +40,6 @@ let UserSessionService = class UserSessionService {
|
|
|
40
40
|
userSession.user_id = user.id;
|
|
41
41
|
userSession.session_key = sessionToken;
|
|
42
42
|
userSession.is_session_loggedout = 0;
|
|
43
|
-
userSession.login_time = new Date();
|
|
44
43
|
const expiryTokenInHours = this.configService.get('TOKEN_EXPIRY') || 1;
|
|
45
44
|
userSession.expiry_date = new Date(Date.now() + expiryTokenInHours * 60 * 60 * 1000);
|
|
46
45
|
await this.userSessionRepository.saveSession(userSession);
|
|
@@ -68,6 +67,10 @@ let UserSessionService = class UserSessionService {
|
|
|
68
67
|
async updateSession(userSession) {
|
|
69
68
|
await this.userSessionRepository.saveSession(userSession);
|
|
70
69
|
}
|
|
70
|
+
async fetchUserFcmToken(user_id) {
|
|
71
|
+
return await this.userSessionRepository.fetchUserFcmToken(user_id);
|
|
72
|
+
}
|
|
73
|
+
;
|
|
71
74
|
async switchCurrentLevelService(currentUser, data) {
|
|
72
75
|
let payload;
|
|
73
76
|
payload = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-session.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA4D;AAC5D,0FAAkF;AAClF,2CAAiE;AACjE,iFAA6E;AAC7E,iEAAsE;AACtE,2CAA+C;AAE/C,qCAAiD;AACjD,iFAAqE;AACrE,uDAAiD;AACjD,6CAAmD;AACnD,gGAAoF;AAG7E,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YACmB,qBAA4C,EAC5C,cAA8B,EAC9B,iBAAoC,EAC7C,aAA4B,EAEnB,kBAAwC,EAExC,yBAAsD,EACtD,gBAAkC;QARlC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QAC7C,kBAAa,GAAb,aAAa,CAAe;QAEnB,uBAAkB,GAAlB,kBAAkB,CAAsB;QAExC,8BAAyB,GAAzB,yBAAyB,CAA6B;QACtD,qBAAgB,GAAhB,gBAAgB,CAAkB;
|
|
1
|
+
{"version":3,"file":"user-session.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-session.service.ts"],"names":[],"mappings":"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"}
|