@owlmeans/server-oidc-rp 0.1.2 → 0.1.3

package/build/wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../src/wrapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../src/wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAE3E,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AACjE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEnD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAClG,OAAO,IAAI,MAAM,OAAO,CAAA;AAExB,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAA;AAEnD,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAuB,EAAE;IAC9D,MAAM,OAAO,GAAG,aAAa,CAAqB,YAAY,EAAE;QAC9D,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,EAAmB,CAAA;YAChD,KAAK,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAA;YACxD,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,MAAM,IAAI,kBAAkB,CAAC,OAAO,CAAC,CAAA;YACvC,CAAC;YACD,MAAM,CAAC,EAAE,cAAc,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC3C,MAAM,QAAQ,GAAG,iBAAiB,CAAO,cAAc,EAAE,YAAY,CAAC,KAAK,CAAC,CAAA;YAC5E,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;YAE/B,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;gBAC1D,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;oBAC7C,MAAM,IAAI,kBAAkB,CAAC,QAAQ,CAAC,CAAA;gBACxC,CAAC;gBAED,IAAI,MAAM,CAAC,SAAS,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;qBACnD,GAAG,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;oBACtD,OAAO,EAAE,KAAK,EAAE,CAAA;gBAClB,CAAC;gBAED,MAAM,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;gBAE7B,IAAI,GAAG,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC/C,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,UAAU,CAAoC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC;yBAC9F,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;oBAEtD,MAAM,cAAc,GAAG,iBAAiB,CAAkB,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAA;oBAC3F,MAAM,WAAW,GAAG,MAAM,KAAK,CAAkB,GAAG,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;oBAC5E,IAAI,CAAC,MAAM,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;wBAClD,MAAM,IAAI,YAAY,EAAE,CAAA;oBAC1B,CAAC;oBAED,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,CAAA;oBAE5C,MAAM,WAAW,GAAS;wBACxB,GAAG,IAAI;wBACP,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK;wBACxC,MAAM,EAAE,WAAW,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM;wBACzC,SAAS,EAAE,WAAW,CAAC,SAAS;wBAChC,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ;wBAC/C,SAAS,EAAE,IAAI,IAAI,EAAE;qBACtB,CAAA;oBAED,IAAI,WAAW,CAAC,SAAS,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;wBACzC,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;wBAC/B,WAAW,CAAC,KAAK,GAAG,WAAW,CAAC,SAAS,CAAA;wBACzC,MAAM,CAAC,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;oBAC1C,CAAC;oBAGD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAkB,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;oBAC5F,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAO,kBAAkB,CAAC;yBACpE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,CAAA;oBAEhE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,QAAkC,CAAA;oBAE1D,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,mBAAmB,GAAG,IAAI,EAAE,CAAC,CAAA;oBAElE,OAAO,EAAE,KAAK,EAAE,GAAG,kBAAkB,CAAC,WAAW,EAAE,IAAI,aAAa,EAAE,EAAE,CAAA;gBAC1E,CAAC;qBAAM,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;oBAClC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAoB,aAAa,CAAC,CAAA;oBAC1D,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;oBACzC,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;wBAC5B,IAAI,QAAQ,GAAyB,MAAM,CAAC,OAA+B,CAAA;wBAC3E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;wBACpD,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;4BACnD,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAkC,CAAyB,CAAA;wBAC7F,CAAC;6BAAM,CAAC;4BACN,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,QAAkC,EAAE,cAAc,CAAC,CAAA;4BAC1F,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gCACnB,MAAM,IAAI,kBAAkB,CAAC,cAAc,CAAC,CAAA;4BAC9C,CAAC;wBACH,CAAC;wBAED,MAAM,WAAW,GAAS;4BACxB,GAAG,IAAI;4BACP,SAAS,EAAE,IAAI,IAAI,EAAE;yBACtB,CAAA;wBAED,MAAM,OAAO,GAAG,MAAM,KAAK,CAAkB,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;wBAC5F,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAO,kBAAkB,CAAC;6BACpE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,CAAA;wBAEhE,MAAM,CAAC,OAAO,GAAG,QAAkC,CAAA;wBAEnD,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,mBAAmB,GAAG,IAAI,EAAE,CAAC,CAAA;wBAElE,OAAO,EAAE,KAAK,EAAE,GAAG,kBAAkB,CAAC,WAAW,EAAE,IAAI,aAAa,EAAE,EAAE,CAAA;oBAC1E,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAClB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;gBAC9C,IAAI,GAAG,EAAE,CAAC;oBACR,IAAI,GAAG,YAAY,kBAAkB,EAAE,CAAC;wBACtC,MAAM,GAAG,CAAA;oBACX,CAAC;oBACD,MAAM,IAAI,kBAAkB,CAAC,SAAS,CAAC,CAAA;gBACzC,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAC,CAAA;IAEF,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@owlmeans/server-oidc-rp",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "license": "MIT",
   "type": "module",
   "scripts": {
     "build": "tsc -b",
     "dev": "sleep 312 && nodemon -e ts,tsx,json --watch src --exec \"tsc -p ./tsconfig.json\"",
-    "watch": "tsc -b -w --preserveWatchOutput --pretty"
+    "watch": "tsc -b -w --preserveWatchOutput --pretty",
+    "test": "bun test ./tests"
   },
   "main": "build/index.js",
   "module": "build/index.js",
