@or-sdk/auth 0.24.9-beta.992.0 → 0.24.9-beta.993.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/cjs/AuthBase.js.map +1 -1
- package/dist/cjs/AuthCookieStorage.js +6 -6
- package/dist/cjs/AuthCookieStorage.js.map +1 -1
- package/dist/cjs/AuthForClient.js +88 -17
- package/dist/cjs/AuthForClient.js.map +1 -1
- package/dist/esm/AuthBase.js.map +1 -1
- package/dist/esm/AuthCookieStorage.js +6 -6
- package/dist/esm/AuthCookieStorage.js.map +1 -1
- package/dist/esm/AuthForClient.js +61 -8
- package/dist/esm/AuthForClient.js.map +1 -1
- package/dist/types/AuthBase.d.ts +2 -2
- package/dist/types/AuthBase.d.ts.map +1 -1
- package/dist/types/AuthCookieStorage.d.ts +3 -3
- package/dist/types/AuthCookieStorage.d.ts.map +1 -1
- package/dist/types/AuthForClient.d.ts +13 -7
- package/dist/types/AuthForClient.d.ts.map +1 -1
- package/dist/types/types.d.ts +6 -4
- package/dist/types/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/AuthBase.ts +2 -2
- package/src/AuthCookieStorage.ts +6 -11
- package/src/AuthForClient.ts +84 -66
- package/src/types.ts +6 -5
package/dist/cjs/AuthBase.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthBase.js","sourceRoot":"","sources":["../../src/AuthBase.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAuB;AACvB,iCAAwC;AACxC,2CAAyC;AAEzC;IAKE,kBAAsB,MAAsB;QAClC,IAAA,MAAM,GAAmB,MAAM,OAAzB,EAAE,YAAY,GAAK,MAAM,aAAX,CAAY;QACxC,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC;YAEvB,KAAK,EAAE,EAAE;YACT,MAAM,QAAA;YACN,YAAY,cAAA;SACb,CAAC,CAAC;IACL,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthBase.js","sourceRoot":"","sources":["../../src/AuthBase.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAuB;AACvB,iCAAwC;AACxC,2CAAyC;AAEzC;IAKE,kBAAsB,MAAsB;QAClC,IAAA,MAAM,GAAmB,MAAM,OAAzB,EAAE,YAAY,GAAK,MAAM,aAAX,CAAY;QACxC,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC;YAEvB,KAAK,EAAE,EAAE;YACT,MAAM,QAAA;YACN,YAAY,cAAA;SACb,CAAC,CAAC;IACL,CAAC;IAED,gCAAa,GAAb,UAAc,IAAY,EAAE,uBAA+B;QAA/B,wCAAA,EAAA,+BAA+B;QACzD,IAAI,CAAC,uBAAuB,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE;YAC3D,MAAM,IAAI,qBAAa,CAAC,yCAAyC,CAAC,CAAC;SACpE;IACH,CAAC;IAEK,gCAAa,GAAnB,UAAoB,KAAa,EAAE,eAAuB;QAAvB,gCAAA,EAAA,uBAAuB;;;;;4BAC3C,WAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAO;4BAC/C,MAAM,EAAE,KAAK;4BACb,KAAK,EAAE,aAAa;4BACpB,aAAa,eACR,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CACjC;yBACF,CAAC,EAAA;;wBANI,IAAI,GAAG,SAMX;wBAEF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;wBAC/C,WAAO,IAAI,EAAC;;;;KACb;IAED,oCAAiB,GAAjB,UAAkB,KAAa;QAC7B,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;IAClC,CAAC;IAEH,eAAC;AAAD,CAAC,AAtCD,IAsCC;AAtCqB,4BAAQ"}
|
|
@@ -84,7 +84,7 @@ var AuthCookieStorage = (function () {
|
|
|
84
84
|
enumerable: false,
|
|
85
85
|
configurable: true
|
|
86
86
|
});
|
|
87
|
-
Object.defineProperty(AuthCookieStorage.prototype, "
|
|
87
|
+
Object.defineProperty(AuthCookieStorage.prototype, "user", {
|
|
88
88
|
get: function () {
|
|
89
89
|
return this.cookie.get(this.userCookieName) || null;
|
|
90
90
|
},
|
|
@@ -98,7 +98,7 @@ var AuthCookieStorage = (function () {
|
|
|
98
98
|
AuthCookieStorage.prototype._getNextExpiration = function (expireIn) {
|
|
99
99
|
return new Date(Date.now() + expireIn);
|
|
100
100
|
};
|
|
101
|
-
Object.defineProperty(AuthCookieStorage.prototype, "
|
|
101
|
+
Object.defineProperty(AuthCookieStorage.prototype, "multiUserData", {
|
|
102
102
|
get: function () {
|
|
103
103
|
return this.cookie.get(this.multiUserCookieName) || {};
|
|
104
104
|
},
|
|
@@ -109,7 +109,7 @@ var AuthCookieStorage = (function () {
|
|
|
109
109
|
var _this = this;
|
|
110
110
|
this.stopMonitor();
|
|
111
111
|
this.monitorCookieTimeout = setTimeout(function () {
|
|
112
|
-
var user = _this.
|
|
112
|
+
var user = _this.user;
|
|
113
113
|
if (user) {
|
|
114
114
|
if (!_this.loggedIn) {
|
|
115
115
|
_this.loggedIn = true;
|
|
@@ -146,7 +146,7 @@ var AuthCookieStorage = (function () {
|
|
|
146
146
|
this.cookie.set(this.multiUserCookieName, user, __assign({ path: '/', expires: this._getNextExpiration(expirationOrLong), secure: true }, this.domain));
|
|
147
147
|
};
|
|
148
148
|
AuthCookieStorage.prototype.updateExpiration = function () {
|
|
149
|
-
var user = this.
|
|
149
|
+
var user = this.user;
|
|
150
150
|
var expire = this.getExpire();
|
|
151
151
|
if (user) {
|
|
152
152
|
this.setItem(user, expire);
|
|
@@ -190,7 +190,7 @@ var AuthCookieStorage = (function () {
|
|
|
190
190
|
});
|
|
191
191
|
});
|
|
192
192
|
};
|
|
193
|
-
AuthCookieStorage.prototype.
|
|
193
|
+
AuthCookieStorage.prototype.checkDeprecatedData = function () {
|
|
194
194
|
var user = this.cookie.get(this.deprecatedCookieName);
|
|
195
195
|
if (user) {
|
|
196
196
|
var deprecatedUserExpireValue = this.getExpire(this.deprecatedUserExpireCookieName);
|
|
@@ -209,7 +209,7 @@ var AuthCookieStorage = (function () {
|
|
|
209
209
|
this.cookie.remove(this.deprecatedUserExpireCookieName, __assign({ path: '/' }, this.domain));
|
|
210
210
|
};
|
|
211
211
|
AuthCookieStorage.prototype.hasUserParams = function () {
|
|
212
|
-
return Boolean(this.
|
|
212
|
+
return Boolean(this.user);
|
|
213
213
|
};
|
|
214
214
|
return AuthCookieStorage;
|
|
215
215
|
}());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthCookieStorage.js","sourceRoot":"","sources":["../../src/AuthCookieStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAuB;AACvB,sEAAsC;AACtC,6CAA4C;AAE5C;IAyBE,2BAAY,MAA6B;QAxBxB,iCAA4B,GAAG,GAAG,CAAC;QACnC,yBAAoB,GAAG,OAAO,CAAC;QAC/B,wBAAmB,GAAG,WAAW,CAAC;QAe3C,aAAQ,GAAG,KAAK,CAAC;QASrB,IAAA,YAAY,GAYV,MAAM,aAZI,EACZ,MAAM,GAWJ,MAAM,OAXF,EACN,YAAY,GAUV,MAAM,aAVI,EACZ,eAAe,GASb,MAAM,gBATO,EACf,cAAc,GAQZ,MAAM,eARM,EACd,oBAAoB,GAOlB,MAAM,qBAPY,EACpB,YAAY,GAMV,MAAM,aANI,EACZ,mBAAmB,GAKjB,MAAM,oBALW,EACnB,qBAAqB,GAInB,MAAM,sBAJa,EACrB,aAAa,GAGX,MAAM,cAHK,EACb,YAAY,GAEV,MAAM,aAFI,EACZ,WAAW,GACT,MAAM,YADG,CACF;QAEX,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,0BAAM,EAAE,CAAC;QAE3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAG/B,IAAI,CAAC,oBAAoB,GAAG,cAAc,IAAI,MAAM,CAAC;QACrD,IAAI,CAAC,8BAA8B,GAAG,oBAAoB,IAAI,aAAa,CAAC;QAC5E,IAAI,CAAC,gBAAgB,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;QAEnD,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAG,cAAc,SAAM,CAAC;QAC5E,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,CAAC,oBAAoB,GAAG,UAAG,IAAI,CAAC,cAAc,YAAS,CAAC;QAE5D,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,IAAI,IAAI,CAAC,4BAA4B,CAAC;QACxF,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;QAChF,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC;IAC9E,CAAC;IAGD,sBAAI,qCAAM;aAAV;YACE,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,CAAC;;;OAAA;IAED,
|
|
1
|
+
{"version":3,"file":"AuthCookieStorage.js","sourceRoot":"","sources":["../../src/AuthCookieStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,17 +74,19 @@ var axios_1 = __importDefault(require("axios"));
|
|
|
74
74
|
var AuthForClient = (function (_super) {
|
|
75
75
|
__extends(AuthForClient, _super);
|
|
76
76
|
function AuthForClient(params) {
|
|
77
|
-
|
|
77
|
+
var _this = _super.call(this, params) || this;
|
|
78
|
+
_this.dataStorage = params.dataStorage;
|
|
79
|
+
return _this;
|
|
78
80
|
}
|
|
79
81
|
AuthForClient.prototype.signIn = function (_a) {
|
|
80
|
-
var credentials = _a.credentials, _b = _a.
|
|
82
|
+
var credentials = _a.credentials, _b = _a.long, long = _b === void 0 ? false : _b, _c = _a.allowGuestLogin, allowGuestLogin = _c === void 0 ? false : _c, captchaToken = _a.captchaToken, isCaptchaV2Checkbox = _a.isCaptchaV2Checkbox, verificationCode = _a.verificationCode, userToken = _a.userToken, rememberTwoFactor = _a.rememberTwoFactor;
|
|
81
83
|
return __awaiter(this, void 0, void 0, function () {
|
|
82
84
|
var fingerPrint, options, user;
|
|
83
|
-
return __generator(this, function (
|
|
84
|
-
switch (
|
|
85
|
+
return __generator(this, function (_d) {
|
|
86
|
+
switch (_d.label) {
|
|
85
87
|
case 0: return [4, (0, utils_1.generateFingerPrint)()];
|
|
86
88
|
case 1:
|
|
87
|
-
fingerPrint =
|
|
89
|
+
fingerPrint = _d.sent();
|
|
88
90
|
options = __assign(__assign(__assign({}, credentials), { captchaToken: captchaToken, isCaptchaV2Checkbox: isCaptchaV2Checkbox, verificationCode: verificationCode, fingerPrint: fingerPrint, rememberTwoFactor: rememberTwoFactor }), userToken ? { userToken: userToken } : {});
|
|
89
91
|
return [4, this.sdkApi.makeRequest({
|
|
90
92
|
method: 'POST',
|
|
@@ -92,27 +94,43 @@ var AuthForClient = (function (_super) {
|
|
|
92
94
|
data: options,
|
|
93
95
|
})];
|
|
94
96
|
case 2:
|
|
95
|
-
user =
|
|
97
|
+
user = _d.sent();
|
|
96
98
|
this.validateGuest(user.role, allowGuestLogin);
|
|
97
|
-
return [
|
|
99
|
+
if (!(!user.twoFactorCheck && !user.captchaCheck)) return [3, 5];
|
|
100
|
+
if (!(user.tokenType === 'multi-user')) return [3, 3];
|
|
101
|
+
this.dataStorage.saveMultiUser(user, long);
|
|
102
|
+
return [3, 5];
|
|
103
|
+
case 3: return [4, this.dataStorage.saveUser({
|
|
104
|
+
long: long,
|
|
105
|
+
user: user,
|
|
106
|
+
})];
|
|
107
|
+
case 4:
|
|
108
|
+
_d.sent();
|
|
109
|
+
_d.label = 5;
|
|
110
|
+
case 5: return [2, user];
|
|
98
111
|
}
|
|
99
112
|
});
|
|
100
113
|
});
|
|
101
114
|
};
|
|
102
|
-
AuthForClient.prototype.signInWithToken = function (token, allowGuestLogin) {
|
|
115
|
+
AuthForClient.prototype.signInWithToken = function (token, allowGuestLogin, shouldNotSaveCookies) {
|
|
103
116
|
if (allowGuestLogin === void 0) { allowGuestLogin = false; }
|
|
117
|
+
if (shouldNotSaveCookies === void 0) { shouldNotSaveCookies = false; }
|
|
104
118
|
return __awaiter(this, void 0, void 0, function () {
|
|
105
|
-
var user, allow;
|
|
119
|
+
var userInfo, user, allow;
|
|
106
120
|
return __generator(this, function (_a) {
|
|
107
121
|
switch (_a.label) {
|
|
108
122
|
case 0:
|
|
123
|
+
userInfo = {};
|
|
109
124
|
if (lodash_1.default.isObject(token)) {
|
|
110
125
|
allowGuestLogin = lodash_1.default.get(token, 'allowGuestLogin', false);
|
|
126
|
+
shouldNotSaveCookies = lodash_1.default.get(token, 'shouldNotSaveCookies', false);
|
|
127
|
+
userInfo = lodash_1.default.get(token, 'userInfo', {});
|
|
111
128
|
token = token.token;
|
|
112
129
|
}
|
|
113
130
|
if (!token) {
|
|
114
131
|
return [2, Promise.reject(new Error('No token given'))];
|
|
115
132
|
}
|
|
133
|
+
this.dataStorage.checkDeprecatedData();
|
|
116
134
|
return [4, this.validateToken(token, allowGuestLogin)];
|
|
117
135
|
case 1:
|
|
118
136
|
user = _a.sent();
|
|
@@ -121,6 +139,9 @@ var AuthForClient = (function (_super) {
|
|
|
121
139
|
if (!allow) {
|
|
122
140
|
throw Error('Invalid Token');
|
|
123
141
|
}
|
|
142
|
+
if (!shouldNotSaveCookies) {
|
|
143
|
+
this.dataStorage.setItem(__assign(__assign({}, userInfo), user), this.dataStorage.getExpire());
|
|
144
|
+
}
|
|
124
145
|
return [2, user];
|
|
125
146
|
}
|
|
126
147
|
});
|
|
@@ -152,7 +173,37 @@ var AuthForClient = (function (_super) {
|
|
|
152
173
|
error_1 = _a.sent();
|
|
153
174
|
console.log('Logout failed: ', error_1);
|
|
154
175
|
return [3, 3];
|
|
155
|
-
case 3:
|
|
176
|
+
case 3:
|
|
177
|
+
this.dataStorage.removeItem();
|
|
178
|
+
return [2];
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
});
|
|
182
|
+
};
|
|
183
|
+
AuthForClient.prototype.validateUser = function (allowGuestLogin) {
|
|
184
|
+
if (allowGuestLogin === void 0) { allowGuestLogin = false; }
|
|
185
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
186
|
+
var userParams, user, allow;
|
|
187
|
+
return __generator(this, function (_a) {
|
|
188
|
+
switch (_a.label) {
|
|
189
|
+
case 0:
|
|
190
|
+
this.dataStorage.checkDeprecatedData();
|
|
191
|
+
userParams = this.dataStorage.user;
|
|
192
|
+
if (!userParams) {
|
|
193
|
+
return [2, Promise.reject(new Error('No cached user params are available'))];
|
|
194
|
+
}
|
|
195
|
+
return [4, this.validateToken(userParams.token || '', allowGuestLogin)];
|
|
196
|
+
case 1:
|
|
197
|
+
user = _a.sent();
|
|
198
|
+
if (!user.identityProvider && userParams.identityProvider) {
|
|
199
|
+
user.identityProvider = userParams.identityProvider;
|
|
200
|
+
}
|
|
201
|
+
lodash_1.default.assign(user, { token: userParams.token });
|
|
202
|
+
allow = lodash_1.default.get(user, 'allow', false);
|
|
203
|
+
if (!allow) {
|
|
204
|
+
throw Error('Invalid Token');
|
|
205
|
+
}
|
|
206
|
+
return [2, user];
|
|
156
207
|
}
|
|
157
208
|
});
|
|
158
209
|
});
|
|
@@ -171,7 +222,7 @@ var AuthForClient = (function (_super) {
|
|
|
171
222
|
});
|
|
172
223
|
};
|
|
173
224
|
AuthForClient.prototype.multiUserLoginUser = function (_a) {
|
|
174
|
-
var accountId = _a.accountId, id = _a.id,
|
|
225
|
+
var accountId = _a.accountId, id = _a.id, long = _a.long;
|
|
175
226
|
return __awaiter(this, void 0, void 0, function () {
|
|
176
227
|
var user;
|
|
177
228
|
return __generator(this, function (_b) {
|
|
@@ -183,10 +234,16 @@ var AuthForClient = (function (_super) {
|
|
|
183
234
|
accountId: accountId,
|
|
184
235
|
id: id,
|
|
185
236
|
},
|
|
186
|
-
customHeaders: __assign({}, this.addTokenToHeaders(
|
|
237
|
+
customHeaders: __assign({}, this.addTokenToHeaders(this.multiUserToken)),
|
|
187
238
|
})];
|
|
188
239
|
case 1:
|
|
189
240
|
user = _b.sent();
|
|
241
|
+
return [4, this.dataStorage.saveUser({
|
|
242
|
+
long: long,
|
|
243
|
+
user: user,
|
|
244
|
+
})];
|
|
245
|
+
case 2:
|
|
246
|
+
_b.sent();
|
|
190
247
|
return [2, user];
|
|
191
248
|
}
|
|
192
249
|
});
|
|
@@ -194,10 +251,13 @@ var AuthForClient = (function (_super) {
|
|
|
194
251
|
};
|
|
195
252
|
AuthForClient.prototype.getUserNameForLockScreen = function (user) {
|
|
196
253
|
return __awaiter(this, void 0, void 0, function () {
|
|
197
|
-
var multiUserId, username, token, username_1;
|
|
254
|
+
var multiUserCookie, multiUserId, username, token, username_1;
|
|
198
255
|
return __generator(this, function (_a) {
|
|
199
256
|
switch (_a.label) {
|
|
200
257
|
case 0:
|
|
258
|
+
multiUserCookie = this.dataStorage.multiUserData;
|
|
259
|
+
if (multiUserCookie.username)
|
|
260
|
+
return [2, multiUserCookie.username];
|
|
201
261
|
multiUserId = user.multiUserId, username = user.username, token = user.token;
|
|
202
262
|
if (!multiUserId) return [3, 2];
|
|
203
263
|
return [4, this.sdkApi.makeRequest({
|
|
@@ -224,6 +284,9 @@ var AuthForClient = (function (_super) {
|
|
|
224
284
|
});
|
|
225
285
|
});
|
|
226
286
|
};
|
|
287
|
+
AuthForClient.prototype.updateCookieExpiration = function () {
|
|
288
|
+
this.dataStorage.updateExpiration();
|
|
289
|
+
};
|
|
227
290
|
AuthForClient.prototype.multiUserSetProfile = function (multiuserToken, profile) {
|
|
228
291
|
return __awaiter(this, void 0, void 0, function () {
|
|
229
292
|
return __generator(this, function (_a) {
|
|
@@ -248,7 +311,7 @@ var AuthForClient = (function (_super) {
|
|
|
248
311
|
});
|
|
249
312
|
};
|
|
250
313
|
AuthForClient.prototype.multiUserUploadIcon = function (_a) {
|
|
251
|
-
var name = _a.name, contentType = _a.contentType, _b = _a.cacheControl, cacheControl = _b === void 0 ? 'no-cache' : _b, file = _a.file
|
|
314
|
+
var name = _a.name, contentType = _a.contentType, _b = _a.cacheControl, cacheControl = _b === void 0 ? 'no-cache' : _b, file = _a.file;
|
|
252
315
|
return __awaiter(this, void 0, void 0, function () {
|
|
253
316
|
var data, FormDataLib, formData;
|
|
254
317
|
return __generator(this, function (_c) {
|
|
@@ -261,7 +324,7 @@ var AuthForClient = (function (_super) {
|
|
|
261
324
|
contentType: contentType,
|
|
262
325
|
cacheControl: cacheControl,
|
|
263
326
|
},
|
|
264
|
-
customHeaders: __assign({}, this.addTokenToHeaders(
|
|
327
|
+
customHeaders: __assign({}, this.addTokenToHeaders(this.multiUserToken)),
|
|
265
328
|
})];
|
|
266
329
|
case 1:
|
|
267
330
|
data = _c.sent();
|
|
@@ -308,7 +371,7 @@ var AuthForClient = (function (_super) {
|
|
|
308
371
|
});
|
|
309
372
|
};
|
|
310
373
|
AuthForClient.prototype.multiUserUpdateTwoFactor = function (_a) {
|
|
311
|
-
var secret = _a.secret, enabled = _a.enabled, codes = _a.codes, verificationCode = _a.verificationCode
|
|
374
|
+
var secret = _a.secret, enabled = _a.enabled, codes = _a.codes, verificationCode = _a.verificationCode;
|
|
312
375
|
return __awaiter(this, void 0, void 0, function () {
|
|
313
376
|
return __generator(this, function (_b) {
|
|
314
377
|
return [2, this.sdkApi.makeRequest({
|
|
@@ -320,11 +383,19 @@ var AuthForClient = (function (_super) {
|
|
|
320
383
|
codes: codes,
|
|
321
384
|
verificationCode: verificationCode,
|
|
322
385
|
},
|
|
323
|
-
customHeaders: __assign({}, this.addTokenToHeaders(
|
|
386
|
+
customHeaders: __assign({}, this.addTokenToHeaders(this.multiUserToken)),
|
|
324
387
|
})];
|
|
325
388
|
});
|
|
326
389
|
});
|
|
327
390
|
};
|
|
391
|
+
Object.defineProperty(AuthForClient.prototype, "multiUserToken", {
|
|
392
|
+
get: function () {
|
|
393
|
+
var _a = this.dataStorage.multiUserData.token, token = _a === void 0 ? '' : _a;
|
|
394
|
+
return token;
|
|
395
|
+
},
|
|
396
|
+
enumerable: false,
|
|
397
|
+
configurable: true
|
|
398
|
+
});
|
|
328
399
|
return AuthForClient;
|
|
329
400
|
}(AuthBase_1.AuthBase));
|
|
330
401
|
exports.AuthForClient = AuthForClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthForClient.js","sourceRoot":"","sources":["../../src/AuthForClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAsC;AAYtC,kDAAuB;AACvB,iCAA8C;AAC9C,mDAAyC;AACzC,gDAA0B;AAE1B;IAAmC,iCAAQ;
|
|
1
|
+
{"version":3,"file":"AuthForClient.js","sourceRoot":"","sources":["../../src/AuthForClient.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/AuthBase.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthBase.js","sourceRoot":"","sources":["../../src/AuthBase.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,OAAgB,QAAQ;IAK5B,YAAsB,MAAsB;QAC1C,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC;YAEvB,KAAK,EAAE,EAAE;YACT,MAAM;YACN,YAAY;SACb,CAAC,CAAC;IACL,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthBase.js","sourceRoot":"","sources":["../../src/AuthBase.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,OAAgB,QAAQ;IAK5B,YAAsB,MAAsB;QAC1C,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC;YAEvB,KAAK,EAAE,EAAE;YACT,MAAM;YACN,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,uBAAuB,GAAG,KAAK;QACzD,IAAI,CAAC,uBAAuB,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE;YAC3D,MAAM,IAAI,aAAa,CAAC,yCAAyC,CAAC,CAAC;SACpE;IACH,CAAC;IAEK,aAAa,CAAC,KAAa,EAAE,eAAe,GAAG,KAAK;;YACxD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAO;gBAC/C,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,aAAa;gBACpB,aAAa,oBACR,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CACjC;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YAC/C,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED,iBAAiB,CAAC,KAAa;QAC7B,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;IAClC,CAAC;CAEF"}
|
|
@@ -36,7 +36,7 @@ export class AuthCookieStorage {
|
|
|
36
36
|
get domain() {
|
|
37
37
|
return this.cookieDomain ? { domain: this.cookieDomain } : {};
|
|
38
38
|
}
|
|
39
|
-
get
|
|
39
|
+
get user() {
|
|
40
40
|
return this.cookie.get(this.userCookieName) || null;
|
|
41
41
|
}
|
|
42
42
|
getExpire(cookieName) {
|
|
@@ -46,13 +46,13 @@ export class AuthCookieStorage {
|
|
|
46
46
|
_getNextExpiration(expireIn) {
|
|
47
47
|
return new Date(Date.now() + expireIn);
|
|
48
48
|
}
|
|
49
|
-
get
|
|
49
|
+
get multiUserData() {
|
|
50
50
|
return this.cookie.get(this.multiUserCookieName) || {};
|
|
51
51
|
}
|
|
52
52
|
monitor(logoutCallback, loginCallback) {
|
|
53
53
|
this.stopMonitor();
|
|
54
54
|
this.monitorCookieTimeout = setTimeout(() => {
|
|
55
|
-
const user = this.
|
|
55
|
+
const user = this.user;
|
|
56
56
|
if (user) {
|
|
57
57
|
if (!this.loggedIn) {
|
|
58
58
|
this.loggedIn = true;
|
|
@@ -89,7 +89,7 @@ export class AuthCookieStorage {
|
|
|
89
89
|
this.cookie.set(this.multiUserCookieName, user, Object.assign({ path: '/', expires: this._getNextExpiration(expirationOrLong), secure: true }, this.domain));
|
|
90
90
|
}
|
|
91
91
|
updateExpiration() {
|
|
92
|
-
const user = this.
|
|
92
|
+
const user = this.user;
|
|
93
93
|
const expire = this.getExpire();
|
|
94
94
|
if (user) {
|
|
95
95
|
this.setItem(user, expire);
|
|
@@ -120,7 +120,7 @@ export class AuthCookieStorage {
|
|
|
120
120
|
this.setItem(user, cookieExpirationDuration);
|
|
121
121
|
});
|
|
122
122
|
}
|
|
123
|
-
|
|
123
|
+
checkDeprecatedData() {
|
|
124
124
|
const user = this.cookie.get(this.deprecatedCookieName);
|
|
125
125
|
if (user) {
|
|
126
126
|
const deprecatedUserExpireValue = this.getExpire(this.deprecatedUserExpireCookieName);
|
|
@@ -139,7 +139,7 @@ export class AuthCookieStorage {
|
|
|
139
139
|
this.cookie.remove(this.deprecatedUserExpireCookieName, Object.assign({ path: '/' }, this.domain));
|
|
140
140
|
}
|
|
141
141
|
hasUserParams() {
|
|
142
|
-
return Boolean(this.
|
|
142
|
+
return Boolean(this.user);
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
//# sourceMappingURL=AuthCookieStorage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthCookieStorage.js","sourceRoot":"","sources":["../../src/AuthCookieStorage.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,MAAM,OAAO,iBAAiB;IAyB5B,YAAY,MAA6B;QAxBxB,iCAA4B,GAAG,GAAG,CAAC;QACnC,yBAAoB,GAAG,OAAO,CAAC;QAC/B,wBAAmB,GAAG,WAAW,CAAC;QAe3C,aAAQ,GAAG,KAAK,CAAC;QAQvB,MAAM,EACJ,YAAY,EACZ,MAAM,EACN,YAAY,EACZ,eAAe,EACf,cAAc,EACd,oBAAoB,EACpB,YAAY,EACZ,mBAAmB,EACnB,qBAAqB,EACrB,aAAa,EACb,YAAY,EACZ,WAAW,GACZ,GAAG,MAAM,CAAC;QAEX,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAE3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAG/B,IAAI,CAAC,oBAAoB,GAAG,cAAc,IAAI,MAAM,CAAC;QACrD,IAAI,CAAC,8BAA8B,GAAG,oBAAoB,IAAI,aAAa,CAAC;QAC5E,IAAI,CAAC,gBAAgB,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;QAEnD,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,cAAc,MAAM,CAAC;QAC5E,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,CAAC,oBAAoB,GAAG,GAAG,IAAI,CAAC,cAAc,SAAS,CAAC;QAE5D,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,IAAI,IAAI,CAAC,4BAA4B,CAAC;QACxF,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;QAChF,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC;IAC9E,CAAC;IAGD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"AuthCookieStorage.js","sourceRoot":"","sources":["../../src/AuthCookieStorage.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,MAAM,OAAO,iBAAiB;IAyB5B,YAAY,MAA6B;QAxBxB,iCAA4B,GAAG,GAAG,CAAC;QACnC,yBAAoB,GAAG,OAAO,CAAC;QAC/B,wBAAmB,GAAG,WAAW,CAAC;QAe3C,aAAQ,GAAG,KAAK,CAAC;QAQvB,MAAM,EACJ,YAAY,EACZ,MAAM,EACN,YAAY,EACZ,eAAe,EACf,cAAc,EACd,oBAAoB,EACpB,YAAY,EACZ,mBAAmB,EACnB,qBAAqB,EACrB,aAAa,EACb,YAAY,EACZ,WAAW,GACZ,GAAG,MAAM,CAAC;QAEX,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAE3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAG/B,IAAI,CAAC,oBAAoB,GAAG,cAAc,IAAI,MAAM,CAAC;QACrD,IAAI,CAAC,8BAA8B,GAAG,oBAAoB,IAAI,aAAa,CAAC;QAC5E,IAAI,CAAC,gBAAgB,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;QAEnD,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,cAAc,MAAM,CAAC;QAC5E,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,CAAC,oBAAoB,GAAG,GAAG,IAAI,CAAC,cAAc,SAAS,CAAC;QAE5D,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,IAAI,IAAI,CAAC,4BAA4B,CAAC;QACxF,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;QAChF,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC;IAC9E,CAAC;IAGD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC;IACtD,CAAC;IASD,SAAS,CAAC,UAAmB;QAC3B,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC9E,OAAO,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;IACxE,CAAC;IAEO,kBAAkB,CAAC,QAAgB;QACzC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,mBAA6B,CAAC,IAAI,EAAE,CAAC;IACnE,CAAC;IAQD,OAAO,CAAC,cAA2B,EAAE,aAAoC;QAGvE,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,oBAAoB,GAAG,UAAU,CAAC,GAAG,EAAE;YAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACvB,IAAI,IAAI,EAAE;gBACR,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;iBACtB;gBACD,IAAI,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;oBAAE,aAAa,CAAC,IAAI,CAAC,CAAC;iBAAE;aAC1D;iBAAM,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACxB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACtB,IAAI,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;oBAAE,cAAc,EAAE,CAAC;iBAAE;aACxD;YAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAC9C,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACjC,CAAC;IASD,WAAW;QACT,IAAI,MAAM,EAAE;YACV,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;SACjD;IACH,CAAC;IAGD,OAAO,CAAC,IAAU,EAAE,QAAgB;QAClC,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,kBACvC,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,IAAI,EACZ,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IACxC,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,QAAQ,kBACjD,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,IAAI,EACZ,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IACxC,IAAI,CAAC,MAAM,EACd,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,kBAC7C,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,cAAc,IACpB,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,EAAE,QAAQ,kBAC3D,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,cAAc,IACpB,IAAI,CAAC,MAAM,EACd,CAAC;IACL,CAAC;IAUD,aAAa,CAAC,IAAU,EAAE,gBAAkC;QAC1D,IAAI,OAAO,gBAAgB,KAAK,SAAS,EAAE;YACzC,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;SAC9E;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAoB,EAAE,IAAI,kBAC7C,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAClD,MAAM,EAAE,IAAI,IACT,IAAI,CAAC,MAAM,EACd,CAAC;IACL,CAAC;IAQD,gBAAgB;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC5B;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAoB,CAAC,CAAC;QAC7D,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SACvC;IACH,CAAC;IAYK,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,EAAgB;;YACzC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,uBAAuB,CAAC;YACpE,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAC;gBAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;gBACvB,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAC,CAAC;YAEH,IAAI,wBAAwB,CAAC;YAC7B,IAAI;gBACF,wBAAwB,GAAG,MAAM,WAAW,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;aACzE;YAAC,OAAO,KAAK,EAAE;gBAEd,OAAO,CAAC,GAAG,CAAC,2DAA2D,EAAE,KAAK,CAAC,CAAC;aACjF;YAED,IAAI,CAAC,wBAAwB,EAAE;gBAC7B,wBAAwB,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;aAC1E;YAED,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;QAC/C,CAAC;KAAA;IAGD,mBAAmB;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACxD,IAAI,IAAI,EAAE;YACR,MAAM,yBAAyB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;YACtF,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,yBAAyB,CAAC,CAAC;YAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,kBACvC,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,IAAI,IACT,IAAI,CAAC,MAAM,EACd,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,yBAAyB,kBAClE,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,IAAI,IACT,IAAI,CAAC,MAAM,EACd,CAAC;SACJ;IACH,CAAC;IAQD,UAAU;QACR,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,kBAC1C,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,kBACpC,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,mBAA6B,kBACnD,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,kBAC1C,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,kBACpD,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,kBAC1C,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,kBACpD,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;IACL,CAAC;IAQD,aAAa;QACX,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF"}
|
|
@@ -15,8 +15,9 @@ import axios from 'axios';
|
|
|
15
15
|
export class AuthForClient extends AuthBase {
|
|
16
16
|
constructor(params) {
|
|
17
17
|
super(params);
|
|
18
|
+
this.dataStorage = params.dataStorage;
|
|
18
19
|
}
|
|
19
|
-
signIn({ credentials, allowGuestLogin = false, captchaToken, isCaptchaV2Checkbox, verificationCode, userToken, rememberTwoFactor, }) {
|
|
20
|
+
signIn({ credentials, long = false, allowGuestLogin = false, captchaToken, isCaptchaV2Checkbox, verificationCode, userToken, rememberTwoFactor, }) {
|
|
20
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
22
|
const fingerPrint = yield generateFingerPrint();
|
|
22
23
|
const options = Object.assign(Object.assign(Object.assign({}, credentials), { captchaToken,
|
|
@@ -30,24 +31,42 @@ export class AuthForClient extends AuthBase {
|
|
|
30
31
|
data: options,
|
|
31
32
|
});
|
|
32
33
|
this.validateGuest(user.role, allowGuestLogin);
|
|
34
|
+
if (!user.twoFactorCheck && !user.captchaCheck) {
|
|
35
|
+
if (user.tokenType === 'multi-user') {
|
|
36
|
+
this.dataStorage.saveMultiUser(user, long);
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
yield this.dataStorage.saveUser({
|
|
40
|
+
long,
|
|
41
|
+
user,
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
}
|
|
33
45
|
return user;
|
|
34
46
|
});
|
|
35
47
|
}
|
|
36
|
-
signInWithToken(token, allowGuestLogin = false) {
|
|
48
|
+
signInWithToken(token, allowGuestLogin = false, shouldNotSaveCookies = false) {
|
|
37
49
|
return __awaiter(this, void 0, void 0, function* () {
|
|
50
|
+
let userInfo = {};
|
|
38
51
|
if (_.isObject(token)) {
|
|
39
52
|
allowGuestLogin = _.get(token, 'allowGuestLogin', false);
|
|
53
|
+
shouldNotSaveCookies = _.get(token, 'shouldNotSaveCookies', false);
|
|
54
|
+
userInfo = _.get(token, 'userInfo', {});
|
|
40
55
|
token = token.token;
|
|
41
56
|
}
|
|
42
57
|
if (!token) {
|
|
43
58
|
return Promise.reject(new Error('No token given'));
|
|
44
59
|
}
|
|
60
|
+
this.dataStorage.checkDeprecatedData();
|
|
45
61
|
const user = yield this.validateToken(token, allowGuestLogin);
|
|
46
62
|
_.assign(user, { token });
|
|
47
63
|
const allow = _.get(user, 'allow', false);
|
|
48
64
|
if (!allow) {
|
|
49
65
|
throw Error('Invalid Token');
|
|
50
66
|
}
|
|
67
|
+
if (!shouldNotSaveCookies) {
|
|
68
|
+
this.dataStorage.setItem(Object.assign(Object.assign({}, userInfo), user), this.dataStorage.getExpire());
|
|
69
|
+
}
|
|
51
70
|
return user;
|
|
52
71
|
});
|
|
53
72
|
}
|
|
@@ -70,6 +89,26 @@ export class AuthForClient extends AuthBase {
|
|
|
70
89
|
catch (error) {
|
|
71
90
|
console.log('Logout failed: ', error);
|
|
72
91
|
}
|
|
92
|
+
this.dataStorage.removeItem();
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
validateUser(allowGuestLogin = false) {
|
|
96
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
97
|
+
this.dataStorage.checkDeprecatedData();
|
|
98
|
+
const userParams = this.dataStorage.user;
|
|
99
|
+
if (!userParams) {
|
|
100
|
+
return Promise.reject(new Error('No cached user params are available'));
|
|
101
|
+
}
|
|
102
|
+
const user = yield this.validateToken(userParams.token || '', allowGuestLogin);
|
|
103
|
+
if (!user.identityProvider && userParams.identityProvider) {
|
|
104
|
+
user.identityProvider = userParams.identityProvider;
|
|
105
|
+
}
|
|
106
|
+
_.assign(user, { token: userParams.token });
|
|
107
|
+
const allow = _.get(user, 'allow', false);
|
|
108
|
+
if (!allow) {
|
|
109
|
+
throw Error('Invalid Token');
|
|
110
|
+
}
|
|
111
|
+
return user;
|
|
73
112
|
});
|
|
74
113
|
}
|
|
75
114
|
multiUserGetUsersList(multiuserToken) {
|
|
@@ -83,7 +122,7 @@ export class AuthForClient extends AuthBase {
|
|
|
83
122
|
});
|
|
84
123
|
});
|
|
85
124
|
}
|
|
86
|
-
multiUserLoginUser({ accountId, id,
|
|
125
|
+
multiUserLoginUser({ accountId, id, long }) {
|
|
87
126
|
return __awaiter(this, void 0, void 0, function* () {
|
|
88
127
|
const user = yield this.sdkApi.makeRequest({
|
|
89
128
|
method: 'POST',
|
|
@@ -92,13 +131,20 @@ export class AuthForClient extends AuthBase {
|
|
|
92
131
|
accountId,
|
|
93
132
|
id,
|
|
94
133
|
},
|
|
95
|
-
customHeaders: Object.assign({}, this.addTokenToHeaders(
|
|
134
|
+
customHeaders: Object.assign({}, this.addTokenToHeaders(this.multiUserToken)),
|
|
135
|
+
});
|
|
136
|
+
yield this.dataStorage.saveUser({
|
|
137
|
+
long,
|
|
138
|
+
user,
|
|
96
139
|
});
|
|
97
140
|
return user;
|
|
98
141
|
});
|
|
99
142
|
}
|
|
100
143
|
getUserNameForLockScreen(user) {
|
|
101
144
|
return __awaiter(this, void 0, void 0, function* () {
|
|
145
|
+
const multiUserCookie = this.dataStorage.multiUserData;
|
|
146
|
+
if (multiUserCookie.username)
|
|
147
|
+
return multiUserCookie.username;
|
|
102
148
|
const { multiUserId, username, token } = user;
|
|
103
149
|
if (multiUserId) {
|
|
104
150
|
const { username } = yield this.sdkApi.makeRequest({
|
|
@@ -120,6 +166,9 @@ export class AuthForClient extends AuthBase {
|
|
|
120
166
|
});
|
|
121
167
|
});
|
|
122
168
|
}
|
|
169
|
+
updateCookieExpiration() {
|
|
170
|
+
this.dataStorage.updateExpiration();
|
|
171
|
+
}
|
|
123
172
|
multiUserSetProfile(multiuserToken, profile) {
|
|
124
173
|
return __awaiter(this, void 0, void 0, function* () {
|
|
125
174
|
return this.sdkApi.makeRequest({
|
|
@@ -139,7 +188,7 @@ export class AuthForClient extends AuthBase {
|
|
|
139
188
|
});
|
|
140
189
|
});
|
|
141
190
|
}
|
|
142
|
-
multiUserUploadIcon({ name, contentType, cacheControl = 'no-cache', file
|
|
191
|
+
multiUserUploadIcon({ name, contentType, cacheControl = 'no-cache', file }) {
|
|
143
192
|
return __awaiter(this, void 0, void 0, function* () {
|
|
144
193
|
const data = yield this.sdkApi.makeRequest({
|
|
145
194
|
method: 'POST',
|
|
@@ -149,7 +198,7 @@ export class AuthForClient extends AuthBase {
|
|
|
149
198
|
contentType,
|
|
150
199
|
cacheControl,
|
|
151
200
|
},
|
|
152
|
-
customHeaders: Object.assign({}, this.addTokenToHeaders(
|
|
201
|
+
customHeaders: Object.assign({}, this.addTokenToHeaders(this.multiUserToken)),
|
|
153
202
|
});
|
|
154
203
|
const FormDataLib = isNode ? require('form-data') : FormData;
|
|
155
204
|
const formData = new FormDataLib();
|
|
@@ -185,7 +234,7 @@ export class AuthForClient extends AuthBase {
|
|
|
185
234
|
});
|
|
186
235
|
});
|
|
187
236
|
}
|
|
188
|
-
multiUserUpdateTwoFactor({ secret, enabled, codes, verificationCode
|
|
237
|
+
multiUserUpdateTwoFactor({ secret, enabled, codes, verificationCode }) {
|
|
189
238
|
return __awaiter(this, void 0, void 0, function* () {
|
|
190
239
|
return this.sdkApi.makeRequest({
|
|
191
240
|
method: 'POST',
|
|
@@ -196,9 +245,13 @@ export class AuthForClient extends AuthBase {
|
|
|
196
245
|
codes,
|
|
197
246
|
verificationCode,
|
|
198
247
|
},
|
|
199
|
-
customHeaders: Object.assign({}, this.addTokenToHeaders(
|
|
248
|
+
customHeaders: Object.assign({}, this.addTokenToHeaders(this.multiUserToken)),
|
|
200
249
|
});
|
|
201
250
|
});
|
|
202
251
|
}
|
|
252
|
+
get multiUserToken() {
|
|
253
|
+
const { token = '' } = this.dataStorage.multiUserData;
|
|
254
|
+
return token;
|
|
255
|
+
}
|
|
203
256
|
}
|
|
204
257
|
//# sourceMappingURL=AuthForClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthForClient.js","sourceRoot":"","sources":["../../src/AuthForClient.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAYtC,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,OAAO,aAAc,SAAQ,QAAQ;
|
|
1
|
+
{"version":3,"file":"AuthForClient.js","sourceRoot":"","sources":["../../src/AuthForClient.ts"],"names":[],"mappings":"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"}
|
package/dist/types/AuthBase.d.ts
CHANGED
|
@@ -5,8 +5,8 @@ export declare abstract class AuthBase {
|
|
|
5
5
|
protected readonly discoveryUrl?: string;
|
|
6
6
|
protected readonly sdkUrl?: string;
|
|
7
7
|
protected constructor(params: AuthBaseConfig);
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
validateGuest(role: string, allowGuestLoginOverride?: boolean): void;
|
|
9
|
+
validateToken(token: string, allowGuestLogin?: boolean): Promise<User>;
|
|
10
10
|
addTokenToHeaders(token: string): {
|
|
11
11
|
Authorization: string;
|
|
12
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthBase.d.ts","sourceRoot":"","sources":["../../src/AuthBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAG/C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,8BAAsB,QAAQ;IAC5B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEnC,SAAS,aAAa,MAAM,EAAE,cAAc;IAU5C,
|
|
1
|
+
{"version":3,"file":"AuthBase.d.ts","sourceRoot":"","sources":["../../src/AuthBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAG/C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,8BAAsB,QAAQ;IAC5B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEnC,SAAS,aAAa,MAAM,EAAE,cAAc;IAU5C,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,uBAAuB,UAAQ,GAAG,IAAI;IAM5D,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1E,iBAAiB,CAAC,KAAK,EAAE,MAAM;;;CAIhC"}
|
|
@@ -22,10 +22,10 @@ export declare class AuthCookieStorage implements AuthDataStorage {
|
|
|
22
22
|
readonly expireInLong: number;
|
|
23
23
|
constructor(params: AuthDataStorageConfig);
|
|
24
24
|
get domain(): Domain;
|
|
25
|
-
|
|
25
|
+
get user(): User | null;
|
|
26
26
|
getExpire(cookieName?: string): number;
|
|
27
27
|
private _getNextExpiration;
|
|
28
|
-
get
|
|
28
|
+
get multiUserData(): User;
|
|
29
29
|
monitor(logoutCallback?: () => void, loginCallback?: (user: User) => void): void;
|
|
30
30
|
stopMonitor(): void;
|
|
31
31
|
setItem(user: User, expireIn: number): void;
|
|
@@ -33,7 +33,7 @@ export declare class AuthCookieStorage implements AuthDataStorage {
|
|
|
33
33
|
saveMultiUser(user: User, long: boolean): void;
|
|
34
34
|
updateExpiration(): void;
|
|
35
35
|
saveUser({ long, user }: SaveUserArgs): Promise<void>;
|
|
36
|
-
|
|
36
|
+
checkDeprecatedData(): void;
|
|
37
37
|
removeItem(): void;
|
|
38
38
|
hasUserParams(): boolean;
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthCookieStorage.d.ts","sourceRoot":"","sources":["../../src/AuthCookieStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAK7F,qBAAa,iBAAkB,YAAW,eAAe;IACvD,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAO;IACpD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAW;IAChD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAe;IAEnD,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;IAC1C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAU;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAS;IACxD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAS;IAC/C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,oBAAoB,CAAC,CAAgC;IAE7D,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;gBAGlB,MAAM,EAAE,qBAAqB;IAuCzC,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,
|
|
1
|
+
{"version":3,"file":"AuthCookieStorage.d.ts","sourceRoot":"","sources":["../../src/AuthCookieStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAK7F,qBAAa,iBAAkB,YAAW,eAAe;IACvD,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAO;IACpD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAW;IAChD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAe;IAEnD,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;IAC1C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAU;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAS;IACxD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAS;IAC/C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,oBAAoB,CAAC,CAAgC;IAE7D,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;gBAGlB,MAAM,EAAE,qBAAqB;IAuCzC,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,IAAI,IAAI,IAAI,GAAG,IAAI,CAEtB;IASD,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAKtC,OAAO,CAAC,kBAAkB;IAI1B,IAAI,aAAa,IAAI,IAAI,CAExB;IAQD,OAAO,CAAC,cAAc,CAAC,EAAE,MAAM,IAAI,EAAE,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,GAAG,IAAI;IA2BhF,WAAW,IAAI,IAAI;IAOnB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAmC3C,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IACnD,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI;IAoB9C,gBAAgB,IAAI,IAAI;IAsBlB,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB3D,mBAAmB,IAAI,IAAI;IA0B3B,UAAU,IAAI,IAAI;IAsClB,aAAa,IAAI,OAAO;CAGzB"}
|
|
@@ -1,24 +1,30 @@
|
|
|
1
1
|
import { AuthBase } from './AuthBase';
|
|
2
|
-
import { AuthBaseConfig, MultiUserLoginUserArgs, MultiUserUpdateTwoFactorArgs, MultiUserUploadIconArgs, SignInArgs, User } from './types';
|
|
2
|
+
import { AuthBaseConfig, AuthDataStorage, AuthResponse, MultiUserLoginUserArgs, MultiUserUpdateTwoFactorArgs, MultiUserUploadIconArgs, SignInArgs, User } from './types';
|
|
3
3
|
export declare class AuthForClient extends AuthBase {
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
readonly dataStorage: AuthDataStorage;
|
|
5
|
+
constructor(params: AuthBaseConfig & {
|
|
6
|
+
dataStorage: AuthDataStorage;
|
|
7
|
+
});
|
|
8
|
+
signIn({ credentials, long, allowGuestLogin, captchaToken, isCaptchaV2Checkbox, verificationCode, userToken, rememberTwoFactor, }: SignInArgs): Promise<AuthResponse>;
|
|
6
9
|
signInWithToken(token: string | {
|
|
7
10
|
token: string;
|
|
8
11
|
allowGuestLogin?: boolean;
|
|
9
12
|
shouldNotSaveCookies?: boolean;
|
|
10
|
-
}, allowGuestLogin?: boolean): Promise<User>;
|
|
13
|
+
}, allowGuestLogin?: boolean, shouldNotSaveCookies?: boolean): Promise<User>;
|
|
11
14
|
signOut(token: string, multiuserToken?: string): Promise<void>;
|
|
15
|
+
validateUser(allowGuestLogin?: boolean): Promise<User>;
|
|
12
16
|
multiUserGetUsersList(multiuserToken: string): Promise<any>;
|
|
13
|
-
multiUserLoginUser({ accountId, id,
|
|
17
|
+
multiUserLoginUser({ accountId, id, long }: MultiUserLoginUserArgs): Promise<User>;
|
|
14
18
|
getUserNameForLockScreen(user: Pick<User, 'multiUserId' | 'username' | 'token'>): Promise<string>;
|
|
15
19
|
multiUserGetProfile(multiuserToken: string): Promise<any>;
|
|
20
|
+
updateCookieExpiration(): void;
|
|
16
21
|
multiUserSetProfile(multiuserToken: string, profile: unknown): Promise<any>;
|
|
17
22
|
validateMultiUserToken(multiuserToken: string): Promise<any>;
|
|
18
|
-
multiUserUploadIcon({ name, contentType, cacheControl, file
|
|
23
|
+
multiUserUploadIcon({ name, contentType, cacheControl, file }: MultiUserUploadIconArgs): Promise<string>;
|
|
19
24
|
confirmEmailChange({ token }: {
|
|
20
25
|
token: string;
|
|
21
26
|
}): Promise<any>;
|
|
22
|
-
multiUserUpdateTwoFactor({ secret, enabled, codes, verificationCode
|
|
27
|
+
multiUserUpdateTwoFactor({ secret, enabled, codes, verificationCode }: MultiUserUpdateTwoFactorArgs): Promise<any>;
|
|
28
|
+
private get multiUserToken();
|
|
23
29
|
}
|
|
24
30
|
//# sourceMappingURL=AuthForClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthForClient.d.ts","sourceRoot":"","sources":["../../src/AuthForClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EACL,cAAc,
|
|
1
|
+
{"version":3,"file":"AuthForClient.d.ts","sourceRoot":"","sources":["../../src/AuthForClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EACL,cAAc,EAAE,eAAe,EAC/B,YAAY,EACZ,sBAAsB,EAEtB,4BAA4B,EAC5B,uBAAuB,EAEvB,UAAU,EACV,IAAI,EACL,MAAM,SAAS,CAAC;AAMjB,qBAAa,aAAc,SAAQ,QAAQ;IACzC,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC;gBAC1B,MAAM,EAAE,cAAc,GAAG;QAAC,WAAW,EAAE,eAAe,CAAC;KAAC;IAkB9D,MAAM,CAAC,EACX,WAAW,EACX,IAAY,EACZ,eAAuB,EACvB,YAAY,EACZ,mBAAmB,EACnB,gBAAgB,EAChB,SAAS,EACT,iBAAiB,GAClB,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IA2C/B,eAAe,CACnB,KAAK,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAC;QAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;KAAE,EAC7F,eAAe,UAAQ,EACvB,oBAAoB,UAAQ,GAC3B,OAAO,CAAC,IAAI,CAAC;IAwCV,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC9D,YAAY,CAAC,eAAe,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BpD,qBAAqB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAsB3D,kBAAkB,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BlF,wBAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,GAAE,UAAU,GAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IA0B/F,mBAAmB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAiB/D,sBAAsB;IAUhB,mBAAmB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAiB3E,sBAAsB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAoB5D,mBAAmB,CACvB,EAAE,IAAI,EAAE,WAAW,EAAE,YAAyB,EAAE,IAAI,EAAE,EAAE,uBAAuB,GAC9E,OAAO,CAAC,MAAM,CAAC;IA6CZ,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAqB/D,wBAAwB,CAC5B,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,EAAE,4BAA4B,GACzE,OAAO,CAAC,GAAG,CAAC;IAiBf,OAAO,KAAK,cAAc,GAGzB;CACF"}
|
package/dist/types/types.d.ts
CHANGED
|
@@ -59,6 +59,7 @@ export declare type SignInArgs = {
|
|
|
59
59
|
username: string;
|
|
60
60
|
password: string;
|
|
61
61
|
};
|
|
62
|
+
long?: boolean;
|
|
62
63
|
allowGuestLogin?: boolean;
|
|
63
64
|
captchaToken?: string;
|
|
64
65
|
isCaptchaV2Checkbox?: boolean;
|
|
@@ -69,21 +70,19 @@ export declare type SignInArgs = {
|
|
|
69
70
|
export declare type MultiUserLoginUserArgs = {
|
|
70
71
|
accountId: string;
|
|
71
72
|
id: string;
|
|
72
|
-
|
|
73
|
+
long?: boolean;
|
|
73
74
|
};
|
|
74
75
|
export declare type MultiUserUploadIconArgs = {
|
|
75
76
|
name: string;
|
|
76
77
|
contentType: string;
|
|
77
78
|
cacheControl: string;
|
|
78
79
|
file: File;
|
|
79
|
-
multiuserToken: string;
|
|
80
80
|
};
|
|
81
81
|
export declare type MultiUserUpdateTwoFactorArgs = {
|
|
82
82
|
secret: string;
|
|
83
83
|
enabled: boolean;
|
|
84
84
|
codes: any;
|
|
85
85
|
verificationCode: string;
|
|
86
|
-
multiuserToken: string;
|
|
87
86
|
};
|
|
88
87
|
export interface AuthDataStorage {
|
|
89
88
|
updateExpiration(): void;
|
|
@@ -91,9 +90,12 @@ export interface AuthDataStorage {
|
|
|
91
90
|
monitor(...args: unknown[]): void;
|
|
92
91
|
stopMonitor(): void;
|
|
93
92
|
removeItem(...args: unknown[]): void;
|
|
94
|
-
|
|
93
|
+
multiUserData: User;
|
|
94
|
+
user: User | null;
|
|
95
95
|
setItem(user: User, expiration: number): void;
|
|
96
|
+
saveMultiUser(user: User, long: boolean): void;
|
|
96
97
|
saveMultiUser(user: User, expiration: number): void;
|
|
98
|
+
checkDeprecatedData(): void;
|
|
97
99
|
saveUser(args: SaveUserArgs): Promise<void> | void;
|
|
98
100
|
}
|
|
99
101
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAI7B,YAAY,CAAC,EAAE,MAAM,CAAC;IAKtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,oBAAY,MAAM,GAAG;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,IAAI,GAAG;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,oBAAY,YAAY,GAAG,IAAI,GAAG;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,oBAAY,2BAA2B,GAAG;IACxC,YAAY,EAAE;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE;YACN,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;SACxB,CAAC;KAAE,CAAC;IACP,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,oBAAY,UAAU,GAAG;IACvB,OAAO,EAAE;QACP,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;CACH,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,IAAI,CAAC;CACZ,CAAC;AAEF,oBAAY,UAAU,GAAG;IACvB,WAAW,CAAC,EAAE;QACZ,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/AuthBase.ts
CHANGED
|
@@ -18,13 +18,13 @@ export abstract class AuthBase {
|
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
validateGuest(role: string, allowGuestLoginOverride = false): void {
|
|
22
22
|
if (!allowGuestLoginOverride && _.toLower(role) === 'guest') {
|
|
23
23
|
throw new NoRightsError('Authorization for guests is not allowed');
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
|
|
27
|
+
async validateToken(token: string, allowGuestLogin = false): Promise<User> {
|
|
28
28
|
const user = await this.sdkApi.makeRequest<User>({
|
|
29
29
|
method: 'GET',
|
|
30
30
|
route: '/auth/token',
|
package/src/AuthCookieStorage.ts
CHANGED
|
@@ -71,7 +71,7 @@ export class AuthCookieStorage implements AuthDataStorage {
|
|
|
71
71
|
return this.cookieDomain ? { domain: this.cookieDomain } : {};
|
|
72
72
|
}
|
|
73
73
|
|
|
74
|
-
|
|
74
|
+
get user(): User | null {
|
|
75
75
|
return this.cookie.get(this.userCookieName) || null;
|
|
76
76
|
}
|
|
77
77
|
|
|
@@ -91,12 +91,7 @@ export class AuthCookieStorage implements AuthDataStorage {
|
|
|
91
91
|
return new Date(Date.now() + expireIn);
|
|
92
92
|
}
|
|
93
93
|
|
|
94
|
-
|
|
95
|
-
// const { token = '' } = this.cookie.get(this.multiUserCookieName as string) || {};
|
|
96
|
-
// return token;
|
|
97
|
-
// }
|
|
98
|
-
|
|
99
|
-
get getMultiUserData(): User {
|
|
94
|
+
get multiUserData(): User {
|
|
100
95
|
return this.cookie.get(this.multiUserCookieName as string) || {};
|
|
101
96
|
}
|
|
102
97
|
|
|
@@ -111,7 +106,7 @@ export class AuthCookieStorage implements AuthDataStorage {
|
|
|
111
106
|
// we only need one running constantly
|
|
112
107
|
this.stopMonitor();
|
|
113
108
|
this.monitorCookieTimeout = setTimeout(() => {
|
|
114
|
-
const user = this.
|
|
109
|
+
const user = this.user;
|
|
115
110
|
if (user) {
|
|
116
111
|
if (!this.loggedIn) {
|
|
117
112
|
this.loggedIn = true;
|
|
@@ -197,7 +192,7 @@ export class AuthCookieStorage implements AuthDataStorage {
|
|
|
197
192
|
* ```
|
|
198
193
|
*/
|
|
199
194
|
updateExpiration(): void {
|
|
200
|
-
const user = this.
|
|
195
|
+
const user = this.user;
|
|
201
196
|
const expire = this.getExpire();
|
|
202
197
|
if (user) {
|
|
203
198
|
this.setItem(user, expire);
|
|
@@ -242,7 +237,7 @@ export class AuthCookieStorage implements AuthDataStorage {
|
|
|
242
237
|
}
|
|
243
238
|
|
|
244
239
|
|
|
245
|
-
|
|
240
|
+
checkDeprecatedData(): void {
|
|
246
241
|
const user = this.cookie.get(this.deprecatedCookieName);
|
|
247
242
|
if (user) {
|
|
248
243
|
const deprecatedUserExpireValue = this.getExpire(this.deprecatedUserExpireCookieName);
|
|
@@ -307,6 +302,6 @@ export class AuthCookieStorage implements AuthDataStorage {
|
|
|
307
302
|
* ```
|
|
308
303
|
*/
|
|
309
304
|
hasUserParams(): boolean {
|
|
310
|
-
return Boolean(this.
|
|
305
|
+
return Boolean(this.user);
|
|
311
306
|
}
|
|
312
307
|
}
|
package/src/AuthForClient.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AuthBase } from './AuthBase';
|
|
2
2
|
import {
|
|
3
|
-
AuthBaseConfig,
|
|
3
|
+
AuthBaseConfig, AuthDataStorage,
|
|
4
4
|
AuthResponse,
|
|
5
5
|
MultiUserLoginUserArgs,
|
|
6
6
|
MultiUserResponse,
|
|
@@ -16,8 +16,10 @@ import { isNode } from 'browser-or-node';
|
|
|
16
16
|
import axios from 'axios';
|
|
17
17
|
|
|
18
18
|
export class AuthForClient extends AuthBase {
|
|
19
|
-
|
|
19
|
+
readonly dataStorage: AuthDataStorage;
|
|
20
|
+
constructor(params: AuthBaseConfig & {dataStorage: AuthDataStorage;}) {
|
|
20
21
|
super(params);
|
|
22
|
+
this.dataStorage = params.dataStorage;
|
|
21
23
|
}
|
|
22
24
|
|
|
23
25
|
/**
|
|
@@ -35,13 +37,14 @@ export class AuthForClient extends AuthBase {
|
|
|
35
37
|
*/
|
|
36
38
|
async signIn({
|
|
37
39
|
credentials,
|
|
40
|
+
long = false,
|
|
38
41
|
allowGuestLogin = false,
|
|
39
42
|
captchaToken,
|
|
40
43
|
isCaptchaV2Checkbox,
|
|
41
44
|
verificationCode,
|
|
42
45
|
userToken,
|
|
43
46
|
rememberTwoFactor,
|
|
44
|
-
}: SignInArgs): Promise<
|
|
47
|
+
}: SignInArgs): Promise<AuthResponse> {
|
|
45
48
|
const fingerPrint = await generateFingerPrint();
|
|
46
49
|
|
|
47
50
|
const options = {
|
|
@@ -62,16 +65,16 @@ export class AuthForClient extends AuthBase {
|
|
|
62
65
|
|
|
63
66
|
this.validateGuest(user.role, allowGuestLogin);
|
|
64
67
|
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
68
|
+
if (!user.twoFactorCheck && !user.captchaCheck) {
|
|
69
|
+
if (user.tokenType === 'multi-user') {
|
|
70
|
+
this.dataStorage.saveMultiUser(user, long);
|
|
71
|
+
} else {
|
|
72
|
+
await this.dataStorage.saveUser({
|
|
73
|
+
long,
|
|
74
|
+
user,
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
}
|
|
75
78
|
|
|
76
79
|
return user;
|
|
77
80
|
}
|
|
@@ -87,13 +90,13 @@ export class AuthForClient extends AuthBase {
|
|
|
87
90
|
async signInWithToken(
|
|
88
91
|
token: string | { token: string; allowGuestLogin?: boolean; shouldNotSaveCookies?: boolean; },
|
|
89
92
|
allowGuestLogin = false,
|
|
90
|
-
|
|
93
|
+
shouldNotSaveCookies = false
|
|
91
94
|
): Promise<User> {
|
|
92
|
-
|
|
95
|
+
let userInfo = {};
|
|
93
96
|
if (_.isObject(token)) {
|
|
94
97
|
allowGuestLogin = _.get(token, 'allowGuestLogin', false);
|
|
95
|
-
|
|
96
|
-
|
|
98
|
+
shouldNotSaveCookies = _.get(token, 'shouldNotSaveCookies', false);
|
|
99
|
+
userInfo = _.get(token, 'userInfo', {});
|
|
97
100
|
token = token.token;
|
|
98
101
|
}
|
|
99
102
|
|
|
@@ -101,7 +104,7 @@ export class AuthForClient extends AuthBase {
|
|
|
101
104
|
return Promise.reject(new Error('No token given'));
|
|
102
105
|
}
|
|
103
106
|
|
|
104
|
-
|
|
107
|
+
this.dataStorage.checkDeprecatedData();
|
|
105
108
|
|
|
106
109
|
const user = await this.validateToken(token, allowGuestLogin);
|
|
107
110
|
|
|
@@ -112,12 +115,12 @@ export class AuthForClient extends AuthBase {
|
|
|
112
115
|
throw Error('Invalid Token');
|
|
113
116
|
}
|
|
114
117
|
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
118
|
+
if (!shouldNotSaveCookies) {
|
|
119
|
+
this.dataStorage.setItem({
|
|
120
|
+
...userInfo,
|
|
121
|
+
...user,
|
|
122
|
+
}, this.dataStorage.getExpire());
|
|
123
|
+
}
|
|
121
124
|
|
|
122
125
|
return user;
|
|
123
126
|
}
|
|
@@ -132,7 +135,6 @@ export class AuthForClient extends AuthBase {
|
|
|
132
135
|
try {
|
|
133
136
|
const promises = [];
|
|
134
137
|
if (token) {
|
|
135
|
-
|
|
136
138
|
promises.push(this.sdkApi.makeRequest<void>({
|
|
137
139
|
method: 'DELETE',
|
|
138
140
|
route: '/auth/fingerprint-token',
|
|
@@ -153,37 +155,37 @@ export class AuthForClient extends AuthBase {
|
|
|
153
155
|
// eslint-disable-next-line no-console
|
|
154
156
|
console.log('Logout failed: ', error);
|
|
155
157
|
}
|
|
156
|
-
|
|
158
|
+
this.dataStorage.removeItem();
|
|
157
159
|
}
|
|
158
160
|
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
161
|
+
/**
|
|
162
|
+
* Validate user
|
|
163
|
+
* ```typescript
|
|
164
|
+
* const user = await instance.validateUser();
|
|
165
|
+
* ```
|
|
166
|
+
*/
|
|
167
|
+
async validateUser(allowGuestLogin = false): Promise<User> {
|
|
168
|
+
this.dataStorage.checkDeprecatedData();
|
|
169
|
+
const userParams = this.dataStorage.user;
|
|
170
|
+
|
|
171
|
+
if (!userParams) {
|
|
172
|
+
return Promise.reject(new Error('No cached user params are available'));
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
const user = await this.validateToken(userParams.token || '', allowGuestLogin);
|
|
176
|
+
|
|
177
|
+
if (!user.identityProvider && userParams.identityProvider) {
|
|
178
|
+
user.identityProvider = userParams.identityProvider;
|
|
179
|
+
}
|
|
180
|
+
_.assign(user, { token: userParams.token });
|
|
181
|
+
|
|
182
|
+
const allow = _.get(user, 'allow', false);
|
|
183
|
+
if (!allow) {
|
|
184
|
+
throw Error('Invalid Token');
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
return user;
|
|
188
|
+
}
|
|
187
189
|
|
|
188
190
|
/**
|
|
189
191
|
* Get users list of a multi-user
|
|
@@ -213,7 +215,7 @@ export class AuthForClient extends AuthBase {
|
|
|
213
215
|
* });
|
|
214
216
|
* ```
|
|
215
217
|
*/
|
|
216
|
-
async multiUserLoginUser({ accountId, id,
|
|
218
|
+
async multiUserLoginUser({ accountId, id, long }: MultiUserLoginUserArgs): Promise<User> {
|
|
217
219
|
const user = await this.sdkApi.makeRequest<User>({
|
|
218
220
|
method: 'POST',
|
|
219
221
|
route: '/multi-user/user-token',
|
|
@@ -222,14 +224,14 @@ export class AuthForClient extends AuthBase {
|
|
|
222
224
|
id,
|
|
223
225
|
},
|
|
224
226
|
customHeaders: {
|
|
225
|
-
...this.addTokenToHeaders(
|
|
227
|
+
...this.addTokenToHeaders(this.multiUserToken),
|
|
226
228
|
},
|
|
227
229
|
});
|
|
228
230
|
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
231
|
+
await this.dataStorage.saveUser({
|
|
232
|
+
long,
|
|
233
|
+
user,
|
|
234
|
+
});
|
|
233
235
|
|
|
234
236
|
return user;
|
|
235
237
|
}
|
|
@@ -241,8 +243,8 @@ export class AuthForClient extends AuthBase {
|
|
|
241
243
|
* ```
|
|
242
244
|
*/
|
|
243
245
|
async getUserNameForLockScreen(user: Pick<User, 'multiUserId'| 'username'| 'token'>): Promise<string> {
|
|
244
|
-
|
|
245
|
-
|
|
246
|
+
const multiUserCookie = this.dataStorage.multiUserData;
|
|
247
|
+
if (multiUserCookie.username) return multiUserCookie.username;
|
|
246
248
|
|
|
247
249
|
const { multiUserId, username, token } = user;
|
|
248
250
|
if (multiUserId) {
|
|
@@ -276,6 +278,17 @@ export class AuthForClient extends AuthBase {
|
|
|
276
278
|
});
|
|
277
279
|
}
|
|
278
280
|
|
|
281
|
+
|
|
282
|
+
/**
|
|
283
|
+
* Update cookie expiration
|
|
284
|
+
* ```typescript
|
|
285
|
+
* instance.updateCookieExpiration();
|
|
286
|
+
* ```
|
|
287
|
+
*/
|
|
288
|
+
updateCookieExpiration() {
|
|
289
|
+
this.dataStorage.updateExpiration();
|
|
290
|
+
}
|
|
291
|
+
|
|
279
292
|
/**
|
|
280
293
|
* Set profile for multi-user
|
|
281
294
|
* ```typescript
|
|
@@ -320,7 +333,7 @@ export class AuthForClient extends AuthBase {
|
|
|
320
333
|
* ```
|
|
321
334
|
*/
|
|
322
335
|
async multiUserUploadIcon(
|
|
323
|
-
{ name, contentType, cacheControl = 'no-cache', file
|
|
336
|
+
{ name, contentType, cacheControl = 'no-cache', file }: MultiUserUploadIconArgs
|
|
324
337
|
): Promise<string> {
|
|
325
338
|
const data = await this.sdkApi.makeRequest<MultiUserUploadIconResponse>({
|
|
326
339
|
method: 'POST',
|
|
@@ -331,7 +344,7 @@ export class AuthForClient extends AuthBase {
|
|
|
331
344
|
cacheControl,
|
|
332
345
|
},
|
|
333
346
|
customHeaders: {
|
|
334
|
-
...this.addTokenToHeaders(
|
|
347
|
+
...this.addTokenToHeaders(this.multiUserToken),
|
|
335
348
|
},
|
|
336
349
|
});
|
|
337
350
|
|
|
@@ -388,7 +401,7 @@ export class AuthForClient extends AuthBase {
|
|
|
388
401
|
* ```
|
|
389
402
|
*/
|
|
390
403
|
async multiUserUpdateTwoFactor(
|
|
391
|
-
{ secret, enabled, codes, verificationCode
|
|
404
|
+
{ secret, enabled, codes, verificationCode }: MultiUserUpdateTwoFactorArgs
|
|
392
405
|
): Promise<any> {
|
|
393
406
|
return this.sdkApi.makeRequest<any>({
|
|
394
407
|
method: 'POST',
|
|
@@ -400,9 +413,14 @@ export class AuthForClient extends AuthBase {
|
|
|
400
413
|
verificationCode,
|
|
401
414
|
},
|
|
402
415
|
customHeaders: {
|
|
403
|
-
...this.addTokenToHeaders(
|
|
416
|
+
...this.addTokenToHeaders(this.multiUserToken),
|
|
404
417
|
},
|
|
405
418
|
});
|
|
406
419
|
}
|
|
407
420
|
|
|
421
|
+
|
|
422
|
+
private get multiUserToken(): string {
|
|
423
|
+
const { token = '' } = this.dataStorage.multiUserData;
|
|
424
|
+
return token;
|
|
425
|
+
}
|
|
408
426
|
}
|
package/src/types.ts
CHANGED
|
@@ -74,7 +74,7 @@ export type SignInArgs = {
|
|
|
74
74
|
username: string;
|
|
75
75
|
password: string;
|
|
76
76
|
};
|
|
77
|
-
|
|
77
|
+
long?: boolean;
|
|
78
78
|
allowGuestLogin?: boolean;
|
|
79
79
|
captchaToken?: string;
|
|
80
80
|
isCaptchaV2Checkbox?: boolean;
|
|
@@ -86,7 +86,7 @@ export type SignInArgs = {
|
|
|
86
86
|
export type MultiUserLoginUserArgs = {
|
|
87
87
|
accountId: string;
|
|
88
88
|
id: string;
|
|
89
|
-
|
|
89
|
+
long?: boolean;
|
|
90
90
|
};
|
|
91
91
|
|
|
92
92
|
export type MultiUserUploadIconArgs = {
|
|
@@ -94,7 +94,6 @@ export type MultiUserUploadIconArgs = {
|
|
|
94
94
|
contentType: string;
|
|
95
95
|
cacheControl: string;
|
|
96
96
|
file: File;
|
|
97
|
-
multiuserToken: string;
|
|
98
97
|
};
|
|
99
98
|
|
|
100
99
|
export type MultiUserUpdateTwoFactorArgs = {
|
|
@@ -102,7 +101,6 @@ export type MultiUserUpdateTwoFactorArgs = {
|
|
|
102
101
|
enabled: boolean;
|
|
103
102
|
codes: any;
|
|
104
103
|
verificationCode: string;
|
|
105
|
-
multiuserToken: string;
|
|
106
104
|
};
|
|
107
105
|
|
|
108
106
|
|
|
@@ -112,8 +110,11 @@ export interface AuthDataStorage {
|
|
|
112
110
|
monitor(...args: unknown[]): void;
|
|
113
111
|
stopMonitor(): void;
|
|
114
112
|
removeItem(...args: unknown[]): void;
|
|
115
|
-
|
|
113
|
+
multiUserData: User;
|
|
114
|
+
user: User | null;
|
|
116
115
|
setItem(user: User, expiration: number): void;
|
|
116
|
+
saveMultiUser(user: User, long: boolean): void;
|
|
117
117
|
saveMultiUser(user: User, expiration: number): void;
|
|
118
|
+
checkDeprecatedData(): void;
|
|
118
119
|
saveUser(args: SaveUserArgs): Promise<void> |void;
|
|
119
120
|
}
|