alp-node-auth 7.2.2 → 8.0.0

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.0.0](https://github.com/christophehurpeau/alp/compare/alp-node-auth@7.2.2...alp-node-auth@8.0.0) (2023-03-19)
+
+
+### ⚠ BREAKING CHANGES
+
+* changed api for alp-node-auth
+
+### Features
+
+* auth browser-readable cookie ([7ce6b13](https://github.com/christophehurpeau/alp/commit/7ce6b13752ffd3b6238e6c9fe04fe907e208b7d5))
+* update dev dependencies ([9d7e24f](https://github.com/christophehurpeau/alp/commit/9d7e24f8e504d47feae64ca618dc2b3a69babc38))
+
+
+
 ## [7.2.2](https://github.com/christophehurpeau/alp/compare/alp-node-auth@7.2.1...alp-node-auth@7.2.2) (2023-02-18)
 
 

package/README.md

@@ -23,7 +23,7 @@ npm install --save alp-node-auth
 
 - Provides route and controller to login user
 - Provides extandable services and managers
-- Provides authentication middleware: `context.state.connected` and `context.state.user`
+- Provides authentication middleware: `context.state.loggedInUserId` and `context.state.loggedInUser`
 
 ## How to use
 

package/dist/definitions/MongoUsersManager.d.ts

@@ -3,7 +3,9 @@ import type { User, Account, UserSanitized } from '../types.d';
 export default class MongoUsersManager<U extends User = User, USanitized extends UserSanitized = UserSanitized> {
     store: MongoStore<U>;
     constructor(store: MongoStore<U>);
+    /** @deprecated use findById instead */
     findConnected(connected: string): Promise<U | undefined>;
+    findById(userId: string): Promise<U | undefined>;
     insertOne(user: MongoInsertType<U>): Promise<any>;
     replaceOne(user: U): Promise<any>;
     sanitize(user: U): USanitized;

package/dist/definitions/MongoUsersManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MongoUsersManager.d.ts","sourceRoot":"","sources":["../../src/MongoUsersManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAU,MAAM,YAAY,CAAC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,iBAAiB,CACpC,CAAC,SAAS,IAAI,GAAG,IAAI,EACrB,UAAU,SAAS,aAAa,GAAG,aAAa;IAEhD,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;gBAET,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IAIhC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIxD,SAAS,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAIjD,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAIjC,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,UAAU;IAI7B,wBAAwB,CAAC,EACvB,SAAS,EACT,MAAM,EACN,QAAQ,GACT,EAAE;QACD,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAqB1B,aAAa,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAapD,gBAAgB,CAAC,IAAI,EAAE,CAAC,GAAG,aAAa;CAmBzC"}
+{"version":3,"file":"MongoUsersManager.d.ts","sourceRoot":"","sources":["../../src/MongoUsersManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAU,MAAM,YAAY,CAAC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,iBAAiB,CACpC,CAAC,SAAS,IAAI,GAAG,IAAI,EACrB,UAAU,SAAS,aAAa,GAAG,aAAa;IAEhD,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;gBAET,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IAIhC,uCAAuC;IACvC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIxD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIhD,SAAS,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAIjD,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAIjC,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,UAAU;IAI7B,wBAAwB,CAAC,EACvB,SAAS,EACT,MAAM,EACN,QAAQ,GACT,EAAE;QACD,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAqB1B,aAAa,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAapD,gBAAgB,CAAC,IAAI,EAAE,CAAC,GAAG,aAAa;CAmBzC"}

package/dist/definitions/authSocketIO.d.ts

@@ -1,5 +1,5 @@
 import type { NodeApplication } from 'alp-types';
 import type { User } from '../types.d';
 import type MongoUsersManager from './MongoUsersManager';
-export declare const authSocketIO: <U extends User = User>(app: NodeApplication, usersManager: MongoUsersManager<U, import("../types.d").UserSanitized>, io: any) => void;
+export declare const authSocketIO: <U extends User = User>(app: NodeApplication, usersManager: MongoUsersManager<U, import("../types.d").UserSanitized>, io: any, jwtAudience?: string) => void;
 //# sourceMappingURL=authSocketIO.d.ts.map

package/dist/definitions/authSocketIO.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authSocketIO.d.ts","sourceRoot":"","sources":["../../src/authSocketIO.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,iBAAiB,MAAM,qBAAqB,CAAC;AAMzD,eAAO,MAAM,YAAY,+BAClB,eAAe,8EAGhB,GAAG,KACN,IAgCF,CAAC"}
+{"version":3,"file":"authSocketIO.d.ts","sourceRoot":"","sources":["../../src/authSocketIO.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,iBAAiB,MAAM,qBAAqB,CAAC;AAMzD,eAAO,MAAM,YAAY,+BAClB,eAAe,8EAGhB,GAAG,gBACO,MAAM,KACnB,IAgCF,CAAC"}

package/dist/definitions/index.d.ts

@@ -16,15 +16,15 @@ export { createAuthApolloContext } from './authApolloContext';
 export { STATUSES } from './services/user/UserAccountsService';
 declare module 'alp-types' {
     interface ContextState {
-        connected: NonNullable<ContextState['user']>['_id'] | null | undefined;
-        user: User | null | undefined;
+        loggedInUserId: NonNullable<ContextState['loggedInUser']>['_id'] | null | undefined;
+        loggedInUser: User | null | undefined;
     }
     interface ContextSanitizedState {
-        connected: NonNullable<ContextSanitizedState['user']>['_id'] | null | undefined;
-        user: UserSanitized | null | undefined;
+        loggedInUserId: NonNullable<ContextSanitizedState['loggedInUser']>['_id'] | null | undefined;
+        loggedInUser: UserSanitized | null | undefined;
     }
     interface BaseContext {
-        setConnected: (connected: NonNullable<ContextState['user']>['_id'], user: NonNullable<ContextState['user']>) => Promise<void>;
+        setLoggedIn: (loggedInUserId: NonNullable<ContextState['loggedInUserId']>, loggedInUser: NonNullable<ContextState['loggedInUser']>) => Promise<void>;
         logout: () => void;
     }
 }
@@ -41,8 +41,8 @@ export default function init<StrategyKeys extends AllowedStrategyKeys = 'google'
     jwtAudience?: string;
 }): (app: NodeApplication) => {
     routes: AuthRoutesType;
-    getConnectedAndUserFromRequest: (req: IncomingMessage) => Promise<[U["_id"] | null | undefined, U | null | undefined]>;
-    getConnectedAndUser: import("./utils/createFindConnectedAndUser").FindConnectedAndUser<U>;
+    findLoggedInUserFromRequest: (req: IncomingMessage) => Promise<[U["_id"] | null | undefined, U | null | undefined]>;
+    findLoggedInUser: import("./utils/createFindLoggedInUser").FindLoggedInUser<U>;
     middleware: <T>(ctx: Context, next: () => T | Promise<T>) => Promise<T>;
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/definitions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/definitions/services/authentification/AuthenticationService.d.ts

@@ -28,7 +28,7 @@ export interface Oauth2Strategy<Params extends string> extends Strategy {
 }
 export type Strategies<StrategyKeys extends AllowedStrategyKeys> = Record<StrategyKeys, Oauth2Strategy<any>>;
 export interface AccessResponseHooks<StrategyKeys, U extends User = User> {
-    afterLoginSuccess?: <StrategyKey extends StrategyKeys>(strategy: StrategyKey, connectedUser: U) => void | Promise<void>;
+    afterLoginSuccess?: <StrategyKey extends StrategyKeys>(strategy: StrategyKey, loggedInUser: U) => void | Promise<void>;
     afterScopeUpdate?: <StrategyKey extends StrategyKeys>(strategy: StrategyKey, scopeKey: string, account: Account, user: U) => void | Promise<void>;
 }
 export declare class AuthenticationService<StrategyKeys extends AllowedStrategyKeys, U extends User = User, USanitized extends UserSanitized = UserSanitized> extends EventEmitter {
@@ -48,7 +48,7 @@ export declare class AuthenticationService<StrategyKeys extends AllowedStrategyK
         user?: U;
         accountId?: AccountId;
     }, params?: any): Promise<void>;
-    accessResponse<StrategyKey extends StrategyKeys>(ctx: any, strategy: StrategyKey, isConnected: undefined | boolean, hooks: AccessResponseHooks<StrategyKeys, U>): Promise<U>;
+    accessResponse<StrategyKey extends StrategyKeys>(ctx: Context, strategy: StrategyKey, isLoggedIn: boolean, hooks: AccessResponseHooks<StrategyKeys, U>): Promise<U>;
     refreshAccountTokens(user: U, account: Account): Promise<boolean>;
 }
 //# sourceMappingURL=AuthenticationService.d.ts.map

package/dist/definitions/services/authentification/AuthenticationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuthenticationService.d.ts","sourceRoot":"","sources":["../../../../src/services/authentification/AuthenticationService.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAErD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,KAAK,mBAAmB,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAI3D,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc,CAAC,MAAM,SAAS,MAAM,CAAE,SAAQ,QAAQ;IACrE,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED,MAAM,MAAM,UAAU,CAAC,YAAY,SAAS,mBAAmB,IAAI,MAAM,CACvE,YAAY,EACZ,cAAc,CAAC,GAAG,CAAC,CACpB,CAAC;AAEF,MAAM,WAAW,mBAAmB,CAAC,YAAY,EAAE,CAAC,SAAS,IAAI,GAAG,IAAI;IACtE,iBAAiB,CAAC,EAAE,CAAC,WAAW,SAAS,YAAY,EACnD,QAAQ,EAAE,WAAW,EACrB,aAAa,EAAE,CAAC,KACb,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,gBAAgB,CAAC,EAAE,CAAC,WAAW,SAAS,YAAY,EAClD,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,CAAC,KACJ,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,qBAAa,qBAAqB,CAChC,YAAY,SAAS,mBAAmB,EACxC,CAAC,SAAS,IAAI,GAAG,IAAI,EACrB,UAAU,SAAS,aAAa,GAAG,aAAa,CAChD,SAAQ,YAAY;IACpB,MAAM,EAAE,UAAU,CAAC;IAEnB,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC;IAErC,mBAAmB,EAAE,mBAAmB,CAAC,YAAY,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;gBAGpE,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,EACpC,mBAAmB,EAAE,mBAAmB,CAAC,YAAY,EAAE,CAAC,EAAE,UAAU,CAAC;IAQvE,eAAe,CAAC,CAAC,SAAS,YAAY,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,MAAM;IAWnE,SAAS,CACb,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,MAAM,CAAC;IAgCZ,YAAY,CAChB,QAAQ,EAAE,YAAY,EACtB,WAAW,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,GACpC,OAAO,CAAC,MAAM,CAAC;IA+BlB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAS7C,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,YAAY,EACtB,EACE,YAAY,EACZ,QAAQ,EACR,IAAI,EACJ,SAAS,GACV,EAAE;QACD,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,EAAE,CAAC,CAAC;QACT,SAAS,CAAC,EAAE,SAAS,CAAC;KACvB,EACD,MAAM,CAAC,EAAE,GAAG,GACX,OAAO,CAAC,IAAI,CAAC;IAuCV,cAAc,CAAC,WAAW,SAAS,YAAY,EACnD,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,WAAW,EACrB,WAAW,EAAE,SAAS,GAAG,OAAO,EAChC,KAAK,EAAE,mBAAmB,CAAC,YAAY,EAAE,CAAC,CAAC,GAC1C,OAAO,CAAC,CAAC,CAAC;IAgEb,oBAAoB,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAsBlE"}
+{"version":3,"file":"AuthenticationService.d.ts","sourceRoot":"","sources":["../../../../src/services/authentification/AuthenticationService.ts"],"names":[],"mappings":"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"}

package/dist/definitions/utils/cookies.d.ts

@@ -1,5 +1,6 @@
 import type { IncomingMessage } from 'http';
 import type { Option } from 'cookies';
-export declare const COOKIE_NAME = "connectedUser";
+export declare const COOKIE_NAME_TOKEN = "loggedInUserToken";
+export declare const COOKIE_NAME_STATE = "loggedInUserState";
 export declare const getTokenFromRequest: (req: IncomingMessage, options?: Pick<Option, Exclude<keyof Option, 'secure'>>) => string | undefined;
 //# sourceMappingURL=cookies.d.ts.map

package/dist/definitions/utils/cookies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../../src/utils/cookies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,eAAO,MAAM,WAAW,kBAAkB,CAAC;AAE3C,eAAO,MAAM,mBAAmB,QACzB,eAAe,YACV,KAAK,MAAM,EAAE,QAAQ,MAAM,MAAM,EAAE,QAAQ,CAAC,CAAC,KACtD,MAAM,GAAG,SAQX,CAAC"}
+{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../../src/utils/cookies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AAErD,eAAO,MAAM,mBAAmB,QACzB,eAAe,YACV,KAAK,MAAM,EAAE,QAAQ,MAAM,MAAM,EAAE,QAAQ,CAAC,CAAC,KACtD,MAAM,GAAG,SAYX,CAAC"}

package/dist/definitions/utils/createFindLoggedInUser.d.ts

@@ -0,0 +1,6 @@
+import type { Logger } from 'nightingale-logger';
+import type { User, UserSanitized } from '../../types';
+import type MongoUsersManager from '../MongoUsersManager';
+export type FindLoggedInUser<U extends User> = (jwtAudience?: string, token?: string) => Promise<[null | undefined | U['_id'], null | undefined | U]>;
+export declare const createFindLoggedInUser: <U extends User, USanitized extends UserSanitized>(secretKey: string, usersManager: MongoUsersManager<U, USanitized>, logger: Logger) => FindLoggedInUser<U>;
+//# sourceMappingURL=createFindLoggedInUser.d.ts.map

package/dist/definitions/utils/createFindLoggedInUser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createFindLoggedInUser.d.ts","sourceRoot":"","sources":["../../../src/utils/createFindLoggedInUser.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,iBAAiB,MAAM,sBAAsB,CAAC;AA0B1D,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,IAAI,IAAI,CAC7C,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,MAAM,KACX,OAAO,CAAC,CAAC,IAAI,GAAG,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC;AAElE,eAAO,MAAM,sBAAsB,gEAItB,MAAM,0DAET,MAAM,wBAwBf,CAAC"}

package/dist/index-node16.mjs

@@ -26,7 +26,7 @@ function createAuthController({
      * The user must already be connected
      */
     async addScope(ctx) {
-      if (!ctx.state.connected) {
+      if (!ctx.state.loggedInUser) {
         await ctx.redirectTo(homeRouterKey);
         return;
       }
@@ -41,12 +41,12 @@ function createAuthController({
     async response(ctx) {
       const strategy = ctx.namedParam('strategy');
       ctx.assert(strategy);
-      const connectedUser = await authenticationService.accessResponse(ctx, strategy, ctx.state.connected, {
+      const loggedInUser = await authenticationService.accessResponse(ctx, strategy, !!ctx.state.loggedInUser, {
         afterLoginSuccess: authHooks.afterLoginSuccess,
         afterScopeUpdate: authHooks.afterScopeUpdate
       });
       const keyPath = usersManager.store.keyPath;
-      await ctx.setConnected(connectedUser[keyPath], connectedUser);
+      await ctx.setLoggedIn(loggedInUser[keyPath], loggedInUser);
       await ctx.redirectTo(homeRouterKey);
     },
     async logout(ctx) {
@@ -198,7 +198,7 @@ class AuthenticationService extends EventEmitter {
     });
     return ctx.redirect(redirectUri);
   }
-  async accessResponse(ctx, strategy, isConnected, hooks) {
+  async accessResponse(ctx, strategy, isLoggedIn, hooks) {
     if (ctx.query.error) {
       const error = new Error(ctx.query.error);
       error.status = 403;
@@ -220,7 +220,7 @@ class AuthenticationService extends EventEmitter {
       throw new Error('Unexpected cookie value');
     }
     if (!cookie.isLoginAccess) {
-      if (!isConnected) {
+      if (!isLoggedIn) {
         throw new Error('You are not connected');
       }
     }
@@ -235,15 +235,15 @@ class AuthenticationService extends EventEmitter {
       }
       return user;
     }
-    const connectedUser = ctx.state.user;
+    const loggedInUser = ctx.state.loggedInUser;
     const {
       account,
       user
-    } = await this.userAccountsService.update(connectedUser, strategy, tokens, cookie.scope, cookie.scopeKey);
+    } = await this.userAccountsService.update(loggedInUser, strategy, tokens, cookie.scope, cookie.scopeKey);
     if (hooks.afterScopeUpdate) {
       await hooks.afterScopeUpdate(strategy, cookie.scopeKey, account, user);
     }
-    return connectedUser;
+    return loggedInUser;
   }
   refreshAccountTokens(user, account) {
     if (account.tokenExpireDate && account.tokenExpireDate.getTime() > Date.now()) {
@@ -397,14 +397,19 @@ class UserAccountsService extends EventEmitter {
   }
 }
 
-const COOKIE_NAME = 'connectedUser';
+const COOKIE_NAME_TOKEN = 'loggedInUserToken';
+const COOKIE_NAME_STATE = 'loggedInUserState';
 const getTokenFromRequest = (req, options) => {
+  if (req.headers.authorization?.startsWith('Bearer ')) {
+    return req.headers.authorization.slice(7);
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   const cookies = new Cookies(req, null, {
     ...options,
     secure: true
   });
-  return cookies.get(COOKIE_NAME);
+  return cookies.get(COOKIE_NAME_TOKEN);
 };
 
 const verifyPromisified = promisify(jsonwebtoken.verify);
@@ -413,23 +418,24 @@ const createDecodeJWT = secretKey => async (token, jwtAudience) => {
     algorithms: ['HS512'],
     audience: jwtAudience
   });
-  return result?.connected;
+  return result?.loggedInUserId;
 };
-const createFindConnectedAndUser = (secretKey, usersManager, logger) => {
+const createFindLoggedInUser = (secretKey, usersManager, logger) => {
   const decodeJwt = createDecodeJWT(secretKey);
   return async (jwtAudience, token) => {
     if (!token || !jwtAudience) return [null, null];
-    let connected;
+    let loggedInUserId;
     try {
-      connected = await decodeJwt(token, jwtAudience);
+      loggedInUserId = await decodeJwt(token, jwtAudience);
     } catch (err) {
       logger.debug('failed to verify authentification', {
         err
       });
     }
-    if (connected == null) return [null, null];
-    const user = await usersManager.findConnected(connected);
-    return [connected, user];
+    if (loggedInUserId == null) return [null, null];
+    const loggedInUser = await usersManager.findById(loggedInUserId);
+    if (!loggedInUser) return [null, null];
+    return [loggedInUserId, loggedInUser];
   };
 };
 
@@ -437,9 +443,14 @@ class MongoUsersManager {
   constructor(store) {
     this.store = store;
   }
+
+  /** @deprecated use findById instead */
   findConnected(connected) {
     return this.store.findByKey(connected);
   }
+  findById(userId) {
+    return this.store.findByKey(userId);
+  }
   insertOne(user) {
     return this.store.insertOne(user);
   }
@@ -586,8 +597,8 @@ class UserAccountSlackService {
 }
 
 const logger$2 = new Logger('alp:auth');
-const authSocketIO = (app, usersManager, io) => {
-  const findConnectedAndUser = createFindConnectedAndUser(app.config.get('authentication').get('secretKey'), usersManager, logger$2);
+const authSocketIO = (app, usersManager, io, jwtAudience) => {
+  const findLoggedInUser = createFindLoggedInUser(app.config.get('authentication').get('secretKey'), usersManager, logger$2);
   const users = new Map();
   io.users = users;
   io.use(async (socket, next) => {
@@ -595,12 +606,12 @@ const authSocketIO = (app, usersManager, io) => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     const token = getTokenFromRequest(handshakeData);
     if (!token) return next();
-    const [connected, user] = await findConnectedAndUser(
+    const [loggedInUserId, loggedInUser] = await findLoggedInUser(
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    handshakeData.headers['user-agent'], token);
-    if (!connected || !user) return next();
-    socket.user = user;
-    users.set(socket.client.id, user);
+    jwtAudience || handshakeData.headers['user-agent'], token);
+    if (!loggedInUserId || !loggedInUser) return next();
+    socket.user = loggedInUser;
+    users.set(socket.client.id, loggedInUser);
     socket.on('disconnected', () => users.delete(socket.client.id));
     await next();
   });
@@ -608,7 +619,7 @@ const authSocketIO = (app, usersManager, io) => {
 
 const logger$1 = new Logger('alp:auth');
 const getTokenFromReq = req => {
-  if (req.cookies) return req.cookies[COOKIE_NAME];
+  if (req.cookies) return req.cookies[COOKIE_NAME_TOKEN];
   return getTokenFromRequest(req);
 };
 
@@ -617,14 +628,14 @@ const getTokenFromReq = req => {
  * @internal
  */
 const createAuthApolloContext = (config, usersManager) => {
-  const findConnectedAndUser = createFindConnectedAndUser(config.get('authentication').get('secretKey'), usersManager, logger$1);
+  const findLoggedInUser = createFindLoggedInUser(config.get('authentication').get('secretKey'), usersManager, logger$1);
   return async ({
     req,
     connection
   }) => {
-    if (connection?.user) {
+    if (connection?.loggedInUser) {
       return {
-        user: connection.user
+        user: connection.loggedInUser
       };
     }
     if (!req) return null;
@@ -634,15 +645,16 @@ const createAuthApolloContext = (config, usersManager) => {
     if (!token) return {
       user: undefined
     };
-    const [, user] = await findConnectedAndUser(
+    const [, loggedInUser] = await findLoggedInUser(
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     req.headers['user-agent'], token);
     return {
-      user
+      user: loggedInUser
     };
   };
 };
 
+/* eslint-disable max-lines */
 const logger = new Logger('alp:auth');
 const signPromisified = promisify(jsonwebtoken.sign);
 function init({
@@ -665,69 +677,87 @@ function init({
       defaultStrategy,
       authHooks
     });
-    app.context.setConnected = async function (connected, user) {
-      logger.debug('setConnected', {
-        connected
+    app.context.setLoggedIn = async function (loggedInUserId, loggedInUser) {
+      logger.debug('setLoggedIn', {
+        loggedInUser
       });
-      if (!connected) {
-        throw new Error('Illegal value for setConnected');
+      if (!loggedInUserId) {
+        throw new Error('Illegal value for setLoggedIn');
       }
-      this.state.connected = connected;
-      this.state.user = user;
+      this.state.loggedInUserId = loggedInUserId;
+      this.state.loggedInUser = loggedInUser;
       const token = await signPromisified({
-        connected,
+        loggedInUserId,
         time: Date.now()
       }, this.config.get('authentication').get('secretKey'), {
         algorithm: 'HS512',
         audience: jwtAudience || this.request.headers['user-agent'],
         expiresIn: '30 days'
       });
-
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-      this.cookies.set(COOKIE_NAME, token, {
+      this.cookies.set(COOKIE_NAME_TOKEN, token, {
         httpOnly: true,
         secure: this.config.get('allowHttps')
       });
+      this.cookies.set(COOKIE_NAME_STATE, JSON.stringify({
+        loggedInUserId,
+        expiresIn: (() => {
+          const date = new Date();
+          date.setDate(date.getDate() + 30);
+          return date.getTime();
+        })()
+      }), {
+        httpOnly: false,
+        secure: this.config.get('allowHttps')
+      });
     };
     app.context.logout = function () {
-      delete this.state.connected;
-      delete this.state.user;
-      this.cookies.set(COOKIE_NAME, '', {
+      delete this.state.loggedInUserId;
+      delete this.state.loggedInUser;
+      this.cookies.set(COOKIE_NAME_TOKEN, '', {
+        expires: new Date(1)
+      });
+      this.cookies.set(COOKIE_NAME_STATE, '', {
         expires: new Date(1)
       });
     };
-    const getConnectedAndUser = createFindConnectedAndUser(app.config.get('authentication').get('secretKey'), usersManager, logger);
+    const findLoggedInUser = createFindLoggedInUser(app.config.get('authentication').get('secretKey'), usersManager, logger);
     return {
       routes: createRoutes(controller),
-      getConnectedAndUserFromRequest: req => {
+      findLoggedInUserFromRequest: req => {
         const token = getTokenFromRequest(req);
-        return getConnectedAndUser(jwtAudience || req.headers['user-agent'], token);
+        return findLoggedInUser(jwtAudience || req.headers['user-agent'], token);
       },
-      getConnectedAndUser,
+      findLoggedInUser,
       middleware: async (ctx, next) => {
-        const token = ctx.cookies.get(COOKIE_NAME);
+        const token = ctx.cookies.get(COOKIE_NAME_TOKEN);
         const userAgent = ctx.request.headers['user-agent'];
         logger.debug('middleware', {
           token
         });
-        const setState = (connected, user) => {
-          ctx.state.connected = connected;
-          ctx.state.user = user;
-          ctx.sanitizedState.connected = connected;
-          ctx.sanitizedState.user = user && usersManager.sanitize(user);
+        const setState = (loggedInUserId, loggedInUser) => {
+          ctx.state.loggedInUserId = loggedInUserId;
+          ctx.state.user = loggedInUser;
+          ctx.sanitizedState.loggedInUserId = loggedInUserId;
+          ctx.sanitizedState.loggedInUser = loggedInUser && usersManager.sanitize(loggedInUser);
         };
-        const [connected, user] = await getConnectedAndUser(jwtAudience || userAgent, token);
+        const [loggedInUserId, loggedInUser] = await findLoggedInUser(jwtAudience || userAgent, token);
         logger.debug('middleware', {
-          connected
+          loggedInUserId
         });
-        if (connected == null || user == null) {
-          if (token) ctx.cookies.set(COOKIE_NAME, '', {
-            expires: new Date(1)
-          });
+        if (loggedInUserId == null || loggedInUser == null) {
+          if (token) {
+            ctx.cookies.set(COOKIE_NAME_TOKEN, '', {
+              expires: new Date(1)
+            });
+            ctx.cookies.set(COOKIE_NAME_STATE, '', {
+              expires: new Date(1)
+            });
+          }
           setState(null, null);
           return next();
         }
-        setState(connected, user);
+        setState(loggedInUserId, loggedInUser);
         return next();
       }
     };