@@ -35,32 +36,35 @@
     }
   },
   "devDependencies": {
+    "@owlmeans/dep-config": "workspace:*",
+    "@owlmeans/test-auth": "^0.1.2",
+    "@types/bun": "^1.3.0",
     "@types/node": "^24.10.1",
     "nodemon": "^3.1.11",
     "npm-check": "^6.0.1",
-    "typescript": "^5.8.3"
+    "typescript": "^6.0.2"
   },
   "dependencies": {
     "@noble/hashes": "^1.5.0",
-    "@owlmeans/auth": "^0.1.2",
-    "@owlmeans/auth-common": "^0.1.2",
-    "@owlmeans/basic-envelope": "^0.1.2",
-    "@owlmeans/client-module": "^0.1.2",
-    "@owlmeans/config": "^0.1.2",
-    "@owlmeans/context": "^0.1.2",
-    "@owlmeans/did": "^0.1.2",
-    "@owlmeans/module": "^0.1.2",
-    "@owlmeans/oidc": "^0.1.2",
-    "@owlmeans/resource": "^0.1.2",
-    "@owlmeans/route": "^0.1.2",
-    "@owlmeans/server-api": "^0.1.2",
-    "@owlmeans/server-auth": "^0.1.2",
-    "@owlmeans/server-context": "^0.1.2",
-    "@owlmeans/server-module": "^0.1.2",
+    "@owlmeans/auth": "^0.1.3",
+    "@owlmeans/auth-common": "^0.1.3",
+    "@owlmeans/basic-envelope": "^0.1.3",
+    "@owlmeans/client-entrypoint": "^0.1.3",
+    "@owlmeans/config": "^0.1.3",
+    "@owlmeans/context": "^0.1.3",
+    "@owlmeans/did": "^0.1.3",
+    "@owlmeans/entrypoint": "^0.1.3",
+    "@owlmeans/oidc": "^0.1.3",
+    "@owlmeans/resource": "^0.1.3",
+    "@owlmeans/route": "^0.1.3",
+    "@owlmeans/server-api": "^0.1.3",
+    "@owlmeans/server-auth": "^0.1.3",
+    "@owlmeans/server-context": "^0.1.3",
+    "@owlmeans/server-entrypoint": "^0.1.3",
     "@scure/base": "^1.1.9",
     "dayjs": "^1.11.13",
-    "jose": "^5.9.6",
-    "openid-client": "^6.1.1"
+    "jose": "6.2.3",
+    "openid-client": "6.8.4"
   },
   "peerDependencies": {
     "ajv": "*"

package/src/actions/init.ts

@@ -1,10 +1,10 @@
-import type { RefedModuleHandler } from '@owlmeans/server-module'
+import type { RefedEntrypointHandler } from '@owlmeans/server-entrypoint'
 import { handleBody } from '@owlmeans/server-api'
 import type { OIDCAuthInitParams, OidcProviderDescriptor } from '@owlmeans/oidc'
 import { AuthenPayloadError, AuthUnknown, DISPATCHER } from '@owlmeans/auth'
 import { assertContext } from '@owlmeans/context'
 import type { Config, Context, OidcClientAdapter, OidcClientService } from '../types.js'
-import type { ClientModule } from '@owlmeans/client-module'
+import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
 import { authService, DEFAULT_ALIAS } from '../consts.js'
 // import {  PROVIDER_CACHE_TTL } from '../consts.js'
 // import type { Client } from 'openid-client'
@@ -15,7 +15,7 @@ import { sha256 } from '@noble/hashes/sha2'
 import { cache, verifierId } from '../utils/cache.js'
 import { AUTHEN_TIMEFRAME } from '@owlmeans/server-auth'
 
-export const init: RefedModuleHandler = handleBody(async (body: OIDCAuthInitParams, ctx) => {
+export const init: RefedEntrypointHandler = handleBody(async (body: OIDCAuthInitParams, ctx) => {
   if (body.entity == null) {
     throw new AuthenPayloadError('entity')
   }
@@ -37,7 +37,7 @@ export const init: RefedModuleHandler = handleBody(async (body: OIDCAuthInitPara
      * @TODO We need to move it to some remote resource.
      * And make oidc service itself use such a resource to get required client.
      */
-    const [providers] = await context.module<ClientModule<OidcProviderDescriptor[]>>(
+    const [providers] = await context.entrypoint<ClientEntrypoint<OidcProviderDescriptor[]>>(
       authService.provider.list
     ).call({
       params: { service: context.cfg.alias ?? context.cfg.service },
@@ -85,7 +85,7 @@ export const init: RefedModuleHandler = handleBody(async (body: OIDCAuthInitPara
     entityId,
   }, { ttl: AUTHEN_TIMEFRAME / 1000 })
 
-  const [dispatcherUrl] = await context.module<ClientModule<string>>(DISPATCHER).call()
+  const [dispatcherUrl] = await context.entrypoint<ClientEntrypoint<string>>(DISPATCHER).call()
 
   const cfg = client.getConfig()
   const url = client.makeAuthUrl({

package/src/actions/process.ts

@@ -1,4 +1,4 @@
-import type { RefedModuleHandler } from '@owlmeans/server-module'
+import type { RefedEntrypointHandler } from '@owlmeans/server-entrypoint'
 import { handleBody } from '@owlmeans/server-api'
 import type { OIDCClientAuthPayload } from '@owlmeans/oidc'
 import { OIDC_WRAPPED_TOKEN } from '@owlmeans/oidc'
@@ -30,7 +30,7 @@ import { wrapper } from '../utils/wrapped.js'
  * 
  * ! There is also token renewal mechanism that should be implemented nearby.
  */
-export const authenticate: RefedModuleHandler = handleBody(async (
+export const authenticate: RefedEntrypointHandler = handleBody(async (
   { authUrl, ...params }: OIDCClientAuthPayload,
   ctx
 ) => {

package/src/auth/plugins/google-client.ts

@@ -0,0 +1,189 @@
+
+import type { AuthPlugin } from '@owlmeans/server-auth/manager/plugins'
+import { assertType } from '@owlmeans/server-auth/manager/plugins'
+import type { Config, Context, OidcClientService } from '../../types.js'
+import { GOOGLE_CLIENT_AUTH, GOOGLE_SERVICE } from '@owlmeans/oidc'
+import type { OidcProviderDescriptor, ProviderProfileDetails } from '@owlmeans/oidc'
+import { base64urlnopad as base64 } from '@scure/base'
+import { randomBytes } from '@noble/hashes/utils'
+import { sha256 } from '@noble/hashes/sha256'
+import { ALL_SCOPES, AuthenFailed, AuthenPayloadError, AuthManagerError, AuthRole } from '@owlmeans/auth'
+import { AUTHEN_TIMEFRAME } from '@owlmeans/server-auth'
+import { cache, verifierId, exchangeId } from '../../utils/cache.js'
+import type { AccountLinkingService } from '../../types.js'
+import { DEFAULT_ALIAS } from '../../consts.js'
+
+const GOOGLE_AUTH_ENDPOINT = 'https://accounts.google.com/o/oauth2/v2/auth'
+const GOOGLE_TOKEN_ENDPOINT = 'https://oauth2.googleapis.com/token'
+const GOOGLE_USERINFO_ENDPOINT = 'https://www.googleapis.com/oauth2/v3/userinfo'
+
+export const googleClientPlugin = <C extends Config, T extends Context<C>>(context: T, service: string = GOOGLE_SERVICE): AuthPlugin => {
+  const getGoogleConfig = async (): Promise<Required<Pick<OidcProviderDescriptor, 'clientId' | 'secret'>> & OidcProviderDescriptor> => {
+    const oidc = context.service<OidcClientService>(DEFAULT_ALIAS)
+    const cfg = await oidc.getConfig({ service })
+    if (cfg == null || cfg.clientId == null || cfg.secret == null) {
+      throw new AuthManagerError('google.config')
+    }
+    return cfg as Required<Pick<OidcProviderDescriptor, 'clientId' | 'secret'>> & OidcProviderDescriptor
+  }
+
+  const plugin: AuthPlugin = {
+    type: GOOGLE_CLIENT_AUTH,
+
+    init: async request => {
+      assertType(request.type, plugin)
+
+      const google = await getGoogleConfig()
+
+      if (request.source == null) {
+        throw new AuthenPayloadError('redirect-uri')
+      }
+
+      const verifier = base64.encode(randomBytes(32))
+      const challenge = base64.encode(sha256(verifier))
+      // Use a random state for cache lookup on callback
+      const state = base64.encode(randomBytes(16))
+
+      await cache<C, T>(context).create({
+        id: verifierId(state),
+        verifier,
+        client: google.clientId,
+        redirectUri: request.source,
+      }, { ttl: AUTHEN_TIMEFRAME / 1000 })
+
+      const scopes = google.extraScopes ?? 'openid profile email'
+      const authEndpoint = google.authEndpoint ?? GOOGLE_AUTH_ENDPOINT
+
+      // Use request.source as redirect_uri — it's the browser's current auth page URL
+      const params = new URLSearchParams({
+        client_id: google.clientId,
+        redirect_uri: request.source,
+        response_type: 'code',
+        scope: scopes,
+        code_challenge: challenge,
+        code_challenge_method: 'S256',
+        state,
+        access_type: 'offline',
+        prompt: 'consent',
+      })
+
+      const url = `${authEndpoint}?${params.toString()}`
+
+      return { challenge: url }
+    },
+
+    authenticate: async credential => {
+      const google = await getGoogleConfig()
+
+      // credential.credential contains the query params from Google callback
+      const callbackParams = new URLSearchParams(credential.credential)
+      const code = callbackParams.get('code')
+      const state = callbackParams.get('state')
+
+      if (code == null) {
+        throw new AuthenPayloadError('code')
+      }
+
+      if (state == null || state === '') {
+        throw new AuthenPayloadError('state')
+      }
+
+      // Look up the PKCE verifier using the state parameter
+      const verification = await cache<C, T>(context).pick(verifierId(state))
+      if (verification == null || verification.verifier == null) {
+        throw new AuthenFailed()
+      }
+
+      // Use the redirect_uri stored during init for token exchange
+      const redirectUri = verification.redirectUri
+      if (redirectUri == null) {
+        throw new AuthenFailed()
+      }
+
+      // Exchange code for tokens
+      const tokenEndpoint = google.tokenEndpoint ?? GOOGLE_TOKEN_ENDPOINT
+      const tokenResponse = await fetch(tokenEndpoint, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        body: new URLSearchParams({
+          code,
+          client_id: google.clientId,
+          client_secret: google.secret,
+          redirect_uri: redirectUri,
+          grant_type: 'authorization_code',
+          code_verifier: verification.verifier,
+        }),
+      })
+
+      if (!tokenResponse.ok) {
+        throw new AuthenFailed()
+      }
+
+      const tokens = await tokenResponse.json() as Record<string, string | number | undefined>
+      if (tokens.access_token == null) {
+        throw new AuthenFailed()
+      }
+
+      // Fetch user info
+      const userinfoEndpoint = google.userinfoEndpoint ?? GOOGLE_USERINFO_ENDPOINT
+      const userinfoResponse = await fetch(userinfoEndpoint, {
+        headers: { Authorization: `Bearer ${tokens.access_token}` },
+      })
+
+      if (!userinfoResponse.ok) {
+        throw new AuthenFailed()
+      }
+
+      const userinfo = await userinfoResponse.json() as {
+        sub: string; email: string; name?: string; picture?: string
+      }
+
+      if (userinfo.sub == null || userinfo.email == null) {
+        throw new AuthenFailed()
+      }
+
+      // Use the account linking service to load or create identity
+      const oidc = context.service<OidcClientService>(DEFAULT_ALIAS)
+      const store = oidc.accountLinking() as AccountLinkingService | null
+      if (store == null) {
+        throw new AuthManagerError('google.account.store')
+      }
+
+      const profileDetails: ProviderProfileDetails = {
+        type: GOOGLE_CLIENT_AUTH,
+        service,
+        clientId: google.clientId,
+        userId: userinfo.sub,
+        username: userinfo.name ?? userinfo.email,
+      }
+
+      let profile = await store.getLinkedProfile(profileDetails)
+
+      if (profile == null) {
+        profile = await store.linkProfile(profileDetails, {
+          username: userinfo.email,
+          force: false,
+        })
+      }
+
+      // Generate exchange token for the auth manager to issue final bearer
+      const exchangeToken = base64.encode(randomBytes(32))
+      await cache<C, T>(context).create(
+        { id: exchangeId(exchangeToken), payload: tokens as any },
+        { ttl: AUTHEN_TIMEFRAME / 1000 }
+      )
+
+      credential.scopes = [ALL_SCOPES]
+      credential.source = google.clientId
+      credential.role = AuthRole.User
+      credential.type = GOOGLE_CLIENT_AUTH
+      credential.userId = profile.userId
+      credential.profileId = profile.profileId
+      credential.entityId = profile.entityId
+
+      return { token: exchangeToken }
+    }
+  }
+
+  return plugin
+}

package/src/auth/plugins/index.ts

@@ -1,8 +1,10 @@
 
 import { plugins as authPlugins } from '@owlmeans/server-auth/manager'
 import { oidcClientPlugin } from './oidc-client.js'
-import { OIDC_CLIENT_AUTH } from '@owlmeans/oidc'
+import { googleClientPlugin } from './google-client.js'
+import { OIDC_CLIENT_AUTH, GOOGLE_CLIENT_AUTH } from '@owlmeans/oidc'
 
 authPlugins[OIDC_CLIENT_AUTH] = oidcClientPlugin as typeof authPlugins[keyof typeof authPlugins]
+authPlugins[GOOGLE_CLIENT_AUTH] = googleClientPlugin as typeof authPlugins[keyof typeof authPlugins]
 
 export const plugins = authPlugins

package/src/gate.ts

@@ -1,5 +1,5 @@
 import { createLazyService } from '@owlmeans/context'
-import type { GateService } from '@owlmeans/module'
+import type { GateService } from '@owlmeans/entrypoint'
 import { OIDC_GATE } from '@owlmeans/oidc'
 import type { Config, Context } from './types.js'
 import { AuthForbidden } from '@owlmeans/auth'

package/src/guard.ts

@@ -1,12 +1,12 @@
 import type { OidcGuardOptions } from '@owlmeans/oidc'
 import type { Config, Context } from './types.js'
-import type { CommonModule } from '@owlmeans/module'
+import type { CommonEntrypoint } from '@owlmeans/entrypoint'
 import { 
   appendOidcGuard as appendBasicOidcGuard, 
   setupOidcGuard as setupBasicOidcGuard, 
   DISPATCHER_OIDC, DISPATCHER_OIDC_INIT 
 } from '@owlmeans/oidc'
-import { elevate } from '@owlmeans/server-module'
+import { elevate } from '@owlmeans/server-entrypoint'
 import * as actions from './actions/index.js'
 
 export const appendOidcGuard = <C extends Config, T extends Context<C>>(
@@ -17,7 +17,7 @@ export const appendOidcGuard = <C extends Config, T extends Context<C>>(
   return ctx
 }
 
-export const setupOidcGuard = (modules: CommonModule[], coguards?: string | string[]) => {
+export const setupOidcGuard = (modules: CommonEntrypoint[], coguards?: string | string[]) => {
   setupBasicOidcGuard(modules, coguards)
 
   elevate(modules, DISPATCHER_OIDC_INIT, actions.init)

package/src/index.ts

@@ -1,4 +1,20 @@
-export type * from './types.js'
+// Public types — no upstream openid-client types re-exported
+export type {
+  OidcClientDescriptor,
+  OidcTokenSet,
+  OidcTokenSetParameters,
+  OidcGrantChecks,
+  OidcServerMetadata,
+  OidcIntrospectionResponse,
+  OidcClientService,
+  OidcClientAdapter,
+  OidcRpConfig,
+  Config,
+  Context,
+  AccountLinkingService,
+  AccountMeta,
+  ProviderApiService,
+} from './types.js'
 export * from './consts.js'
 export * from './service.js'
 export * from './guard.js'

package/src/model/gate.ts

@@ -4,7 +4,7 @@ import type { Config, Context, OidcClientService } from '../types.js'
 import { cache, managedId } from '../utils/cache.js'
 import type { GateModel, PermissionRequest, PermissionResponse } from './types.js'
 import { ResponseMode } from './consts.js'
-import type { ClientModule } from '@owlmeans/client-module'
+import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
 import type { OidcProviderDescriptor } from '@owlmeans/oidc'
 
 export const createGateModel = <C extends Config, T extends Context<C>>(ctx: T): GateModel => {
@@ -18,7 +18,7 @@ export const createGateModel = <C extends Config, T extends Context<C>>(ctx: T):
         })
       } catch (e) {
         if (e instanceof AuthManagerError) {
-          const [providers] = await ctx.module<ClientModule<OidcProviderDescriptor[]>>(
+          const [providers] = await ctx.entrypoint<ClientEntrypoint<OidcProviderDescriptor[]>>(
             authService.provider.list
           ).call({
             params: { service: ctx.cfg.alias ?? ctx.cfg.service },

package/src/modules.ts

@@ -1,22 +1,22 @@
-import type { CommonModule } from '@owlmeans/module'
-import { module, guard, filter, body } from '@owlmeans/module'
+import type { CommonEntrypoint } from '@owlmeans/entrypoint'
+import { entrypoint, guard, filter, body } from '@owlmeans/entrypoint'
 import { backend, route, RouteMethod, service } from '@owlmeans/route'
 import { authService } from './consts.js'
-import { elevate } from '@owlmeans/client-module'
+import { elevate } from '@owlmeans/client-entrypoint'
 import { GUARD_ED25519 } from '@owlmeans/auth-common'
 import { OIDCTokenUpdateSchema } from '@owlmeans/oidc'
 
 export const setupAuthServiceModules = (
-  modules: CommonModule[],
+  modules: CommonEntrypoint[],
   serviceAlias: string,
   prefix: string = 'oidc-api'
 ) => {
   modules.push(
-    module(
+    entrypoint(
       route(authService.provider.list, `/${prefix}/provider/:service`, service(serviceAlias)),
       guard(GUARD_ED25519)
     ),
-    module(
+    entrypoint(
       route(
         authService.auth.update, `/${prefix}/auth/update`,
         backend(service(serviceAlias), RouteMethod.POST)

package/src/service.ts

@@ -1,6 +1,7 @@
 import { DEF_OIDC_ACCOUNT_LINKING, DEF_OIDC_PROVIDER_API, DEFAULT_ALIAS } from './consts.js'
 import { assertContext, createService } from '@owlmeans/context'
-import type { AccountLinkingService, Config, Context, OidcClientService, ProviderApiService, OidcClientAdapter } from './types.js'
+import type { AccountLinkingService, Config, Context, OidcClientService, ProviderApiService, OidcClientAdapter, OidcTokenSet, OidcTokenSetParameters, OidcIntrospectionResponse } from './types.js'
+import type { AuthorizationCodeGrantChecks } from 'openid-client'
 import { AuthManagerError } from '@owlmeans/auth'
 import { makeSecurityHelper } from '@owlmeans/config'
 import * as client from 'openid-client'
@@ -22,7 +23,7 @@ export const makeOidcClientService = (alias: string = DEFAULT_ALIAS): OidcClient
         throw new AuthManagerError('oidc.client.service')
       }
 
-      if (typeof clientId === 'object' && clientId.clientId == null) {
+      if (typeof clientId === 'object' && clientId.clientId == null && cfg.clientId == null) {
         throw new AuthManagerError('oidc.client.client-id')
       }
 
@@ -82,8 +83,8 @@ export const makeOidcClientService = (alias: string = DEFAULT_ALIAS): OidcClient
 
         makeAuthUrl: params => client.buildAuthorizationUrl(descriptor, params).toString(),
 
-        // grantWithCredentials: async () => client.clientCredentialsGrant(descriptor, { grant_type: 'client_credentials' }),
-        grantWithCredentials: async () => client.clientCredentialsGrant(descriptor),
+        grantWithCredentials: async () =>
+          client.clientCredentialsGrant(descriptor) as Promise<OidcTokenSet>,
 
         grantWithCode: async (url, checks, params) => {
           const urlObj = new URL(url)
@@ -97,9 +98,9 @@ export const makeOidcClientService = (alias: string = DEFAULT_ALIAS): OidcClient
 
           checks.idTokenExpected ??= true
 
-          return await client.authorizationCodeGrant(
-            descriptor, urlObj, checks
-          )
+          return client.authorizationCodeGrant(
+            descriptor, urlObj, checks as AuthorizationCodeGrantChecks
+          ) as Promise<OidcTokenSet>
         },
 
         refresh: async tokenSet => {
@@ -107,11 +108,15 @@ export const makeOidcClientService = (alias: string = DEFAULT_ALIAS): OidcClient
           if (refreshToken == null) {
             throw new AuthManagerError('refresh-token')
           }
-          return await client.refreshTokenGrant(descriptor, refreshToken)
+          return client.refreshTokenGrant(descriptor, refreshToken) as Promise<OidcTokenSetParameters>
         },
 
-        introspect: async (tokenSet, type = 'access_token') =>
-          await client.tokenIntrospection(descriptor, tokenSet[type] as string),
+        introspect: async (tokenSet, type = 'access_token') => {
+          const tokenValue = type === 'refresh_token' ? tokenSet.refresh_token
+            : type === 'id_token' ? tokenSet.id_token
+            : tokenSet.access_token
+          return client.tokenIntrospection(descriptor, tokenValue as string) as Promise<OidcIntrospectionResponse>
+        },
 
       } satisfies OidcClientAdapter
     },
@@ -119,7 +124,7 @@ export const makeOidcClientService = (alias: string = DEFAULT_ALIAS): OidcClient
     getConfig: async clientId => {
       const context = assertContext<Config, Context>(service.ctx as Context, alias)
 
-      if (typeof clientId === 'object' && clientId.clientId == null) {
+      if (typeof clientId === 'object' && clientId.clientId == null && clientId.service == null) {
         throw new AuthManagerError('oidc.client.client-id')
       }
 
@@ -128,7 +133,7 @@ export const makeOidcClientService = (alias: string = DEFAULT_ALIAS): OidcClient
           return consumer.clientId === clientId
         }
         return Object.entries(clientId).every(
-          ([key, value]) => consumer[key as keyof typeof consumer] === value
+          ([key, value]) => value == null || consumer[key as keyof typeof consumer] === value
         )
       })
     },
@@ -159,6 +164,11 @@ export const makeOidcClientService = (alias: string = DEFAULT_ALIAS): OidcClient
       return null
     },
 
+    findProvider: predicate => {
+      const context = assertContext<Config, Context>(service.ctx as Context, alias)
+      return (context.cfg.oidc.providers ?? []).find(predicate)
+    },
+
     hasProvider: params => {
       const ctx = service.assertCtx<Config, Context>()
       if (ctx.cfg.oidc.providers == null) {

package/src/types.ts

@@ -1,13 +1,70 @@
 import type { InitializedService } from '@owlmeans/context'
-import type { AuthorizationCodeGrantChecks, Configuration, IntrospectionResponse, ServerMetadata, TokenEndpointResponse, TokenEndpointResponseHelpers } from 'openid-client'
 import type { ServerConfig, ServerContext } from '@owlmeans/server-context'
 import type { OidcProviderConfig, OidcSharedConfig, WithSharedConfig, ProviderProfileDetails, OidcUserDetails, OidcProviderSettings } from '@owlmeans/oidc'
 import type { AuthCredentials, AuthPayload, Profile } from '@owlmeans/auth'
+import type { Configuration, ServerMetadata, TokenEndpointResponse, TokenEndpointResponseHelpers } from 'openid-client'
 
-export type OidcClientDescriptor = Configuration 
+// ---------------------------------------------------------------------------
+// OwlMeans-owned public types — no upstream openid-client type appears below
+// the line marked with (@public). Only src/service.ts may import openid-client
+// types directly; all other files use these interfaces.
+// ---------------------------------------------------------------------------
+
+/** Opaque descriptor for an OIDC client configuration obtained via discovery.
+ *  Consumers receive and pass it back; they must never read its internals. */
+export type OidcClientDescriptor = Configuration
+
+/** Token set returned from any grant. Includes the standard OAuth2 fields
+ *  plus the openid-client helper method `claims()` for ID-token claim access. */
+export interface OidcTokenSet {
+  access_token?: string
+  refresh_token?: string
+  id_token?: string
+  token_type?: string
+  expires_in?: number
+  scope?: string
+  /** Decode and return claims from the ID token. */
+  claims: () => Record<string, unknown>
+}
+
+/** Subset of OidcTokenSet without helper methods; used for storage/serialization. */
+export type OidcTokenSetParameters = Pick<OidcTokenSet, 'access_token' | 'refresh_token' | 'id_token' | 'token_type' | 'expires_in' | 'scope'>
+
+/** PKCE + ID-token check parameters for the authorization-code grant. */
+export interface OidcGrantChecks {
+  pkceCodeVerifier?: string
+  idTokenExpected?: boolean
+}
+
+/** Issuer/endpoint metadata from the OIDC discovery document. */
+export type OidcServerMetadata = ServerMetadata
+
+/** Response from token introspection. */
+export interface OidcIntrospectionResponse {
+  active: boolean
+  scope?: string
+  sub?: string
+  client_id?: string
+  token_type?: string
+  exp?: number
+  iat?: number
+  [key: string]: unknown
+}
+
+// ---------------------------------------------------------------------------
+// Internal adapter types — used only within this package (@internal)
+// These preserve the upstream types for internal implementation use only.
+// ---------------------------------------------------------------------------
+
+/** @internal — internal alias; do not export from index.ts */
 export type TokenSet = TokenEndpointResponse & TokenEndpointResponseHelpers
+/** @internal */
 export type TokenSetParameters = TokenEndpointResponse
 
+// ---------------------------------------------------------------------------
+// Service interfaces (@public)
+// ---------------------------------------------------------------------------
+
 export interface OidcClientService extends InitializedService {
   getConfiguration: (clientId: string | Partial<OidcProviderConfig>) => Promise<OidcClientDescriptor>
   getClient: (clientId: string | OidcClientDescriptor | Partial<OidcProviderConfig>) => Promise<OidcClientAdapter>
@@ -16,22 +73,23 @@ export interface OidcClientService extends InitializedService {
 
   registerTemporaryProvider: (config: OidcProviderConfig) => OidcProviderConfig
   unregisterTemporaryProvider: (params: Partial<OidcProviderConfig>) => void
-  hasProvider: (params: Partial<OidcProviderConfig>) => boolean
+  hasProvider: (params: string | Partial<OidcProviderConfig>) => boolean
   entityToClientId: (params: Partial<OidcProviderConfig>) => string
 
   providerApi: () => ProviderApiService | null
   accountLinking: () => AccountLinkingService | null
+  findProvider: (predicate: (provider: OidcProviderConfig) => boolean) => OidcProviderConfig | undefined
 }
 
 export interface OidcClientAdapter {
-  getMetadata: () => ServerMetadata
+  getMetadata: () => OidcServerMetadata
   getClientId: () => string
   getConfig: () => OidcProviderConfig
   makeAuthUrl: (params: Record<string, string>) => string
-  grantWithCredentials: () => Promise<TokenSet>
-  grantWithCode: (currentUrl: string, checks: AuthorizationCodeGrantChecks, params: Record<string, string>) => Promise<TokenSet>
-  refresh: (tokenSet: TokenSetParameters | string) => Promise<TokenSetParameters>
-  introspect: (tokenSet: TokenSetParameters, type?: string) => Promise<IntrospectionResponse>
+  grantWithCredentials: () => Promise<OidcTokenSet>
+  grantWithCode: (currentUrl: string, checks: OidcGrantChecks, params: Record<string, string>) => Promise<OidcTokenSet>
+  refresh: (tokenSet: OidcTokenSetParameters | string) => Promise<OidcTokenSetParameters>
+  introspect: (tokenSet: OidcTokenSetParameters, type?: string) => Promise<OidcIntrospectionResponse>
 }
 
 export interface OidcRpConfig extends OidcSharedConfig {
@@ -62,3 +120,4 @@ export interface ProviderApiService extends InitializedService {
   getUserDetails: (token: string, userId: string) => Promise<OidcUserDetails>
   getSettings: (token: string, realm: string) => Promise<OidcProviderSettings>
 }
+