dce-reactkit 2.0.3 → 2.0.4

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 (37) hide show
  1. package/lib/components/AppWrapper.d.ts +19 -0
  2. package/lib/components/AppWrapper.js +127 -0
  3. package/lib/components/AppWrapper.js.map +1 -0
  4. package/lib/components/ErrorBox.d.ts +12 -0
  5. package/lib/components/ErrorBox.js +65 -0
  6. package/lib/components/ErrorBox.js.map +1 -0
  7. package/lib/helpers/handleError.d.ts +14 -0
  8. package/lib/helpers/handleError.js +54 -0
  9. package/lib/helpers/handleError.js.map +1 -0
  10. package/lib/helpers/handleSuccess.d.ts +8 -0
  11. package/lib/helpers/handleSuccess.js +20 -0
  12. package/lib/helpers/handleSuccess.js.map +1 -0
  13. package/lib/helpers/parseRequest.d.ts +21 -0
  14. package/lib/helpers/parseRequest.js +240 -0
  15. package/lib/helpers/parseRequest.js.map +1 -0
  16. package/lib/helpers/showFatalError.d.ts +2 -0
  17. package/lib/helpers/showFatalError.js +5 -0
  18. package/lib/helpers/showFatalError.js.map +1 -0
  19. package/lib/helpers/visitServerEndpoint.d.ts +7 -1
  20. package/lib/helpers/visitServerEndpoint.js +57 -6
  21. package/lib/helpers/visitServerEndpoint.js.map +1 -1
  22. package/lib/types/ParamType.d.ts +17 -0
  23. package/lib/types/ParamType.js +21 -0
  24. package/lib/types/ParamType.js.map +1 -0
  25. package/lib/types/ReactKitErrorCode.d.ts +5 -1
  26. package/lib/types/ReactKitErrorCode.js +4 -0
  27. package/lib/types/ReactKitErrorCode.js.map +1 -1
  28. package/package.json +2 -1
  29. package/src/components/AppWrapper.tsx +55 -5
  30. package/src/components/ErrorBox.tsx +4 -1
  31. package/src/helpers/handleError.ts +65 -0
  32. package/src/helpers/handleSuccess.ts +18 -0
  33. package/src/helpers/parseRequest.ts +299 -0
  34. package/src/helpers/visitServerEndpoint.tsx +52 -1
  35. package/src/types/ParamType.ts +18 -0
  36. package/src/types/ReactKitErrorCode.tsx +4 -0
  37. package/tsconfig.json +1 -1
