ag-common 0.0.307 → 0.0.308

package/dist/ui/helpers/routes.d.ts

@@ -1,6 +1,7 @@
 import { ICognitoAuth } from './cognito';
 import { AxiosWrapperLite } from './jwt';
 import { TLang } from '../../common/helpers/i18n';
+export declare type TProtocol = 'http:' | 'https:';
 export interface LocationSubset {
     /**
      * slash only path eg /aaa/bbb
@@ -22,10 +23,7 @@ export interface LocationSubset {
      * protocol less up to first slash eg aaa.com:1111
      */
     host: string;
-    /**
-     * eg http: or https:
-     */
-    protocol: string;
+    protocol: TProtocol;
     /**
      * full url
      */
@@ -65,7 +63,7 @@ export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialS
  * @param param0
  * @returns
  */
-export declare const getClientOrServerReqHref: ({ url: { href, query }, forceServer, userAgent, darkMode, defaultHost, }: {
+export declare const getClientOrServerReqHref: ({ url: { href, query, protocol }, forceServer, userAgent, darkMode, defaultHost, }: {
     url: {
         /**
          * parse querystring keyvalues
@@ -75,6 +73,7 @@ export declare const getClientOrServerReqHref: ({ url: { href, query }, forceSer
          * full url
          */
         href?: string | undefined;
+        protocol: TProtocol;
     };
     /**
      * if true, wont use window location. default false
@@ -96,13 +95,14 @@ export declare const getClientOrServerReqHref: ({ url: { href, query }, forceSer
  * get server side parsed url
  * @param param0 * @returns
  */
-export declare const getServerReq: ({ defaultHost, pathname, query, headers, }: {
+export declare const getServerReq: ({ defaultHost, pathname, query, headers, encrypted, }: {
     /**
      * eg ctx?.req?.headers || {}
      */
     headers: {
         host?: string;
         'user-agent'?: string;
+        'x-forwarded-proto'?: 'http' | 'https';
     };
     /** what to use if host is not available on headers */
     defaultHost: string;
@@ -114,6 +114,10 @@ export declare const getServerReq: ({ defaultHost, pathname, query, headers, }:
      * eg ctx.query
      */
     query: Record<string, string | string[] | undefined>;
+    /**
+     * eg (ctx?.req?.socket as any)?.encrypted)
+     */
+    encrypted: boolean;
 }) => {
     url: LocationSubset;
     userAgent: string;

package/dist/ui/helpers/routes.js

@@ -34,10 +34,11 @@ const getRenderLanguage = ({ defaultHost, url, }) => {
  * @param param0
  * @returns
  */
-const getClientOrServerReqHref = ({ url: { href, query }, forceServer = false, userAgent, darkMode, defaultHost, }) => {
+const getClientOrServerReqHref = ({ url: { href, query, protocol }, forceServer = false, userAgent, darkMode, defaultHost, }) => {
     if (typeof window !== 'undefined') {
         if (!forceServer) {
             href = window.location.href;
+            protocol = window.location.protocol;
         }
         darkMode =
             window.matchMedia &&
@@ -53,11 +54,11 @@ const getClientOrServerReqHref = ({ url: { href, query }, forceServer = false, u
     const url = {
         hash: parsed.hash || '',
         host: parsed.host || '',
-        origin: `${parsed.protocol}//${parsed.host}`,
-        href: `${parsed.protocol}//${parsed.host}${parsed.path}${parsed.hash || ''}`,
+        origin: `${protocol}//${parsed.host}`,
+        href: `${protocol}//${parsed.host}${parsed.path}${parsed.hash || ''}`,
         path: `${parsed.path}${parsed.hash || ''}`,
         pathname: parsed.pathname || '',
-        protocol: parsed.protocol || '',
+        protocol: protocol || '',
         query: Object.assign(Object.assign({}, query), (0, string_1.stringToObject)(parsed.query || '', '=', '&')),
     };
     return {
@@ -73,12 +74,16 @@ exports.getClientOrServerReqHref = getClientOrServerReqHref;
  * get server side parsed url
  * @param param0 * @returns
  */
-const getServerReq = ({ defaultHost, pathname, query, headers, }) => {
-    var _a;
+const getServerReq = ({ defaultHost, pathname, query, headers, encrypted, }) => {
+    var _a, _b;
     const href = calculateServerHref({
         host: headers.host || defaultHost,
         pathname,
     });
+    let protocol = 'http:';
+    if (((_a = headers['x-forwarded-proto']) === null || _a === void 0 ? void 0 : _a.includes('https')) || encrypted) {
+        protocol = 'https:';
+    }
     const parsedQuery = !query || Object.keys(query).length === 0
         ? undefined
         : (0, object_1.castStringlyObject)(query);
@@ -86,9 +91,10 @@ const getServerReq = ({ defaultHost, pathname, query, headers, }) => {
         url: {
             href,
             query: parsedQuery,
+            protocol,
         },
         forceServer: true,
-        userAgent: (_a = headers['user-agent']) === null || _a === void 0 ? void 0 : _a.toLowerCase(),
+        userAgent: (_b = headers['user-agent']) === null || _b === void 0 ? void 0 : _b.toLowerCase(),
         defaultHost,
     });
     return ret;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.307",
+  "version": "0.0.308",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",