cronapp-framework-mobile-js 2.9.6-SP.4 → 2.9.6-SP.41

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.
@@ -92,6 +92,9 @@
92
92
  if ($cookies.get('_u')) {
93
93
  if (!localStorage.getItem('_u')) {
94
94
  var decodedUser = decodeURIComponent($cookies.get('_u'));
95
+ if (window.isUsingCookie()) {
96
+ delete decodedUser.token;
97
+ }
95
98
  localStorage.setItem("_u", decodedUser);
96
99
  }
97
100
  // Redirect to home page
@@ -113,7 +116,7 @@
113
116
  'Content-Type' : 'application/x-www-form-urlencoded'
114
117
  };
115
118
 
116
- if (token) {
119
+ if (!window.isUsingCookie() && token) {
117
120
  headerValues["X-AUTH-TOKEN"] = token;
118
121
  }
119
122
 
@@ -140,6 +143,9 @@
140
143
  // The session storage will be cleaned when the browser window is closed
141
144
  if(typeof (Storage) !== "undefined") {
142
145
  // save the user data on localStorage
146
+ if (window.isUsingCookie()) {
147
+ delete data.token;
148
+ }
143
149
  localStorage.setItem('_u', JSON.stringify(data));
144
150
  }
145
151
  else {
@@ -126,14 +126,17 @@
126
126
  formData.append("file", files[i]);
127
127
  }
128
128
  let _u = JSON.parse(localStorage.getItem('_u'));
129
+ let headerValues = window.isUsingCookie() ? {
130
+ 'Content-Type' : undefined
131
+ } : {
132
+ 'Content-Type' : undefined,
133
+ 'X-AUTH-TOKEN' : (_u ?_u.token : '')
134
+ };
129
135
  this.$promise = $http({
130
136
  method: 'POST',
131
137
  url: (window.hostApp || "") + uploadUrl,
132
138
  data: formData,
133
- headers: {
134
- 'Content-Type': undefined,
135
- 'X-AUTH-TOKEN': (_u ? _u.token : '')
136
- },
139
+ headers: headerValues,
137
140
  onProgress: function (event) {
138
141
  this.safeApply(function () {
139
142
  if (event.lengthComputable) {
package/package.json CHANGED
@@ -1,10 +1,11 @@
1
1
  {
2
2
  "name": "cronapp-framework-mobile-js",
3
- "version": "2.9.6-SP.4",
3
+ "version": "2.9.6-SP.41",
4
4
  "description": "Javascript library for CronApp's projects",
5
5
  "main": "cronapp.framework.mobile.js",
6
6
  "scripts": {
7
- "test": "echo \"Error: no test specified\" && exit 1"
7
+ "test": "echo \"Error: no test specified\" && exit 1",
8
+ "preinstall": "npx force-resolutions"
8
9
  },
9
10
  "repository": {
10
11
  "type": "git",
@@ -53,12 +54,16 @@
53
54
  "bootstrap": "3.3.4",
54
55
  "jquery": "3.5.0",
55
56
  "font-awesome": "4.4.0",
56
- "chart.js": "2.0.0",
57
+ "chart.js": "2.9.4",
57
58
  "ng-file-upload": "12.2.13",
58
59
  "angular-moment": "1.2.0",
59
60
  "pace-js": "1.0.2",
60
- "moment": "2.24.0",
61
+ "moment": "2.29.4",
61
62
  "cronapp-ion-tab-badge": "1.0.0",
62
63
  "signature_pad": "^3.0.0-beta.4"
64
+ },
65
+ "resolutions": {
66
+ "chart.js": "2.9.4",
67
+ "moment": "2.29.4"
63
68
  }
64
69
  }
package/postupdate.json CHANGED
@@ -343,6 +343,10 @@
343
343
  "old" : "plugins/moment/min/moment-with-locales.min.js",
344
344
  "new": "node_modules/moment/min/moment-with-locales.min.js"
345
345
  },
346
+ {
347
+ "old" : "node_modules/cronapp-lib-js/dist/js/moment/moment-with-locales.min.js",
348
+ "new": "node_modules/moment/min/moment-with-locales.min.js"
349
+ },
346
350
  {
347
351
  "old" : "plugins/angular-moment/angular-moment.min.js",
348
352
  "new": "node_modules/angular-moment/angular-moment.min.js"
@@ -427,6 +431,10 @@
427
431
  "old" : "plugins/chart.js/dist/Chart.min.js",
428
432
  "new": "node_modules/chart.js/dist/Chart.min.js"
429
433
  },
434
+ {
435
+ "old" : "node_modules/cronapp-lib-js/dist/js/chart.js/Chart.min.js",
436
+ "new": "node_modules/chart.js/dist/Chart.min.js"
437
+ },
430
438
  {
431
439
  "old" : "plugins/cronapp-framework-mobile-js/dist/components/js/qrcode.js",
432
440
  "new": "node_modules/cronapp-framework-mobile-js/dist/components/js/qrcode.js"