@data-loom/service-js 0.4.4-auth-alpha.5 → 0.4.4-auth-alpha.8

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.
Files changed (11) hide show
  1. package/dist/main/services/session-service/index.d.ts.map +1 -1
  2. package/dist/main/services/session-service/index.js +12 -14
  3. package/dist/main/services/session-service/index.js.map +1 -1
  4. package/dist/main/services/session-service/types.d.ts +1 -1
  5. package/dist/main/services/session-service/types.d.ts.map +1 -1
  6. package/dist/module/services/session-service/index.d.ts.map +1 -1
  7. package/dist/module/services/session-service/index.js +12 -14
  8. package/dist/module/services/session-service/index.js.map +1 -1
  9. package/dist/module/services/session-service/types.d.ts +1 -1
  10. package/dist/module/services/session-service/types.d.ts.map +1 -1
  11. package/package.json +2 -2
package/dist/main/services/session-service/index.d.ts.map CHANGED
@@ -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,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;IA2BvF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAuBvD;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAmCvE;;OAEG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;;;;CA0BrD"}
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;IA6BvF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAuBvD;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAgCvE;;OAEG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;;;;CA0BrD"}
package/dist/main/services/session-service/index.js CHANGED
@@ -31,7 +31,7 @@ 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(returnUrl || window.location.href);
34
+ const encodedRedirectUrl = encodeURIComponent(decodeURIComponent(returnUrl || window.location.href));
35
35
  const baseLoginUrl = `/spark/faas/${this.appId}/runtime/page/login`;
36
36
  const loginPageUrl = `${baseLoginUrl}?biz_source=${this.bizSource}&redirect_uri=${encodedRedirectUrl}`;