@@ -0,0 +1,299 @@
1
+ // Import caccl libs
2
+ import { getLaunchInfo } from 'caccl-lti';
3
+
4
+ // Import shared types
5
+ import ReactKitErrorCode from '../types/ReactKitErrorCode';
6
+ import ParamType from '../types/ParamType';
7
+
8
+ // Import helpers
9
+ import handleError from './handleError';
10
+
11
+ /**
12
+ * Parse express request params and body
13
+ * @author Gabe Abrams
14
+ * @param opts object containing all arguments
15
+ * @param opts.req express request instance
16
+ * @param opts.res express response instance
17
+ * @param opts.params map of parameters that should be parsed out of the request
18
+ * @returns parsed params + user info from session (if it exists) or undefined
19
+ * if an error occurred
20
+ */
21
+ const parseRequest = (
22
+ opts: {
23
+ req: any,
24
+ res: any,
25
+ params: {
26
+ [k in string]: ParamType
27
+ },
28
+ },
29
+ ): ({ [k in string]: any } | undefined) => {
30
+ // Output
31
+
32
+ const output: { [k in string]: any } = {};
33
+
34
+ /*----------------------------------------*/
35
+ /* Parse Params */
36
+ /*----------------------------------------*/
37
+
38
+ // Process items one by one
39
+ const paramList = Object.entries(opts.params);
40
+ for (let i = 0; i < paramList.length; i++) {
41
+ const [name, type] = paramList[i];
42
+
43
+ // Find the value as a string
44
+ const value = (
45
+ opts.req.params[name]
46
+ || opts.req.query[name]
47
+ || opts.req.body[name]
48
+ );
49
+
50
+ // Parse
51
+ if (type === ParamType.Boolean || type === ParamType.BooleanOptional) {
52
+ // Boolean
53
+
54
+ // Handle case where value doesn't exist
55
+ if (value === undefined) {
56
+ if (type === ParamType.BooleanOptional) {
57
+ output[name] = undefined;
58
+ } else {
59
+ return handleError(
60
+ opts.res,
61
+ {
62
+ message: `Parameter ${name} is required, but it was not included.`,
63
+ code: ReactKitErrorCode.MissingParameter,
64
+ status: 422,
65
+ },
66
+ );
67
+ }
68
+ } else {
69
+ // Value exists
70
+
71
+ // Simplify value
72
+ const simpleVal = (
73
+ String(value)
74
+ .trim()
75
+ .toLowerCase()
76
+ );
77
+
78
+ // Parse
79
+ output[name] = (
80
+ [
81
+ 'true',
82
+ 'yes',
83
+ 'y',
84
+ '1',
85
+ 't',
86
+ ].indexOf(simpleVal) >= 0
87
+ );
88
+ }
89
+ } else if (type === ParamType.Float || type === ParamType.FloatOptional) {
90
+ // Float
91
+
92
+ // Handle case where value doesn't exist
93
+ if (value === undefined) {
94
+ if (type === ParamType.FloatOptional) {
95
+ output[name] = undefined;
96
+ } else {
97
+ return handleError(
98
+ opts.res,
99
+ {
100
+ message: `Parameter ${name} is required, but it was not included.`,
101
+ code: ReactKitErrorCode.MissingParameter,
102
+ status: 422,
103
+ },
104
+ );
105
+ }
106
+ } else if (!Number.isNaN(Number.parseFloat(String(value)))) {
107
+ // Value is a number
108
+ output[name] = Number.parseFloat(String(value));
109
+ } else {
110
+ // Issue!
111
+ return handleError(
112
+ opts.res,
113
+ {
114
+ message: `Request data was malformed: ${name} was not a valid float.`,
115
+ code: ReactKitErrorCode.InvalidParameter,
116
+ status: 422,
117
+ },
118
+ );
119
+ }
120
+ } else if (type === ParamType.Int || type === ParamType.IntOptional) {
121
+ // Int
122
+
123
+ // Handle case where value doesn't exist
124
+ if (value === undefined) {
125
+ if (type === ParamType.IntOptional) {
126
+ output[name] = undefined;
127
+ } else {
128
+ return handleError(
129
+ opts.res,
130
+ {
131
+ message: `Parameter ${name} is required, but it was not included.`,
132
+ code: ReactKitErrorCode.MissingParameter,
133
+ status: 422,
134
+ },
135
+ );
136
+ }
137
+ } else if (!Number.isNaN(Number.parseInt(String(value), 10))) {
138
+ // Value is a number
139
+ output[name] = Number.parseInt(String(value), 10);
140
+ } else {
141
+ // Issue!
142
+ return handleError(
143
+ opts.res,
144
+ {
145
+ message: `Request data was malformed: ${name} was not a valid int.`,
146
+ code: ReactKitErrorCode.InvalidParameter,
147
+ status: 422,
148
+ },
149
+ );
150
+ }
151
+ } else if (type === ParamType.JSON || type === ParamType.JSONOptional) {
152
+ // Stringified JSON
153
+
154
+ // Handle case where value doesn't exist
155
+ if (value === undefined) {
156
+ if (type === ParamType.JSONOptional) {
157
+ output[name] = undefined;
158
+ } else {
159
+ return handleError(
160
+ opts.res,
161
+ {
162
+ message: `Parameter ${name} is required, but it was not included.`,
163
+ code: ReactKitErrorCode.MissingParameter,
164
+ status: 422,
165
+ },
166
+ );
167
+ }
168
+ } else {
169
+ // Value exists
170
+
171
+ // Parse
172
+ try {
173
+ output[name] = JSON.parse(String(value));
174
+ } catch (err) {
175
+ return handleError(
176
+ opts.res,
177
+ {
178
+ message: `Request data was malformed: ${name} was not a valid JSON payload.`,
179
+ code: ReactKitErrorCode.InvalidParameter,
180
+ status: 422,
181
+ },
182
+ );
183
+ }
184
+ }
185
+ } else if (type === ParamType.String || type === ParamType.StringOptional) {
186
+ // String
187
+
188
+ // Handle case where value doesn't exist
189
+ if (value === undefined) {
190
+ if (type === ParamType.StringOptional) {
191
+ output[name] = undefined;
192
+ } else {
193
+ return handleError(
194
+ opts.res,
195
+ {
196
+ message: `Parameter ${name} is required, but it was not included.`,
197
+ code: ReactKitErrorCode.MissingParameter,
198
+ status: 422,
199
+ },
200
+ );
201
+ }
202
+ } else {
203
+ // Value exists
204
+
205
+ // Leave as is
206
+ output[name] = value;
207
+ }
208
+ } else {
209
+ // No valid data type
210
+ return handleError(
211
+ opts.res,
212
+ {
213
+ message: `An internal error occurred: we could not determine the type of ${name}.`,
214
+ code: ReactKitErrorCode.InvalidParameter,
215
+ status: 422,
216
+ },
217
+ );
218
+ }
219
+ }
220
+
221
+ /*----------------------------------------*/
222
+ /* Launch Info */
223
+ /*----------------------------------------*/
224
+
225
+ // Get launch info
226
+ const { launched, launchInfo } = getLaunchInfo(opts.req);
227
+ if (!launched || !launchInfo) {
228
+ return handleError(
229
+ opts.res,
230
+ {
231
+ message: 'Your session has expired. Please refresh the page and try again.',
232
+ code: ReactKitErrorCode.SessionExpired,
233
+ status: 440,
234
+ },
235
+ );
236
+ }
237
+
238
+ // Error if user info cannot be found
239
+ if (
240
+ !launchInfo.userId
241
+ || !launchInfo.userFirstName
242
+ || !launchInfo.userLastName
243
+ || (
244
+ launchInfo.notInCourse
245
+ && !launchInfo.isAdmin
246
+ )
247
+ || (
248
+ !launchInfo.isTTM
249
+ && !launchInfo.isLearner
250
+ && !launchInfo.isAdmin
251
+ )
252
+ ) {
253
+ return handleError(
254
+ opts.res,
255
+ {
256
+ message: 'Your session was invalid. Please refresh the page and try again.',
257
+ code: ReactKitErrorCode.SessionExpired,
258
+ status: 440,
259
+ },
260
+ );
261
+ }
262
+
263
+ // Add launch info to output
264
+ output.userId = launchInfo.userId;
265
+ output.userFirstName = launchInfo.userFirstName;
266
+ output.userLastName = launchInfo.userLastName;
267
+ output.isLearner = !!launchInfo.isLearner;
268
+ output.isTTM = !!launchInfo.isTTM;
269
+ output.isAdmin = !!launchInfo.isAdmin;
270
+ output.isWatchingInPrivate = !!(opts.req.session.isWatchingInPrivate);
271
+
272
+ /*----------------------------------------*/
273
+ /* Require Course Consistency */
274
+ /*----------------------------------------*/
275
+
276
+ // Make sure the user actually launched from the appropriate course
277
+ if (
278
+ output.courseId
279
+ && launchInfo.courseId
280
+ && output.courseId !== launchInfo.courseId
281
+ && !output.isTTM
282
+ && !output.isAdmin
283
+ ) {
284
+ // Course of interest is not the launch course
285
+ return handleError(
286
+ opts.res,
287
+ {
288
+ message: 'You switched sessions by opening Immersive Classroom in another tab. Please refresh the page and try again.',
289
+ code: ReactKitErrorCode.WrongCourse,
290
+ status: 401,
291
+ },
292
+ );
293
+ }
294
+
295
+ // Return processed params
296
+ return output;
297
+ };
298
+
299
+ export default parseRequest;
@@ -5,8 +5,31 @@ import { sendRequest } from 'caccl/client';
5
5
  import ErrorWithCode from '../errors/ErrorWithCode';
