@things-factory/auth-base 6.2.42 → 6.2.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "6.2.42",
+  "version": "6.2.48",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -30,11 +30,11 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/email-base": "^6.2.42",
+    "@things-factory/email-base": "^6.2.48",
     "@things-factory/env": "^6.2.33",
-    "@things-factory/i18n-base": "^6.2.42",
-    "@things-factory/shell": "^6.2.42",
-    "@things-factory/utils": "^6.2.33",
+    "@things-factory/i18n-base": "^6.2.48",
+    "@things-factory/shell": "^6.2.48",
+    "@things-factory/utils": "^6.2.48",
     "jsonwebtoken": "^9.0.0",
     "koa-passport": "^6.0.0",
     "koa-session": "^6.4.0",
@@ -43,5 +43,5 @@
     "passport-local": "^1.0.0",
     "popsicle-cookie-jar": "^1.0.0"
   },
-  "gitHead": "cc76b5c3dea6a88d4381e914eeaaff9e102e672d"
+  "gitHead": "70ed4f01ef662cde4d99911dc9374abd564cbe0e"
 }

package/server/router/auth-private-process-router.ts

@@ -67,7 +67,7 @@ authPrivateProcessRouter
     clearAccessTokenCookie(context)
   })
   .get('/profile', async (context, next) => {
-    const { domain, user } = context.state
+    const { domain, user, protected: protectedIP } = context.state
 
     let domains: Partial<Domain>[] = await getUserDomains(user)
     domains = domains.filter((d: Domain) => d.extType == domainType)
@@ -79,6 +79,7 @@ authPrivateProcessRouter
         userType: user.userType,
         owner: await process.domainOwnerGranted(domain, user),
         super: await process.superUserGranted(domain, user),
+        protected: protectedIP,
         privileges: await User.getPrivilegesByDomain(user, domain)
       },
       domains,

package/server/service/application/application-query.ts

@@ -75,9 +75,24 @@ export class ApplicationQuery {
 }
 
 function buildAuthURL(pathname: string, context: ResolverContext): string {
-  const { origin } = context.request
-  let url: URL = new URL(origin)
-  url.protocol = protocol || url.protocol
+  const originalProtocol = context.headers['x-forwarded-proto']
+  const originalHost = context.headers['x-forwarded-host']
+  const originalPort = context.headers['x-forwarded-port']
+
+  if (originalProtocol && originalHost) {
+    var url: URL = new URL(`${originalProtocol}://${originalHost}`)
+    if (originalPort) {
+      url.port = originalPort
+    }
+  } else {
+    var url: URL = new URL(context.request.origin)
+  }
+
+  if (protocol) {
+    url.protocol = protocol
+  }
+
   url.pathname = pathname
+
   return url.href
 }

package/server/service/privilege/privilege.ts

@@ -27,6 +27,9 @@ export class PrivilegeObject {
 
   @Field({ nullable: true })
   super?: boolean
+
+  @Field({ nullable: true })
+  protected?: boolean
 }
 
 @InputType()
@@ -42,6 +45,9 @@ export class PrivilegeInput {
 
   @Field({ nullable: true })
   super?: boolean
+
+  @Field({ nullable: true })
+  protected?: boolean
 }
 
 @Entity()