@travetto/auth-web-passport 7.0.0-rc.2 → 7.0.0-rc.4

package/README.md

@@ -45,8 +45,8 @@ export class AppConfig {
           callbackURL: 'http://localhost:3000/auth/facebook/callback',
           profileFields: ['id', 'username', 'displayName', 'photos', 'email'],
         },
-        (accessToken, refreshToken, profile, cb) =>
-          cb(undefined, profile)
+        (accessToken, refreshToken, profile, callback) =>
+          callback(undefined, profile)
       ),
       (user: FbUser) => ({
         id: user.username,
@@ -59,8 +59,8 @@ export class AppConfig {
   @InjectableFactory()
   static principalSource(): Authorizer {
     return new class implements Authorizer {
-      async authorize(p: Principal) {
-        return p;
+      async authorize(principal: Principal) {
+        return principal;
       }
     }();
   }
@@ -81,7 +81,7 @@ import { Controller, Get, Post, WebRequest, ContextParam, WebResponse } from '@t
 import { Login, Authenticated, Logout } from '@travetto/auth-web';
 import { Principal } from '@travetto/auth';
 
-import { FbAuthSymbol } from './conf.ts';
+import { FbAuthSymbol } from './config.ts';
 
 @Controller('/auth')
 export class SampleAuth {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/auth-web-passport",
-  "version": "7.0.0-rc.2",
+  "version": "7.0.0-rc.4",
   "description": "Web authentication integration support for the Travetto framework",
   "keywords": [
     "authentication",
@@ -26,11 +26,11 @@
     "directory": "module/auth-web-passport"
   },
   "dependencies": {
-    "@travetto/auth": "^7.0.0-rc.1",
-    "@travetto/auth-web": "^7.0.0-rc.2",
-    "@travetto/config": "^7.0.0-rc.1",
-    "@travetto/web": "^7.0.0-rc.2",
-    "@travetto/web-connect": "^7.0.0-rc.2",
+    "@travetto/auth": "^7.0.0-rc.3",
+    "@travetto/auth-web": "^7.0.0-rc.4",
+    "@travetto/config": "^7.0.0-rc.3",
+    "@travetto/web": "^7.0.0-rc.4",
+    "@travetto/web-connect": "^7.0.0-rc.4",
     "@types/passport": "^1.0.17",
     "passport": "^0.7.0"
   },

package/src/authenticator.ts

@@ -26,18 +26,18 @@ export class PassportAuthenticator<V extends PassportUser = PassportUser> implem
    * @param strategyName Name of passport strategy
    * @param strategy  A passport strategy
    * @param toPrincipal  How to convert a user to an identity
-   * @param opts Extra passport options
+   * @param options Extra passport options
    */
   constructor(
     strategyName: string,
     strategy: passport.Strategy,
     toPrincipal: (user: V) => SimplePrincipal,
-    opts: passport.AuthenticateOptions | ((ctx: WebFilterContext) => passport.AuthenticateOptions) = {},
+    options: passport.AuthenticateOptions | ((ctx: WebFilterContext) => passport.AuthenticateOptions) = {},
   ) {
     this.#strategyName = strategyName;
     this.#strategy = strategy;
     this.#toPrincipal = toPrincipal;
-    this.#passportOptions = typeof opts === 'function' ? opts : ((): Partial<passport.AuthenticateOptions> => opts);
+    this.#passportOptions = typeof options === 'function' ? options : ((): Partial<passport.AuthenticateOptions> => options);
     passport.use(this.#strategyName, this.#strategy);
   }
 
@@ -61,8 +61,8 @@ export class PassportAuthenticator<V extends PassportUser = PassportUser> implem
       state: PassportUtil.enhanceState(ctx, requestOptions.state)
     };
 
-    const user = await WebConnectUtil.invoke<V>(ctx, (req, res, next) =>
-      passport.authenticate(this.#strategyName, options, next)(req, res)
+    const user = await WebConnectUtil.invoke<V>(ctx, (request, response, next) =>
+      passport.authenticate(this.#strategyName, options, next)(request, response)
     );
 
     if (user) {

package/src/util.ts

@@ -1,5 +1,5 @@
 import { WebFilterContext, WebRequest } from '@travetto/web';
-import { castTo, Util } from '@travetto/runtime';
+import { castTo, JSONUtil } from '@travetto/runtime';
 
 /**
  * Passport utilities
@@ -8,15 +8,15 @@ export class PassportUtil {
 
   /**
    * Read passport state string as bas64 encoded JSON value
-   * @param src The input src for a state read (string, or a request obj)
+   * @param input The input for a state read (string, or a request)
    */
-  static readState<T = Record<string, unknown>>(src?: string | WebRequest): T | undefined {
-    const state = (typeof src === 'string' ? src :
-      (typeof src?.context.httpQuery?.state === 'string' ?
-        src?.context.httpQuery?.state : ''));
+  static readState<T = Record<string, unknown>>(input?: string | WebRequest): T | undefined {
+    const state = (typeof input === 'string' ? input :
+      (typeof input?.context.httpQuery?.state === 'string' ?
+        input?.context.httpQuery?.state : ''));
     if (state) {
       try {
-        return Util.decodeSafeJSON(state);
+        return JSONUtil.parseBase64(state);
       } catch { }
     }
   }
@@ -28,7 +28,7 @@ export class PassportUtil {
    */
   static writeState(state?: Record<string, unknown>): string | undefined {
     if (state) {
-      return Util.encodeSafeJSON(state);
+      return JSONUtil.stringifyBase64(state);
     }
   }
 
@@ -40,16 +40,16 @@ export class PassportUtil {
    * @returns
    */
   static addToState(state: string | Record<string, unknown>, current?: string | WebRequest, key?: string): string {
-    const pre = this.readState(current) ?? {};
-    const toAdd = typeof state === 'string' ? JSON.parse(state) : state;
-    const base: Record<string, unknown> = key ? castTo(pre[key] ??= {}) : pre;
-    for (const k of Object.keys(toAdd)) {
-      if (k === '__proto__' || k === 'constructor' || k === 'prototype') {
+    const original = this.readState(current) ?? {};
+    const toAdd: Record<string, unknown> = typeof state === 'string' ? JSONUtil.parseSafe(state) : state;
+    const base: Record<string, unknown> = key ? castTo(original[key] ??= {}) : original;
+    for (const property of Object.keys(toAdd)) {
+      if (property === '__proto__' || property === 'constructor' || property === 'prototype') {
         continue;
       }
-      base[k] = toAdd[k];
+      base[property] = toAdd[property];
     }
-    return this.writeState(pre)!;
+    return this.writeState(original)!;
   }
 
   /**