@data-loom/service-js 0.4.4-auth-alpha.16 → 0.4.4-user-alpha.1
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/main/index.d.ts +1 -1
- package/dist/main/index.d.ts.map +1 -1
- package/dist/main/index.js +3 -2
- package/dist/main/index.js.map +1 -1
- package/dist/main/services/DataloomServiceBase.d.ts +0 -1
- package/dist/main/services/DataloomServiceBase.d.ts.map +1 -1
- package/dist/main/services/DataloomServiceBase.js +0 -1
- package/dist/main/services/DataloomServiceBase.js.map +1 -1
- package/dist/main/services/session-service/index.d.ts.map +1 -1
- package/dist/main/services/session-service/index.js +20 -39
- package/dist/main/services/session-service/index.js.map +1 -1
- package/dist/main/services/session-service/types.d.ts +1 -5
- package/dist/main/services/session-service/types.d.ts.map +1 -1
- package/dist/main/services/types.d.ts +17 -0
- package/dist/main/services/types.d.ts.map +1 -0
- package/dist/main/services/types.js +19 -0
- package/dist/main/services/types.js.map +1 -0
- package/dist/main/services/user-service/index.d.ts +3 -3
- package/dist/main/services/user-service/index.d.ts.map +1 -1
- package/dist/main/services/user-service/index.js +35 -8
- package/dist/main/services/user-service/index.js.map +1 -1
- package/dist/main/services/user-service/types.d.ts +16 -5
- package/dist/main/services/user-service/types.d.ts.map +1 -1
- package/dist/main/services/user-service/types.js +0 -5
- package/dist/main/services/user-service/types.js.map +1 -1
- package/dist/main/utils/helpers.d.ts +3 -0
- package/dist/main/utils/helpers.d.ts.map +1 -1
- package/dist/main/utils/helpers.js +18 -1
- package/dist/main/utils/helpers.js.map +1 -1
- package/dist/main/utils/logger.d.ts.map +1 -1
- package/dist/main/utils/logger.js +3 -4
- package/dist/main/utils/logger.js.map +1 -1
- package/dist/module/index.d.ts +1 -1
- package/dist/module/index.d.ts.map +1 -1
- package/dist/module/index.js +3 -2
- package/dist/module/index.js.map +1 -1
- package/dist/module/services/DataloomServiceBase.d.ts +0 -1
- package/dist/module/services/DataloomServiceBase.d.ts.map +1 -1
- package/dist/module/services/DataloomServiceBase.js +0 -1
- package/dist/module/services/DataloomServiceBase.js.map +1 -1
- package/dist/module/services/session-service/index.d.ts.map +1 -1
- package/dist/module/services/session-service/index.js +20 -39
- package/dist/module/services/session-service/index.js.map +1 -1
- package/dist/module/services/session-service/types.d.ts +1 -5
- package/dist/module/services/session-service/types.d.ts.map +1 -1
- package/dist/module/services/types.d.ts +17 -0
- package/dist/module/services/types.d.ts.map +1 -0
- package/dist/module/services/types.js +16 -0
- package/dist/module/services/types.js.map +1 -0
- package/dist/module/services/user-service/index.d.ts +3 -3
- package/dist/module/services/user-service/index.d.ts.map +1 -1
- package/dist/module/services/user-service/index.js +35 -8
- package/dist/module/services/user-service/index.js.map +1 -1
- package/dist/module/services/user-service/types.d.ts +16 -5
- package/dist/module/services/user-service/types.d.ts.map +1 -1
- package/dist/module/services/user-service/types.js +0 -5
- package/dist/module/services/user-service/types.js.map +1 -1
- package/dist/module/utils/helpers.d.ts +3 -0
- package/dist/module/utils/helpers.d.ts.map +1 -1
- package/dist/module/utils/helpers.js +15 -0
- package/dist/module/utils/helpers.js.map +1 -1
- package/dist/module/utils/logger.d.ts.map +1 -1
- package/dist/module/utils/logger.js +3 -4
- package/dist/module/utils/logger.js.map +1 -1
- package/package.json +3 -3
package/dist/main/index.d.ts
CHANGED
|
@@ -4,6 +4,6 @@ import { DataloomServiceOptions } from './utils/types';
|
|
|
4
4
|
export default class DataloomService {
|
|
5
5
|
user: UserService;
|
|
6
6
|
session: SessionService;
|
|
7
|
-
constructor(
|
|
7
|
+
constructor(dataloomUrl: string, options: DataloomServiceOptions);
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/main/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,cAAc,CAAC;gBAEZ,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,cAAc,CAAC;gBAEZ,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB;CAKjE"}
|
package/dist/main/index.js
CHANGED
|
@@ -7,9 +7,10 @@ const user_service_1 = __importDefault(require("./services/user-service"));
|
|
|
7
7
|
const session_service_1 = __importDefault(require("./services/session-service"));
|
|
8
8
|
const helpers_1 = require("./utils/helpers");
|
|
9
9
|
class DataloomService {
|
|
10
|
-
constructor(
|
|
10
|
+
constructor(dataloomUrl, options) {
|
|
11
|
+
const baseUrl = (0, helpers_1.isBrowser)() ? window.location.origin : '';
|
|
11
12
|
this.user = new user_service_1.default(baseUrl, options);
|
|
12
|
-
this.session = new session_service_1.default(
|
|
13
|
+
this.session = new session_service_1.default(baseUrl, options);
|
|
13
14
|
}
|
|
14
15
|
}
|
|
15
16
|
exports.default = DataloomService;
|
package/dist/main/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;AAAA,2EAAiE;AACjE,iFAAuE;AACvE,6CAA4C;AAG5C,MAAqB,eAAe;IAIlC,YAAY,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;AAAA,2EAAiE;AACjE,iFAAuE;AACvE,6CAA4C;AAG5C,MAAqB,eAAe;IAIlC,YAAY,WAAmB,EAAE,OAA+B;QAC9D,MAAM,OAAO,GAAG,IAAA,mBAAS,GAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,IAAI,CAAC,IAAI,GAAG,IAAI,sBAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,GAAG,IAAI,yBAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;CACF;AATD,kCASC"}
|
|
@@ -8,7 +8,6 @@ export default abstract class DataloomServiceBase {
|
|
|
8
8
|
protected logger: boolean;
|
|
9
9
|
protected serviceName: ServiceName;
|
|
10
10
|
protected brandId: string;
|
|
11
|
-
protected bizSource: string;
|
|
12
11
|
protected appId: string;
|
|
13
12
|
protected onRequestError?: (error: OnRequestErrorType) => void;
|
|
14
13
|
constructor(baseUrl: string, options: DataloomServiceOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataloomServiceBase.d.ts","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,sBAAsB,EACtB,KAAK,EACL,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,kBAAkB,EAClB,SAAS,EACV,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,mBAAmB;IAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"DataloomServiceBase.d.ts","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,sBAAsB,EACtB,KAAK,EACL,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,kBAAkB,EAClB,SAAS,EACV,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,mBAAmB;IAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAEnD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB;IAkBtD,SAAS,CAAC,CAAC,EACf,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;CAsIvC"}
|
|
@@ -17,7 +17,6 @@ class DataloomServiceBase {
|
|
|
17
17
|
this.logger = (_a = options.logger) !== null && _a !== void 0 ? _a : false;
|
|
18
18
|
this.serviceName = types_1.ServiceName.DEFAULT;
|
|
19
19
|
this.brandId = (0, helpers_1.serializeSessionBrandId)(options.brandName);
|
|
20
|
-
this.bizSource = options.brandName;
|
|
21
20
|
this.appId = options.appId;
|
|
22
21
|
this.onRequestError = options.onRequestError;
|
|
23
22
|
if (options.fetch) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataloomServiceBase.js","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":";;;;;AAAA,aAAa;AACb,uEAA8C;AAE9C,gDAAqD;AACrD,4CAA0D;AAC1D,8CAA4E;AAC5E,0CAQwB;AAExB,MAA8B,mBAAmB;
|
|
1
|
+
{"version":3,"file":"DataloomServiceBase.js","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAgBjE,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IACpD,WAAW,cAA8B;IAElD;;OAEG;IACH,eAAe,CAAC,OAAO,CAAC,EAAE,wBAAwB,GAAG,uBAAuB,CAAC,SAAS,CAAC;IA0BvF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAkBvD;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IA8BjE;;OAEG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;;;;CA0BrD"}
|
|
@@ -31,9 +31,8 @@ class SessionService extends DataloomServiceBase_1.default {
|
|
|
31
31
|
return browserEnvError;
|
|
32
32
|
}
|
|
33
33
|
const { returnUrl, newTab = false } = options !== null && options !== void 0 ? options : {};
|
|
34
|
-
const encodedRedirectUrl = encodeURIComponent(
|
|
35
|
-
const
|
|
36
|
-
const loginPageUrl = `${baseLoginUrl}?biz_source=${this.bizSource}&redirect_uri=${encodedRedirectUrl}`;
|
|
34
|
+
const encodedRedirectUrl = encodeURIComponent(returnUrl || window.location.href);
|
|
35
|
+
const loginPageUrl = `/suda/login?brand=${this.brandId}&appId=${this.appId}&redirectUrl=${encodedRedirectUrl}`;
|
|
37
36
|
if (newTab) {
|
|
38
37
|
window.open(loginPageUrl, '_blank');
|
|
39
38
|
}
|
|
@@ -55,50 +54,32 @@ class SessionService extends DataloomServiceBase_1.default {
|
|
|
55
54
|
console.log('[Dataloom][SessionService.SignOut] dataloom.service.session.signOut can only be invoked in browser environment.');
|
|
56
55
|
return browserEnvError;
|
|
57
56
|
}
|
|
58
|
-
return this.fetchData('/
|
|
59
|
-
method: '
|
|
60
|
-
|
|
61
|
-
redirectURI: window.location.href,
|
|
62
|
-
},
|
|
63
|
-
});
|
|
57
|
+
return this.fetchData('/suda/api/runtime/v1/idp/logout', {
|
|
58
|
+
method: 'GET',
|
|
59
|
+
}, { psmName: 'SessionService.SignOut' });
|
|
64
60
|
}
|
|
65
61
|
/**
|
|
66
62
|
* Gets the current user information if there is an existing session.
|
|
67
63
|
*/
|
|
68
|
-
|
|
69
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
64
|
+
getUserInfo() {
|
|
70
65
|
if (!(0, helpers_1.isBrowser)()) {
|
|
71
66
|
console.log('[Dataloom][SessionService.GetUserInfo] dataloom.service.session.getUserInfo can only be invoked in browser environment.');
|
|
72
67
|
return Promise.resolve(browserEnvError);
|
|
73
68
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
data: {
|
|
89
|
-
user_info: {
|
|
90
|
-
user_id: (_c = (_b = response.data) === null || _b === void 0 ? void 0 : _b.userInfo) === null || _c === void 0 ? void 0 : _c.userID,
|
|
91
|
-
name: (_e = (_d = response.data) === null || _d === void 0 ? void 0 : _d.userInfo) === null || _e === void 0 ? void 0 : _e.name,
|
|
92
|
-
avatar: (_g = (_f = response.data) === null || _f === void 0 ? void 0 : _f.userInfo) === null || _g === void 0 ? void 0 : _g.avatar,
|
|
93
|
-
email: (_j = (_h = response.data) === null || _h === void 0 ? void 0 : _h.userInfo) === null || _j === void 0 ? void 0 : _j.email,
|
|
94
|
-
phone_number: (_l = (_k = response.data) === null || _k === void 0 ? void 0 : _k.userInfo) === null || _l === void 0 ? void 0 : _l.desensitizedPhoneNumber,
|
|
95
|
-
},
|
|
96
|
-
},
|
|
97
|
-
error: null,
|
|
98
|
-
status: response.status,
|
|
99
|
-
statusText: response.statusText,
|
|
100
|
-
};
|
|
101
|
-
return userInfoResponse;
|
|
69
|
+
let url = '/suda/api/session/v1/idp/user_info';
|
|
70
|
+
const searchParams = new URLSearchParams();
|
|
71
|
+
if (this.brandId) {
|
|
72
|
+
searchParams.append('brand', this.brandId);
|
|
73
|
+
}
|
|
74
|
+
if (this.appId) {
|
|
75
|
+
searchParams.append('app_id', this.appId);
|
|
76
|
+
}
|
|
77
|
+
if (this.brandId || this.appId) {
|
|
78
|
+
url += `?${searchParams.toString()}`;
|
|
79
|
+
}
|
|
80
|
+
return this.fetchData(url, {
|
|
81
|
+
method: 'GET',
|
|
82
|
+
}, { psmName: 'SessionService.GetUserInfo' });
|
|
102
83
|
}
|
|
103
84
|
/**
|
|
104
85
|
* Navigate to user profile page within app runtime environment.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":";;;;;AAAA,iFAAyD;AACzD,6CAAgD;AAIhD,iDAAgD;AAEhD,MAAM,eAAe,GAAG;IACtB,IAAI,EAAE,IAAI;IACV,KAAK,EAAE;QACL,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,kCAAkC;QAC3C,IAAI,EAAE,qDAAqD;QAC3D,OAAO,EAAE,yDAAyD;KACnE;IACD,MAAM,EAAE,GAAG;IACX,UAAU,EAAE,aAAa;CAC1B,CAAC;AAEF,MAAqB,cAAe,SAAQ,6BAAmB;IAA/D;;QACW,gBAAW,GAAG,mBAAW,CAAC,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/types.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEtC,MAAM,WAAW,MAAM;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QACN,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,YAAY,CAAC;CAC1B"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export interface I18n {
|
|
2
|
+
language_code: number;
|
|
3
|
+
text: string;
|
|
4
|
+
}
|
|
5
|
+
export type I18ns = I18n[];
|
|
6
|
+
export declare enum AccountStatus {
|
|
7
|
+
Unspecified = 0,
|
|
8
|
+
Inactive = 1,
|
|
9
|
+
Active = 2,
|
|
10
|
+
Disabled = 3,
|
|
11
|
+
Terminated = 4
|
|
12
|
+
}
|
|
13
|
+
export declare enum UserStatus {
|
|
14
|
+
active = 1,
|
|
15
|
+
inactive = 2
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/services/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;AAG3B,oBAAY,aAAa;IACvB,WAAW,IAAA;IACX,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,UAAU,IAAA;CACX;AAGD,oBAAY,UAAU;IACpB,MAAM,IAAI;IACV,QAAQ,IAAA;CACT"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.UserStatus = exports.AccountStatus = void 0;
|
|
4
|
+
// 新版接口返回状态值,需要兼容至老版UserStatus
|
|
5
|
+
var AccountStatus;
|
|
6
|
+
(function (AccountStatus) {
|
|
7
|
+
AccountStatus[AccountStatus["Unspecified"] = 0] = "Unspecified";
|
|
8
|
+
AccountStatus[AccountStatus["Inactive"] = 1] = "Inactive";
|
|
9
|
+
AccountStatus[AccountStatus["Active"] = 2] = "Active";
|
|
10
|
+
AccountStatus[AccountStatus["Disabled"] = 3] = "Disabled";
|
|
11
|
+
AccountStatus[AccountStatus["Terminated"] = 4] = "Terminated";
|
|
12
|
+
})(AccountStatus = exports.AccountStatus || (exports.AccountStatus = {}));
|
|
13
|
+
// 老版接口返回值,需要保持
|
|
14
|
+
var UserStatus;
|
|
15
|
+
(function (UserStatus) {
|
|
16
|
+
UserStatus[UserStatus["active"] = 1] = "active";
|
|
17
|
+
UserStatus[UserStatus["inactive"] = 2] = "inactive";
|
|
18
|
+
})(UserStatus = exports.UserStatus || (exports.UserStatus = {}));
|
|
19
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/services/types.ts"],"names":[],"mappings":";;;AAOA,8BAA8B;AAC9B,IAAY,aAMX;AAND,WAAY,aAAa;IACvB,+DAAW,CAAA;IACX,yDAAQ,CAAA;IACR,qDAAM,CAAA;IACN,yDAAQ,CAAA;IACR,6DAAU,CAAA;AACZ,CAAC,EANW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAMxB;AAED,eAAe;AACf,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+CAAU,CAAA;IACV,mDAAQ,CAAA;AACV,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import DataloomServiceBase from '../DataloomServiceBase';
|
|
2
|
-
import { ServiceName } from '../../utils/types';
|
|
2
|
+
import { ServiceName, type DataloomServiceResponse } from '../../utils/types';
|
|
3
3
|
import type { SearchParams, UserResponse } from './types';
|
|
4
4
|
export default class UserService extends DataloomServiceBase {
|
|
5
5
|
serviceName: ServiceName;
|
|
6
|
-
search(params: SearchParams): Promise<
|
|
7
|
-
getByIds(ids: number[]): Promise<
|
|
6
|
+
search(params: SearchParams): Promise<DataloomServiceResponse<UserResponse>>;
|
|
7
|
+
getByIds(ids: number[]): Promise<DataloomServiceResponse<UserResponse>>;
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,KAAK,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAc,MAAM,SAAS,CAAC;AAGtE,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,mBAAmB;IACjD,WAAW,cAA2B;IAEzC,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAmC5E,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;CA+B9E"}
|
|
@@ -5,30 +5,57 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const DataloomServiceBase_1 = __importDefault(require("../DataloomServiceBase"));
|
|
7
7
|
const types_1 = require("../../utils/types");
|
|
8
|
+
const helpers_1 = require("../../utils/helpers");
|
|
8
9
|
class UserService extends DataloomServiceBase_1.default {
|
|
9
10
|
constructor() {
|
|
10
11
|
super(...arguments);
|
|
11
12
|
this.serviceName = types_1.ServiceName.UserService;
|
|
12
13
|
}
|
|
13
|
-
search(params) {
|
|
14
|
+
async search(params) {
|
|
15
|
+
var _a, _b;
|
|
14
16
|
const { name, pageSize } = params;
|
|
15
|
-
|
|
17
|
+
const res = await this.fetchData(`/af/app/${this.appId}/runtime/api/v1/account/search_user`, {
|
|
16
18
|
method: 'POST',
|
|
17
19
|
body: {
|
|
18
20
|
query: name,
|
|
19
|
-
page_size: pageSize,
|
|
20
|
-
brand: this.brandId,
|
|
21
|
-
app_id: this.appId,
|
|
21
|
+
page_size: pageSize !== null && pageSize !== void 0 ? pageSize : 100,
|
|
22
22
|
},
|
|
23
23
|
}, { psmName: 'UserService.Search' });
|
|
24
|
+
if (res.error) {
|
|
25
|
+
return res;
|
|
26
|
+
}
|
|
27
|
+
return Object.assign(Object.assign({}, res), { data: {
|
|
28
|
+
user_list: (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.map((item) => ({
|
|
29
|
+
avatar: item.avatar,
|
|
30
|
+
email: item.email,
|
|
31
|
+
name: (0, helpers_1.retrieveNameFromI18n)(item.name),
|
|
32
|
+
status: (0, helpers_1.convertUserStatus)(item.userStatus),
|
|
33
|
+
user_id: item.larkUserID.toString(),
|
|
34
|
+
user_type: item.userType,
|
|
35
|
+
}))) !== null && _b !== void 0 ? _b : [],
|
|
36
|
+
} });
|
|
24
37
|
}
|
|
25
|
-
getByIds(ids) {
|
|
26
|
-
|
|
38
|
+
async getByIds(ids) {
|
|
39
|
+
var _a, _b;
|
|
40
|
+
const res = await this.fetchData(`/af/app/${this.appId}/runtime/api/v1/account/list_users`, {
|
|
27
41
|
method: 'POST',
|
|
28
42
|
body: {
|
|
29
|
-
|
|
43
|
+
userIDList: ids,
|
|
30
44
|
},
|
|
31
45
|
}, { psmName: 'UserService.GetByIds' });
|
|
46
|
+
if (res.error) {
|
|
47
|
+
return res;
|
|
48
|
+
}
|
|
49
|
+
return Object.assign(Object.assign({}, res), { data: {
|
|
50
|
+
user_list: (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.map((item) => ({
|
|
51
|
+
avatar: item.avatar,
|
|
52
|
+
email: item.email,
|
|
53
|
+
name: (0, helpers_1.retrieveNameFromI18n)(item.name),
|
|
54
|
+
status: (0, helpers_1.convertUserStatus)(item.userStatus),
|
|
55
|
+
user_id: item.larkUserID.toString(),
|
|
56
|
+
user_type: item.userType,
|
|
57
|
+
}))) !== null && _b !== void 0 ? _b : [],
|
|
58
|
+
} });
|
|
32
59
|
}
|
|
33
60
|
}
|
|
34
61
|
exports.default = UserService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":";;;;;AAAA,iFAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":";;;;;AAAA,iFAAyD;AACzD,6CAA8E;AAE9E,iDAA8E;AAE9E,MAAqB,WAAY,SAAQ,6BAAmB;IAA5D;;QACW,gBAAW,GAAG,mBAAW,CAAC,WAAW,CAAC;IAoEjD,CAAC;IAlEC,KAAK,CAAC,MAAM,CAAC,MAAoB;;QAC/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,WAAW,IAAI,CAAC,KAAK,qCAAqC,EAC1D;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,GAAG;aAC3B;SACF,EACD,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAClC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EACP,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,IAAI,EAAE,IAAA,8BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC;oBACrC,MAAM,EAAE,IAAA,2BAAiB,EAAC,IAAI,CAAC,UAAU,CAAC;oBAC1C,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;oBACnC,SAAS,EAAE,IAAI,CAAC,QAAQ;iBACzB,CAAC,CAAC,mCAAI,EAAE;aACZ,IACD;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAa;;QAC1B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,WAAW,IAAI,CAAC,KAAK,oCAAoC,EACzD;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,UAAU,EAAE,GAAG;aAChB;SACF,EACD,EAAE,OAAO,EAAE,sBAAsB,EAAE,CACpC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EACP,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,IAAI,EAAE,IAAA,8BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC;oBACrC,MAAM,EAAE,IAAA,2BAAiB,EAAC,IAAI,CAAC,UAAU,CAAC;oBAC1C,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;oBACnC,SAAS,EAAE,IAAI,CAAC,QAAQ;iBACzB,CAAC,CAAC,mCAAI,EAAE;aACZ,IACD;IACJ,CAAC;CACF;AArED,8BAqEC"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
+
import { type I18ns, AccountStatus, UserStatus } from '../types';
|
|
1
2
|
export type SearchParams = {
|
|
2
3
|
name: string;
|
|
3
4
|
pageSize?: number;
|
|
4
5
|
};
|
|
5
|
-
declare enum UserStatus {
|
|
6
|
-
active = 1,
|
|
7
|
-
inactive = 2
|
|
8
|
-
}
|
|
9
6
|
export type User = {
|
|
10
7
|
user_id: string;
|
|
11
8
|
email: string;
|
|
@@ -13,8 +10,22 @@ export type User = {
|
|
|
13
10
|
avatar: string;
|
|
14
11
|
status: UserStatus;
|
|
15
12
|
};
|
|
13
|
+
export type DepartmentEntity = {
|
|
14
|
+
departmentID: number;
|
|
15
|
+
larkDepartmentID: number;
|
|
16
|
+
name: I18ns;
|
|
17
|
+
};
|
|
18
|
+
export type UserEntity = {
|
|
19
|
+
userID: number;
|
|
20
|
+
larkUserID: number;
|
|
21
|
+
name: I18ns;
|
|
22
|
+
avatar: string;
|
|
23
|
+
userType: string;
|
|
24
|
+
email: string;
|
|
25
|
+
userStatus: AccountStatus;
|
|
26
|
+
department: DepartmentEntity;
|
|
27
|
+
};
|
|
16
28
|
export type UserResponse = {
|
|
17
29
|
user_list: User[];
|
|
18
30
|
};
|
|
19
|
-
export {};
|
|
20
31
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/user-service/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/user-service/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEjE,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,KAAK,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,KAAK,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,aAAa,CAAC;IAC1B,UAAU,EAAE,gBAAgB,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,IAAI,EAAE,CAAC;CACnB,CAAC"}
|
|
@@ -1,8 +1,3 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
var UserStatus;
|
|
4
|
-
(function (UserStatus) {
|
|
5
|
-
UserStatus[UserStatus["active"] = 1] = "active";
|
|
6
|
-
UserStatus[UserStatus["inactive"] = 2] = "inactive";
|
|
7
|
-
})(UserStatus || (UserStatus = {}));
|
|
8
3
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/services/user-service/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/services/user-service/types.ts"],"names":[],"mappings":""}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import { I18ns, AccountStatus, UserStatus } from '../services/types';
|
|
1
2
|
export declare const isBrowser: () => boolean;
|
|
2
3
|
export declare const serializeSessionBrandId: (brand: string) => string;
|
|
3
4
|
export declare const getCookieByName: (name: string) => string;
|
|
5
|
+
export declare const retrieveNameFromI18n: (i18ns: I18ns) => string;
|
|
6
|
+
export declare const convertUserStatus: (status: AccountStatus) => UserStatus;
|
|
4
7
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,eAAyE,CAAC;AAEhG,eAAO,MAAM,uBAAuB,UAAW,MAAM,KAAG,MAMvD,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAO9C,CAAC"}
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIrE,eAAO,MAAM,SAAS,eAAyE,CAAC;AAEhG,eAAO,MAAM,uBAAuB,UAAW,MAAM,KAAG,MAMvD,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAO9C,CAAC;AAEF,eAAO,MAAM,oBAAoB,0BAEhC,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAAY,aAAa,KAAG,UASzD,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getCookieByName = exports.serializeSessionBrandId = exports.isBrowser = void 0;
|
|
3
|
+
exports.convertUserStatus = exports.retrieveNameFromI18n = exports.getCookieByName = exports.serializeSessionBrandId = exports.isBrowser = void 0;
|
|
4
|
+
const types_1 = require("../services/types");
|
|
5
|
+
const CN_LANG_CODE = 2052;
|
|
4
6
|
const isBrowser = () => typeof window !== 'undefined' && typeof document !== 'undefined';
|
|
5
7
|
exports.isBrowser = isBrowser;
|
|
6
8
|
const serializeSessionBrandId = (brand) => {
|
|
@@ -19,4 +21,19 @@ const getCookieByName = (name) => {
|
|
|
19
21
|
return (_b = (_a = cookies.find((cookie) => cookie.trim().startsWith(`${name}=`))) === null || _a === void 0 ? void 0 : _a.split('=')[1]) !== null && _b !== void 0 ? _b : '';
|
|
20
22
|
};
|
|
21
23
|
exports.getCookieByName = getCookieByName;
|
|
24
|
+
const retrieveNameFromI18n = (i18ns) => {
|
|
25
|
+
var _a;
|
|
26
|
+
return ((_a = i18ns === null || i18ns === void 0 ? void 0 : i18ns.find((i18n) => i18n.language_code === CN_LANG_CODE)) === null || _a === void 0 ? void 0 : _a.text) || '';
|
|
27
|
+
};
|
|
28
|
+
exports.retrieveNameFromI18n = retrieveNameFromI18n;
|
|
29
|
+
const convertUserStatus = (status) => {
|
|
30
|
+
if (status === types_1.AccountStatus.Active || status === types_1.AccountStatus.Inactive) {
|
|
31
|
+
return types_1.UserStatus.active;
|
|
32
|
+
}
|
|
33
|
+
if (status === types_1.AccountStatus.Disabled || status === types_1.AccountStatus.Terminated) {
|
|
34
|
+
return types_1.UserStatus.inactive;
|
|
35
|
+
}
|
|
36
|
+
return types_1.UserStatus.active;
|
|
37
|
+
};
|
|
38
|
+
exports.convertUserStatus = convertUserStatus;
|
|
22
39
|
//# sourceMappingURL=helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/utils/helpers.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/utils/helpers.ts"],"names":[],"mappings":";;;AAAA,6CAAqE;AAErE,MAAM,YAAY,GAAG,IAAI,CAAC;AAEnB,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW,CAAC;AAAnF,QAAA,SAAS,aAA0E;AAEzF,MAAM,uBAAuB,GAAG,CAAC,KAAa,EAAU,EAAE;IAC/D,IAAI,KAAK,KAAK,QAAQ,EAAE;QACtB,OAAO,GAAG,CAAC;KACZ;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AANW,QAAA,uBAAuB,2BAMlC;AAEK,MAAM,eAAe,GAAG,CAAC,IAAY,EAAU,EAAE;;IACtD,IAAI,CAAC,IAAA,iBAAS,GAAE,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO,MAAA,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,0CAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC;AAC7F,CAAC,CAAC;AAPW,QAAA,eAAe,mBAO1B;AAEK,MAAM,oBAAoB,GAAG,CAAC,KAAY,EAAE,EAAE;;IACnD,OAAO,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,KAAK,YAAY,CAAC,0CAAE,IAAI,KAAI,EAAE,CAAC;AAChF,CAAC,CAAC;AAFW,QAAA,oBAAoB,wBAE/B;AAEK,MAAM,iBAAiB,GAAG,CAAC,MAAqB,EAAc,EAAE;IACrE,IAAI,MAAM,KAAK,qBAAa,CAAC,MAAM,IAAI,MAAM,KAAK,qBAAa,CAAC,QAAQ,EAAE;QACxE,OAAO,kBAAU,CAAC,MAAM,CAAC;KAC1B;IACD,IAAI,MAAM,KAAK,qBAAa,CAAC,QAAQ,IAAI,MAAM,KAAK,qBAAa,CAAC,UAAU,EAAE;QAC5E,OAAO,kBAAU,CAAC,QAAQ,CAAC;KAC5B;IAED,OAAO,kBAAU,CAAC,MAAM,CAAC;AAC3B,CAAC,CAAC;AATW,QAAA,iBAAiB,qBAS5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,SAAS,YAAW,MAAM,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,SAAS,YAAW,MAAM,SAiB5D,CAAC;AAEF,eAAO,MAAM,WAAW,YACb,MAAM,YACL;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,QAAQ,MAAM,CAAA;CAAE,YAC1C,MAAM,SA0BhB,CAAC"}
|
|
@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.logResponse = exports.logRequest = void 0;
|
|
4
4
|
const logRequest = (params, psmName = 'Service') => {
|
|
5
5
|
const { traceId, url, method, body } = params;
|
|
6
|
-
|
|
7
|
-
const decodedParams = Array.from(new URL(url, 'http://temp.invalid').searchParams.entries())
|
|
6
|
+
const decodedParams = Array.from(new URL(url).searchParams.entries())
|
|
8
7
|
.filter(([key]) => !['count', 'tx', 'missing', 'resolution', 'column'].includes(key))
|
|
9
8
|
.map(([key, value]) => `${key}=${value}`);
|
|
10
9
|
console.log(`[Dataloom][${psmName}][Request]`, 'trace id:', traceId, 'method:', method, 'params:', decodedParams.join(','), 'body:', body);
|
|
@@ -14,10 +13,10 @@ const logResponse = (traceId, response, psmName = 'Service') => {
|
|
|
14
13
|
const { data, error, status } = response;
|
|
15
14
|
const hasError = !!error;
|
|
16
15
|
if (hasError) {
|
|
17
|
-
console.error(`[Dataloom][${psmName}][Response Failed]`, 'trace id:', traceId, 'statusCode:', status, 'error:', error);
|
|
16
|
+
console.error(`[Dataloom][${psmName}][Response ${error ? 'Failed' : 'Success'}]`, 'trace id:', traceId, 'statusCode:', status, 'error:', error);
|
|
18
17
|
}
|
|
19
18
|
else {
|
|
20
|
-
console.log(`[Dataloom][${psmName}][Response Success]`, 'trace id:', traceId, 'statusCode:', status, 'data:', data);
|
|
19
|
+
console.log(`[Dataloom][${psmName}][Response ${error ? 'Failed' : 'Success'}]`, 'trace id:', traceId, 'statusCode:', status, 'data:', data);
|
|
21
20
|
}
|
|
22
21
|
};
|
|
23
22
|
exports.logResponse = logResponse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":";;;AASO,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,UAAkB,SAAS,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":";;;AASO,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,UAAkB,SAAS,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAC9C,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;SAClE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACpF,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;IAE5C,OAAO,CAAC,GAAG,CACT,cAAc,OAAO,YAAY,EACjC,WAAW,EACX,OAAO,EACP,SAAS,EACT,MAAM,EACN,SAAS,EACT,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EACvB,OAAO,EACP,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,UAAU,cAiBrB;AAEK,MAAM,WAAW,GAAG,CACzB,OAAe,EACf,QAAmD,EACnD,UAAkB,SAAS,EAC3B,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IACzC,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC;IAEzB,IAAI,QAAQ,EAAE;QACZ,OAAO,CAAC,KAAK,CACX,cAAc,OAAO,cAAc,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,GAAG,EAClE,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,QAAQ,EACR,KAAK,CACN,CAAC;KACH;SAAM;QACL,OAAO,CAAC,GAAG,CACT,cAAc,OAAO,cAAc,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,GAAG,EAClE,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,OAAO,EACP,IAAI,CACL,CAAC;KACH;AACH,CAAC,CAAC;AA7BW,QAAA,WAAW,eA6BtB"}
|
package/dist/module/index.d.ts
CHANGED
|
@@ -4,6 +4,6 @@ import { DataloomServiceOptions } from './utils/types';
|
|
|
4
4
|
export default class DataloomService {
|
|
5
5
|
user: UserService;
|
|
6
6
|
session: SessionService;
|
|
7
|
-
constructor(
|
|
7
|
+
constructor(dataloomUrl: string, options: DataloomServiceOptions);
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,cAAc,CAAC;gBAEZ,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,cAAc,CAAC;gBAEZ,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB;CAKjE"}
|
package/dist/module/index.js
CHANGED
|
@@ -2,9 +2,10 @@ import { default as UserService } from './services/user-service';
|
|
|
2
2
|
import { default as SessionService } from './services/session-service';
|
|
3
3
|
import { isBrowser } from './utils/helpers';
|
|
4
4
|
export default class DataloomService {
|
|
5
|
-
constructor(
|
|
5
|
+
constructor(dataloomUrl, options) {
|
|
6
|
+
const baseUrl = isBrowser() ? window.location.origin : '';
|
|
6
7
|
this.user = new UserService(baseUrl, options);
|
|
7
|
-
this.session = new SessionService(
|
|
8
|
+
this.session = new SessionService(baseUrl, options);
|
|
8
9
|
}
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=index.js.map
|
package/dist/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,CAAC,OAAO,OAAO,eAAe;IAIlC,YAAY,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,CAAC,OAAO,OAAO,eAAe;IAIlC,YAAY,WAAmB,EAAE,OAA+B;QAC9D,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,IAAI,CAAC,IAAI,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;CACF"}
|
|
@@ -8,7 +8,6 @@ export default abstract class DataloomServiceBase {
|
|
|
8
8
|
protected logger: boolean;
|
|
9
9
|
protected serviceName: ServiceName;
|
|
10
10
|
protected brandId: string;
|
|
11
|
-
protected bizSource: string;
|
|
12
11
|
protected appId: string;
|
|
13
12
|
protected onRequestError?: (error: OnRequestErrorType) => void;
|
|
14
13
|
constructor(baseUrl: string, options: DataloomServiceOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataloomServiceBase.d.ts","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,sBAAsB,EACtB,KAAK,EACL,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,kBAAkB,EAClB,SAAS,EACV,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,mBAAmB;IAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"DataloomServiceBase.d.ts","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,sBAAsB,EACtB,KAAK,EACL,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,kBAAkB,EAClB,SAAS,EACV,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,mBAAmB;IAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAEnD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB;IAkBtD,SAAS,CAAC,CAAC,EACf,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;CAsIvC"}
|
|
@@ -12,7 +12,6 @@ export default class DataloomServiceBase {
|
|
|
12
12
|
this.logger = (_a = options.logger) !== null && _a !== void 0 ? _a : false;
|
|
13
13
|
this.serviceName = ServiceName.DEFAULT;
|
|
14
14
|
this.brandId = serializeSessionBrandId(options.brandName);
|
|
15
|
-
this.bizSource = options.brandName;
|
|
16
15
|
this.appId = options.appId;
|
|
17
16
|
this.onRequestError = options.onRequestError;
|
|
18
17
|
if (options.fetch) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataloomServiceBase.js","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAIL,WAAW,GAIZ,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAgB,mBAAmB;
|
|
1
|
+
{"version":3,"file":"DataloomServiceBase.js","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAIL,WAAW,GAIZ,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAgB,mBAAmB;IAU/C,YAAY,OAAe,EAAE,OAA+B;;QAC1D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,mCAAQ,OAAO,CAAC,OAAO,KAAE,mBAAmB,EAAE,eAAe,CAAC,iBAAiB,CAAC,GAAE,CAAC;QAC/F,IAAI,CAAC,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,KAAK,CAAC;QACtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,uBAAuB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;QAE7C,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;SAC5B;aAAM,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;YACvC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;SACxB;aAAM;YACL,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;SACpB;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CACb,GAAW,EACX,OAAqB,EACrB,MAAkB;;QAElB,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,GAAG,EAAE,CAAC;QAEpD,IAAI,OAAO,GAAW,CAAC,CAAC,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC;YAClC,UAAU,CACR;gBACE,OAAO;gBACP,GAAG,EAAE,QAAQ;gBACb,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,EACD,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAChB,CAAC;SACH;QAED,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACrC,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,SAAS;gBACtB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;aACnC,CAAC,CAAC;YAEH,IAAI,KAAK,GAAG,IAAI,CAAC;YACjB,IAAI,IAAI,GAAG,IAAI,CAAC;YAChB,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;YACxB,IAAI,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;YAEhC,IAAI,GAAG,CAAC,EAAE,EAAE;gBACV,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;gBAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAEpC,2BAA2B;gBAC3B,IAAI,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,SAAS,EAAE;oBAClD,IAAI,GAAG,IAAI,CAAC;oBACZ,KAAK,GAAG;wBACN,IAAI,EAAE,UAAU,CAAC,WAAW,IAAI,GAAG,CAAC,MAAM;wBAC1C,OAAO,EAAE,EAAE;wBACX,IAAI,EAAE,EAAE;wBACR,OAAO,EAAE,UAAU,CAAC,SAAS,IAAI,IAAI;qBACtC,CAAC;iBACH;qBAAM;oBACL,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;oBACvB,KAAK,GAAG,IAAI,CAAC;iBACd;aACF;iBAAM;gBACL,oBAAoB;gBACpB,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;gBAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAEpC,IAAI;oBACF,6BAA6B;oBAC7B,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;wBACtB,KAAK,GAAG;4BACN,IAAI,EAAE,GAAG;4BACT,OAAO,EAAE,8CAA8C;4BACvD,OAAO,EAAE,EAAE;4BACX,IAAI,EAAE,wBAAwB;yBAC/B,CAAC;qBACH;yBAAM;wBACL,KAAK,GAAG;4BACN,IAAI,EAAE,UAAU,CAAC,WAAW,IAAI,GAAG,CAAC,MAAM;4BAC1C,OAAO,EAAE,UAAU,CAAC,SAAS,IAAI,IAAI;4BACrC,OAAO,EAAE,EAAE;4BACX,IAAI,EAAE,EAAE;yBACT,CAAC;qBACH;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,KAAK,GAAG;wBACN,IAAI,EAAE,UAAU,CAAC,WAAW,IAAI,GAAG,CAAC,MAAM;wBAC1C,OAAO,EAAE,UAAU,CAAC,SAAS,IAAI,IAAI;wBACrC,OAAO,EAAE,EAAE;wBACX,IAAI,EAAE,EAAE;qBACT,CAAC;oBACF,IAAI,GAAG,IAAI,CAAC;oBACZ,MAAM,GAAG,GAAG,CAAC;oBACb,UAAU,GAAG,yBAAyB,CAAC;iBACxC;aACF;YAED,MAAM,eAAe,GAAG;gBACtB,IAAI;gBACJ,KAAK;gBACL,MAAM;gBACN,UAAU;aACX,CAAC;YAEF,IAAI,KAAK,EAAE;gBACT,MAAA,IAAI,CAAC,cAAc,qFACd,KAAK,KACR,MAAM;oBACN,UAAU,IACV,CAAC;aACJ;YAED,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,WAAW,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,CAAC;aACxD;YAED,OAAO,eAAe,CAAC;SACxB;QAAC,OAAO,CAAM,EAAE;YACf,MAAM,aAAa,GAAG;gBACpB,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO;oBACnB,OAAO,EAAE,EAAE;oBACX,IAAI,EAAE,EAAE;iBACT;gBACD,MAAM,EAAE,GAAG;gBACX,UAAU,EAAE,yBAAyB;aACtC,CAAC;YAEF,MAAA,IAAI,CAAC,cAAc,qFACd,aAAa,CAAC,KAAK,KACtB,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,UAAU,EAAE,aAAa,CAAC,UAAU,IACpC,CAAC;YAEH,MAAM,eAAe,mBACnB,IAAI,EAAE,IAAI,IACP,aAAa,CACjB,CAAC;YAEF,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,WAAW,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,CAAC;aACxD;YAED,OAAO,eAAe,CAAC;SACxB;IACH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAgBjE,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IACpD,WAAW,cAA8B;IAElD;;OAEG;IACH,eAAe,CAAC,OAAO,CAAC,EAAE,wBAAwB,GAAG,uBAAuB,CAAC,SAAS,CAAC;IA0BvF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAkBvD;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IA8BjE;;OAEG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;;;;CA0BrD"}
|
|
@@ -26,9 +26,8 @@ export default class SessionService extends DataloomServiceBase {
|
|
|
26
26
|
return browserEnvError;
|
|
27
27
|
}
|
|
28
28
|
const { returnUrl, newTab = false } = options !== null && options !== void 0 ? options : {};
|
|
29
|
-
const encodedRedirectUrl = encodeURIComponent(
|
|
30
|
-
const
|
|
31
|
-
const loginPageUrl = `${baseLoginUrl}?biz_source=${this.bizSource}&redirect_uri=${encodedRedirectUrl}`;
|
|
29
|
+
const encodedRedirectUrl = encodeURIComponent(returnUrl || window.location.href);
|
|
30
|
+
const loginPageUrl = `/suda/login?brand=${this.brandId}&appId=${this.appId}&redirectUrl=${encodedRedirectUrl}`;
|
|
32
31
|
if (newTab) {
|
|
33
32
|
window.open(loginPageUrl, '_blank');
|
|
34
33
|
}
|
|
@@ -50,50 +49,32 @@ export default class SessionService extends DataloomServiceBase {
|
|
|
50
49
|
console.log('[Dataloom][SessionService.SignOut] dataloom.service.session.signOut can only be invoked in browser environment.');
|
|
51
50
|
return browserEnvError;
|
|
52
51
|
}
|
|
53
|
-
return this.fetchData('/
|
|
54
|
-
method: '
|
|
55
|
-
|
|
56
|
-
redirectURI: window.location.href,
|
|
57
|
-
},
|
|
58
|
-
});
|
|
52
|
+
return this.fetchData('/suda/api/runtime/v1/idp/logout', {
|
|
53
|
+
method: 'GET',
|
|
54
|
+
}, { psmName: 'SessionService.SignOut' });
|
|
59
55
|
}
|
|
60
56
|
/**
|
|
61
57
|
* Gets the current user information if there is an existing session.
|
|
62
58
|
*/
|
|
63
|
-
|
|
64
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
59
|
+
getUserInfo() {
|
|
65
60
|
if (!isBrowser()) {
|
|
66
61
|
console.log('[Dataloom][SessionService.GetUserInfo] dataloom.service.session.getUserInfo can only be invoked in browser environment.');
|
|
67
62
|
return Promise.resolve(browserEnvError);
|
|
68
63
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
data: {
|
|
84
|
-
user_info: {
|
|
85
|
-
user_id: (_c = (_b = response.data) === null || _b === void 0 ? void 0 : _b.userInfo) === null || _c === void 0 ? void 0 : _c.userID,
|
|
86
|
-
name: (_e = (_d = response.data) === null || _d === void 0 ? void 0 : _d.userInfo) === null || _e === void 0 ? void 0 : _e.name,
|
|
87
|
-
avatar: (_g = (_f = response.data) === null || _f === void 0 ? void 0 : _f.userInfo) === null || _g === void 0 ? void 0 : _g.avatar,
|
|
88
|
-
email: (_j = (_h = response.data) === null || _h === void 0 ? void 0 : _h.userInfo) === null || _j === void 0 ? void 0 : _j.email,
|
|
89
|
-
phone_number: (_l = (_k = response.data) === null || _k === void 0 ? void 0 : _k.userInfo) === null || _l === void 0 ? void 0 : _l.desensitizedPhoneNumber,
|
|
90
|
-
},
|
|
91
|
-
},
|
|
92
|
-
error: null,
|
|
93
|
-
status: response.status,
|
|
94
|
-
statusText: response.statusText,
|
|
95
|
-
};
|
|
96
|
-
return userInfoResponse;
|
|
64
|
+
let url = '/suda/api/session/v1/idp/user_info';
|
|
65
|
+
const searchParams = new URLSearchParams();
|
|
66
|
+
if (this.brandId) {
|
|
67
|
+
searchParams.append('brand', this.brandId);
|
|
68
|
+
}
|
|
69
|
+
if (this.appId) {
|
|
70
|
+
searchParams.append('app_id', this.appId);
|
|
71
|
+
}
|
|
72
|
+
if (this.brandId || this.appId) {
|
|
73
|
+
url += `?${searchParams.toString()}`;
|
|
74
|
+
}
|
|
75
|
+
return this.fetchData(url, {
|
|
76
|
+
method: 'GET',
|
|
77
|
+
}, { psmName: 'SessionService.GetUserInfo' });
|
|
97
78
|
}
|
|
98
79
|
/**
|
|
99
80
|
* Navigate to user profile page within app runtime environment.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,eAAe,GAAG;IACtB,IAAI,EAAE,IAAI;IACV,KAAK,EAAE;QACL,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,kCAAkC;QAC3C,IAAI,EAAE,qDAAqD;QAC3D,OAAO,EAAE,yDAAyD;KACnE;IACD,MAAM,EAAE,GAAG;IACX,UAAU,EAAE,aAAa;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IAA/D;;QACW,gBAAW,GAAG,WAAW,CAAC,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/types.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEtC,MAAM,WAAW,MAAM;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QACN,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,YAAY,CAAC;CAC1B"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export interface I18n {
|
|
2
|
+
language_code: number;
|
|
3
|
+
text: string;
|
|
4
|
+
}
|
|
5
|
+
export type I18ns = I18n[];
|
|
6
|
+
export declare enum AccountStatus {
|
|
7
|
+
Unspecified = 0,
|
|
8
|
+
Inactive = 1,
|
|
9
|
+
Active = 2,
|
|
10
|
+
Disabled = 3,
|
|
11
|
+
Terminated = 4
|
|
12
|
+
}
|
|
13
|
+
export declare enum UserStatus {
|
|
14
|
+
active = 1,
|
|
15
|
+
inactive = 2
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/services/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;AAG3B,oBAAY,aAAa;IACvB,WAAW,IAAA;IACX,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,UAAU,IAAA;CACX;AAGD,oBAAY,UAAU;IACpB,MAAM,IAAI;IACV,QAAQ,IAAA;CACT"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
// 新版接口返回状态值,需要兼容至老版UserStatus
|
|
2
|
+
export var AccountStatus;
|
|
3
|
+
(function (AccountStatus) {
|
|
4
|
+
AccountStatus[AccountStatus["Unspecified"] = 0] = "Unspecified";
|
|
5
|
+
AccountStatus[AccountStatus["Inactive"] = 1] = "Inactive";
|
|
6
|
+
AccountStatus[AccountStatus["Active"] = 2] = "Active";
|
|
7
|
+
AccountStatus[AccountStatus["Disabled"] = 3] = "Disabled";
|
|
8
|
+
AccountStatus[AccountStatus["Terminated"] = 4] = "Terminated";
|
|
9
|
+
})(AccountStatus || (AccountStatus = {}));
|
|
10
|
+
// 老版接口返回值,需要保持
|
|
11
|
+
export var UserStatus;
|
|
12
|
+
(function (UserStatus) {
|
|
13
|
+
UserStatus[UserStatus["active"] = 1] = "active";
|
|
14
|
+
UserStatus[UserStatus["inactive"] = 2] = "inactive";
|
|
15
|
+
})(UserStatus || (UserStatus = {}));
|
|
16
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/services/types.ts"],"names":[],"mappings":"AAOA,8BAA8B;AAC9B,MAAM,CAAN,IAAY,aAMX;AAND,WAAY,aAAa;IACvB,+DAAW,CAAA;IACX,yDAAQ,CAAA;IACR,qDAAM,CAAA;IACN,yDAAQ,CAAA;IACR,6DAAU,CAAA;AACZ,CAAC,EANW,aAAa,KAAb,aAAa,QAMxB;AAED,eAAe;AACf,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+CAAU,CAAA;IACV,mDAAQ,CAAA;AACV,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import DataloomServiceBase from '../DataloomServiceBase';
|
|
2
|
-
import { ServiceName } from '../../utils/types';
|
|
2
|
+
import { ServiceName, type DataloomServiceResponse } from '../../utils/types';
|
|
3
3
|
import type { SearchParams, UserResponse } from './types';
|
|
4
4
|
export default class UserService extends DataloomServiceBase {
|
|
5
5
|
serviceName: ServiceName;
|
|
6
|
-
search(params: SearchParams): Promise<
|
|
7
|
-
getByIds(ids: number[]): Promise<
|
|
6
|
+
search(params: SearchParams): Promise<DataloomServiceResponse<UserResponse>>;
|
|
7
|
+
getByIds(ids: number[]): Promise<DataloomServiceResponse<UserResponse>>;
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,KAAK,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAc,MAAM,SAAS,CAAC;AAGtE,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,mBAAmB;IACjD,WAAW,cAA2B;IAEzC,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAmC5E,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;CA+B9E"}
|
|
@@ -1,29 +1,56 @@
|
|
|
1
1
|
import DataloomServiceBase from '../DataloomServiceBase';
|
|
2
2
|
import { ServiceName } from '../../utils/types';
|
|
3
|
+
import { convertUserStatus, retrieveNameFromI18n } from '../../utils/helpers';
|
|
3
4
|
export default class UserService extends DataloomServiceBase {
|
|
4
5
|
constructor() {
|
|
5
6
|
super(...arguments);
|
|
6
7
|
this.serviceName = ServiceName.UserService;
|
|
7
8
|
}
|
|
8
|
-
search(params) {
|
|
9
|
+
async search(params) {
|
|
10
|
+
var _a, _b;
|
|
9
11
|
const { name, pageSize } = params;
|
|
10
|
-
|
|
12
|
+
const res = await this.fetchData(`/af/app/${this.appId}/runtime/api/v1/account/search_user`, {
|
|
11
13
|
method: 'POST',
|
|
12
14
|
body: {
|
|
13
15
|
query: name,
|
|
14
|
-
page_size: pageSize,
|
|
15
|
-
brand: this.brandId,
|
|
16
|
-
app_id: this.appId,
|
|
16
|
+
page_size: pageSize !== null && pageSize !== void 0 ? pageSize : 100,
|
|
17
17
|
},
|
|
18
18
|
}, { psmName: 'UserService.Search' });
|
|
19
|
+
if (res.error) {
|
|
20
|
+
return res;
|
|
21
|
+
}
|
|
22
|
+
return Object.assign(Object.assign({}, res), { data: {
|
|
23
|
+
user_list: (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.map((item) => ({
|
|
24
|
+
avatar: item.avatar,
|
|
25
|
+
email: item.email,
|
|
26
|
+
name: retrieveNameFromI18n(item.name),
|
|
27
|
+
status: convertUserStatus(item.userStatus),
|
|
28
|
+
user_id: item.larkUserID.toString(),
|
|
29
|
+
user_type: item.userType,
|
|
30
|
+
}))) !== null && _b !== void 0 ? _b : [],
|
|
31
|
+
} });
|
|
19
32
|
}
|
|
20
|
-
getByIds(ids) {
|
|
21
|
-
|
|
33
|
+
async getByIds(ids) {
|
|
34
|
+
var _a, _b;
|
|
35
|
+
const res = await this.fetchData(`/af/app/${this.appId}/runtime/api/v1/account/list_users`, {
|
|
22
36
|
method: 'POST',
|
|
23
37
|
body: {
|
|
24
|
-
|
|
38
|
+
userIDList: ids,
|
|
25
39
|
},
|
|
26
40
|
}, { psmName: 'UserService.GetByIds' });
|
|
41
|
+
if (res.error) {
|
|
42
|
+
return res;
|
|
43
|
+
}
|
|
44
|
+
return Object.assign(Object.assign({}, res), { data: {
|
|
45
|
+
user_list: (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.map((item) => ({
|
|
46
|
+
avatar: item.avatar,
|
|
47
|
+
email: item.email,
|
|
48
|
+
name: retrieveNameFromI18n(item.name),
|
|
49
|
+
status: convertUserStatus(item.userStatus),
|
|
50
|
+
user_id: item.larkUserID.toString(),
|
|
51
|
+
user_type: item.userType,
|
|
52
|
+
}))) !== null && _b !== void 0 ? _b : [],
|
|
53
|
+
} });
|
|
27
54
|
}
|
|
28
55
|
}
|
|
29
56
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAgC,MAAM,mBAAmB,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,mBAAmB;IAA5D;;QACW,gBAAW,GAAG,WAAW,CAAC,WAAW,CAAC;IAoEjD,CAAC;IAlEC,KAAK,CAAC,MAAM,CAAC,MAAoB;;QAC/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,WAAW,IAAI,CAAC,KAAK,qCAAqC,EAC1D;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,GAAG;aAC3B;SACF,EACD,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAClC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EACP,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrC,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC;oBAC1C,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;oBACnC,SAAS,EAAE,IAAI,CAAC,QAAQ;iBACzB,CAAC,CAAC,mCAAI,EAAE;aACZ,IACD;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAa;;QAC1B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,WAAW,IAAI,CAAC,KAAK,oCAAoC,EACzD;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,UAAU,EAAE,GAAG;aAChB;SACF,EACD,EAAE,OAAO,EAAE,sBAAsB,EAAE,CACpC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EACP,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrC,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC;oBAC1C,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;oBACnC,SAAS,EAAE,IAAI,CAAC,QAAQ;iBACzB,CAAC,CAAC,mCAAI,EAAE;aACZ,IACD;IACJ,CAAC;CACF"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
+
import { type I18ns, AccountStatus, UserStatus } from '../types';
|
|
1
2
|
export type SearchParams = {
|
|
2
3
|
name: string;
|
|
3
4
|
pageSize?: number;
|
|
4
5
|
};
|
|
5
|
-
declare enum UserStatus {
|
|
6
|
-
active = 1,
|
|
7
|
-
inactive = 2
|
|
8
|
-
}
|
|
9
6
|
export type User = {
|
|
10
7
|
user_id: string;
|
|
11
8
|
email: string;
|
|
@@ -13,8 +10,22 @@ export type User = {
|
|
|
13
10
|
avatar: string;
|
|
14
11
|
status: UserStatus;
|
|
15
12
|
};
|
|
13
|
+
export type DepartmentEntity = {
|
|
14
|
+
departmentID: number;
|
|
15
|
+
larkDepartmentID: number;
|
|
16
|
+
name: I18ns;
|
|
17
|
+
};
|
|
18
|
+
export type UserEntity = {
|
|
19
|
+
userID: number;
|
|
20
|
+
larkUserID: number;
|
|
21
|
+
name: I18ns;
|
|
22
|
+
avatar: string;
|
|
23
|
+
userType: string;
|
|
24
|
+
email: string;
|
|
25
|
+
userStatus: AccountStatus;
|
|
26
|
+
department: DepartmentEntity;
|
|
27
|
+
};
|
|
16
28
|
export type UserResponse = {
|
|
17
29
|
user_list: User[];
|
|
18
30
|
};
|
|
19
|
-
export {};
|
|
20
31
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/user-service/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/user-service/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEjE,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,KAAK,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,KAAK,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,aAAa,CAAC;IAC1B,UAAU,EAAE,gBAAgB,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,IAAI,EAAE,CAAC;CACnB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/services/user-service/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/services/user-service/types.ts"],"names":[],"mappings":""}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import { I18ns, AccountStatus, UserStatus } from '../services/types';
|
|
1
2
|
export declare const isBrowser: () => boolean;
|
|
2
3
|
export declare const serializeSessionBrandId: (brand: string) => string;
|
|
3
4
|
export declare const getCookieByName: (name: string) => string;
|
|
5
|
+
export declare const retrieveNameFromI18n: (i18ns: I18ns) => string;
|
|
6
|
+
export declare const convertUserStatus: (status: AccountStatus) => UserStatus;
|
|
4
7
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,eAAyE,CAAC;AAEhG,eAAO,MAAM,uBAAuB,UAAW,MAAM,KAAG,MAMvD,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAO9C,CAAC"}
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIrE,eAAO,MAAM,SAAS,eAAyE,CAAC;AAEhG,eAAO,MAAM,uBAAuB,UAAW,MAAM,KAAG,MAMvD,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAO9C,CAAC;AAEF,eAAO,MAAM,oBAAoB,0BAEhC,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAAY,aAAa,KAAG,UASzD,CAAC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { AccountStatus, UserStatus } from '../services/types';
|
|
2
|
+
const CN_LANG_CODE = 2052;
|
|
1
3
|
export const isBrowser = () => typeof window !== 'undefined' && typeof document !== 'undefined';
|
|
2
4
|
export const serializeSessionBrandId = (brand) => {
|
|
3
5
|
if (brand === 'miaoda') {
|
|
@@ -13,4 +15,17 @@ export const getCookieByName = (name) => {
|
|
|
13
15
|
const cookies = document.cookie.split(';');
|
|
14
16
|
return (_b = (_a = cookies.find((cookie) => cookie.trim().startsWith(`${name}=`))) === null || _a === void 0 ? void 0 : _a.split('=')[1]) !== null && _b !== void 0 ? _b : '';
|
|
15
17
|
};
|
|
18
|
+
export const retrieveNameFromI18n = (i18ns) => {
|
|
19
|
+
var _a;
|
|
20
|
+
return ((_a = i18ns === null || i18ns === void 0 ? void 0 : i18ns.find((i18n) => i18n.language_code === CN_LANG_CODE)) === null || _a === void 0 ? void 0 : _a.text) || '';
|
|
21
|
+
};
|
|
22
|
+
export const convertUserStatus = (status) => {
|
|
23
|
+
if (status === AccountStatus.Active || status === AccountStatus.Inactive) {
|
|
24
|
+
return UserStatus.active;
|
|
25
|
+
}
|
|
26
|
+
if (status === AccountStatus.Disabled || status === AccountStatus.Terminated) {
|
|
27
|
+
return UserStatus.inactive;
|
|
28
|
+
}
|
|
29
|
+
return UserStatus.active;
|
|
30
|
+
};
|
|
16
31
|
//# sourceMappingURL=helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW,CAAC;AAEhG,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,KAAa,EAAU,EAAE;IAC/D,IAAI,KAAK,KAAK,QAAQ,EAAE;QACtB,OAAO,GAAG,CAAC;KACZ;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAU,EAAE;;IACtD,IAAI,CAAC,SAAS,EAAE,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO,MAAA,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,0CAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC;AAC7F,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,aAAa,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAErE,MAAM,YAAY,GAAG,IAAI,CAAC;AAE1B,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW,CAAC;AAEhG,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,KAAa,EAAU,EAAE;IAC/D,IAAI,KAAK,KAAK,QAAQ,EAAE;QACtB,OAAO,GAAG,CAAC;KACZ;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAU,EAAE;;IACtD,IAAI,CAAC,SAAS,EAAE,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO,MAAA,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,0CAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC;AAC7F,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAY,EAAE,EAAE;;IACnD,OAAO,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,KAAK,YAAY,CAAC,0CAAE,IAAI,KAAI,EAAE,CAAC;AAChF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAqB,EAAc,EAAE;IACrE,IAAI,MAAM,KAAK,aAAa,CAAC,MAAM,IAAI,MAAM,KAAK,aAAa,CAAC,QAAQ,EAAE;QACxE,OAAO,UAAU,CAAC,MAAM,CAAC;KAC1B;IACD,IAAI,MAAM,KAAK,aAAa,CAAC,QAAQ,IAAI,MAAM,KAAK,aAAa,CAAC,UAAU,EAAE;QAC5E,OAAO,UAAU,CAAC,QAAQ,CAAC;KAC5B;IAED,OAAO,UAAU,CAAC,MAAM,CAAC;AAC3B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,SAAS,YAAW,MAAM,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,SAAS,YAAW,MAAM,SAiB5D,CAAC;AAEF,eAAO,MAAM,WAAW,YACb,MAAM,YACL;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,QAAQ,MAAM,CAAA;CAAE,YAC1C,MAAM,SA0BhB,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
export const logRequest = (params, psmName = 'Service') => {
|
|
2
2
|
const { traceId, url, method, body } = params;
|
|
3
|
-
|
|
4
|
-
const decodedParams = Array.from(new URL(url, 'http://temp.invalid').searchParams.entries())
|
|
3
|
+
const decodedParams = Array.from(new URL(url).searchParams.entries())
|
|
5
4
|
.filter(([key]) => !['count', 'tx', 'missing', 'resolution', 'column'].includes(key))
|
|
6
5
|
.map(([key, value]) => `${key}=${value}`);
|
|
7
6
|
console.log(`[Dataloom][${psmName}][Request]`, 'trace id:', traceId, 'method:', method, 'params:', decodedParams.join(','), 'body:', body);
|
|
@@ -10,10 +9,10 @@ export const logResponse = (traceId, response, psmName = 'Service') => {
|
|
|
10
9
|
const { data, error, status } = response;
|
|
11
10
|
const hasError = !!error;
|
|
12
11
|
if (hasError) {
|
|
13
|
-
console.error(`[Dataloom][${psmName}][Response Failed]`, 'trace id:', traceId, 'statusCode:', status, 'error:', error);
|
|
12
|
+
console.error(`[Dataloom][${psmName}][Response ${error ? 'Failed' : 'Success'}]`, 'trace id:', traceId, 'statusCode:', status, 'error:', error);
|
|
14
13
|
}
|
|
15
14
|
else {
|
|
16
|
-
console.log(`[Dataloom][${psmName}][Response Success]`, 'trace id:', traceId, 'statusCode:', status, 'data:', data);
|
|
15
|
+
console.log(`[Dataloom][${psmName}][Response ${error ? 'Failed' : 'Success'}]`, 'trace id:', traceId, 'statusCode:', status, 'data:', data);
|
|
17
16
|
}
|
|
18
17
|
};
|
|
19
18
|
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,UAAkB,SAAS,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,UAAkB,SAAS,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAC9C,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;SAClE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACpF,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;IAE5C,OAAO,CAAC,GAAG,CACT,cAAc,OAAO,YAAY,EACjC,WAAW,EACX,OAAO,EACP,SAAS,EACT,MAAM,EACN,SAAS,EACT,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EACvB,OAAO,EACP,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,OAAe,EACf,QAAmD,EACnD,UAAkB,SAAS,EAC3B,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IACzC,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC;IAEzB,IAAI,QAAQ,EAAE;QACZ,OAAO,CAAC,KAAK,CACX,cAAc,OAAO,cAAc,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,GAAG,EAClE,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,QAAQ,EACR,KAAK,CACN,CAAC;KACH;SAAM;QACL,OAAO,CAAC,GAAG,CACT,cAAc,OAAO,cAAc,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,GAAG,EAClE,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,OAAO,EACP,IAAI,CACL,CAAC;KACH;AACH,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@data-loom/service-js",
|
|
3
|
-
"version": "0.4.4-
|
|
3
|
+
"version": "0.4.4-user-alpha.1",
|
|
4
4
|
"description": "Dataloom service",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"service",
|
|
@@ -33,10 +33,10 @@
|
|
|
33
33
|
"test:types:watch": "run-s build && tsd --files 'test/**/*.test-d.ts' --watch"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@data-loom/node-fetch": "0.4.
|
|
36
|
+
"@data-loom/node-fetch": "0.4.3"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@types/jest": "
|
|
39
|
+
"@types/jest": "~29.2.4",
|
|
40
40
|
"cpy-cli": "^5.0.0",
|
|
41
41
|
"jest": "^29.6.1",
|
|
42
42
|
"node-abort-controller": "^3.0.1",
|