@etsoo/materialui 1.2.84 → 1.2.85

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 (4) hide show
  1. package/lib/app/ServiceApp.d.ts +2 -1
  2. package/lib/app/ServiceApp.js +3 -3
  3. package/package.json +1 -1
  4. package/src/app/ServiceApp.ts +7 -7
package/lib/app/ServiceApp.d.ts CHANGED
@@ -39,8 +39,9 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
39
39
  /**
40
40
  * Go to the login page
41
41
  * @param tryLogin Try to login again
42
+ * @param removeUrl Remove current URL for reuse
42
43
  */
43
- toLoginPage(tryLogin?: boolean): void;
44
+ toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
44
45
  /**
45
46
  * Refresh token
46
47
  * @param props Props
package/lib/app/ServiceApp.js CHANGED
@@ -54,10 +54,10 @@ export class ServiceApp extends ReactApp {
54
54
  /**
55
55
  * Go to the login page
56
56
  * @param tryLogin Try to login again
57
+ * @param removeUrl Remove current URL for reuse
57
58
  */
58
- toLoginPage(tryLogin) {
59
- const parameters = `?serviceId=${this.settings.serviceId}&${DomUtils.CultureField}=${this.culture}${tryLogin ? "" : "&tryLogin=false"}&url=` +
60
- encodeURIComponent(location.href);
59
+ toLoginPage(tryLogin, removeUrl) {
60
+ const parameters = `?serviceId=${this.settings.serviceId}&${DomUtils.CultureField}=${this.culture}${tryLogin ? "" : "&tryLogin=false"}${removeUrl ? "" : "&url=" + encodeURIComponent(location.href)}`;
61
61
  // Make sure apply new device id for new login
62
62
  this.clearDeviceId();
63
63
  if (BridgeUtils.host == null) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/materialui",
3
- "version": "1.2.84",
3
+ "version": "1.2.85",
4
4
  "description": "TypeScript Material-UI Implementation",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
package/src/app/ServiceApp.ts CHANGED
@@ -89,14 +89,14 @@ export class ServiceApp<
89
89
  /**
90
90
  * Go to the login page
91
91
  * @param tryLogin Try to login again
92
+ * @param removeUrl Remove current URL for reuse
92
93
  */
93
- override toLoginPage(tryLogin?: boolean) {
94
- const parameters =
95
- `?serviceId=${this.settings.serviceId}&${DomUtils.CultureField}=${
96
- this.culture
97
- }${tryLogin ? "" : "&tryLogin=false"}&url=` +
98
- encodeURIComponent(location.href);
99
-
94
+ override toLoginPage(tryLogin?: boolean, removeUrl?: boolean) {
95
+ const parameters = `?serviceId=${this.settings.serviceId}&${
96
+ DomUtils.CultureField
97
+ }=${this.culture}${tryLogin ? "" : "&tryLogin=false"}${
98
+ removeUrl ? "" : "&url=" + encodeURIComponent(location.href)
99
+ }`;
100
100
  // Make sure apply new device id for new login
101
101
  this.clearDeviceId();
102
102