meet-my-ride 1.5.18 → 1.5.20
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/client.d.ts +0 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +20 -34
- package/dist/client.js.map +1 -1
- package/package.json +1 -1
package/dist/client.d.ts
CHANGED
|
@@ -4,7 +4,6 @@ import { AuthService } from "./services/auth/auth.service";
|
|
|
4
4
|
import MeetService from "./services/meet/meet.service";
|
|
5
5
|
export declare class MeetMyRideClient {
|
|
6
6
|
readonly http: AxiosInstance;
|
|
7
|
-
private readonly refreshHttp;
|
|
8
7
|
readonly user: UserService;
|
|
9
8
|
readonly auth: AuthService;
|
|
10
9
|
readonly meet: MeetService;
|
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAc,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAkC,MAAM,OAAO,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,WAAW,MAAM,8BAA8B,CAAC;AAIvD,qBAAa,gBAAgB;IACzB,SAAgB,IAAI,EAAE,aAAa,CAAC;IACpC,SAAgB,IAAI,EAAE,WAAW,CAAC;IAClC,SAAgB,IAAI,EAAE,WAAW,CAAC;IAClC,SAAgB,IAAI,EAAE,WAAW,CAAC;IAElC,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,YAAY,CAAsC;gBAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAmC5C,kDAAkD;IACrC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAQ5C,WAAW;YAuCX,kBAAkB;CAiBnC"}
|
package/dist/client.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import axios
|
|
1
|
+
import axios from "axios";
|
|
2
2
|
import { UserService } from "./services/user/user.service";
|
|
3
3
|
import { AuthService } from "./services/auth/auth.service";
|
|
4
4
|
import { TokenStorageService } from "./services/tokenstorage/tokenstorage";
|
|
@@ -9,35 +9,26 @@ export class MeetMyRideClient {
|
|
|
9
9
|
this.isRefreshing = false;
|
|
10
10
|
this.refreshQueue = [];
|
|
11
11
|
this.tokenStorage = new TokenStorageService();
|
|
12
|
-
// Main API client (with interceptors)
|
|
13
12
|
this.http = axios.create({
|
|
14
13
|
baseURL: baseUrl,
|
|
15
14
|
headers: { "Content-Type": "application/json" },
|
|
16
15
|
withCredentials: true
|
|
17
16
|
});
|
|
18
|
-
// Bare client for refresh (NO interceptors)
|
|
19
|
-
this.refreshHttp = axios.create({
|
|
20
|
-
baseURL: baseUrl,
|
|
21
|
-
headers: { "Content-Type": "application/json" },
|
|
22
|
-
withCredentials: true
|
|
23
|
-
});
|
|
24
17
|
if (apiKey) {
|
|
25
18
|
this.http.defaults.headers["Authorization"] = `Bearer ${apiKey}`;
|
|
26
19
|
}
|
|
27
|
-
//
|
|
20
|
+
// --- Request interceptor: attach token ---
|
|
28
21
|
this.http.interceptors.request.use(async (config) => {
|
|
29
22
|
const token = await this.tokenStorage.getAccessToken();
|
|
30
23
|
if (token) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
34
|
-
config.headers.set("Authorization", `Bearer ${token}`);
|
|
24
|
+
config.headers = config.headers ?? {};
|
|
25
|
+
config.headers["Authorization"] = `Bearer ${token}`;
|
|
35
26
|
}
|
|
36
27
|
return config;
|
|
37
28
|
});
|
|
38
|
-
//
|
|
29
|
+
// --- Response interceptor: handle 401 & refresh ---
|
|
39
30
|
this.http.interceptors.response.use(response => response, error => this.handleError(error));
|
|
40
|
-
// Services
|
|
31
|
+
// --- Services ---
|
|
41
32
|
this.user = new UserService(this.http);
|
|
42
33
|
this.auth = new AuthService(this.http, this.tokenStorage);
|
|
43
34
|
this.meet = new MeetService(this.http, this.tokenStorage);
|
|
@@ -54,9 +45,7 @@ export class MeetMyRideClient {
|
|
|
54
45
|
async handleError(error) {
|
|
55
46
|
const originalRequest = error.config;
|
|
56
47
|
const refreshToken = await this.tokenStorage.getRefreshToken();
|
|
57
|
-
if (error.response?.status === 401 &&
|
|
58
|
-
refreshToken &&
|
|
59
|
-
!originalRequest._retry) {
|
|
48
|
+
if (error.response?.status === 401 && refreshToken && !originalRequest._retry) {
|
|
60
49
|
originalRequest._retry = true;
|
|
61
50
|
if (!this.isRefreshing) {
|
|
62
51
|
this.isRefreshing = true;
|
|
@@ -64,28 +53,22 @@ export class MeetMyRideClient {
|
|
|
64
53
|
const newToken = await this.refreshAccessToken();
|
|
65
54
|
this.isRefreshing = false;
|
|
66
55
|
// Resume queued requests
|
|
67
|
-
this.refreshQueue.forEach(
|
|
68
|
-
config.headers ?? (config.headers = {});
|
|
69
|
-
config.headers["Authorization"] = `Bearer ${newToken}`;
|
|
70
|
-
resolve(this.http(config));
|
|
71
|
-
});
|
|
56
|
+
this.refreshQueue.forEach(cb => cb(newToken));
|
|
72
57
|
this.refreshQueue = [];
|
|
73
58
|
}
|
|
74
|
-
catch (
|
|
59
|
+
catch (refreshError) {
|
|
75
60
|
this.isRefreshing = false;
|
|
76
|
-
// Reject all queued requests
|
|
77
|
-
this.refreshQueue.forEach(({ reject }) => reject(err));
|
|
78
61
|
this.refreshQueue = [];
|
|
79
62
|
await this.tokenStorage.clear();
|
|
80
|
-
return Promise.reject(
|
|
63
|
+
return Promise.reject(refreshError);
|
|
81
64
|
}
|
|
82
65
|
}
|
|
83
|
-
// Queue the request
|
|
66
|
+
// Queue the request and clone config for safety
|
|
84
67
|
return new Promise((resolve, reject) => {
|
|
85
|
-
this.refreshQueue.push({
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
68
|
+
this.refreshQueue.push((token) => {
|
|
69
|
+
const retryConfig = { ...originalRequest }; // <-- clone
|
|
70
|
+
retryConfig.headers = { ...(retryConfig.headers ?? {}), Authorization: `Bearer ${token}` };
|
|
71
|
+
resolve(this.http(retryConfig));
|
|
89
72
|
});
|
|
90
73
|
});
|
|
91
74
|
}
|
|
@@ -95,11 +78,14 @@ export class MeetMyRideClient {
|
|
|
95
78
|
const refreshToken = await this.tokenStorage.getRefreshToken();
|
|
96
79
|
if (!refreshToken)
|
|
97
80
|
throw new Error("No refresh token available");
|
|
98
|
-
const res = await this.
|
|
81
|
+
const res = await this.http.post("/users/refresh", { refreshToken });
|
|
99
82
|
const { accessToken, refreshToken: newRefreshToken } = res.data;
|
|
100
83
|
await this.tokenStorage.setAccessToken(accessToken ?? "");
|
|
101
84
|
await this.tokenStorage.setRefreshToken(newRefreshToken ?? "");
|
|
102
|
-
|
|
85
|
+
// Update default Authorization header
|
|
86
|
+
if (accessToken) {
|
|
87
|
+
this.http.defaults.headers["Authorization"] = `Bearer ${accessToken}`;
|
|
88
|
+
}
|
|
103
89
|
return accessToken ?? "";
|
|
104
90
|
}
|
|
105
91
|
}
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|