@or-sdk/auth 0.24.9-beta.991.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 +13 -11
- 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/cjs/index.js +1 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/AuthBase.js.map +1 -1
- package/dist/esm/AuthCookieStorage.js +13 -11
- 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/esm/index.js +1 -0
- package/dist/esm/index.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 +5 -4
- package/dist/types/AuthCookieStorage.d.ts.map +1 -1
- package/dist/types/AuthForClient.d.ts +14 -8
- package/dist/types/AuthForClient.d.ts.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/types.d.ts +8 -5
- package/dist/types/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/AuthBase.ts +2 -2
- package/src/AuthCookieStorage.ts +16 -11
- package/src/AuthForClient.ts +85 -67
- package/src/index.ts +1 -0
- package/src/types.ts +8 -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,10 +98,9 @@ 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
|
-
|
|
104
|
-
return token;
|
|
103
|
+
return this.cookie.get(this.multiUserCookieName) || {};
|
|
105
104
|
},
|
|
106
105
|
enumerable: false,
|
|
107
106
|
configurable: true
|
|
@@ -110,7 +109,7 @@ var AuthCookieStorage = (function () {
|
|
|
110
109
|
var _this = this;
|
|
111
110
|
this.stopMonitor();
|
|
112
111
|
this.monitorCookieTimeout = setTimeout(function () {
|
|
113
|
-
var user = _this.
|
|
112
|
+
var user = _this.user;
|
|
114
113
|
if (user) {
|
|
115
114
|
if (!_this.loggedIn) {
|
|
116
115
|
_this.loggedIn = true;
|
|
@@ -140,11 +139,14 @@ var AuthCookieStorage = (function () {
|
|
|
140
139
|
this.cookie.set(this.deprecatedCookieName, user, __assign({ path: '/', expires: nextExpiration }, this.domain));
|
|
141
140
|
this.cookie.set(this.deprecatedUserExpireCookieName, expireIn, __assign({ path: '/', expires: nextExpiration }, this.domain));
|
|
142
141
|
};
|
|
143
|
-
AuthCookieStorage.prototype.saveMultiUser = function (user,
|
|
144
|
-
|
|
142
|
+
AuthCookieStorage.prototype.saveMultiUser = function (user, expirationOrLong) {
|
|
143
|
+
if (typeof expirationOrLong === 'boolean') {
|
|
144
|
+
expirationOrLong = expirationOrLong ? this.expireInLong : this.expireInShort;
|
|
145
|
+
}
|
|
146
|
+
this.cookie.set(this.multiUserCookieName, user, __assign({ path: '/', expires: this._getNextExpiration(expirationOrLong), secure: true }, this.domain));
|
|
145
147
|
};
|
|
146
|
-
AuthCookieStorage.prototype.
|
|
147
|
-
var user = this.
|
|
148
|
+
AuthCookieStorage.prototype.updateExpiration = function () {
|
|
149
|
+
var user = this.user;
|
|
148
150
|
var expire = this.getExpire();
|
|
149
151
|
if (user) {
|
|
150
152
|
this.setItem(user, expire);
|
|
@@ -188,7 +190,7 @@ var AuthCookieStorage = (function () {
|
|
|
188
190
|
});
|
|
189
191
|
});
|
|
190
192
|
};
|
|
191
|
-
AuthCookieStorage.prototype.
|
|
193
|
+
AuthCookieStorage.prototype.checkDeprecatedData = function () {
|
|
192
194
|
var user = this.cookie.get(this.deprecatedCookieName);
|
|
193
195
|
if (user) {
|
|
194
196
|
var deprecatedUserExpireValue = this.getExpire(this.deprecatedUserExpireCookieName);
|
|
@@ -207,7 +209,7 @@ var AuthCookieStorage = (function () {
|
|
|
207
209
|
this.cookie.remove(this.deprecatedUserExpireCookieName, __assign({ path: '/' }, this.domain));
|
|
208
210
|
};
|
|
209
211
|
AuthCookieStorage.prototype.hasUserParams = function () {
|
|
210
|
-
return Boolean(this.
|
|
212
|
+
return Boolean(this.user);
|
|
211
213
|
};
|
|
212
214
|
return AuthCookieStorage;
|
|
213
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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,sBAAI,mCAAI;aAAR;YACE,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC;QACtD,CAAC;;;OAAA;IASD,qCAAS,GAAT,UAAU,UAAmB;QAC3B,IAAM,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,8CAAkB,GAA1B,UAA2B,QAAgB;QACzC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,sBAAI,4CAAa;aAAjB;YACE,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,mBAA6B,CAAC,IAAI,EAAE,CAAC;QACnE,CAAC;;;OAAA;IAQD,mCAAO,GAAP,UAAQ,cAA2B,EAAE,aAAoC;QAAzE,iBAkBC;QAfC,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,oBAAoB,GAAG,UAAU,CAAC;YACrC,IAAM,IAAI,GAAG,KAAI,CAAC,IAAI,CAAC;YACvB,IAAI,IAAI,EAAE;gBACR,IAAI,CAAC,KAAI,CAAC,QAAQ,EAAE;oBAClB,KAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;iBACtB;gBACD,IAAI,gBAAC,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;oBAAE,aAAa,CAAC,IAAI,CAAC,CAAC;iBAAE;aAC1D;iBAAM,IAAI,KAAI,CAAC,QAAQ,EAAE;gBACxB,KAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACtB,IAAI,gBAAC,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;oBAAE,cAAc,EAAE,CAAC;iBAAE;aACxD;YAED,KAAI,CAAC,OAAO,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAC9C,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACjC,CAAC;IASD,uCAAW,GAAX;QACE,IAAI,MAAM,EAAE;YACV,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;SACjD;IACH,CAAC;IAGD,mCAAO,GAAP,UAAQ,IAAU,EAAE,QAAgB;QAClC,IAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,aACvC,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,aACjD,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,aAC7C,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,aAC3D,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,cAAc,IACpB,IAAI,CAAC,MAAM,EACd,CAAC;IACL,CAAC;IAUD,yCAAa,GAAb,UAAc,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,aAC7C,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,4CAAgB,GAAhB;QACE,IAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,IAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC5B;QACD,IAAM,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,oCAAQ,GAAd,UAAe,EAA4B;YAA1B,IAAI,UAAA,EAAE,IAAI,UAAA;;;;;;wBACnB,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,uBAAuB,CAAC;wBAC9D,WAAW,GAAG,IAAI,mBAAQ,CAAC;4BAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;4BACvB,YAAY,EAAE,IAAI,CAAC,YAAY;4BAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;yBACpB,CAAC,CAAC;;;;wBAI0B,WAAM,WAAW,CAAC,iBAAiB,CAAC,EAAE,GAAG,KAAA,EAAE,CAAC,EAAA;;wBAAvE,wBAAwB,GAAG,SAA4C,CAAC;;;;wBAGxE,OAAO,CAAC,GAAG,CAAC,2DAA2D,EAAE,OAAK,CAAC,CAAC;;;wBAGlF,IAAI,CAAC,wBAAwB,EAAE;4BAC7B,wBAAwB,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;yBAC1E;wBAED,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;;;;;KAC9C;IAGD,+CAAmB,GAAnB;QACE,IAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACxD,IAAI,IAAI,EAAE;YACR,IAAM,yBAAyB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;YACtF,IAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,yBAAyB,CAAC,CAAC;YAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,aACvC,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,aAClE,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,IAAI,IACT,IAAI,CAAC,MAAM,EACd,CAAC;SACJ;IACH,CAAC;IAQD,sCAAU,GAAV;QACE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,aAC1C,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,aACpC,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,mBAA6B,aACnD,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,aAC1C,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,aACpD,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,aAC1C,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,aACpD,IAAI,EAAE,GAAG,IACN,IAAI,CAAC,MAAM,EACd,CAAC;IACL,CAAC;IAQD,yCAAa,GAAb;QACE,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IACH,wBAAC;AAAD,CAAC,AA7SD,IA6SC;AA7SY,8CAAiB"}
|
|
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAsC;AAYtC,kDAAuB;AACvB,iCAA8C;AAC9C,mDAAyC;AACzC,gDAA0B;AAE1B;IAAmC,iCAAQ;IAEzC,uBAAY,MAAwD;QAApE,YACE,kBAAM,MAAM,CAAC,SAEd;QADC,KAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;;IACxC,CAAC;IAeK,8BAAM,GAAZ,UAAa,EASA;YARX,WAAW,iBAAA,EACX,YAAY,EAAZ,IAAI,mBAAG,KAAK,KAAA,EACZ,uBAAuB,EAAvB,eAAe,mBAAG,KAAK,KAAA,EACvB,YAAY,kBAAA,EACZ,mBAAmB,yBAAA,EACnB,gBAAgB,sBAAA,EAChB,SAAS,eAAA,EACT,iBAAiB,uBAAA;;;;;4BAEG,WAAM,IAAA,2BAAmB,GAAE,EAAA;;wBAAzC,WAAW,GAAG,SAA2B;wBAEzC,OAAO,kCACR,WAAW,KACd,YAAY,cAAA,EACZ,mBAAmB,qBAAA,EACnB,gBAAgB,kBAAA,EAChB,WAAW,aAAA,EACX,iBAAiB,mBAAA,KACb,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,WAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CACnC,CAAC;wBAEW,WAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAe;gCACvD,MAAM,EAAE,MAAM;gCACd,KAAK,EAAE,aAAa;gCACpB,IAAI,EAAE,OAAO;6BACd,CAAC,EAAA;;wBAJI,IAAI,GAAG,SAIX;wBAEF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;6BAE3C,CAAA,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,YAAY,CAAA,EAA1C,cAA0C;6BACxC,CAAA,IAAI,CAAC,SAAS,KAAK,YAAY,CAAA,EAA/B,cAA+B;wBACjC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;;4BAE3C,WAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;4BAC9B,IAAI,MAAA;4BACJ,IAAI,MAAA;yBACL,CAAC,EAAA;;wBAHF,SAGE,CAAC;;4BAIP,WAAO,IAAI,EAAC;;;;KACb;IAUK,uCAAe,GAArB,UACE,KAA6F,EAC7F,eAAuB,EACvB,oBAA4B;QAD5B,gCAAA,EAAA,uBAAuB;QACvB,qCAAA,EAAA,4BAA4B;;;;;;wBAExB,QAAQ,GAAG,EAAE,CAAC;wBAClB,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;4BACrB,eAAe,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;4BACzD,oBAAoB,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,sBAAsB,EAAE,KAAK,CAAC,CAAC;4BACnE,QAAQ,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;4BACxC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;yBACrB;wBAED,IAAI,CAAC,KAAK,EAAE;4BACV,WAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC,EAAC;yBACpD;wBAED,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;wBAE1B,WAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,EAAA;;wBAAvD,IAAI,GAAG,SAAgD;wBAE7D,gBAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,OAAA,EAAE,CAAC,CAAC;wBAEpB,KAAK,GAAG,gBAAC,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;wBAC1C,IAAI,CAAC,KAAK,EAAE;4BACV,MAAM,KAAK,CAAC,eAAe,CAAC,CAAC;yBAC9B;wBAED,IAAI,CAAC,oBAAoB,EAAE;4BACzB,IAAI,CAAC,WAAW,CAAC,OAAO,uBACnB,QAAQ,GACR,IAAI,GACN,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC;yBAClC;wBAED,WAAO,IAAI,EAAC;;;;KACb;IAQK,+BAAO,GAAb,UAAc,KAAa,EAAE,cAAuB;;;;;;;wBAE1C,QAAQ,GAAG,EAAE,CAAC;wBACpB,IAAI,KAAK,EAAE;4BACT,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAO;gCAC1C,MAAM,EAAE,QAAQ;gCAChB,KAAK,EAAE,yBAAyB;gCAChC,aAAa,eACR,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CACjC;6BACF,CAAC,CAAC,CAAC;yBACL;wBACD,IAAI,cAAc,EAAE;4BAClB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,YACnC,MAAM,EAAE,QAAQ,EAChB,KAAK,EAAE,+BAA+B,IACnC,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,EACzC,CAAC,CAAC;yBACL;wBACD,WAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAA;;wBAA3B,SAA2B,CAAC;;;;wBAG5B,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAK,CAAC,CAAC;;;wBAExC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;;;;;KAC/B;IAQK,oCAAY,GAAlB,UAAmB,eAAuB;QAAvB,gCAAA,EAAA,uBAAuB;;;;;;wBACxC,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;wBACjC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;wBAEzC,IAAI,CAAC,UAAU,EAAE;4BACf,WAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC,EAAC;yBACzE;wBAEY,WAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE,EAAE,eAAe,CAAC,EAAA;;wBAAxE,IAAI,GAAG,SAAiE;wBAE9E,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,UAAU,CAAC,gBAAgB,EAAE;4BACzD,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,CAAC;yBACrD;wBACD,gBAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;wBAEtC,KAAK,GAAG,gBAAC,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;wBAC1C,IAAI,CAAC,KAAK,EAAE;4BACV,MAAM,KAAK,CAAC,eAAe,CAAC,CAAC;yBAC9B;wBAED,WAAO,IAAI,EAAC;;;;KACb;IAQK,6CAAqB,GAA3B,UAA4B,cAAsB;;;gBAChD,IAAI,CAAC,cAAc;oBAAE,WAAO,KAAK,EAAC;gBAElC,WAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAM;wBAClC,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE,wBAAwB;wBAC/B,aAAa,eACR,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAC1C;qBACF,CAAC,EAAC;;;KACJ;IAYK,0CAAkB,GAAxB,UAAyB,EAA+C;YAA7C,SAAS,eAAA,EAAE,EAAE,QAAA,EAAE,IAAI,UAAA;;;;;4BAC/B,WAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAO;4BAC/C,MAAM,EAAE,MAAM;4BACd,KAAK,EAAE,wBAAwB;4BAC/B,IAAI,EAAE;gCACJ,SAAS,WAAA;gCACT,EAAE,IAAA;6BACH;4BACD,aAAa,eACR,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAC/C;yBACF,CAAC,EAAA;;wBAVI,IAAI,GAAG,SAUX;wBAEF,WAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;gCAC9B,IAAI,MAAA;gCACJ,IAAI,MAAA;6BACL,CAAC,EAAA;;wBAHF,SAGE,CAAC;wBAEH,WAAO,IAAI,EAAC;;;;KACb;IAQK,gDAAwB,GAA9B,UAA+B,IAAoD;;;;;;wBAC3E,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC;wBACvD,IAAI,eAAe,CAAC,QAAQ;4BAAE,WAAO,eAAe,CAAC,QAAQ,EAAC;wBAEtD,WAAW,GAAsB,IAAI,YAA1B,EAAE,QAAQ,GAAY,IAAI,SAAhB,EAAE,KAAK,GAAK,IAAI,MAAT,CAAU;6BAC1C,WAAW,EAAX,cAAW;wBACQ,WAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAoB;gCACpE,MAAM,EAAE,KAAK;gCACb,KAAK,EAAE,kBAAkB;gCACzB,aAAa,eACR,IAAI,CAAC,iBAAiB,CAAC,KAAK,IAAI,EAAE,CAAC,CACvC;6BACF,CAAC,EAAA;;wBANM,aAAa,CAAA,SAMnB,CAAA,SANc;wBAQhB,WAAO,UAAQ,EAAC;4BAGlB,WAAO,QAAQ,EAAC;;;;KACjB;IAQK,2CAAmB,GAAzB,UAA0B,cAAsB;;;gBAC9C,WAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAM;wBAClC,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE,qBAAqB;wBAC5B,aAAa,eACR,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAC1C;qBACF,CAAC,EAAC;;;KACJ;IASD,8CAAsB,GAAtB;QACE,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;IACtC,CAAC;IAQK,2CAAmB,GAAzB,UAA0B,cAAsB,EAAE,OAAgB;;;gBAChE,WAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAM;wBAClC,MAAM,EAAE,MAAM;wBACd,KAAK,EAAE,qBAAqB;wBAC5B,IAAI,EAAE,OAAO;wBACb,aAAa,eACR,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAC1C;qBACF,CAAC,EAAC;;;KACJ;IAQK,8CAAsB,GAA5B,UAA6B,cAAsB;;;gBACjD,WAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAM;wBAClC,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE,mBAAmB;wBAC1B,aAAa,eACR,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAC1C;qBACF,CAAC,EAAC;;;KACJ;IAYK,2CAAmB,GAAzB,UACE,EAA+E;YAA7E,IAAI,UAAA,EAAE,WAAW,iBAAA,EAAE,oBAAyB,EAAzB,YAAY,mBAAG,UAAU,KAAA,EAAE,IAAI,UAAA;;;;;4BAEvC,WAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAA8B;4BACtE,MAAM,EAAE,MAAM;4BACd,KAAK,EAAE,6BAA6B;4BACpC,IAAI,EAAE;gCACJ,IAAI,MAAA;gCACJ,WAAW,aAAA;gCACX,YAAY,cAAA;6BACb;4BACD,aAAa,eACR,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAC/C;yBACF,CAAC,EAAA;;wBAXI,IAAI,GAAG,SAWX;wBAEI,WAAW,GAAG,wBAAM,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;wBACvD,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;wBAEnC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,UAAC,KAAK,EAAE,GAAG;4BAC7C,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;wBAC9B,CAAC,CAAC,CAAC;wBAEH,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;wBAC/C,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;wBAC7C,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;6BAEhC,wBAAM,EAAN,cAAM;wBACR,WAAM,IAAI,OAAO,CAAO,UAAC,OAAO,EAAE,MAAM;gCACtC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,UAAC,KAAU;oCAChD,IAAI,KAAK;wCAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;oCAChC,OAAO,EAAE,CAAC;gCACZ,CAAC,CAAC,CAAC;4BACL,CAAC,CAAC,EAAA;;wBALF,SAKE,CAAC;;4BAEH,WAAM,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAA;;wBAAjD,SAAiD,CAAC;;4BAGpD,WAAO,IAAI,CAAC,WAAW,EAAC;;;;KACzB;IAQK,0CAAkB,GAAxB,UAAyB,EAA6B;YAA3B,KAAK,WAAA;;;gBAC9B,WAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAM;wBAClC,MAAM,EAAE,MAAM;wBACd,KAAK,EAAE,iCAAiC;wBACxC,IAAI,EAAE;4BACJ,KAAK,OAAA;yBACN;qBACF,CAAC,EAAC;;;KACJ;IAaK,gDAAwB,GAA9B,UACE,EAA0E;YAAxE,MAAM,YAAA,EAAE,OAAO,aAAA,EAAE,KAAK,WAAA,EAAE,gBAAgB,sBAAA;;;gBAE1C,WAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAM;wBAClC,MAAM,EAAE,MAAM;wBACd,KAAK,EAAE,uBAAuB;wBAC9B,IAAI,EAAE;4BACJ,MAAM,QAAA;4BACN,OAAO,SAAA;4BACP,KAAK,OAAA;4BACL,gBAAgB,kBAAA;yBACjB;wBACD,aAAa,eACR,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAC/C;qBACF,CAAC,EAAC;;;KACJ;IAGD,sBAAY,yCAAc;aAA1B;YACU,IAAA,KAAe,IAAI,CAAC,WAAW,CAAC,aAAa,MAAnC,EAAV,KAAK,mBAAG,EAAE,KAAA,CAAoC;YACtD,OAAO,KAAK,CAAC;QACf,CAAC;;;OAAA;IACH,oBAAC;AAAD,CAAC,AAxZD,CAAmC,mBAAQ,GAwZ1C;AAxZY,sCAAa"}
|
package/dist/cjs/index.js
CHANGED
|
@@ -25,4 +25,5 @@ var AuthCookieStorage_1 = require("./AuthCookieStorage");
|
|
|
25
25
|
Object.defineProperty(exports, "AuthCookieStorage", { enumerable: true, get: function () { return AuthCookieStorage_1.AuthCookieStorage; } });
|
|
26
26
|
__exportStar(require("./types"), exports);
|
|
27
27
|
__exportStar(require("./constants"), exports);
|
|
28
|
+
__exportStar(require("./utils"), exports);
|
|
28
29
|
//# sourceMappingURL=index.js.map
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,mDAAkD;AAAzC,gHAAA,cAAc,OAAA;AACvB,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,0CAAwB;AACxB,8CAA4B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,mDAAkD;AAAzC,gHAAA,cAAc,OAAA;AACvB,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,0CAAwB;AACxB,8CAA4B;AAC5B,0CAAwB"}
|
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,14 +46,13 @@ export class AuthCookieStorage {
|
|
|
46
46
|
_getNextExpiration(expireIn) {
|
|
47
47
|
return new Date(Date.now() + expireIn);
|
|
48
48
|
}
|
|
49
|
-
get
|
|
50
|
-
|
|
51
|
-
return token;
|
|
49
|
+
get multiUserData() {
|
|
50
|
+
return this.cookie.get(this.multiUserCookieName) || {};
|
|
52
51
|
}
|
|
53
52
|
monitor(logoutCallback, loginCallback) {
|
|
54
53
|
this.stopMonitor();
|
|
55
54
|
this.monitorCookieTimeout = setTimeout(() => {
|
|
56
|
-
const user = this.
|
|
55
|
+
const user = this.user;
|
|
57
56
|
if (user) {
|
|
58
57
|
if (!this.loggedIn) {
|
|
59
58
|
this.loggedIn = true;
|
|
@@ -83,11 +82,14 @@ export class AuthCookieStorage {
|
|
|
83
82
|
this.cookie.set(this.deprecatedCookieName, user, Object.assign({ path: '/', expires: nextExpiration }, this.domain));
|
|
84
83
|
this.cookie.set(this.deprecatedUserExpireCookieName, expireIn, Object.assign({ path: '/', expires: nextExpiration }, this.domain));
|
|
85
84
|
}
|
|
86
|
-
saveMultiUser(user,
|
|
87
|
-
|
|
85
|
+
saveMultiUser(user, expirationOrLong) {
|
|
86
|
+
if (typeof expirationOrLong === 'boolean') {
|
|
87
|
+
expirationOrLong = expirationOrLong ? this.expireInLong : this.expireInShort;
|
|
88
|
+
}
|
|
89
|
+
this.cookie.set(this.multiUserCookieName, user, Object.assign({ path: '/', expires: this._getNextExpiration(expirationOrLong), secure: true }, this.domain));
|
|
88
90
|
}
|
|
89
|
-
|
|
90
|
-
const user = this.
|
|
91
|
+
updateExpiration() {
|
|
92
|
+
const user = this.user;
|
|
91
93
|
const expire = this.getExpire();
|
|
92
94
|
if (user) {
|
|
93
95
|
this.setItem(user, expire);
|
|
@@ -118,7 +120,7 @@ export class AuthCookieStorage {
|
|
|
118
120
|
this.setItem(user, cookieExpirationDuration);
|
|
119
121
|
});
|
|
120
122
|
}
|
|
121
|
-
|
|
123
|
+
checkDeprecatedData() {
|
|
122
124
|
const user = this.cookie.get(this.deprecatedCookieName);
|
|
123
125
|
if (user) {
|
|
124
126
|
const deprecatedUserExpireValue = this.getExpire(this.deprecatedUserExpireCookieName);
|
|
@@ -137,7 +139,7 @@ export class AuthCookieStorage {
|
|
|
137
139
|
this.cookie.remove(this.deprecatedUserExpireCookieName, Object.assign({ path: '/' }, this.domain));
|
|
138
140
|
}
|
|
139
141
|
hasUserParams() {
|
|
140
|
-
return Boolean(this.
|
|
142
|
+
return Boolean(this.user);
|
|
141
143
|
}
|
|
142
144
|
}
|
|
143
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":"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"}
|
|
@@ -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
|