lansenger-sdk-ts 1.1.1 → 1.2.0
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/auth.d.ts +3 -1
- package/dist/auth.js +15 -4
- package/dist/client.js +2 -2
- package/dist/persistence.d.ts +1 -1
- package/dist/persistence.js +5 -2
- package/package.json +1 -1
package/dist/auth.d.ts
CHANGED
|
@@ -19,11 +19,13 @@ export declare class UserTokenManager {
|
|
|
19
19
|
private userToken;
|
|
20
20
|
private refreshToken;
|
|
21
21
|
private userTokenExpiry;
|
|
22
|
+
private refreshTokenExpiry;
|
|
22
23
|
private staffId;
|
|
23
24
|
constructor(config: LansengerConfig, fetchFn: FetchFn, appTokenManager: TokenManager, store?: CredentialStore | null);
|
|
24
25
|
getToken(): Promise<string>;
|
|
25
|
-
setTokens(userToken: string, refreshToken: string, expiresIn?: number, staffId?: string): void;
|
|
26
|
+
setTokens(userToken: string, refreshToken: string, expiresIn?: number, staffId?: string, refreshExpiresIn?: number): void;
|
|
26
27
|
get staff_id(): string | null;
|
|
27
28
|
get refresh_token(): string | null;
|
|
29
|
+
get refresh_token_expiry(): number;
|
|
28
30
|
invalidate(): void;
|
|
29
31
|
}
|
package/dist/auth.js
CHANGED
|
@@ -74,6 +74,7 @@ class UserTokenManager {
|
|
|
74
74
|
this.userToken = null;
|
|
75
75
|
this.refreshToken = null;
|
|
76
76
|
this.userTokenExpiry = 0;
|
|
77
|
+
this.refreshTokenExpiry = 0;
|
|
77
78
|
this.staffId = null;
|
|
78
79
|
this.config = config;
|
|
79
80
|
this.fetchFn = fetchFn;
|
|
@@ -88,6 +89,7 @@ class UserTokenManager {
|
|
|
88
89
|
this.userToken = ut;
|
|
89
90
|
this.refreshToken = rt;
|
|
90
91
|
this.userTokenExpiry = expiry;
|
|
92
|
+
this.refreshTokenExpiry = cached.refresh_token_expiry || 0;
|
|
91
93
|
}
|
|
92
94
|
}
|
|
93
95
|
}
|
|
@@ -117,14 +119,18 @@ class UserTokenManager {
|
|
|
117
119
|
const tokenData = data.data || {};
|
|
118
120
|
this.userToken = tokenData.userToken;
|
|
119
121
|
const expiresIn = tokenData.expiresIn || 7200;
|
|
120
|
-
|
|
122
|
+
const newRefreshToken = tokenData.refreshToken;
|
|
123
|
+
if (newRefreshToken) {
|
|
124
|
+
this.refreshToken = newRefreshToken;
|
|
125
|
+
}
|
|
121
126
|
this.staffId = tokenData.staffId;
|
|
122
127
|
this.userTokenExpiry = Math.floor(Date.now() / 1000) + expiresIn - USER_TOKEN_REFRESH_MARGIN;
|
|
123
128
|
if (!this.userToken) {
|
|
124
129
|
throw new exceptions_1.LansengerAuthError("Refresh response missing userToken field");
|
|
125
130
|
}
|
|
126
131
|
if (this.store) {
|
|
127
|
-
|
|
132
|
+
const refreshExpiresIn = tokenData.refreshExpiresIn || 0;
|
|
133
|
+
this.store.saveUserToken(this.userToken, this.refreshToken || "", expiresIn, USER_TOKEN_REFRESH_MARGIN, refreshExpiresIn);
|
|
128
134
|
}
|
|
129
135
|
return this.userToken;
|
|
130
136
|
}
|
|
@@ -134,14 +140,16 @@ class UserTokenManager {
|
|
|
134
140
|
throw new exceptions_1.LansengerNetworkError(`userToken refresh failed: ${e instanceof Error ? e.message : String(e)}`);
|
|
135
141
|
}
|
|
136
142
|
}
|
|
137
|
-
setTokens(userToken, refreshToken, expiresIn = 7200, staffId = "") {
|
|
143
|
+
setTokens(userToken, refreshToken, expiresIn = 7200, staffId = "", refreshExpiresIn = 0) {
|
|
138
144
|
this.userToken = userToken;
|
|
139
145
|
this.refreshToken = refreshToken;
|
|
140
146
|
this.userTokenExpiry = Math.floor(Date.now() / 1000) + expiresIn - USER_TOKEN_REFRESH_MARGIN;
|
|
147
|
+
if (refreshExpiresIn)
|
|
148
|
+
this.refreshTokenExpiry = Math.floor(Date.now() / 1000) + refreshExpiresIn;
|
|
141
149
|
if (staffId)
|
|
142
150
|
this.staffId = staffId;
|
|
143
151
|
if (this.store) {
|
|
144
|
-
this.store.saveUserToken(userToken, refreshToken, expiresIn);
|
|
152
|
+
this.store.saveUserToken(userToken, refreshToken, expiresIn, USER_TOKEN_REFRESH_MARGIN, refreshExpiresIn);
|
|
145
153
|
}
|
|
146
154
|
}
|
|
147
155
|
get staff_id() {
|
|
@@ -150,6 +158,9 @@ class UserTokenManager {
|
|
|
150
158
|
get refresh_token() {
|
|
151
159
|
return this.refreshToken;
|
|
152
160
|
}
|
|
161
|
+
get refresh_token_expiry() {
|
|
162
|
+
return this.refreshTokenExpiry;
|
|
163
|
+
}
|
|
153
164
|
invalidate() {
|
|
154
165
|
this.userToken = null;
|
|
155
166
|
this.userTokenExpiry = 0;
|
package/dist/client.js
CHANGED
|
@@ -432,9 +432,9 @@ class LansengerClient {
|
|
|
432
432
|
const result = await (0, oauth_1.exchangeCodeForUserToken)(this._config, token, code, { redirect_uri: opts?.redirect_uri, fetchFn: this._fetchFn });
|
|
433
433
|
if (result.success) {
|
|
434
434
|
if (this._store) {
|
|
435
|
-
this._store.saveUserToken(result.user_token || "", result.refresh_token || "", result.expires_in);
|
|
435
|
+
this._store.saveUserToken(result.user_token || "", result.refresh_token || "", result.expires_in, undefined, result.refresh_expires_in || 0);
|
|
436
436
|
}
|
|
437
|
-
this._userTokenManager.setTokens(result.user_token || "", result.refresh_token || "", result.expires_in, result.staff_id || "");
|
|
437
|
+
this._userTokenManager.setTokens(result.user_token || "", result.refresh_token || "", result.expires_in, result.staff_id || "", result.refresh_expires_in || 0);
|
|
438
438
|
}
|
|
439
439
|
return result;
|
|
440
440
|
}
|
package/dist/persistence.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export declare class CredentialStore {
|
|
|
15
15
|
loadAppToken(): string | null;
|
|
16
16
|
saveAppToken(token: string, expiresIn?: number, margin?: number): void;
|
|
17
17
|
loadUserToken(): Record<string, any>;
|
|
18
|
-
saveUserToken(userToken: string, refreshToken?: string, expiresIn?: number): void;
|
|
18
|
+
saveUserToken(userToken: string, refreshToken?: string, expiresIn?: number, margin?: number, refreshExpiresIn?: number): void;
|
|
19
19
|
clearProfile(): void;
|
|
20
20
|
clear(): void;
|
|
21
21
|
listProfiles(): string[];
|
package/dist/persistence.js
CHANGED
|
@@ -160,15 +160,18 @@ class CredentialStore {
|
|
|
160
160
|
user_token: data.user_token || "",
|
|
161
161
|
refresh_token: data.refresh_token || "",
|
|
162
162
|
user_token_expiry: data.user_token_expiry || 0,
|
|
163
|
+
refresh_token_expiry: data.refresh_token_expiry || 0,
|
|
163
164
|
};
|
|
164
165
|
}
|
|
165
|
-
saveUserToken(userToken, refreshToken = "", expiresIn = 0) {
|
|
166
|
+
saveUserToken(userToken, refreshToken = "", expiresIn = 0, margin = 300, refreshExpiresIn = 0) {
|
|
166
167
|
const state = this.load();
|
|
167
168
|
const data = this.getProfileData(state);
|
|
168
169
|
data.user_token = userToken;
|
|
169
170
|
data.refresh_token = refreshToken;
|
|
170
171
|
if (expiresIn)
|
|
171
|
-
data.user_token_expiry = Date.now() / 1000 + expiresIn;
|
|
172
|
+
data.user_token_expiry = Date.now() / 1000 + expiresIn - margin;
|
|
173
|
+
if (refreshExpiresIn)
|
|
174
|
+
data.refresh_token_expiry = Date.now() / 1000 + refreshExpiresIn;
|
|
172
175
|
this.save(this.setProfileData(state, data));
|
|
173
176
|
}
|
|
174
177
|
clearProfile() {
|