prostgles-server 4.2.195 → 4.2.196

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 (5) hide show
  1. package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
  2. package/dist/Auth/setupAuthRoutes.js +8 -3
  3. package/dist/Auth/setupAuthRoutes.js.map +1 -1
  4. package/lib/Auth/setupAuthRoutes.ts +10 -3
  5. package/package.json +1 -1
package/dist/Auth/setupAuthRoutes.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AAGA,OAAO,EAA0B,WAAW,EAAmB,MAAM,eAAe,CAAC;AAKrF,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,iBA+KtD"}
1
+ {"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AAGA,OAAO,EAA0B,WAAW,EAAmB,MAAM,eAAe,CAAC;AAKrF,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,iBAsLtD"}
package/dist/Auth/setupAuthRoutes.js CHANGED
@@ -99,6 +99,10 @@ async function setupAuthRoutes() {
99
99
  }
100
100
  return userOrCode;
101
101
  };
102
+ const isLoggedInUser = async () => {
103
+ const userInfo = await getUser();
104
+ return !!userInfo?.user;
105
+ };
102
106
  if (this.prostgles.restApi) {
103
107
  if (Object.values(this.prostgles.restApi.routes).some((restRoute) => this.matchesRoute(restRoute.split("/:")[0], req.path))) {
104
108
  next();
@@ -120,19 +124,20 @@ async function setupAuthRoutes() {
120
124
  */
121
125
  if (this.isUserRoute(req.path)) {
122
126
  /* Check auth. Redirect to login if unauthorized */
123
- const u = await getUser();
127
+ const u = await isLoggedInUser();
124
128
  if (!u) {
125
129
  res.redirect(`${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login}?returnURL=${encodeURIComponent(req.originalUrl)}`);
126
130
  return;
127
131
  }
128
132
  /* If authorized and going to returnUrl then redirect. Otherwise serve file */
129
133
  }
130
- else if (returnURL && (await getUser())) {
134
+ else if (returnURL && (await isLoggedInUser())) {
131
135
  res.redirect(returnURL);
132
136
  return;
133
137
  /** If Logged in and requesting login then redirect to main page */
134
138
  }
135
- else if (this.matchesRoute(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login, req.path) && (await getUser())) {
139
+ else if (this.matchesRoute(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login, req.path) &&
140
+ (await isLoggedInUser())) {
136
141
  res.redirect("/");
137
142
  return;
138
143
  }
package/dist/Auth/setupAuthRoutes.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"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"}
package/lib/Auth/setupAuthRoutes.ts CHANGED
@@ -117,6 +117,10 @@ export async function setupAuthRoutes(this: AuthHandler) {
117
117
  }
118
118
  return userOrCode;
119
119
  };
120
+ const isLoggedInUser = async () => {
121
+ const userInfo = await getUser();
122
+ return !!userInfo?.user;
123
+ };
120
124
  if (this.prostgles.restApi) {
121
125
  if (
122
126
  Object.values(this.prostgles.restApi.routes).some((restRoute) =>
@@ -144,7 +148,7 @@ export async function setupAuthRoutes(this: AuthHandler) {
144
148
  */
145
149
  if (this.isUserRoute(req.path)) {
146
150
  /* Check auth. Redirect to login if unauthorized */
147
- const u = await getUser();
151
+ const u = await isLoggedInUser();
148
152
  if (!u) {
149
153
  res.redirect(
150
154
  `${AUTH_ROUTES_AND_PARAMS.login}?returnURL=${encodeURIComponent(req.originalUrl)}`
@@ -153,12 +157,15 @@ export async function setupAuthRoutes(this: AuthHandler) {
153
157
  }
154
158
 
155
159
  /* If authorized and going to returnUrl then redirect. Otherwise serve file */
156
- } else if (returnURL && (await getUser())) {
160
+ } else if (returnURL && (await isLoggedInUser())) {
157
161
  res.redirect(returnURL);
158
162
  return;
159
163
 
160
164
  /** If Logged in and requesting login then redirect to main page */
161
- } else if (this.matchesRoute(AUTH_ROUTES_AND_PARAMS.login, req.path) && (await getUser())) {
165
+ } else if (
166
+ this.matchesRoute(AUTH_ROUTES_AND_PARAMS.login, req.path) &&
167
+ (await isLoggedInUser())
168
+ ) {
162
169
  res.redirect("/");
163
170
  return;
164
171
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-server",
3
- "version": "4.2.195",
3
+ "version": "4.2.196",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",