37
37
  if (newTab) {
@@ -68,27 +68,25 @@ class SessionService extends DataloomServiceBase_1.default {
68
68
  * Gets the current user information if there is an existing session.
69
69
  */
70
70
  async getUserInfo() {
71
+ var _a;
71
72
  if (!(0, helpers_1.isBrowser)()) {
72
73
  console.log('[Dataloom][SessionService.GetUserInfo] dataloom.service.session.getUserInfo can only be invoked in browser environment.');
73
74
  return Promise.resolve(browserEnvError);
74
75
  }
75
- let url = `/af/app/${this.appId}/runtime/api/v1/account/login/user?biz_source=${this.bizSource}`;
76
+ const url = `/af/app/${this.appId}/runtime/api/v1/account/login/user?biz_source=${this.bizSource}`;
77
+ // Get tenantDomainName from current URL hostname
78
+ const urlObj = new URL(globalThis.location.href);
79
+ const pathSegments = urlObj.hostname.split('.');
80
+ const tenantDomainName = (_a = pathSegments[0]) !== null && _a !== void 0 ? _a : '';
76
81
  const response = await this.fetchData(url, {
77
- method: 'GET',
82
+ method: 'POST',
83
+ body: {
84
+ appID: this.appId,
85
+ tenantDomainName,
86
+ },
78
87
  }, {
79
88
  skipBaseUrl: true,
80
89
  });
81
- // 兼容性处理：如果返回的 userInfo 中包含 userID，转换为 user_id
82
- if (response.data && response.data.userInfo) {
83
- const userInfo = response.data.userInfo;
84
- // Check if userID exists (from backend) and user_id doesn't exist
85
- if ('userID' in userInfo && !('user_id' in userInfo)) {
86
- // @ts-ignore - We're handling the conversion here
87
- userInfo.user_id = userInfo.userID;
88
- // @ts-ignore - Remove the original userID field
89
- delete userInfo.userID;
90
- }
91
- }
92
90
  return response;
93
91
  }
94
92
  /**
package/dist/main/services/session-service/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"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"}
package/dist/main/services/session-service/types.d.ts CHANGED
@@ -21,7 +21,7 @@ export interface SignInRedirectionOptions {
21
21
  newTab?: boolean;
22
22
  }
23
23
  export interface UserBaseInfo {
24
- user_id?: number;
24
+ userID?: number;
25
25
  name?: I18ns;
26
26
  avatar?: Avatar;
27
27
  email?: string;
package/dist/main/services/session-service/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/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;AAE3B,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;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/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;AAE3B,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,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB"}
package/dist/module/services/session-service/index.d.ts.map CHANGED
@@ -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,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;IA2BvF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAuBvD;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAmCvE;;OAEG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;;;;CA0BrD"}
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;IA6BvF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAuBvD;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAgCvE;;OAEG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;;;;CA0BrD"}
package/dist/module/services/session-service/index.js CHANGED
@@ -26,7 +26,7 @@ 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(returnUrl || window.location.href);
29
+ const encodedRedirectUrl = encodeURIComponent(decodeURIComponent(returnUrl || window.location.href));
30
30
  const baseLoginUrl = `/spark/faas/${this.appId}/runtime/page/login`;
31
31
  const loginPageUrl = `${baseLoginUrl}?biz_source=${this.bizSource}&redirect_uri=${encodedRedirectUrl}`;
32
32
  if (newTab) {
@@ -63,27 +63,25 @@ export default class SessionService extends DataloomServiceBase {
63
63
  * Gets the current user information if there is an existing session.
64
64
  */
65
65
  async getUserInfo() {
66
+ var _a;
66
67
  if (!isBrowser()) {
67
68
  console.log('[Dataloom][SessionService.GetUserInfo] dataloom.service.session.getUserInfo can only be invoked in browser environment.');
68
69
  return Promise.resolve(browserEnvError);
69
70
  }
70
- let url = `/af/app/${this.appId}/runtime/api/v1/account/login/user?biz_source=${this.bizSource}`;
71
+ const url = `/af/app/${this.appId}/runtime/api/v1/account/login/user?biz_source=${this.bizSource}`;
72
+ // Get tenantDomainName from current URL hostname
73
+ const urlObj = new URL(globalThis.location.href);
74
+ const pathSegments = urlObj.hostname.split('.');
75
+ const tenantDomainName = (_a = pathSegments[0]) !== null && _a !== void 0 ? _a : '';
71
76
  const response = await this.fetchData(url, {
72
- method: 'GET',
77
+ method: 'POST',
78
+ body: {
79
+ appID: this.appId,
80
+ tenantDomainName,
81
+ },
73
82
  }, {
74
83
  skipBaseUrl: true,
75
84
  });
76
- // 兼容性处理：如果返回的 userInfo 中包含 userID，转换为 user_id
77
- if (response.data && response.data.userInfo) {
78
- const userInfo = response.data.userInfo;
79
- // Check if userID exists (from backend) and user_id doesn't exist
80
- if ('userID' in userInfo && !('user_id' in userInfo)) {
81
- // @ts-ignore - We're handling the conversion here
82
- userInfo.user_id = userInfo.userID;
83
- // @ts-ignore - Remove the original userID field
84
- delete userInfo.userID;
85
- }
86
- }
87
85
  return response;
88
86
  }
89
87
  /**
package/dist/module/services/session-service/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"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"}
package/dist/module/services/session-service/types.d.ts CHANGED
@@ -21,7 +21,7 @@ export interface SignInRedirectionOptions {
21
21
  newTab?: boolean;
22
22
  }
23
23
  export interface UserBaseInfo {
24
- user_id?: number;
24
+ userID?: number;
25
25
  name?: I18ns;
26
26
  avatar?: Avatar;
27
27
  email?: string;
package/dist/module/services/session-service/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/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;AAE3B,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;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/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;AAE3B,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,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@data-loom/service-js",
3
- "version": "0.4.4-auth-alpha.5",
3
+ "version": "0.4.4-auth-alpha.8",
4
4
  "description": "Dataloom service",
5
5
  "keywords": [
6
6
  "service",
@@ -33,7 +33,7 @@
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.4-auth-alpha.5"
36
+ "@data-loom/node-fetch": "0.4.4-auth-alpha.8"
37
37
  },
38
38
  "devDependencies": {
39
39
  "@types/jest": "~29.2.4",