skapi-js 1.0.15 → 1.0.16

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 (7) hide show
  1. package/dist/skapi.js +1 -1
  2. package/dist/skapi.js.map +1 -1
  3. package/dist/skapi.module.js +1 -1
  4. package/dist/skapi.module.js.map +1 -1
  5. package/js/main/skapi.js +1 -1
  6. package/js/methods/user.js +20 -38
  7. package/package.json +1 -1
package/js/main/skapi.js CHANGED
@@ -22,7 +22,7 @@ export default class Skapi {
22
22
  set user(value) {
23
23
  }
24
24
  constructor(service, owner, options) {
25
- this.version = '1.0.15';
25
+ this.version = '1.0.16';
26
26
  this.session = null;
27
27
  this.connection = null;
28
28
  this.host = 'skapi';
package/js/methods/user.js CHANGED
@@ -143,49 +143,31 @@ export function authentication() {
143
143
  return;
144
144
  }
145
145
  if (refreshToken || !session.isValid()) {
146
- let signedOut = false;
147
- try {
148
- let idToken = session.getIdToken().payload;
149
- if (idToken['custom:service'] !== this.service) {
150
- cognitoUser.signOut();
151
- this.session = null;
152
- signedOut = true;
153
- res(null);
146
+ cognitoUser.refreshSession(session.getRefreshToken(), (refreshErr, refreshedSession) => {
147
+ if (refreshErr) {
148
+ rej(refreshErr);
154
149
  }
155
- }
156
- catch (err) {
157
- }
158
- if (!signedOut) {
159
- cognitoUser.refreshSession(session.getRefreshToken(), (refreshErr, refreshedSession) => {
160
- if (refreshErr)
161
- rej(refreshErr);
150
+ else {
151
+ if (!refreshedSession.isValid()) {
152
+ session = refreshedSession;
153
+ }
162
154
  else {
163
- if (refreshedSession.isValid()) {
164
- this.session = refreshedSession;
165
- normalizeUserAttributes(refreshedSession.getIdToken().payload);
166
- res(refreshedSession);
167
- }
168
- else {
169
- rej(new SkapiError('Invalid session.', { code: 'INVALID_REQUEST' }));
170
- return;
171
- }
155
+ rej(new SkapiError('Invalid session.', { code: 'INVALID_REQUEST' }));
156
+ return;
172
157
  }
173
- });
174
- }
158
+ }
159
+ });
175
160
  }
176
- else {
177
- let idToken = session.getIdToken().payload;
178
- if (idToken['custom:service'] !== this.service) {
179
- cognitoUser.signOut();
180
- this.session = null;
181
- res(null);
182
- }
183
- else {
184
- this.session = session;
185
- normalizeUserAttributes(idToken);
186
- res(session);
187
- }
161
+ let idToken = session.getIdToken().payload;
162
+ if (idToken['custom:service'] !== this.service) {
163
+ cognitoUser.signOut();
164
+ this.session = null;
165
+ rej(new SkapiError('Invalid session.', { code: 'INVALID_REQUEST' }));
166
+ return;
188
167
  }
168
+ this.session = session;
169
+ normalizeUserAttributes(idToken);
170
+ res(session);
189
171
  });
190
172
  });
191
173
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "skapi-js",
3
- "version": "1.0.15",
3
+ "version": "1.0.16",
4
4
  "description": "Javascript library for Skapi: Complete JAM Stack, front-end driven serverless backend API service.",
5
5
  "main": "./dist/skapi.module.js",
6
6
  "types": "./js/Main.d.ts",