6
6
  import ReactKitErrorCode from '../types/ReactKitErrorCode';
7
7
 
8
+ /*------------------------------------------------------------------------*/
9
+ /* Listener */
10
+ /*------------------------------------------------------------------------*/
11
+
12
+ // Handler for session expiry
13
+ let sessionExpiryHandler: () => void;
14
+
15
+ // Keep track of whether or not session expiry has already been handled
16
+ let sessionAlreadyExpired = false;
17
+
8
18
  /**
9
- * Visit an endpoint on the server
19
+ * Set the session expiry handler
20
+ * @author Gabe Abrams
21
+ * @param handler new handler to use when session expires
22
+ */
23
+ export const setSessionExpiryHandler = (handler: () => void) => {
24
+ sessionExpiryHandler = handler;
25
+ };
26
+
27
+ /*------------------------------------------------------------------------*/
28
+ /* Main */
29
+ /*------------------------------------------------------------------------*/
30
+
31
+ /**
32
+ * Visit an endpoint on the server [for client only]
10
33
  * @author Gabe Abrams
11
34
  * @param opts object containing all arguments
12
35
  * @param opts.path - the path of the server endpoint
@@ -36,6 +59,34 @@ const visitServerEndpoint = async (
36
59
  );
37
60
  }
38
61
  if (!response.body.success) {
62
+ // Session expired
63
+ if (response.body.code === ReactKitErrorCode.SessionExpired) {
64
+ // Skip notice if session was already expired
65
+ if (sessionAlreadyExpired) {
66
+ // Never return (browser is already reloading)
67
+ await new Promise<{ [key in string]: any }>(() => {
68
+ // Promise that never returns
69
+ });
70
+ }
71
+ sessionAlreadyExpired = true;
72
+
73
+ // Show session expiration message
74
+ if (sessionExpiryHandler) {
75
+ // Use handler
76
+ sessionExpiryHandler();
77
+ } else {
78
+ // Fallback to alert
79
+
80
+ // eslint-disable-next-line no-alert
81
+ alert('Your session has expired. Please start over.');
82
+ }
83
+
84
+ // Never return (don't continue execution)
85
+ await new Promise<{ [key in string]: any }>(() => {
86
+ // Promise that never returns
87
+ });
88
+ }
89
+
39
90
  // Other errors
40
91
  throw new ErrorWithCode(
41
92
  (
@@ -0,0 +1,18 @@
1
+ /**
2
+ * API param types
3
+ * @author Gabe Abrams
4
+ */
5
+ enum ParamType {
6
+ Boolean = 'boolean', // Boolean
7
+ BooleanOptional = 'boolean-optional', // Optional boolean
8
+ Float = 'float', // Float Number
9
+ FloatOptional = 'float-optional', // Optional Float Number
10
+ Int = 'int', // Integer Number
11
+ IntOptional = 'int-optional', // Optional Integer Number
12
+ JSON = 'json', // JSONified object
13
+ JSONOptional = 'json-optional', // Optional JSONified object
14
+ String = 'string', // String
15
+ StringOptional = 'string-optional', // Optional string
16
+ }
17
+
18
+ export default ParamType;
@@ -7,6 +7,10 @@
7
7
  enum ReactKitErrorCode {
8
8
  NoResponse = 'DRK1',
9
9
  NoCode = 'DRK2',
10
+ SessionExpired = 'DRK3',
11
+ MissingParameter = 'DRK4',
12
+ InvalidParameter = 'DRK5',
13
+ WrongCourse = 'DRK6',
10
14
  }
11
15
 
12
16
  export default ReactKitErrorCode;
package/tsconfig.json CHANGED
@@ -10,7 +10,7 @@
10
10
  "target": "es5",
11
11
  "jsx": "react-jsx",
12
12
  "lib": [
13
- "es2015",
13
+ "es2017",
14
14
  "dom"
15
15
  ],
16
16
  "outDir": "./lib"