@oxyhq/services 5.10.2 → 5.10.4
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/lib/commonjs/core/OxyServices.js +10 -1
- package/lib/commonjs/core/OxyServices.js.map +1 -1
- package/lib/commonjs/core/auth/AuthService.js +11 -1
- package/lib/commonjs/core/auth/AuthService.js.map +1 -1
- package/lib/module/core/OxyServices.js +10 -1
- package/lib/module/core/OxyServices.js.map +1 -1
- package/lib/module/core/auth/AuthService.js +11 -1
- package/lib/module/core/auth/AuthService.js.map +1 -1
- package/lib/typescript/core/OxyServices.d.ts.map +1 -1
- package/lib/typescript/core/auth/AuthService.d.ts +1 -1
- package/lib/typescript/core/auth/AuthService.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/core/OxyServices.ts +13 -4
- package/src/core/auth/AuthService.ts +12 -2
|
@@ -63,14 +63,21 @@ class OxyServices {
|
|
|
63
63
|
setupInterceptors() {
|
|
64
64
|
// Request interceptor for adding auth header and handling token refresh
|
|
65
65
|
this.client.interceptors.request.use(async req => {
|
|
66
|
+
console.log('🔍 Interceptor - URL:', req.url);
|
|
67
|
+
console.log('🔍 Interceptor - Has token:', this.tokenStore.hasAccessToken());
|
|
66
68
|
if (!this.tokenStore.hasAccessToken()) {
|
|
69
|
+
console.log('❌ Interceptor - No token available');
|
|
67
70
|
return req;
|
|
68
71
|
}
|
|
69
72
|
|
|
70
73
|
// Check if token is expired and refresh if needed
|
|
71
74
|
try {
|
|
72
75
|
const accessToken = this.tokenStore.getAccessToken();
|
|
73
|
-
if (!accessToken)
|
|
76
|
+
if (!accessToken) {
|
|
77
|
+
console.log('❌ Interceptor - No access token');
|
|
78
|
+
return req;
|
|
79
|
+
}
|
|
80
|
+
console.log('✅ Interceptor - Adding Authorization header');
|
|
74
81
|
const decoded = (0, _jwtDecode.jwtDecode)(accessToken);
|
|
75
82
|
const currentTime = Math.floor(Date.now() / 1000);
|
|
76
83
|
|
|
@@ -92,8 +99,10 @@ class OxyServices {
|
|
|
92
99
|
const currentToken = this.tokenStore.getAccessToken();
|
|
93
100
|
if (currentToken) {
|
|
94
101
|
req.headers.Authorization = `Bearer ${currentToken}`;
|
|
102
|
+
console.log('✅ Interceptor - Authorization header set');
|
|
95
103
|
}
|
|
96
104
|
} catch (error) {
|
|
105
|
+
console.log('❌ Interceptor - Error processing token:', error);
|
|
97
106
|
// If token is invalid, clear it
|
|
98
107
|
this.clearTokens();
|
|
99
108
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_axios","_interopRequireDefault","require","_jwtDecode","_errorUtils","e","__esModule","default","TokenStore","accessToken","refreshToken","constructor","getInstance","instance","setTokens","getAccessToken","getRefreshToken","clearTokens","hasAccessToken","OxyServices","config","client","axios","create","baseURL","timeout","tokenStore","setupInterceptors","interceptors","request","use","req","decoded","jwtDecode","currentTime","Math","floor","Date","now","exp","sessionId","res","get","data","refreshError","currentToken","headers","Authorization","error","getBaseURL","defaults","getCurrentUserId","userId","id","validate","valid","getClient","handleError","handleHttpError","healthCheck","auth","options","debug","onError","loadUser","session","next","authHeader","token","startsWith","substring","
|
|
1
|
+
{"version":3,"names":["_axios","_interopRequireDefault","require","_jwtDecode","_errorUtils","e","__esModule","default","TokenStore","accessToken","refreshToken","constructor","getInstance","instance","setTokens","getAccessToken","getRefreshToken","clearTokens","hasAccessToken","OxyServices","config","client","axios","create","baseURL","timeout","tokenStore","setupInterceptors","interceptors","request","use","req","console","log","url","decoded","jwtDecode","currentTime","Math","floor","Date","now","exp","sessionId","res","get","data","refreshError","currentToken","headers","Authorization","error","getBaseURL","defaults","getCurrentUserId","userId","id","validate","valid","getClient","handleError","handleHttpError","healthCheck","auth","options","debug","onError","loadUser","session","next","authHeader","token","startsWith","substring","method","path","message","code","status","json","decodeError","user","apiError","exports"],"sourceRoot":"../../../src","sources":["core/OxyServices.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -56,13 +56,23 @@ class AuthService extends _OxyServices.OxyServices {
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
/**
|
|
59
|
-
* Get access token by session ID
|
|
59
|
+
* Get access token by session ID and set it in the token store
|
|
60
60
|
*/
|
|
61
61
|
async getTokenBySession(sessionId) {
|
|
62
62
|
try {
|
|
63
|
+
console.log('🔑 getTokenBySession - Fetching token for session:', sessionId);
|
|
63
64
|
const res = await this.getClient().get(`/api/session/token/${sessionId}`);
|
|
65
|
+
const {
|
|
66
|
+
accessToken
|
|
67
|
+
} = res.data;
|
|
68
|
+
console.log('🔑 getTokenBySession - Token received:', !!accessToken);
|
|
69
|
+
|
|
70
|
+
// Set the token in the centralized token store
|
|
71
|
+
this.setTokens(accessToken);
|
|
72
|
+
console.log('🔑 getTokenBySession - Token set in store');
|
|
64
73
|
return res.data;
|
|
65
74
|
} catch (error) {
|
|
75
|
+
console.log('❌ getTokenBySession - Error:', error);
|
|
66
76
|
throw this.handleError(error);
|
|
67
77
|
}
|
|
68
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_jwtDecode","require","_OxyServices","AuthService","OxyServices","signUp","username","email","password","res","getClient","post","data","error","handleError","signIn","deviceName","deviceFingerprint","getUserBySession","sessionId","get","getTokenBySession","getSessionsBySessionId","logoutSession","targetSessionId","delete","logoutAllSessions","validateSession","options","useHeaderValidation","headers","source","authenticateToken","loadFullUser","onError","debug","req","next","startTime","Date","now","authHeader","token","startsWith","substring","console","log","method","path","message","code","status","json","decoded","jwtDecode","userId","id","decodeError","isValid","user","validation","valid","sessionError","validate","validationError","accessToken","duration","apiError","validateToken","undefined","Error","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","put","checkUsernameAvailability","response","warn","available","checkEmailAvailability","exports"],"sourceRoot":"../../../../src","sources":["core/auth/AuthService.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_jwtDecode","require","_OxyServices","AuthService","OxyServices","signUp","username","email","password","res","getClient","post","data","error","handleError","signIn","deviceName","deviceFingerprint","getUserBySession","sessionId","get","getTokenBySession","console","log","accessToken","setTokens","getSessionsBySessionId","logoutSession","targetSessionId","delete","logoutAllSessions","validateSession","options","useHeaderValidation","headers","source","authenticateToken","loadFullUser","onError","debug","req","next","startTime","Date","now","authHeader","token","startsWith","substring","method","path","message","code","status","json","decoded","jwtDecode","userId","id","decodeError","isValid","user","validation","valid","sessionError","validate","validationError","duration","apiError","validateToken","undefined","Error","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","put","checkUsernameAvailability","response","warn","available","checkEmailAvailability","exports"],"sourceRoot":"../../../../src","sources":["core/auth/AuthService.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -58,14 +58,21 @@ export class OxyServices {
|
|
|
58
58
|
setupInterceptors() {
|
|
59
59
|
// Request interceptor for adding auth header and handling token refresh
|
|
60
60
|
this.client.interceptors.request.use(async req => {
|
|
61
|
+
console.log('🔍 Interceptor - URL:', req.url);
|
|
62
|
+
console.log('🔍 Interceptor - Has token:', this.tokenStore.hasAccessToken());
|
|
61
63
|
if (!this.tokenStore.hasAccessToken()) {
|
|
64
|
+
console.log('❌ Interceptor - No token available');
|
|
62
65
|
return req;
|
|
63
66
|
}
|
|
64
67
|
|
|
65
68
|
// Check if token is expired and refresh if needed
|
|
66
69
|
try {
|
|
67
70
|
const accessToken = this.tokenStore.getAccessToken();
|
|
68
|
-
if (!accessToken)
|
|
71
|
+
if (!accessToken) {
|
|
72
|
+
console.log('❌ Interceptor - No access token');
|
|
73
|
+
return req;
|
|
74
|
+
}
|
|
75
|
+
console.log('✅ Interceptor - Adding Authorization header');
|
|
69
76
|
const decoded = jwtDecode(accessToken);
|
|
70
77
|
const currentTime = Math.floor(Date.now() / 1000);
|
|
71
78
|
|
|
@@ -87,8 +94,10 @@ export class OxyServices {
|
|
|
87
94
|
const currentToken = this.tokenStore.getAccessToken();
|
|
88
95
|
if (currentToken) {
|
|
89
96
|
req.headers.Authorization = `Bearer ${currentToken}`;
|
|
97
|
+
console.log('✅ Interceptor - Authorization header set');
|
|
90
98
|
}
|
|
91
99
|
} catch (error) {
|
|
100
|
+
console.log('❌ Interceptor - Error processing token:', error);
|
|
92
101
|
// If token is invalid, clear it
|
|
93
102
|
this.clearTokens();
|
|
94
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["axios","jwtDecode","handleHttpError","TokenStore","accessToken","refreshToken","constructor","getInstance","instance","setTokens","getAccessToken","getRefreshToken","clearTokens","hasAccessToken","OxyServices","config","client","create","baseURL","timeout","tokenStore","setupInterceptors","interceptors","request","use","req","decoded","currentTime","Math","floor","Date","now","exp","sessionId","res","get","data","refreshError","currentToken","headers","Authorization","error","getBaseURL","defaults","getCurrentUserId","userId","id","validate","valid","getClient","handleError","healthCheck","auth","options","debug","onError","loadUser","session","next","authHeader","token","startsWith","substring","
|
|
1
|
+
{"version":3,"names":["axios","jwtDecode","handleHttpError","TokenStore","accessToken","refreshToken","constructor","getInstance","instance","setTokens","getAccessToken","getRefreshToken","clearTokens","hasAccessToken","OxyServices","config","client","create","baseURL","timeout","tokenStore","setupInterceptors","interceptors","request","use","req","console","log","url","decoded","currentTime","Math","floor","Date","now","exp","sessionId","res","get","data","refreshError","currentToken","headers","Authorization","error","getBaseURL","defaults","getCurrentUserId","userId","id","validate","valid","getClient","handleError","healthCheck","auth","options","debug","onError","loadUser","session","next","authHeader","token","startsWith","substring","method","path","message","code","status","json","decodeError","user","apiError"],"sourceRoot":"../../../src","sources":["core/OxyServices.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -52,13 +52,23 @@ export class AuthService extends OxyServices {
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
/**
|
|
55
|
-
* Get access token by session ID
|
|
55
|
+
* Get access token by session ID and set it in the token store
|
|
56
56
|
*/
|
|
57
57
|
async getTokenBySession(sessionId) {
|
|
58
58
|
try {
|
|
59
|
+
console.log('🔑 getTokenBySession - Fetching token for session:', sessionId);
|
|
59
60
|
const res = await this.getClient().get(`/api/session/token/${sessionId}`);
|
|
61
|
+
const {
|
|
62
|
+
accessToken
|
|
63
|
+
} = res.data;
|
|
64
|
+
console.log('🔑 getTokenBySession - Token received:', !!accessToken);
|
|
65
|
+
|
|
66
|
+
// Set the token in the centralized token store
|
|
67
|
+
this.setTokens(accessToken);
|
|
68
|
+
console.log('🔑 getTokenBySession - Token set in store');
|
|
60
69
|
return res.data;
|
|
61
70
|
} catch (error) {
|
|
71
|
+
console.log('❌ getTokenBySession - Error:', error);
|
|
62
72
|
throw this.handleError(error);
|
|
63
73
|
}
|
|
64
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["jwtDecode","OxyServices","AuthService","signUp","username","email","password","res","getClient","post","data","error","handleError","signIn","deviceName","deviceFingerprint","getUserBySession","sessionId","get","getTokenBySession","getSessionsBySessionId","logoutSession","targetSessionId","delete","logoutAllSessions","validateSession","options","useHeaderValidation","headers","source","authenticateToken","loadFullUser","onError","debug","req","next","startTime","Date","now","authHeader","token","startsWith","substring","console","log","method","path","message","code","status","json","decoded","userId","id","decodeError","isValid","user","validation","valid","sessionError","validate","validationError","accessToken","duration","apiError","validateToken","undefined","Error","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","put","checkUsernameAvailability","response","warn","available","checkEmailAvailability"],"sourceRoot":"../../../../src","sources":["core/auth/AuthService.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["jwtDecode","OxyServices","AuthService","signUp","username","email","password","res","getClient","post","data","error","handleError","signIn","deviceName","deviceFingerprint","getUserBySession","sessionId","get","getTokenBySession","console","log","accessToken","setTokens","getSessionsBySessionId","logoutSession","targetSessionId","delete","logoutAllSessions","validateSession","options","useHeaderValidation","headers","source","authenticateToken","loadFullUser","onError","debug","req","next","startTime","Date","now","authHeader","token","startsWith","substring","method","path","message","code","status","json","decoded","userId","id","decodeError","isValid","user","validation","valid","sessionError","validate","validationError","duration","apiError","validateToken","undefined","Error","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","put","checkUsernameAvailability","response","warn","available","checkEmailAvailability"],"sourceRoot":"../../../../src","sources":["core/auth/AuthService.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OxyServices.d.ts","sourceRoot":"","sources":["../../../src/core/OxyServices.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAA8B,MAAM,OAAO,CAAC;AAEzE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAQ,MAAM,sBAAsB,CAAC;AAsDjE,qBAAa,WAAW;IACtB,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC;IAChC,OAAO,CAAC,UAAU,CAAa;IAE/B;;;OAGG;gBACS,MAAM,EAAE,SAAS;IAU7B;;OAEG;IACH,OAAO,CAAC,iBAAiB;
|
|
1
|
+
{"version":3,"file":"OxyServices.d.ts","sourceRoot":"","sources":["../../../src/core/OxyServices.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAA8B,MAAM,OAAO,CAAC;AAEzE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAQ,MAAM,sBAAsB,CAAC;AAsDjE,qBAAa,WAAW;IACtB,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC;IAChC,OAAO,CAAC,UAAU,CAAa;IAE/B;;;OAGG;gBACS,MAAM,EAAE,SAAS;IAU7B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAsDzB;;OAEG;IACI,UAAU,IAAI,MAAM;IAI3B;;OAEG;IACI,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,GAAE,MAAW,GAAG,IAAI;IAItE;;OAEG;IACI,WAAW,IAAI,IAAI;IAI1B;;OAEG;IACI,gBAAgB,IAAI,MAAM,GAAG,IAAI;IAcxC;;OAEG;IACH,OAAO,CAAC,cAAc;IAItB;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAalC;;OAEG;IACH,SAAS,CAAC,SAAS,IAAI,aAAa;IAIpC;;OAEG;IACH,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,QAAQ;IAI3C;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC;QAC3B,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KACnB,CAAC;IASF;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,IAAI,CAAC,OAAO,GAAE;QACZ,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,GAAG,CAAC;QACnC,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;KACd,IAII,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,GAAG;CAkGxC"}
|
|
@@ -22,7 +22,7 @@ export declare class AuthService extends OxyServices {
|
|
|
22
22
|
*/
|
|
23
23
|
getUserBySession(sessionId: string): Promise<User>;
|
|
24
24
|
/**
|
|
25
|
-
* Get access token by session ID
|
|
25
|
+
* Get access token by session ID and set it in the token store
|
|
26
26
|
*/
|
|
27
27
|
getTokenBySession(sessionId: string): Promise<{
|
|
28
28
|
accessToken: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthService.d.ts","sourceRoot":"","sources":["../../../../src/core/auth/AuthService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAiB,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAU5D;;GAEG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAC1C;;OAEG;IACG,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,IAAI,CAAA;KAAE,CAAC;IAaxH;;OAEG;IACG,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAc7H;;OAEG;IACG,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASxD;;OAEG;IACG,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthService.d.ts","sourceRoot":"","sources":["../../../../src/core/auth/AuthService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAiB,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAU5D;;GAEG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAC1C;;OAEG;IACG,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,IAAI,CAAA;KAAE,CAAC;IAaxH;;OAEG;IACG,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAc7H;;OAEG;IACG,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASxD;;OAEG;IACG,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAmB/F;;OAEG;IACG,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAS/D;;OAEG;IACG,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU/E;;OAEG;IACG,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQzD;;;;;;;;;;;;;;;;;;;;OAoBG;IACG,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QACP,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAC;KAC1B,GACL,OAAO,CAAC;QACT,KAAK,EAAE,OAAO,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,IAAI,CAAC;QACX,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IA0BF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+BG;IACH,iBAAiB,CAAC,OAAO,GAAE;QACzB,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,GAAG,CAAC;QACnC,KAAK,CAAC,EAAE,OAAO,CAAC;KACZ,IAGU,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,GAAG;IAqJ7C;;;;;;;;;;;;;;;;;;;OAmBG;IACG,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAC1C,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IAoFF;;OAEG;IACG,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAS1D;;OAEG;IACG,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ/D;;OAEG;IACG,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ5E;;OAEG;IACG,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAoBnG;;OAEG;IACG,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAsB9F"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oxyhq/services",
|
|
3
|
-
"version": "5.10.
|
|
3
|
+
"version": "5.10.4",
|
|
4
4
|
"description": "Reusable OxyHQ module to handle authentication, user management, karma system, device-based session management and more 🚀",
|
|
5
5
|
"main": "lib/commonjs/index.js",
|
|
6
6
|
"module": "lib/module/index.js",
|
package/src/core/OxyServices.ts
CHANGED
|
@@ -78,14 +78,23 @@ export class OxyServices {
|
|
|
78
78
|
private setupInterceptors(): void {
|
|
79
79
|
// Request interceptor for adding auth header and handling token refresh
|
|
80
80
|
this.client.interceptors.request.use(async (req: InternalAxiosRequestConfig) => {
|
|
81
|
+
console.log('🔍 Interceptor - URL:', req.url);
|
|
82
|
+
console.log('🔍 Interceptor - Has token:', this.tokenStore.hasAccessToken());
|
|
83
|
+
|
|
81
84
|
if (!this.tokenStore.hasAccessToken()) {
|
|
85
|
+
console.log('❌ Interceptor - No token available');
|
|
82
86
|
return req;
|
|
83
87
|
}
|
|
84
88
|
|
|
85
89
|
// Check if token is expired and refresh if needed
|
|
86
90
|
try {
|
|
87
91
|
const accessToken = this.tokenStore.getAccessToken();
|
|
88
|
-
if (!accessToken)
|
|
92
|
+
if (!accessToken) {
|
|
93
|
+
console.log('❌ Interceptor - No access token');
|
|
94
|
+
return req;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
console.log('✅ Interceptor - Adding Authorization header');
|
|
89
98
|
|
|
90
99
|
const decoded = jwtDecode<JwtPayload>(accessToken);
|
|
91
100
|
const currentTime = Math.floor(Date.now() / 1000);
|
|
@@ -108,8 +117,10 @@ export class OxyServices {
|
|
|
108
117
|
const currentToken = this.tokenStore.getAccessToken();
|
|
109
118
|
if (currentToken) {
|
|
110
119
|
req.headers.Authorization = `Bearer ${currentToken}`;
|
|
120
|
+
console.log('✅ Interceptor - Authorization header set');
|
|
111
121
|
}
|
|
112
122
|
} catch (error) {
|
|
123
|
+
console.log('❌ Interceptor - Error processing token:', error);
|
|
113
124
|
// If token is invalid, clear it
|
|
114
125
|
this.clearTokens();
|
|
115
126
|
}
|
|
@@ -346,6 +357,4 @@ export class OxyServices {
|
|
|
346
357
|
}
|
|
347
358
|
};
|
|
348
359
|
}
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
}
|
|
360
|
+
}
|
|
@@ -61,13 +61,23 @@ export class AuthService extends OxyServices {
|
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
/**
|
|
64
|
-
* Get access token by session ID
|
|
64
|
+
* Get access token by session ID and set it in the token store
|
|
65
65
|
*/
|
|
66
66
|
async getTokenBySession(sessionId: string): Promise<{ accessToken: string; expiresAt: string }> {
|
|
67
67
|
try {
|
|
68
|
+
console.log('🔑 getTokenBySession - Fetching token for session:', sessionId);
|
|
68
69
|
const res = await this.getClient().get(`/api/session/token/${sessionId}`);
|
|
70
|
+
const { accessToken } = res.data;
|
|
71
|
+
|
|
72
|
+
console.log('🔑 getTokenBySession - Token received:', !!accessToken);
|
|
73
|
+
|
|
74
|
+
// Set the token in the centralized token store
|
|
75
|
+
this.setTokens(accessToken);
|
|
76
|
+
console.log('🔑 getTokenBySession - Token set in store');
|
|
77
|
+
|
|
69
78
|
return res.data;
|
|
70
79
|
} catch (error) {
|
|
80
|
+
console.log('❌ getTokenBySession - Error:', error);
|
|
71
81
|
throw this.handleError(error);
|
|
72
82
|
}
|
|
73
83
|
}
|
|
@@ -547,4 +557,4 @@ export class AuthService extends OxyServices {
|
|
|
547
557
|
|
|
548
558
|
// Note: getUserById and getUserProfileByUsername methods have been moved to UserService
|
|
549
559
|
// Use oxyServices.users.getUserById() and oxyServices.users.getProfileByUsername() instead
|
|
550
|
-
}
|
|
560
|
+
}
|