propro-utils 1.5.15 → 1.5.17
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.
|
@@ -35,9 +35,6 @@ const { checkIfUserExists } = require('./account_info');
|
|
|
35
35
|
*/
|
|
36
36
|
const authValidation = (redisClient, userSchema, requiredPermissions = []) => {
|
|
37
37
|
return async (req, res, next) => {
|
|
38
|
-
console.log('authValidation middleware');
|
|
39
|
-
console.log('req.cookies', JSON.stringify(req.cookies));
|
|
40
|
-
console.log('req.headers', JSON.stringify(req.headers));
|
|
41
38
|
try {
|
|
42
39
|
const accessToken =
|
|
43
40
|
req.cookies['x-access-token'] ||
|
package/package.json
CHANGED
package/src/server/index.js
CHANGED
|
@@ -76,18 +76,16 @@ class AuthMiddleware {
|
|
|
76
76
|
handleLogin = async (req, res) => {
|
|
77
77
|
const { returnTokens } = req.query;
|
|
78
78
|
|
|
79
|
-
console.log('returnTokens:', returnTokens);
|
|
80
|
-
|
|
81
79
|
try {
|
|
82
80
|
const response = await this.proxyToAuthServer(
|
|
83
81
|
req,
|
|
84
82
|
`/api/v1/auth/login?returnTokens=${returnTokens}`
|
|
85
83
|
);
|
|
86
84
|
|
|
87
|
-
console.log('response:', JSON.stringify(response.data));
|
|
88
|
-
|
|
89
85
|
const { account, tokens } = response.data;
|
|
86
|
+
console.log('account:', account);
|
|
90
87
|
const user = await checkIfUserExists(this.userSchema, account.accountId);
|
|
88
|
+
console.log('user:', user);
|
|
91
89
|
|
|
92
90
|
if (returnTokens === 'true') {
|
|
93
91
|
res.status(response.status).json({ account, user, tokens });
|
|
@@ -329,7 +327,6 @@ class AuthMiddleware {
|
|
|
329
327
|
proxyToAuthServer = async (req, path) => {
|
|
330
328
|
let accessToken = null;
|
|
331
329
|
if (this.pathRequiresAccessToken(path)) {
|
|
332
|
-
console.log('path requires access token');
|
|
333
330
|
accessToken = req.cookies['x-access-token'];
|
|
334
331
|
if (!accessToken) {
|
|
335
332
|
throw new Error('No access token provided');
|
|
@@ -363,9 +360,6 @@ class AuthMiddleware {
|
|
|
363
360
|
|
|
364
361
|
const data = req.file ? formData : req.body;
|
|
365
362
|
|
|
366
|
-
console.log('formattedAuthUrl:', formattedAuthUrl);
|
|
367
|
-
console.log('data:', data);
|
|
368
|
-
|
|
369
363
|
return axios({
|
|
370
364
|
method: req.method,
|
|
371
365
|
url: `${formattedAuthUrl}`,
|
|
@@ -21,8 +21,6 @@ const setAuthCookies = (res, tokens, account, user, appUrl) => {
|
|
|
21
21
|
domain = '.mapmap.app';
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
-
console.log('domain: ', domain, 'appUrl: ', appUrl, tokens, account, user);
|
|
25
|
-
|
|
26
24
|
const commonAttributes = {
|
|
27
25
|
// secure: process.env.NODE_ENV === 'production',
|
|
28
26
|
secure: true,
|
package/utils/redis.js
CHANGED