lambder 1.0.63 → 1.0.65

package/.vscode/settings.json

@@ -18,7 +18,9 @@
 			"**/.git/": true,
     },
     "cSpell.words": [
-      "lambder", 
+      "lambder",
+      "LMBDRAUTHID",
+      "LMBDRTOKEN"
     ],
   }
   

package/dist/Lambder.d.ts

@@ -1,5 +1,5 @@
 import type { APIGatewayProxyEvent, APIGatewayProxyEventHeaders, Context } from "aws-lambda";
-import Resolver from "./Resolver.js";
+import LambderResolver from "./LambderResolver.js";
 import LambderResponseBuilder, { LambderResolverResponse } from "./LambderResponseBuilder.js";
 type Path = `/${string}`;
 type Session = {
@@ -25,14 +25,14 @@ type RenderContext = {
     lambdaContext: Context;
 };
 type ConditionFunction = (ctx: RenderContext) => boolean;
-type ActionFunction = (ctx: RenderContext, resolver: Resolver) => LambderResolverResponse | Promise<LambderResolverResponse>;
+type ActionFunction = (ctx: RenderContext, resolver: LambderResolver) => LambderResolverResponse | Promise<LambderResolverResponse>;
 type HookCreatedFunction = (lambderInstance: Lambder) => Promise<void>;
-type HookBeforeRenderFunction = (ctx: RenderContext, resolver: Resolver) => RenderContext | Error | Promise<RenderContext | Error>;
-type HookAfterRenderFunction = (ctx: RenderContext, resolver: Resolver, response: LambderResolverResponse) => LambderResolverResponse | Error | Promise<LambderResolverResponse | Error>;
-type HookFallbackFunction = (ctx: RenderContext, resolver: Resolver) => void | Promise<void>;
+type HookBeforeRenderFunction = (ctx: RenderContext, resolver: LambderResolver) => RenderContext | Error | Promise<RenderContext | Error>;
+type HookAfterRenderFunction = (ctx: RenderContext, resolver: LambderResolver, response: LambderResolverResponse) => LambderResolverResponse | Error | Promise<LambderResolverResponse | Error>;
+type HookFallbackFunction = (ctx: RenderContext, resolver: LambderResolver) => void | Promise<void>;
 type GlobalErrorHandlerFunction = (err: Error, ctx: RenderContext | null, response: LambderResponseBuilder) => LambderResolverResponse | Promise<LambderResolverResponse>;
-type RouteFallbackHandlerFunction = (ctx: RenderContext, resolver: Resolver) => LambderResolverResponse;
-type ApiFallbackHandlerFunction = (ctx: RenderContext, resolver: Resolver) => LambderResolverResponse;
+type RouteFallbackHandlerFunction = (ctx: RenderContext, resolver: LambderResolver) => LambderResolverResponse;
+type ApiFallbackHandlerFunction = (ctx: RenderContext, resolver: LambderResolver) => LambderResolverResponse;
 export declare const createContext: (event: APIGatewayProxyEvent, lambdaContext: Context, apiPath?: string | null) => RenderContext;
 export default class Lambder {
     private apiPath;

package/dist/Lambder.js

@@ -1,7 +1,7 @@
 import querystring from "querystring";
 import cookieParser from "cookie";
 import { match } from "path-to-regexp";
-import Resolver from "./Resolver.js";
+import LambderResolver from "./LambderResolver.js";
 import LambderResponseBuilder from "./LambderResponseBuilder.js";
 export const createContext = (event, lambdaContext, apiPath = null) => {
     const host = event.headers.Host || event.headers.host || "";
@@ -69,7 +69,8 @@ export default class Lambder {
     testPatternMatch(pattern, path) {
         return (match(pattern, { decode: decodeURIComponent }))(path) !== false;
     }
-    async validateSession(session) {
+    async validateSession(ctx) {
+        const { session, apiName, post, cookie } = ctx;
         if (!session)
             return false;
         if (!session.userId || !session.userIdHash || !session.sessionHash || !session.csrfToken)
@@ -78,6 +79,14 @@ export default class Lambder {
             return false;
         if (session.expiresTimeStamp > Date.now())
             return false;
+        if (apiName) {
+            if (!post.token)
+                return false;
+            if (post.token !== cookie.LMBDRTOKEN)
+                return false;
+            if (post.token !== session.csrfToken)
+                return false;
+        }
         // Check DDB;
         return false;
     }
@@ -128,7 +137,7 @@ export default class Lambder {
                     (typeof condition === "function" && condition(ctx)) ||
                     (condition?.constructor == RegExp && condition.test(ctx.path)))),
             actionFn: async (ctx, resolver) => {
-                const isSessionValid = this.validateSession(ctx.session);
+                const isSessionValid = this.validateSession(ctx);
                 if (!isSessionValid)
                     throw new Error("Session not found");
                 if (typeof condition === "string") {
@@ -157,7 +166,7 @@ export default class Lambder {
                 (typeof apiName === "function" && apiName(ctx)) ||
                 (apiName?.constructor == RegExp && apiName.test(ctx.apiName))),
             actionFn: async (ctx, resolver) => {
-                const isSessionValid = this.validateSession(ctx.session);
+                const isSessionValid = this.validateSession(ctx);
                 if (!isSessionValid)
                     throw new Error("Session not found");
                 return await actionFn(ctx, resolver);
@@ -183,7 +192,7 @@ export default class Lambder {
     }
     ;
     getResolver(resolve, reject) {
-        return new Resolver({
+        return new LambderResolver({
             isCorsEnabled: this.isCorsEnabled,
             publicPath: this.publicPath,
             apiVersion: this.apiVersion,

package/dist/LambderCaller.d.ts

@@ -48,7 +48,8 @@ export default class LambderCaller {
         fetchStartedHandler?: FetchStartEventHandler;
         fetchEndedHandler?: FetchEndEventHandler;
     });
-    apiRaw<T>(apiName: string, payload?: any, headers?: Record<string, any>, options?: {
+    apiRaw<T>(apiName: string, payload?: any, options?: {
+        headers?: Record<string, any>;
         versionExpiredHandler?: VoidFunction;
         sessionExpiredHandler?: VoidFunction;
         messageHandler?: MessageHandler;

package/dist/LambderCaller.js

@@ -27,7 +27,8 @@ export default class LambderCaller {
         this.fetchEndedHandler = fetchEndedHandler;
     }
     ;
-    async apiRaw(apiName, payload, headers, options) {
+    async apiRaw(apiName, payload, options) {
+        const headers = options?.headers;
         const fetchTracker = { apiName, done: false, fetchEndCalled: false };
         try {
             this.fetchTrackerList.push(fetchTracker);
@@ -37,7 +38,7 @@ export default class LambderCaller {
                     activeFetchList: this.fetchTrackerList.filter(v => !v.done)
                 });
             const version = this.apiVersion;
-            const token = Cookies.get("LMBRTOKEN") || "";
+            const token = Cookies.get("LMBDRTOKEN") || "";
             const siteHost = window.location.hostname;
             let data = await fetch(this.apiPath, {
                 method: 'POST', mode: 'same-origin', cache: 'no-cache',
@@ -68,8 +69,8 @@ export default class LambderCaller {
                 return null;
             }
             if (data && data.sessionExpired) {
-                Cookies.set('LMBRAUTHID', '', { expires: -1 });
-                Cookies.set('LMBRTOKEN', '', { expires: -1 });
+                Cookies.set('LMBDRAUTHID', '', { expires: -1 });
+                Cookies.set('LMBDRTOKEN', '', { expires: -1 });
                 if (this.sessionExpiredHandler) {
                     await this.sessionExpiredHandler();
                 }

package/dist/{Resolver.d.ts → LambderResolver.d.ts}

@@ -12,7 +12,7 @@ interface DieResolverMethods {
     file: MethodType<LambderResponseBuilder, 'file'>;
     api: MethodType<LambderResponseBuilder, 'api'>;
 }
-export default class Resolver extends LambderResponseBuilder {
+export default class LambderResolver extends LambderResponseBuilder {
     resolve: (response: LambderResolverResponse) => void;
     reject: (err: Error) => void;
     die: DieResolverMethods;

package/dist/{Resolver.js → LambderResolver.js}

@@ -1,5 +1,5 @@
 import LambderResponseBuilder from "./LambderResponseBuilder.js";
-export default class Resolver extends LambderResponseBuilder {
+export default class LambderResolver extends LambderResponseBuilder {
     resolve;
     reject;
     die;

package/dist/index.d.ts

@@ -2,4 +2,4 @@ import Lambder from './Lambder.js';
 export default Lambder;
 export { default as LambderCaller } from "./LambderCaller.js";
 export { default as LambderResponseBuilder } from "./LambderResponseBuilder.js";
-export { default as Resolver } from "./Resolver.js";
+export { default as LambderResolver } from "./LambderResolver.js";

package/dist/index.js

@@ -2,4 +2,4 @@ import Lambder from './Lambder.js';
 export default Lambder;
 export { default as LambderCaller } from "./LambderCaller.js";
 export { default as LambderResponseBuilder } from "./LambderResponseBuilder.js";
-export { default as Resolver } from "./Resolver.js";
+export { default as LambderResolver } from "./LambderResolver.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambder",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Lambder.ts

@@ -3,7 +3,7 @@ import cookieParser from "cookie";
 import { match } from "path-to-regexp";
 
 import type { APIGatewayProxyEvent, APIGatewayProxyEventHeaders, Context } from "aws-lambda";
-import Resolver from "./Resolver.js";
+import LambderResolver from "./LambderResolver.js";
 import LambderResponseBuilder, { LambderResolverResponse } from "./LambderResponseBuilder.js";
 
 type Path = `/${string}`;
@@ -33,17 +33,17 @@ type RenderContext = {
 };
 
 type ConditionFunction = (ctx: RenderContext) => boolean;
-type ActionFunction = (ctx: RenderContext, resolver: Resolver) => LambderResolverResponse|Promise<LambderResolverResponse>;
+type ActionFunction = (ctx: RenderContext, resolver: LambderResolver) => LambderResolverResponse|Promise<LambderResolverResponse>;
 type ActionObject = { conditionFn: ConditionFunction, actionFn: ActionFunction };
 
 type HookCreatedFunction = (lambderInstance: Lambder) => Promise<void>;
-type HookBeforeRenderFunction = (ctx: RenderContext, resolver: Resolver) => RenderContext|Error|Promise<RenderContext|Error>;
-type HookAfterRenderFunction = (ctx: RenderContext, resolver: Resolver, response: LambderResolverResponse) => LambderResolverResponse|Error|Promise<LambderResolverResponse|Error>;
-type HookFallbackFunction = (ctx: RenderContext, resolver: Resolver) => void|Promise<void>;
+type HookBeforeRenderFunction = (ctx: RenderContext, resolver: LambderResolver) => RenderContext|Error|Promise<RenderContext|Error>;
+type HookAfterRenderFunction = (ctx: RenderContext, resolver: LambderResolver, response: LambderResolverResponse) => LambderResolverResponse|Error|Promise<LambderResolverResponse|Error>;
+type HookFallbackFunction = (ctx: RenderContext, resolver: LambderResolver) => void|Promise<void>;
 
 type GlobalErrorHandlerFunction = (err: Error, ctx: RenderContext|null, response: LambderResponseBuilder) => LambderResolverResponse|Promise<LambderResolverResponse>;
-type RouteFallbackHandlerFunction = (ctx:RenderContext, resolver: Resolver) => LambderResolverResponse;
-type ApiFallbackHandlerFunction = (ctx:RenderContext, resolver: Resolver) => LambderResolverResponse;
+type RouteFallbackHandlerFunction = (ctx:RenderContext, resolver: LambderResolver) => LambderResolverResponse;
+type ApiFallbackHandlerFunction = (ctx:RenderContext, resolver: LambderResolver) => LambderResolverResponse;
 
 type HookEventType = "created"|"beforeRender"|"afterRender"|"fallback";
 
@@ -123,16 +123,23 @@ export default class Lambder {
         return (match(pattern, { decode: decodeURIComponent }))(path) !== false;
     }
 
-    private async validateSession (session: Session|null): Promise<boolean>{
+    private async validateSession (ctx: RenderContext): Promise<boolean>{
+        const { session, apiName, post, cookie } = ctx;
         if(!session) return false;
         if(!session.userId || !session.userIdHash || !session.sessionHash || !session.csrfToken) return false;
         if(!session.createdTimeStamp || !session.expiresTimeStamp) return false;
         if(session.expiresTimeStamp > Date.now()) return false;
+
+        if(apiName){
+            if(!post.token) return false;
+            if(post.token !== cookie.LMBDRTOKEN) return false;
+            if(post.token !== session.csrfToken) return false;
+        }
         // Check DDB;
         return false;
     };
 
-    private async handleNoMatchedAction(ctx: RenderContext, resolver: Resolver){
+    private async handleNoMatchedAction(ctx: RenderContext, resolver: LambderResolver){
         for(const hook of this.hookList["fallback"]){  await hook.hookFn(ctx, resolver); }
 
         const isAPI = ctx.path === this.apiPath;
@@ -160,7 +167,7 @@ export default class Lambder {
                     (condition?.constructor == RegExp && condition.test(ctx.path))
                 )
             ), 
-            actionFn: async (ctx:RenderContext, resolver: Resolver) => {
+            actionFn: async (ctx:RenderContext, resolver: LambderResolver) => {
                 if(typeof condition === "string"){
                     ctx.pathParams = this.getPatternMatch(condition, ctx.path);
                 }else if(condition?.constructor == RegExp){
@@ -182,8 +189,8 @@ export default class Lambder {
                     (condition?.constructor == RegExp && condition.test(ctx.path))
                 )
             ), 
-            actionFn: async (ctx:RenderContext, resolver: Resolver) => {
-                const isSessionValid = this.validateSession(ctx.session);
+            actionFn: async (ctx:RenderContext, resolver: LambderResolver) => {
+                const isSessionValid = this.validateSession(ctx);
                 if(!isSessionValid) throw new Error("Session not found");
                 if(typeof condition === "string"){
                     ctx.pathParams = this.getPatternMatch(condition, ctx.path);
@@ -202,7 +209,7 @@ export default class Lambder {
                 (typeof apiName === "function" && apiName(ctx)) ||
                 (apiName?.constructor == RegExp && apiName.test(ctx.apiName))
             ), 
-            actionFn: async (ctx:RenderContext, resolver: Resolver) => await actionFn(ctx, resolver),
+            actionFn: async (ctx:RenderContext, resolver: LambderResolver) => await actionFn(ctx, resolver),
         });
     };
 
@@ -213,8 +220,8 @@ export default class Lambder {
                 (typeof apiName === "function" && apiName(ctx)) ||
                 (apiName?.constructor == RegExp && apiName.test(ctx.apiName))
             ), 
-            actionFn: async (ctx:RenderContext, resolver: Resolver) => {
-                const isSessionValid = this.validateSession(ctx.session);
+            actionFn: async (ctx:RenderContext, resolver: LambderResolver) => {
+                const isSessionValid = this.validateSession(ctx);
                 if(!isSessionValid) throw new Error("Session not found");
                 return await actionFn(ctx, resolver);
             }
@@ -247,7 +254,7 @@ export default class Lambder {
     };
 
     private getResolver(resolve: (response: LambderResolverResponse) => void, reject: (err: Error) => void){
-        return new Resolver({
+        return new LambderResolver({
             isCorsEnabled: this.isCorsEnabled, 
             publicPath: this.publicPath,
             apiVersion: this.apiVersion,

package/src/LambderCaller.ts

@@ -81,7 +81,8 @@ export default class LambderCaller {
 
     };
 
-    async apiRaw<T>(apiName: string, payload?: any, headers?: Record<string, any>, options?: {
+    async apiRaw<T>(apiName: string, payload?: any, options?: {
+        headers?: Record<string, any>
         versionExpiredHandler?: VoidFunction, 
         sessionExpiredHandler?: VoidFunction, 
         messageHandler?: MessageHandler,
@@ -91,6 +92,7 @@ export default class LambderCaller {
         fetchStartedHandler?: FetchStartEventHandler, 
         fetchEndedHandler?: FetchEndEventHandler,
     }): Promise<LambderApiResponse<T>|null>{
+        const headers = options?.headers;
         const fetchTracker: FetchTracker = { apiName, done: false, fetchEndCalled: false };
         try {
             this.fetchTrackerList.push(fetchTracker);
@@ -99,7 +101,7 @@ export default class LambderCaller {
                 activeFetchList: this.fetchTrackerList.filter(v=>!v.done)
             });
             const version = this.apiVersion;
-            const token = Cookies.get("LMBRTOKEN") || "";
+            const token = Cookies.get("LMBDRTOKEN") || "";
             const siteHost = window.location.hostname;
             let data = await fetch(this.apiPath, {
                 method: 'POST', mode: 'same-origin', cache: 'no-cache',
@@ -128,8 +130,8 @@ export default class LambderCaller {
                 return null;
             }
             if(data && data.sessionExpired){ 
-                Cookies.set('LMBRAUTHID', '', { expires: -1 });
-                Cookies.set('LMBRTOKEN', '', { expires: -1 });
+                Cookies.set('LMBDRAUTHID', '', { expires: -1 });
+                Cookies.set('LMBDRTOKEN', '', { expires: -1 });
                 if(this.sessionExpiredHandler){
                     await this.sessionExpiredHandler();
                 }else if(this.errorHandler){

package/src/{Resolver.ts → LambderResolver.ts}

@@ -15,7 +15,7 @@ interface DieResolverMethods {
     api: MethodType<LambderResponseBuilder, 'api'>;
 }
 
-export default class Resolver extends LambderResponseBuilder {
+export default class LambderResolver extends LambderResponseBuilder {
     public resolve: (response: LambderResolverResponse) => void;
     public reject: (err: Error) => void;
     public die: DieResolverMethods;

package/src/index.ts

@@ -3,4 +3,4 @@ import Lambder from './Lambder.js';
 export default Lambder;
 export { default as LambderCaller } from "./LambderCaller.js";
 export { default as LambderResponseBuilder } from "./LambderResponseBuilder.js";
-export { default as Resolver } from "./Resolver.js";
+export { default as LambderResolver } from "./LambderResolver.js";