@aptana/multichannel-common 2.9.15 → 2.9.17

package/core/domain/auth/TokenGuard.d.ts

@@ -14,14 +14,20 @@ export declare class TokenGuard implements Guard {
      * The currently authenticated user.
      */
     private _user;
+    /**
+     * Skip userKey & userToken authentication
+     */
+    private _skipUserKeyAuth;
     /**
      * Create a new authtentication guard.
      */
-    constructor(provider: UserProvider, req: any);
+    constructor(provider: UserProvider, req: any, options?: {
+        skipUserKeyAuth?: boolean;
+    });
     /**
      * Determine if the current user is authenticated. If not, throw an error.
      */
-    authenticate(): Promise<Authenticable>;
+    authenticate(): Promise<Authenticable | undefined>;
     check(): Promise<boolean>;
     guest(): Promise<boolean>;
     setUser(user: Authenticable): Promise<void>;

package/core/domain/auth/TokenGuard.js

@@ -18,22 +18,34 @@ class TokenGuard {
      * The currently authenticated user.
      */
     _user;
+    /**
+     * Skip userKey & userToken authentication
+     */
+    _skipUserKeyAuth;
     /**
      * Create a new authtentication guard.
      */
-    constructor(provider, req) {
+    constructor(provider, req, options) {
         this._provider = provider;
         this._req = req;
+        this._skipUserKeyAuth = options?.skipUserKeyAuth ?? false;
     }
     /**
      * Determine if the current user is authenticated. If not, throw an error.
      */
     async authenticate() {
-        const user = await this.user();
-        if (user) {
-            return user;
+        try {
+            const user = await this.user();
+            if (user) {
+                return user;
+            }
+        }
+        catch (error) {
+            if (error && error.statusCode) {
+                throw error;
+            }
+            throw new WrongCredentialsError_1.default();
         }
-        throw new WrongCredentialsError_1.default();
     }
     async check() {
         return !!(await this.user());
@@ -54,7 +66,8 @@ class TokenGuard {
         let user = null;
         let token = this.getTokenFromRequest();
         let { userKey, userToken } = this.getUserKeyTokenFromRequest();
-        if (userKey && userToken) {
+        // Skip userKey auth if configured
+        if (!this._skipUserKeyAuth && userKey && userToken) {
             user = await this._provider.getByUserKeyAndUserToken(userKey, userToken);
         }
         else if (token) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptana/multichannel-common",
-  "version": "2.9.15",
+  "version": "2.9.17",
   "license": "MIT",
   "description": "",
   "keywords": [