@authup/server-core 1.0.0-beta.40 → 1.0.0-beta.41

package/dist/adapters/http/adapters/oauth2/grant-types/utils/credentials.d.ts

@@ -1,4 +1,4 @@
-import type { Request } from 'routup';
+import type { IRoutupEvent } from 'routup';
 export type ExtractedClientCredentials = {
     clientId?: string;
     clientSecret?: string;
@@ -11,5 +11,5 @@ export type ExtractedClientCredentials = {
  * that present credentials in BOTH the Basic Authorization header and the
  * request body.
  */
-export declare function extractClientCredentialsFromRequest(req: Request): ExtractedClientCredentials;
+export declare function extractClientCredentialsFromRequest(event: IRoutupEvent): Promise<ExtractedClientCredentials>;
 //# sourceMappingURL=credentials.d.ts.map

package/dist/adapters/http/adapters/oauth2/grant-types/utils/credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../../../../../../src/adapters/http/adapters/oauth2/grant-types/utils/credentials.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,MAAM,0BAA0B,GAAG;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,OAAO,GAAG,0BAA0B,CA4B5F"}
+{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../../../../../../src/adapters/http/adapters/oauth2/grant-types/utils/credentials.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAE3C,MAAM,MAAM,0BAA0B,GAAG;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,mCAAmC,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,0BAA0B,CAAC,CA6BlH"}

package/dist/adapters/http/adapters/oauth2/grant-types/utils/credentials.mjs

@@ -1,5 +1,5 @@
 import { OAuth2Error } from "@authup/specs";
-import { useRequestBody } from "@routup/basic/body";
+import { readRequestBody } from "@routup/basic/body";
 import { AuthorizationHeaderType, parseAuthorizationHeader } from "hapic";
 //#region src/adapters/http/adapters/oauth2/grant-types/utils/credentials.ts
 /**
@@ -9,11 +9,12 @@ import { AuthorizationHeaderType, parseAuthorizationHeader } from "hapic";
 * authentication methods in a single request. This helper rejects requests
 * that present credentials in BOTH the Basic Authorization header and the
 * request body.
-*/ function extractClientCredentialsFromRequest(req) {
-	const bodyClientId = readStringBody(req, "client_id");
-	const bodyClientSecret = readStringBody(req, "client_secret");
+*/ async function extractClientCredentialsFromRequest(event) {
+	const body = await readRequestBody(event);
+	const bodyClientId = readStringField(body, "client_id");
+	const bodyClientSecret = readStringField(body, "client_secret");
 	const hasBodyCredentials = !!bodyClientId || !!bodyClientSecret;
-	const basicCredentials = parseBasicCredentials(req);
+	const basicCredentials = parseBasicCredentials(event);
 	if (hasBodyCredentials && basicCredentials) throw OAuth2Error.requestInvalid("Client credentials must be provided either via Basic Authorization header or request body, not both.");
 	if (hasBodyCredentials) {
 		if (!bodyClientId) throw OAuth2Error.requestInvalid("client_secret was provided without client_id.");
@@ -25,13 +26,13 @@ import { AuthorizationHeaderType, parseAuthorizationHeader } from "hapic";
 	if (basicCredentials) return basicCredentials;
 	return {};
 }
-function readStringBody(req, key) {
-	const value = useRequestBody(req, key);
+function readStringField(body, key) {
+	const value = body?.[key];
 	return typeof value === "string" && value.length > 0 ? value : void 0;
 }
-function parseBasicCredentials(req) {
-	const headerValue = req.headers.authorization;
-	if (typeof headerValue !== "string") return;
+function parseBasicCredentials(event) {
+	const headerValue = event.headers.get("authorization");
+	if (!headerValue) return;
 	let header;
 	try {
 		header = parseAuthorizationHeader(headerValue);

package/dist/adapters/http/adapters/oauth2/grant-types/utils/credentials.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.mjs","names":["OAuth2Error","useRequestBody","AuthorizationHeaderType","parseAuthorizationHeader","extractClientCredentialsFromRequest","req","bodyClientId","readStringBody","bodyClientSecret","hasBodyCredentials","basicCredentials","parseBasicCredentials","requestInvalid","clientId","clientSecret","key","value","length","undefined","headerValue","headers","authorization","header","type","BASIC","formDecode","username","password","decodeURIComponent","replace"],"sources":["../../../../../../../src/adapters/http/adapters/oauth2/grant-types/utils/credentials.ts"],"sourcesContent":["/*\n * Copyright (c) 2025-2026.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport { OAuth2Error } from '@authup/specs';\nimport { useRequestBody } from '@routup/basic/body';\nimport { AuthorizationHeaderType, parseAuthorizationHeader } from 'hapic';\nimport type { Request } from 'routup';\n\nexport type ExtractedClientCredentials = {\n    clientId?: string,\n    clientSecret?: string,\n};\n\n/**\n * Extract client credentials from an OAuth2 token endpoint request.\n *\n * Per RFC 6749 §2.3.1, the server MUST NOT support multiple client\n * authentication methods in a single request. This helper rejects requests\n * that present credentials in BOTH the Basic Authorization header and the\n * request body.\n */\nexport function extractClientCredentialsFromRequest(req: Request): ExtractedClientCredentials {\n    const bodyClientId = readStringBody(req, 'client_id');\n    const bodyClientSecret = readStringBody(req, 'client_secret');\n    const hasBodyCredentials = !!bodyClientId || !!bodyClientSecret;\n\n    const basicCredentials = parseBasicCredentials(req);\n\n    if (hasBodyCredentials && basicCredentials) {\n        throw OAuth2Error.requestInvalid(\n            'Client credentials must be provided either via Basic Authorization header or request body, not both.',\n        );\n    }\n\n    if (hasBodyCredentials) {\n        // Reject stray client_secret without client_id — otherwise grants\n        // that gate auth on `if (clientId)` would silently skip\n        // authentication and leak through with the secret discarded.\n        if (!bodyClientId) {\n            throw OAuth2Error.requestInvalid('client_secret was provided without client_id.');\n        }\n        return { clientId: bodyClientId, clientSecret: bodyClientSecret };\n    }\n\n    if (basicCredentials) {\n        return basicCredentials;\n    }\n\n    return {};\n}\n\nfunction readStringBody(req: Request, key: string): string | undefined {\n    const value = useRequestBody(req, key);\n    return typeof value === 'string' && value.length > 0 ? value : undefined;\n}\n\nfunction parseBasicCredentials(req: Request): ExtractedClientCredentials | undefined {\n    const headerValue = req.headers.authorization;\n    if (typeof headerValue !== 'string') {\n        return undefined;\n    }\n\n    let header;\n    try {\n        header = parseAuthorizationHeader(headerValue);\n    } catch {\n        // Malformed Authorization header — surface as 400 invalid_request\n        // rather than letting hapic's error propagate as 500.\n        throw OAuth2Error.requestInvalid('Malformed Authorization header.');\n    }\n\n    if (header.type !== AuthorizationHeaderType.BASIC) {\n        return undefined;\n    }\n\n    // RFC 6749 §2.3.1 + Appendix B: client_id and client_secret are\n    // application/x-www-form-urlencoded BEFORE base64 encoding in the\n    // Authorization header. hapic only base64-decodes; we form-decode here\n    // so credentials containing reserved characters (`:`, `+`, `%`, `&`,\n    // `=`, etc.) round-trip correctly.\n    return {\n        clientId: formDecode(header.username),\n        clientSecret: formDecode(header.password),\n    };\n}\n\nfunction formDecode(value: string): string {\n    try {\n        // application/x-www-form-urlencoded: '+' represents space; %XX is\n        // percent-encoded UTF-8.\n        return decodeURIComponent(value.replace(/\\+/g, ' '));\n    } catch {\n        // Malformed percent-encoding — return raw value rather than\n        // throwing; the caller will still validate via authentication.\n        return value;\n    }\n}\n"],"mappings":";;;;;;;;;;;GAyBA,SAAgBI,oCAAoCC,KAAY;CAC5D,MAAMC,eAAeC,eAAeF,KAAK,YAAA;CACzC,MAAMG,mBAAmBD,eAAeF,KAAK,gBAAA;CAC7C,MAAMI,qBAAqB,CAAC,CAACH,gBAAgB,CAAC,CAACE;CAE/C,MAAME,mBAAmBC,sBAAsBN,IAAAA;AAE/C,KAAII,sBAAsBC,iBACtB,OAAMV,YAAYY,eACd,uGAAA;AAIR,KAAIH,oBAAoB;AAIpB,MAAI,CAACH,aACD,OAAMN,YAAYY,eAAe,gDAAA;AAErC,SAAO;GAAEC,UAAUP;GAAcQ,cAAcN;GAAiB;;AAGpE,KAAIE,iBACA,QAAOA;AAGX,QAAO,EAAC;;AAGZ,SAASH,eAAeF,KAAcU,KAAW;CAC7C,MAAMC,QAAQf,eAAeI,KAAKU,IAAAA;AAClC,QAAO,OAAOC,UAAU,YAAYA,MAAMC,SAAS,IAAID,QAAQE,KAAAA;;AAGnE,SAASP,sBAAsBN,KAAY;CACvC,MAAMc,cAAcd,IAAIe,QAAQC;AAChC,KAAI,OAAOF,gBAAgB,SACvB;CAGJ,IAAIG;AACJ,KAAI;AACAA,WAASnB,yBAAyBgB,YAAAA;SAC9B;AAGJ,QAAMnB,YAAYY,eAAe,kCAAA;;AAGrC,KAAIU,OAAOC,SAASrB,wBAAwBsB,MACxC;AAQJ,QAAO;EACHX,UAAUY,WAAWH,OAAOI,SAAQ;EACpCZ,cAAcW,WAAWH,OAAOK,SAAQ;EAC5C;;AAGJ,SAASF,WAAWT,OAAa;AAC7B,KAAI;AAGA,SAAOY,mBAAmBZ,MAAMa,QAAQ,OAAO,IAAA,CAAA;SAC3C;AAGJ,SAAOb"}
+{"version":3,"file":"credentials.mjs","names":["OAuth2Error","readRequestBody","AuthorizationHeaderType","parseAuthorizationHeader","extractClientCredentialsFromRequest","event","body","bodyClientId","readStringField","bodyClientSecret","hasBodyCredentials","basicCredentials","parseBasicCredentials","requestInvalid","clientId","clientSecret","key","value","length","undefined","headerValue","headers","get","header","type","BASIC","formDecode","username","password","decodeURIComponent","replace"],"sources":["../../../../../../../src/adapters/http/adapters/oauth2/grant-types/utils/credentials.ts"],"sourcesContent":["/*\n * Copyright (c) 2025-2026.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport { OAuth2Error } from '@authup/specs';\nimport { readRequestBody } from '@routup/basic/body';\nimport { AuthorizationHeaderType, parseAuthorizationHeader } from 'hapic';\nimport type { IRoutupEvent } from 'routup';\n\nexport type ExtractedClientCredentials = {\n    clientId?: string,\n    clientSecret?: string,\n};\n\n/**\n * Extract client credentials from an OAuth2 token endpoint request.\n *\n * Per RFC 6749 §2.3.1, the server MUST NOT support multiple client\n * authentication methods in a single request. This helper rejects requests\n * that present credentials in BOTH the Basic Authorization header and the\n * request body.\n */\nexport async function extractClientCredentialsFromRequest(event: IRoutupEvent): Promise<ExtractedClientCredentials> {\n    const body = await readRequestBody(event);\n    const bodyClientId = readStringField(body, 'client_id');\n    const bodyClientSecret = readStringField(body, 'client_secret');\n    const hasBodyCredentials = !!bodyClientId || !!bodyClientSecret;\n\n    const basicCredentials = parseBasicCredentials(event);\n\n    if (hasBodyCredentials && basicCredentials) {\n        throw OAuth2Error.requestInvalid(\n            'Client credentials must be provided either via Basic Authorization header or request body, not both.',\n        );\n    }\n\n    if (hasBodyCredentials) {\n        // Reject stray client_secret without client_id — otherwise grants\n        // that gate auth on `if (clientId)` would silently skip\n        // authentication and leak through with the secret discarded.\n        if (!bodyClientId) {\n            throw OAuth2Error.requestInvalid('client_secret was provided without client_id.');\n        }\n        return { clientId: bodyClientId, clientSecret: bodyClientSecret };\n    }\n\n    if (basicCredentials) {\n        return basicCredentials;\n    }\n\n    return {};\n}\n\nfunction readStringField(body: Record<string, any> | undefined, key: string): string | undefined {\n    const value = body?.[key];\n    return typeof value === 'string' && value.length > 0 ? value : undefined;\n}\n\nfunction parseBasicCredentials(event: IRoutupEvent): ExtractedClientCredentials | undefined {\n    const headerValue = event.headers.get('authorization');\n    if (!headerValue) {\n        return undefined;\n    }\n\n    let header;\n    try {\n        header = parseAuthorizationHeader(headerValue);\n    } catch {\n        // Malformed Authorization header — surface as 400 invalid_request\n        // rather than letting hapic's error propagate as 500.\n        throw OAuth2Error.requestInvalid('Malformed Authorization header.');\n    }\n\n    if (header.type !== AuthorizationHeaderType.BASIC) {\n        return undefined;\n    }\n\n    // RFC 6749 §2.3.1 + Appendix B: client_id and client_secret are\n    // application/x-www-form-urlencoded BEFORE base64 encoding in the\n    // Authorization header. hapic only base64-decodes; we form-decode here\n    // so credentials containing reserved characters (`:`, `+`, `%`, `&`,\n    // `=`, etc.) round-trip correctly.\n    return {\n        clientId: formDecode(header.username),\n        clientSecret: formDecode(header.password),\n    };\n}\n\nfunction formDecode(value: string): string {\n    try {\n        // application/x-www-form-urlencoded: '+' represents space; %XX is\n        // percent-encoded UTF-8.\n        return decodeURIComponent(value.replace(/\\+/g, ' '));\n    } catch {\n        // Malformed percent-encoding — return raw value rather than\n        // throwing; the caller will still validate via authentication.\n        return value;\n    }\n}\n"],"mappings":";;;;;;;;;;;GAyBA,eAAsBI,oCAAoCC,OAAmB;CACzE,MAAMC,OAAO,MAAML,gBAAgBI,MAAAA;CACnC,MAAME,eAAeC,gBAAgBF,MAAM,YAAA;CAC3C,MAAMG,mBAAmBD,gBAAgBF,MAAM,gBAAA;CAC/C,MAAMI,qBAAqB,CAAC,CAACH,gBAAgB,CAAC,CAACE;CAE/C,MAAME,mBAAmBC,sBAAsBP,MAAAA;AAE/C,KAAIK,sBAAsBC,iBACtB,OAAMX,YAAYa,eACd,uGAAA;AAIR,KAAIH,oBAAoB;AAIpB,MAAI,CAACH,aACD,OAAMP,YAAYa,eAAe,gDAAA;AAErC,SAAO;GAAEC,UAAUP;GAAcQ,cAAcN;GAAiB;;AAGpE,KAAIE,iBACA,QAAOA;AAGX,QAAO,EAAC;;AAGZ,SAASH,gBAAgBF,MAAuCU,KAAW;CACvE,MAAMC,QAAQX,OAAOU;AACrB,QAAO,OAAOC,UAAU,YAAYA,MAAMC,SAAS,IAAID,QAAQE,KAAAA;;AAGnE,SAASP,sBAAsBP,OAAmB;CAC9C,MAAMe,cAAcf,MAAMgB,QAAQC,IAAI,gBAAA;AACtC,KAAI,CAACF,YACD;CAGJ,IAAIG;AACJ,KAAI;AACAA,WAASpB,yBAAyBiB,YAAAA;SAC9B;AAGJ,QAAMpB,YAAYa,eAAe,kCAAA;;AAGrC,KAAIU,OAAOC,SAAStB,wBAAwBuB,MACxC;AAQJ,QAAO;EACHX,UAAUY,WAAWH,OAAOI,SAAQ;EACpCZ,cAAcW,WAAWH,OAAOK,SAAQ;EAC5C;;AAGJ,SAASF,WAAWT,OAAa;AAC7B,KAAI;AAGA,SAAOY,mBAAmBZ,MAAMa,QAAQ,OAAO,IAAA,CAAA;SAC3C;AAGJ,SAAOb"}

package/dist/adapters/http/adapters/oauth2/grant-types/utils/guess.d.ts

@@ -1,4 +1,4 @@
 import { OAuth2TokenGrant } from '@authup/specs';
-import type { Request } from 'routup';
-export declare function guessOauth2GrantTypeByRequest(request: Request): `${OAuth2TokenGrant}` | undefined;
+import type { IRoutupEvent } from 'routup';
+export declare function guessOauth2GrantTypeByRequest(event: IRoutupEvent): Promise<`${OAuth2TokenGrant}` | undefined>;
 //# sourceMappingURL=guess.d.ts.map

package/dist/adapters/http/adapters/oauth2/grant-types/utils/guess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guess.d.ts","sourceRoot":"","sources":["../../../../../../../src/adapters/http/adapters/oauth2/grant-types/utils/guess.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,wBAAgB,6BAA6B,CACzC,OAAO,EAAE,OAAO,GAChB,GAAG,gBAAgB,EAAE,GAAG,SAAS,CA6DpC"}
+{"version":3,"file":"guess.d.ts","sourceRoot":"","sources":["../../../../../../../src/adapters/http/adapters/oauth2/grant-types/utils/guess.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAE3C,wBAAsB,6BAA6B,CAC/C,KAAK,EAAE,YAAY,GACnB,OAAO,CAAC,GAAG,gBAAgB,EAAE,GAAG,SAAS,CAAC,CAkE7C"}

package/dist/adapters/http/adapters/oauth2/grant-types/utils/guess.mjs

@@ -1,23 +1,26 @@
 import { OAuth2TokenGrant } from "@authup/specs";
-import { useRequestBody } from "@routup/basic/body";
-import { AuthorizationHeaderType, parseAuthorizationHeader } from "hapic";
+import { readRequestBody } from "@routup/basic/body";
 import { useRequestQuery } from "@routup/basic/query";
+import { AuthorizationHeaderType, parseAuthorizationHeader } from "hapic";
 //#region src/adapters/http/adapters/oauth2/grant-types/utils/guess.ts
-function guessOauth2GrantTypeByRequest(request) {
-	const grantType = useRequestBody(request, "grant_type") || useRequestQuery(request, "grant_type");
+async function guessOauth2GrantTypeByRequest(event) {
+	const body = await readRequestBody(event);
+	const query = useRequestQuery(event);
+	const pick = (key) => body?.[key] ?? query?.[key];
+	const grantType = pick("grant_type");
 	if (Object.values(OAuth2TokenGrant).includes(grantType)) return grantType;
-	const username = useRequestBody(request, "username") || useRequestQuery(request, "username");
-	const password = useRequestBody(request, "password") || useRequestQuery(request, "password");
+	const username = pick("username");
+	const password = pick("password");
 	if (username && password) return OAuth2TokenGrant.PASSWORD;
-	const robotId = useRequestBody(request, "id") || useRequestQuery(request, "id");
-	const robotSecret = useRequestBody(request, "secret") || useRequestQuery(request, "secret");
+	const robotId = pick("id");
+	const robotSecret = pick("secret");
 	if (robotId && robotSecret) return OAuth2TokenGrant.ROBOT_CREDENTIALS;
-	if (useRequestBody(request, "refresh_token") || useRequestQuery(request, "refresh_token")) return OAuth2TokenGrant.REFRESH_TOKEN;
-	if (useRequestBody(request, "code") || useRequestQuery(request, "code")) return OAuth2TokenGrant.AUTHORIZATION_CODE;
-	let clientId = useRequestBody(request, "client_id") || useRequestQuery(request, "client_id");
-	let clientSecret = useRequestBody(request, "client_secret") || useRequestQuery(request, "client_secret");
+	if (pick("refresh_token")) return OAuth2TokenGrant.REFRESH_TOKEN;
+	if (pick("code")) return OAuth2TokenGrant.AUTHORIZATION_CODE;
+	let clientId = pick("client_id");
+	let clientSecret = pick("client_secret");
 	if (!clientId && !clientSecret) {
-		const { authorization: headerValue } = request.headers;
+		const headerValue = event.headers.get("authorization");
 		if (headerValue) {
 			const header = parseAuthorizationHeader(headerValue);
 			if (header.type === AuthorizationHeaderType.BASIC) {

package/dist/adapters/http/adapters/oauth2/grant-types/utils/guess.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"guess.mjs","names":["OAuth2TokenGrant","useRequestBody","useRequestQuery","AuthorizationHeaderType","parseAuthorizationHeader","guessOauth2GrantTypeByRequest","request","grantType","validGrantTypes","Object","values","includes","username","password","PASSWORD","robotId","robotSecret","ROBOT_CREDENTIALS","refreshToken","REFRESH_TOKEN","code","AUTHORIZATION_CODE","clientId","clientSecret","authorization","headerValue","headers","header","type","BASIC","CLIENT_CREDENTIALS","undefined"],"sources":["../../../../../../../src/adapters/http/adapters/oauth2/grant-types/utils/guess.ts"],"sourcesContent":["/*\n * Copyright (c) 2022.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport { OAuth2TokenGrant } from '@authup/specs';\nimport { useRequestBody } from '@routup/basic/body';\nimport { useRequestQuery } from '@routup/basic/query';\nimport { AuthorizationHeaderType, parseAuthorizationHeader } from 'hapic';\nimport type { Request } from 'routup';\n\nexport function guessOauth2GrantTypeByRequest(\n    request: Request,\n) : `${OAuth2TokenGrant}` | undefined {\n    const grantType = useRequestBody(request, 'grant_type') || useRequestQuery(request, 'grant_type');\n\n    const validGrantTypes = Object.values(OAuth2TokenGrant);\n    if (validGrantTypes.includes(grantType)) {\n        return grantType;\n    }\n\n    const username = useRequestBody(request, 'username') || useRequestQuery(request, 'username');\n    const password = useRequestBody(request, 'password') || useRequestQuery(request, 'password');\n\n    if (username && password) {\n        return OAuth2TokenGrant.PASSWORD;\n    }\n\n    // ------------------------------------------------------------------\n\n    const robotId = useRequestBody(request, 'id') || useRequestQuery(request, 'id');\n    const robotSecret = useRequestBody(request, 'secret') || useRequestQuery(request, 'secret');\n\n    if (robotId && robotSecret) {\n        return OAuth2TokenGrant.ROBOT_CREDENTIALS;\n    }\n\n    // ------------------------------------------------------------------\n\n    const refreshToken = useRequestBody(request, 'refresh_token') || useRequestQuery(request, 'refresh_token');\n    if (refreshToken) {\n        return OAuth2TokenGrant.REFRESH_TOKEN;\n    }\n\n    // ------------------------------------------------------------------\n\n    const code = useRequestBody(request, 'code') || useRequestQuery(request, 'code');\n    if (code) {\n        return OAuth2TokenGrant.AUTHORIZATION_CODE;\n    }\n\n    // ------------------------------------------------------------------\n\n    let clientId = useRequestBody(request, 'client_id') || useRequestQuery(request, 'client_id');\n    let clientSecret = useRequestBody(request, 'client_secret') || useRequestQuery(request, 'client_secret');\n\n    if (!clientId && !clientSecret) {\n        const { authorization: headerValue } = request.headers;\n\n        if (headerValue) {\n            const header = parseAuthorizationHeader(headerValue);\n\n            if (header.type === AuthorizationHeaderType.BASIC) {\n                clientId = header.username;\n                clientSecret = header.password;\n            }\n        }\n    }\n\n    if (clientId && clientSecret) {\n        return OAuth2TokenGrant.CLIENT_CREDENTIALS;\n    }\n\n    return undefined;\n}\n"],"mappings":";;;;;AAaA,SAAgBK,8BACZC,SAAgB;CAEhB,MAAMC,YAAYN,eAAeK,SAAS,aAAA,IAAiBJ,gBAAgBI,SAAS,aAAA;AAGpF,KADwBG,OAAOC,OAAOV,iBAClCQ,CAAgBG,SAASJ,UAAAA,CACzB,QAAOA;CAGX,MAAMK,WAAWX,eAAeK,SAAS,WAAA,IAAeJ,gBAAgBI,SAAS,WAAA;CACjF,MAAMO,WAAWZ,eAAeK,SAAS,WAAA,IAAeJ,gBAAgBI,SAAS,WAAA;AAEjF,KAAIM,YAAYC,SACZ,QAAOb,iBAAiBc;CAK5B,MAAMC,UAAUd,eAAeK,SAAS,KAAA,IAASJ,gBAAgBI,SAAS,KAAA;CAC1E,MAAMU,cAAcf,eAAeK,SAAS,SAAA,IAAaJ,gBAAgBI,SAAS,SAAA;AAElF,KAAIS,WAAWC,YACX,QAAOhB,iBAAiBiB;AAM5B,KADqBhB,eAAeK,SAAS,gBAAA,IAAoBJ,gBAAgBI,SAAS,gBAAA,CAEtF,QAAON,iBAAiBmB;AAM5B,KADalB,eAAeK,SAAS,OAAA,IAAWJ,gBAAgBI,SAAS,OAAA,CAErE,QAAON,iBAAiBqB;CAK5B,IAAIC,WAAWrB,eAAeK,SAAS,YAAA,IAAgBJ,gBAAgBI,SAAS,YAAA;CAChF,IAAIiB,eAAetB,eAAeK,SAAS,gBAAA,IAAoBJ,gBAAgBI,SAAS,gBAAA;AAExF,KAAI,CAACgB,YAAY,CAACC,cAAc;EAC5B,MAAM,EAAEC,eAAeC,gBAAgBnB,QAAQoB;AAE/C,MAAID,aAAa;GACb,MAAME,SAASvB,yBAAyBqB,YAAAA;AAExC,OAAIE,OAAOC,SAASzB,wBAAwB0B,OAAO;AAC/CP,eAAWK,OAAOf;AAClBW,mBAAeI,OAAOd;;;;AAKlC,KAAIS,YAAYC,aACZ,QAAOvB,iBAAiB8B"}
+{"version":3,"file":"guess.mjs","names":["OAuth2TokenGrant","readRequestBody","useRequestQuery","AuthorizationHeaderType","parseAuthorizationHeader","guessOauth2GrantTypeByRequest","event","body","query","pick","key","grantType","validGrantTypes","Object","values","includes","username","password","PASSWORD","robotId","robotSecret","ROBOT_CREDENTIALS","refreshToken","REFRESH_TOKEN","code","AUTHORIZATION_CODE","clientId","clientSecret","headerValue","headers","get","header","type","BASIC","CLIENT_CREDENTIALS","undefined"],"sources":["../../../../../../../src/adapters/http/adapters/oauth2/grant-types/utils/guess.ts"],"sourcesContent":["/*\n * Copyright (c) 2022.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport { OAuth2TokenGrant } from '@authup/specs';\nimport { readRequestBody } from '@routup/basic/body';\nimport { useRequestQuery } from '@routup/basic/query';\nimport { AuthorizationHeaderType, parseAuthorizationHeader } from 'hapic';\nimport type { IRoutupEvent } from 'routup';\n\nexport async function guessOauth2GrantTypeByRequest(\n    event: IRoutupEvent,\n) : Promise<`${OAuth2TokenGrant}` | undefined> {\n    const body = await readRequestBody(event);\n    const query = useRequestQuery(event);\n\n    const pick = (key: string): any => body?.[key] ?? query?.[key];\n\n    const grantType = pick('grant_type');\n\n    const validGrantTypes = Object.values(OAuth2TokenGrant);\n    if (validGrantTypes.includes(grantType)) {\n        return grantType;\n    }\n\n    const username = pick('username');\n    const password = pick('password');\n\n    if (username && password) {\n        return OAuth2TokenGrant.PASSWORD;\n    }\n\n    // ------------------------------------------------------------------\n\n    const robotId = pick('id');\n    const robotSecret = pick('secret');\n\n    if (robotId && robotSecret) {\n        return OAuth2TokenGrant.ROBOT_CREDENTIALS;\n    }\n\n    // ------------------------------------------------------------------\n\n    const refreshToken = pick('refresh_token');\n    if (refreshToken) {\n        return OAuth2TokenGrant.REFRESH_TOKEN;\n    }\n\n    // ------------------------------------------------------------------\n\n    const code = pick('code');\n    if (code) {\n        return OAuth2TokenGrant.AUTHORIZATION_CODE;\n    }\n\n    // ------------------------------------------------------------------\n\n    let clientId = pick('client_id');\n    let clientSecret = pick('client_secret');\n\n    if (!clientId && !clientSecret) {\n        const headerValue = event.headers.get('authorization');\n\n        if (headerValue) {\n            const header = parseAuthorizationHeader(headerValue);\n\n            if (header.type === AuthorizationHeaderType.BASIC) {\n                clientId = header.username;\n                clientSecret = header.password;\n            }\n        }\n    }\n\n    if (clientId && clientSecret) {\n        return OAuth2TokenGrant.CLIENT_CREDENTIALS;\n    }\n\n    return undefined;\n}\n"],"mappings":";;;;;AAaA,eAAsBK,8BAClBC,OAAmB;CAEnB,MAAMC,OAAO,MAAMN,gBAAgBK,MAAAA;CACnC,MAAME,QAAQN,gBAAgBI,MAAAA;CAE9B,MAAMG,QAAQC,QAAqBH,OAAOG,QAAQF,QAAQE;CAE1D,MAAMC,YAAYF,KAAK,aAAA;AAGvB,KADwBI,OAAOC,OAAOd,iBAClCY,CAAgBG,SAASJ,UAAAA,CACzB,QAAOA;CAGX,MAAMK,WAAWP,KAAK,WAAA;CACtB,MAAMQ,WAAWR,KAAK,WAAA;AAEtB,KAAIO,YAAYC,SACZ,QAAOjB,iBAAiBkB;CAK5B,MAAMC,UAAUV,KAAK,KAAA;CACrB,MAAMW,cAAcX,KAAK,SAAA;AAEzB,KAAIU,WAAWC,YACX,QAAOpB,iBAAiBqB;AAM5B,KADqBZ,KAAK,gBACtBa,CACA,QAAOtB,iBAAiBuB;AAM5B,KADad,KAAK,OACde,CACA,QAAOxB,iBAAiByB;CAK5B,IAAIC,WAAWjB,KAAK,YAAA;CACpB,IAAIkB,eAAelB,KAAK,gBAAA;AAExB,KAAI,CAACiB,YAAY,CAACC,cAAc;EAC5B,MAAMC,cAActB,MAAMuB,QAAQC,IAAI,gBAAA;AAEtC,MAAIF,aAAa;GACb,MAAMG,SAAS3B,yBAAyBwB,YAAAA;AAExC,OAAIG,OAAOC,SAAS7B,wBAAwB8B,OAAO;AAC/CP,eAAWK,OAAOf;AAClBW,mBAAeI,OAAOd;;;;AAKlC,KAAIS,YAAYC,aACZ,QAAO3B,iBAAiBkC"}

package/dist/adapters/http/controllers/entities/client/module.d.ts

@@ -1,3 +1,6 @@
+import type { Client } from '@authup/core-kit';
+import type { IRoutupEvent } from 'routup';
+import type { ClientCreatePayload, ClientSavePayload, ClientUpdatePayload, EntityCollectionResponse } from '@authup/core-http-kit';
 import type { IClientRepository, IClientService } from '../../../../../core/index.ts';
 export type ClientControllerContext = {
     service: IClientService;
@@ -7,11 +10,11 @@ export declare class ClientController {
     protected service: IClientService;
     protected repository: IClientRepository;
     constructor(ctx: ClientControllerContext);
-    getMany(req: any, res: any): Promise<any>;
-    get(id: string, req: any, res: any): Promise<any>;
-    add(data: any, req: any, res: any): Promise<any>;
-    edit(id: string, data: any, req: any, res: any): Promise<any>;
-    put(id: string, data: any, req: any, res: any): Promise<any>;
-    drop(id: string, req: any, res: any): Promise<any>;
+    getMany(event: IRoutupEvent): Promise<EntityCollectionResponse<Client>>;
+    get(id: string, event: IRoutupEvent): Promise<Client>;
+    add(data: ClientCreatePayload, event: IRoutupEvent): Promise<Client>;
+    edit(id: string, data: ClientUpdatePayload, event: IRoutupEvent): Promise<Client>;
+    put(id: string, data: ClientSavePayload, event: IRoutupEvent): Promise<Client>;
+    drop(id: string, event: IRoutupEvent): Promise<Client>;
 }
 //# sourceMappingURL=module.d.ts.map

package/dist/adapters/http/controllers/entities/client/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/entities/client/module.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAUtF,MAAM,MAAM,uBAAuB,GAAG;IAClC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,iBAAiB,CAAC;CACjC,CAAC;AAEF,qBAEa,gBAAgB;IACzB,SAAS,CAAC,OAAO,EAAE,cAAc,CAAC;IAElC,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC;gBAE5B,GAAG,EAAE,uBAAuB;IAMlC,OAAO,CACG,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GACtB,OAAO,CAAC,GAAG,CAAC;IAcT,GAAG,CACQ,EAAE,EAAE,MAAM,EACX,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GACtB,OAAO,CAAC,GAAG,CAAC;IAiDT,GAAG,CACI,IAAI,EAAE,GAAG,EACN,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GACtB,OAAO,CAAC,GAAG,CAAC;IAQT,IAAI,CACO,EAAE,EAAE,MAAM,EACd,IAAI,EAAE,GAAG,EACN,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GACtB,OAAO,CAAC,GAAG,CAAC;IAQT,GAAG,CACQ,EAAE,EAAE,MAAM,EACd,IAAI,EAAE,GAAG,EACN,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GACtB,OAAO,CAAC,GAAG,CAAC;IAmBT,IAAI,CACO,EAAE,EAAE,MAAM,EACX,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GACtB,OAAO,CAAC,GAAG,CAAC;CAMlB"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/entities/client/module.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,KAAK,EACR,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,wBAAwB,EAC3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAUtF,MAAM,MAAM,uBAAuB,GAAG;IAClC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,iBAAiB,CAAC;CACjC,CAAC;AAEF,qBAEa,gBAAgB;IACzB,SAAS,CAAC,OAAO,EAAE,cAAc,CAAC;IAElC,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC;gBAE5B,GAAG,EAAE,uBAAuB;IAMlC,OAAO,CACG,KAAK,EAAE,YAAY,GAChC,OAAO,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;IActC,GAAG,CACQ,EAAE,EAAE,MAAM,EACX,KAAK,EAAE,YAAY,GAChC,OAAO,CAAC,MAAM,CAAC;IAiDZ,GAAG,CACI,IAAI,EAAE,mBAAmB,EACtB,KAAK,EAAE,YAAY,GAChC,OAAO,CAAC,MAAM,CAAC;IAUZ,IAAI,CACO,EAAE,EAAE,MAAM,EACd,IAAI,EAAE,mBAAmB,EACtB,KAAK,EAAE,YAAY,GAChC,OAAO,CAAC,MAAM,CAAC;IAUZ,GAAG,CACQ,EAAE,EAAE,MAAM,EACd,IAAI,EAAE,iBAAiB,EACpB,KAAK,EAAE,YAAY,GAChC,OAAO,CAAC,MAAM,CAAC;IAgBZ,IAAI,CACO,EAAE,EAAE,MAAM,EACX,KAAK,EAAE,YAAY,GAChC,OAAO,CAAC,MAAM,CAAC;CAQrB"}

package/dist/adapters/http/controllers/entities/client/module.mjs

@@ -10,9 +10,8 @@ import "../../../../../utils/index.mjs";
 import "../../../middleware/index.mjs";
 import { OAuth2SubKind } from "@authup/specs";
 import { NotFoundError } from "@ebec/http";
-import { send, sendAccepted, sendCreated, useRequestParam } from "routup";
+import { DBody, DContext, DController, DDelete, DGet, DPath, DPost, DPut, DTags } from "@routup/decorators";
 import { useRequestQuery } from "@routup/basic/query";
-import { DBody, DController, DDelete, DGet, DPath, DPost, DPut, DRequest, DResponse, DTags } from "@routup/decorators";
 //#region src/adapters/http/controllers/entities/client/module.ts
 function _ts_decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -35,96 +34,89 @@ var ClientController = class {
 		this.service = ctx.service;
 		this.repository = ctx.repository;
 	}
-	async getMany(req, res) {
-		const actor = buildActorContext(req);
-		const { data, meta } = await this.service.getMany(useRequestQuery(req), actor);
-		return send(res, {
+	async getMany(event) {
+		const actor = buildActorContext(event);
+		const { data, meta } = await this.service.getMany(useRequestQuery(event), actor);
+		return {
 			data,
 			meta
-		});
+		};
 	}
-	async get(id, req, res) {
-		const identity = useRequestIdentity(req);
+	async get(id, event) {
+		const identity = useRequestIdentity(event);
 		let isMe = false;
 		if (identity && identity.type === "client") isMe = isSelfToken(id) || identity.id === id;
 		if (isMe) {
-			const attributes = new OAuth2ScopeAttributesResolver().resolveFor(OAuth2SubKind.CLIENT, useRequestScopes(req));
-			const entity = await this.repository.findOneByIdOrName(identity.id, useRequestParam(req, "realmId"));
+			const attributes = new OAuth2ScopeAttributesResolver().resolveFor(OAuth2SubKind.CLIENT, useRequestScopes(event));
+			const entity = await this.repository.findOneByIdOrName(identity.id, event.params.realmId);
 			if (!entity) throw new NotFoundError();
 			for (const attribute of attributes) if (attribute === "secret") {
 				const withSecret = await this.repository.findOneWithSecret({ id: entity.id });
 				if (withSecret) entity.secret = withSecret.secret;
 			}
-			return send(res, entity);
+			return entity;
 		}
-		const actor = buildActorContext(req);
-		return send(res, await this.service.getOne(id, actor, useRequestQuery(req), useRequestParam(req, "realmId")));
+		const actor = buildActorContext(event);
+		return await this.service.getOne(id, actor, useRequestQuery(event), event.params.realmId);
 	}
-	async add(data, req, res) {
-		const actor = buildActorContext(req);
-		return sendCreated(res, await this.service.create(data, actor));
+	async add(data, event) {
+		const actor = buildActorContext(event);
+		const entity = await this.service.create(data, actor);
+		event.response.status = 201;
+		return entity;
 	}
-	async edit(id, data, req, res) {
-		const actor = buildActorContext(req);
-		return sendAccepted(res, await this.service.update(id, data, actor));
+	async edit(id, data, event) {
+		const actor = buildActorContext(event);
+		const entity = await this.service.update(id, data, actor);
+		event.response.status = 202;
+		return entity;
 	}
-	async put(id, data, req, res) {
-		const actor = buildActorContext(req);
+	async put(id, data, event) {
+		const actor = buildActorContext(event);
 		const { entity, created } = await this.service.save(id || void 0, data, actor);
-		if (created) return sendCreated(res, entity);
-		return sendAccepted(res, entity);
+		event.response.status = created ? 201 : 202;
+		return entity;
 	}
-	async drop(id, req, res) {
-		const actor = buildActorContext(req);
-		return sendAccepted(res, await this.service.delete(id, actor));
+	async drop(id, event) {
+		const actor = buildActorContext(event);
+		const entity = await this.service.delete(id, actor);
+		event.response.status = 202;
+		return entity;
 	}
 };
 _ts_decorate([
 	DGet("", []),
-	_ts_param(0, DRequest()),
-	_ts_param(1, DResponse()),
+	_ts_param(0, DContext()),
 	_ts_metadata("design:type", Function),
-	_ts_metadata("design:paramtypes", [Object, Object]),
+	_ts_metadata("design:paramtypes", [typeof IRoutupEvent === "undefined" ? Object : IRoutupEvent]),
 	_ts_metadata("design:returntype", Promise)
 ], ClientController.prototype, "getMany", null);
 _ts_decorate([
 	DGet("/:id", []),
 	_ts_param(0, DPath("id")),
-	_ts_param(1, DRequest()),
-	_ts_param(2, DResponse()),
+	_ts_param(1, DContext()),
 	_ts_metadata("design:type", Function),
-	_ts_metadata("design:paramtypes", [
-		String,
-		Object,
-		Object
-	]),
+	_ts_metadata("design:paramtypes", [String, typeof IRoutupEvent === "undefined" ? Object : IRoutupEvent]),
 	_ts_metadata("design:returntype", Promise)
 ], ClientController.prototype, "get", null);
 _ts_decorate([
 	DPost("", [ForceLoggedInMiddleware]),
 	_ts_param(0, DBody()),
-	_ts_param(1, DRequest()),
-	_ts_param(2, DResponse()),
+	_ts_param(1, DContext()),
 	_ts_metadata("design:type", Function),
-	_ts_metadata("design:paramtypes", [
-		Object,
-		Object,
-		Object
-	]),
+	_ts_metadata("design:paramtypes", [typeof ClientCreatePayload === "undefined" ? Object : ClientCreatePayload, typeof IRoutupEvent === "undefined" ? Object : IRoutupEvent]),
 	_ts_metadata("design:returntype", Promise)
 ], ClientController.prototype, "add", null);
 _ts_decorate([
 	DPost("/:id", [ForceLoggedInMiddleware]),
 	_ts_param(0, DPath("id")),
 	_ts_param(1, DBody()),
-	_ts_param(2, DRequest()),
-	_ts_param(3, DResponse()),
+	_ts_param(2, DContext()),
 	_ts_metadata("design:type", Function),
 	_ts_metadata("design:paramtypes", [
 		String,
-		Object,
-		Object,
-		Object
+		typeof ClientUpdatePayload === "undefined" ? Object : ClientUpdatePayload,
+		typeof IRoutupEvent === "undefined" ? Object : IRoutupEvent
 	]),
 	_ts_metadata("design:returntype", Promise)
 ], ClientController.prototype, "edit", null);
@@ -132,28 +124,21 @@ _ts_decorate([
 	DPut("/:id", [ForceLoggedInMiddleware]),
 	_ts_param(0, DPath("id")),
 	_ts_param(1, DBody()),
-	_ts_param(2, DRequest()),
-	_ts_param(3, DResponse()),
+	_ts_param(2, DContext()),
 	_ts_metadata("design:type", Function),
 	_ts_metadata("design:paramtypes", [
 		String,
-		Object,
-		Object,
-		Object
+		typeof ClientSavePayload === "undefined" ? Object : ClientSavePayload,
+		typeof IRoutupEvent === "undefined" ? Object : IRoutupEvent
 	]),
 	_ts_metadata("design:returntype", Promise)
 ], ClientController.prototype, "put", null);
 _ts_decorate([
 	DDelete("/:id", [ForceLoggedInMiddleware]),
 	_ts_param(0, DPath("id")),
-	_ts_param(1, DRequest()),
-	_ts_param(2, DResponse()),
+	_ts_param(1, DContext()),
 	_ts_metadata("design:type", Function),
-	_ts_metadata("design:paramtypes", [
-		String,
-		Object,
-		Object
-	]),
+	_ts_metadata("design:paramtypes", [String, typeof IRoutupEvent === "undefined" ? Object : IRoutupEvent]),
 	_ts_metadata("design:returntype", Promise)
 ], ClientController.prototype, "drop", null);
 ClientController = _ts_decorate([

package/dist/adapters/http/controllers/entities/client/module.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"module.mjs","names":["OAuth2SubKind","DBody","DController","DDelete","DGet","DPath","DPost","DPut","DRequest","DResponse","DTags","NotFoundError","send","sendAccepted","sendCreated","useRequestParam","useRequestQuery","OAuth2ScopeAttributesResolver","ForceLoggedInMiddleware","isSelfToken","buildActorContext","useRequestIdentity","useRequestScopes","ClientController","service","repository","ctx","getMany","req","res","actor","data","meta","get","id","identity","isMe","type","attributesResolver","attributes","resolveFor","CLIENT","entity","findOneByIdOrName","attribute","attr","withSecret","findOneWithSecret","secret","getOne","add","create","edit","update","put","created","save","undefined","drop","delete"],"sources":["../../../../../../src/adapters/http/controllers/entities/client/module.ts"],"sourcesContent":["/*\n * Copyright (c) 2022.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport { OAuth2SubKind } from '@authup/specs';\nimport {\n    DBody, \n    DController, \n    DDelete, \n    DGet, \n    DPath, \n    DPost, \n    DPut, \n    DRequest, \n    DResponse, \n    DTags,\n} from '@routup/decorators';\nimport { NotFoundError } from '@ebec/http';\nimport type { Client } from '@authup/core-kit';\nimport {\n    send, \n    sendAccepted, \n    sendCreated, \n    useRequestParam,\n} from 'routup';\nimport { useRequestQuery } from '@routup/basic/query';\nimport type { IClientRepository, IClientService } from '../../../../../core/index.ts';\nimport { OAuth2ScopeAttributesResolver } from '../../../../../core/index.ts';\nimport { ForceLoggedInMiddleware } from '../../../middleware/index.ts';\nimport { isSelfToken } from '../../../../../utils/index.ts';\nimport {\n    buildActorContext,\n    useRequestIdentity,\n    useRequestScopes,\n} from '../../../request/index.ts';\n\nexport type ClientControllerContext = {\n    service: IClientService,\n    repository: IClientRepository,\n};\n\n@DTags('oauth2')\n@DController('/clients')\nexport class ClientController {\n    protected service: IClientService;\n\n    protected repository: IClientRepository;\n\n    constructor(ctx: ClientControllerContext) {\n        this.service = ctx.service;\n        this.repository = ctx.repository;\n    }\n\n    @DGet('', [])\n    async getMany(\n        @DRequest() req: any,\n        @DResponse() res: any,\n    ): Promise<any> {\n        const actor = buildActorContext(req);\n        const {\n            data, \n            meta, \n        } = await this.service.getMany(useRequestQuery(req), actor);\n\n        return send(res, {\n            data,\n            meta, \n        });\n    }\n\n    @DGet('/:id', [])\n    async get(\n        @DPath('id') id: string,\n        @DRequest() req: any,\n        @DResponse() res: any,\n    ): Promise<any> {\n        const identity = useRequestIdentity(req);\n\n        let isMe = false;\n        if (\n            identity &&\n            identity.type === 'client'\n        ) {\n            isMe = isSelfToken(id) || identity.id === id;\n        }\n\n        if (isMe) {\n            const attributesResolver = new OAuth2ScopeAttributesResolver();\n            const attributes = attributesResolver.resolveFor(OAuth2SubKind.CLIENT, useRequestScopes(req));\n\n            const entity = await this.repository.findOneByIdOrName(\n                identity!.id,\n                useRequestParam(req, 'realmId'),\n            );\n\n            if (!entity) {\n                throw new NotFoundError();\n            }\n\n            for (const attribute of attributes) {\n                const attr = attribute as keyof Client;\n                if (attr === 'secret') {\n                    const withSecret = await this.repository.findOneWithSecret({ id: entity.id });\n                    if (withSecret) {\n                        entity.secret = withSecret.secret;\n                    }\n                }\n            }\n\n            return send(res, entity);\n        }\n\n        const actor = buildActorContext(req);\n        const entity = await this.service.getOne(\n            id,\n            actor,\n            useRequestQuery(req),\n            useRequestParam(req, 'realmId'),\n        );\n\n        return send(res, entity);\n    }\n\n    @DPost('', [ForceLoggedInMiddleware])\n    async add(\n        @DBody() data: any,\n        @DRequest() req: any,\n        @DResponse() res: any,\n    ): Promise<any> {\n        const actor = buildActorContext(req);\n        const entity = await this.service.create(data, actor);\n\n        return sendCreated(res, entity);\n    }\n\n    @DPost('/:id', [ForceLoggedInMiddleware])\n    async edit(\n        @DPath('id') id: string,\n        @DBody() data: any,\n        @DRequest() req: any,\n        @DResponse() res: any,\n    ): Promise<any> {\n        const actor = buildActorContext(req);\n        const entity = await this.service.update(id, data, actor);\n\n        return sendAccepted(res, entity);\n    }\n\n    @DPut('/:id', [ForceLoggedInMiddleware])\n    async put(\n        @DPath('id') id: string,\n        @DBody() data: any,\n        @DRequest() req: any,\n        @DResponse() res: any,\n    ): Promise<any> {\n        const actor = buildActorContext(req);\n        const {\n            entity, \n            created, \n        } = await this.service.save(\n            id || undefined,\n            data,\n            actor,\n        );\n\n        if (created) {\n            return sendCreated(res, entity);\n        }\n\n        return sendAccepted(res, entity);\n    }\n\n    @DDelete('/:id', [ForceLoggedInMiddleware])\n    async drop(\n        @DPath('id') id: string,\n        @DRequest() req: any,\n        @DResponse() res: any,\n    ): Promise<any> {\n        const actor = buildActorContext(req);\n        const entity = await this.service.delete(id, actor);\n\n        return sendAccepted(res, entity);\n    }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8CA,IAAauB,mBAAb,MAAaA;CACCC;CAEAC;CAEV,YAAYC,KAA8B;AACtC,OAAKF,UAAUE,IAAIF;AACnB,OAAKC,aAAaC,IAAID;;CAG1B,MACME,QACF,KACA,KACY;EACZ,MAAMG,QAAQV,kBAAkBQ,IAAAA;EAChC,MAAM,EACFG,MACAC,SACA,MAAM,KAAKR,QAAQG,QAAQX,gBAAgBY,IAAAA,EAAME,MAAAA;AAErD,SAAOlB,KAAKiB,KAAK;GACbE;GACAC;GACJ,CAAA;;CAGJ,MACMC,IACF,IACA,KACA,KACY;EACZ,MAAME,WAAWd,mBAAmBO,IAAAA;EAEpC,IAAIQ,OAAO;AACX,MACID,YACAA,SAASE,SAAS,SAElBD,QAAOjB,YAAYe,GAAAA,IAAOC,SAASD,OAAOA;AAG9C,MAAIE,MAAM;GAEN,MAAMG,aAAaD,IADYrB,+BACZqB,CAAmBE,WAAWxC,cAAcyC,QAAQnB,iBAAiBM,IAAAA,CAAAA;GAExF,MAAMc,SAAS,MAAM,KAAKjB,WAAWkB,kBACjCR,SAAUD,IACVnB,gBAAgBa,KAAK,UAAA,CAAA;AAGzB,OAAI,CAACc,OACD,OAAM,IAAI/B,eAAAA;AAGd,QAAK,MAAMiC,aAAaL,WAEpB,KAAIM,cAAS,UAAU;IACnB,MAAMC,aAAa,MAAM,KAAKrB,WAAWsB,kBAAkB,EAAEb,IAAIQ,OAAOR,IAAG,CAAA;AAC3E,QAAIY,WACAJ,QAAOM,SAASF,WAAWE;;AAKvC,UAAOpC,KAAKiB,KAAKa,OAAAA;;EAGrB,MAAMZ,QAAQV,kBAAkBQ,IAAAA;AAQhC,SAAOhB,KAAKiB,KAAKa,MAPI,KAAKlB,QAAQyB,OAC9Bf,IACAJ,OACAd,gBAAgBY,IAAAA,EAChBb,gBAAgBa,KAAK,UAAA,CAAA,CAGRc;;CAGrB,MACMQ,IACF,MACA,KACA,KACY;EACZ,MAAMpB,QAAQV,kBAAkBQ,IAAAA;AAGhC,SAAOd,YAAYe,KAAKa,MAFH,KAAKlB,QAAQ2B,OAAOpB,MAAMD,MAAAA,CAEvBY;;CAG5B,MACMU,KACF,IACA,MACA,KACA,KACY;EACZ,MAAMtB,QAAQV,kBAAkBQ,IAAAA;AAGhC,SAAOf,aAAagB,KAAKa,MAFJ,KAAKlB,QAAQ6B,OAAOnB,IAAIH,MAAMD,MAAAA,CAE1BY;;CAG7B,MACMY,IACF,IACA,MACA,KACA,KACY;EACZ,MAAMxB,QAAQV,kBAAkBQ,IAAAA;EAChC,MAAM,EACFc,QACAa,YACA,MAAM,KAAK/B,QAAQgC,KACnBtB,MAAMuB,KAAAA,GACN1B,MACAD,MAAAA;AAGJ,MAAIyB,QACA,QAAOzC,YAAYe,KAAKa,OAAAA;AAG5B,SAAO7B,aAAagB,KAAKa,OAAAA;;CAG7B,MACMgB,KACF,IACA,KACA,KACY;EACZ,MAAM5B,QAAQV,kBAAkBQ,IAAAA;AAGhC,SAAOf,aAAagB,KAAKa,MAFJ,KAAKlB,QAAQmC,OAAOzB,IAAIJ,MAAAA,CAEpBY;;;;;;;;;;;;;;;;;;;;;;;;;YA1DjBxB,wBAAAA,CAAAA;;;;;;;;;;;;;gBAYIA,wBAAAA,CAAAA;;;;;;;;;;;;;;;eAaDA,wBAAAA,CAAAA;;;;;;;;;;;;;;;kBAwBGA,wBAAAA,CAAAA"}
+{"version":3,"file":"module.mjs","names":["OAuth2SubKind","DBody","DContext","DController","DDelete","DGet","DPath","DPost","DPut","DTags","NotFoundError","useRequestQuery","OAuth2ScopeAttributesResolver","ForceLoggedInMiddleware","isSelfToken","buildActorContext","useRequestIdentity","useRequestScopes","ClientController","service","repository","ctx","getMany","event","actor","data","meta","get","id","identity","isMe","type","attributesResolver","attributes","resolveFor","CLIENT","entity","findOneByIdOrName","params","realmId","attribute","attr","withSecret","findOneWithSecret","secret","getOne","add","create","response","status","edit","update","put","created","save","undefined","drop","delete"],"sources":["../../../../../../src/adapters/http/controllers/entities/client/module.ts"],"sourcesContent":["/*\n * Copyright (c) 2022.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport { OAuth2SubKind } from '@authup/specs';\nimport {\n    DBody,\n    DContext,\n    DController,\n    DDelete,\n    DGet,\n    DPath,\n    DPost,\n    DPut,\n    DTags,\n} from '@routup/decorators';\nimport { NotFoundError } from '@ebec/http';\nimport type { Client } from '@authup/core-kit';\nimport type { IRoutupEvent } from 'routup';\nimport { useRequestQuery } from '@routup/basic/query';\nimport type {\n    ClientCreatePayload,\n    ClientSavePayload,\n    ClientUpdatePayload,\n    EntityCollectionResponse,\n} from '@authup/core-http-kit';\nimport type { IClientRepository, IClientService } from '../../../../../core/index.ts';\nimport { OAuth2ScopeAttributesResolver } from '../../../../../core/index.ts';\nimport { ForceLoggedInMiddleware } from '../../../middleware/index.ts';\nimport { isSelfToken } from '../../../../../utils/index.ts';\nimport {\n    buildActorContext,\n    useRequestIdentity,\n    useRequestScopes,\n} from '../../../request/index.ts';\n\nexport type ClientControllerContext = {\n    service: IClientService,\n    repository: IClientRepository,\n};\n\n@DTags('oauth2')\n@DController('/clients')\nexport class ClientController {\n    protected service: IClientService;\n\n    protected repository: IClientRepository;\n\n    constructor(ctx: ClientControllerContext) {\n        this.service = ctx.service;\n        this.repository = ctx.repository;\n    }\n\n    @DGet('', [])\n    async getMany(\n        @DContext() event: IRoutupEvent,\n    ): Promise<EntityCollectionResponse<Client>> {\n        const actor = buildActorContext(event);\n        const {\n            data,\n            meta,\n        } = await this.service.getMany(useRequestQuery(event), actor);\n\n        return {\n            data,\n            meta,\n        };\n    }\n\n    @DGet('/:id', [])\n    async get(\n        @DPath('id') id: string,\n        @DContext() event: IRoutupEvent,\n    ): Promise<Client> {\n        const identity = useRequestIdentity(event);\n\n        let isMe = false;\n        if (\n            identity &&\n            identity.type === 'client'\n        ) {\n            isMe = isSelfToken(id) || identity.id === id;\n        }\n\n        if (isMe) {\n            const attributesResolver = new OAuth2ScopeAttributesResolver();\n            const attributes = attributesResolver.resolveFor(OAuth2SubKind.CLIENT, useRequestScopes(event));\n\n            const entity = await this.repository.findOneByIdOrName(\n                identity!.id,\n                event.params.realmId,\n            );\n\n            if (!entity) {\n                throw new NotFoundError();\n            }\n\n            for (const attribute of attributes) {\n                const attr = attribute as keyof Client;\n                if (attr === 'secret') {\n                    const withSecret = await this.repository.findOneWithSecret({ id: entity.id });\n                    if (withSecret) {\n                        entity.secret = withSecret.secret;\n                    }\n                }\n            }\n\n            return entity;\n        }\n\n        const actor = buildActorContext(event);\n        const entity = await this.service.getOne(\n            id,\n            actor,\n            useRequestQuery(event),\n            event.params.realmId,\n        );\n\n        return entity;\n    }\n\n    @DPost('', [ForceLoggedInMiddleware])\n    async add(\n        @DBody() data: ClientCreatePayload,\n        @DContext() event: IRoutupEvent,\n    ): Promise<Client> {\n        const actor = buildActorContext(event);\n        const entity = await this.service.create(data, actor);\n\n        event.response.status = 201;\n\n        return entity;\n    }\n\n    @DPost('/:id', [ForceLoggedInMiddleware])\n    async edit(\n        @DPath('id') id: string,\n        @DBody() data: ClientUpdatePayload,\n        @DContext() event: IRoutupEvent,\n    ): Promise<Client> {\n        const actor = buildActorContext(event);\n        const entity = await this.service.update(id, data, actor);\n\n        event.response.status = 202;\n\n        return entity;\n    }\n\n    @DPut('/:id', [ForceLoggedInMiddleware])\n    async put(\n        @DPath('id') id: string,\n        @DBody() data: ClientSavePayload,\n        @DContext() event: IRoutupEvent,\n    ): Promise<Client> {\n        const actor = buildActorContext(event);\n        const {\n            entity,\n            created,\n        } = await this.service.save(\n            id || undefined,\n            data,\n            actor,\n        );\n\n        event.response.status = created ? 201 : 202;\n        return entity;\n    }\n\n    @DDelete('/:id', [ForceLoggedInMiddleware])\n    async drop(\n        @DPath('id') id: string,\n        @DContext() event: IRoutupEvent,\n    ): Promise<Client> {\n        const actor = buildActorContext(event);\n        const entity = await this.service.delete(id, actor);\n\n        event.response.status = 202;\n\n        return entity;\n    }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8CA,IAAakB,mBAAb,MAAaA;CACCC;CAEAC;CAEV,YAAYC,KAA8B;AACtC,OAAKF,UAAUE,IAAIF;AACnB,OAAKC,aAAaC,IAAID;;CAG1B,MACME,QACF,OACyC;EACzC,MAAME,QAAQT,kBAAkBQ,MAAAA;EAChC,MAAM,EACFE,MACAC,SACA,MAAM,KAAKP,QAAQG,QAAQX,gBAAgBY,MAAAA,EAAQC,MAAAA;AAEvD,SAAO;GACHC;GACAC;GACJ;;CAGJ,MACMC,IACF,IACA,OACe;EACf,MAAME,WAAWb,mBAAmBO,MAAAA;EAEpC,IAAIO,OAAO;AACX,MACID,YACAA,SAASE,SAAS,SAElBD,QAAOhB,YAAYc,GAAAA,IAAOC,SAASD,OAAOA;AAG9C,MAAIE,MAAM;GAEN,MAAMG,aAAaD,IADYpB,+BACZoB,CAAmBE,WAAWlC,cAAcmC,QAAQlB,iBAAiBM,MAAAA,CAAAA;GAExF,MAAMa,SAAS,MAAM,KAAKhB,WAAWiB,kBACjCR,SAAUD,IACVL,MAAMe,OAAOC,QAAO;AAGxB,OAAI,CAACH,OACD,OAAM,IAAI1B,eAAAA;AAGd,QAAK,MAAM8B,aAAaP,WAEpB,KAAIQ,cAAS,UAAU;IACnB,MAAMC,aAAa,MAAM,KAAKtB,WAAWuB,kBAAkB,EAAEf,IAAIQ,OAAOR,IAAG,CAAA;AAC3E,QAAIc,WACAN,QAAOQ,SAASF,WAAWE;;AAKvC,UAAOR;;EAGX,MAAMZ,QAAQT,kBAAkBQ,MAAAA;AAQhC,SAAOa,MAPc,KAAKjB,QAAQ0B,OAC9BjB,IACAJ,OACAb,gBAAgBY,MAAAA,EAChBA,MAAMe,OAAOC,QAAO;;CAM5B,MACMO,IACF,MACA,OACe;EACf,MAAMtB,QAAQT,kBAAkBQ,MAAAA;EAChC,MAAMa,SAAS,MAAM,KAAKjB,QAAQ4B,OAAOtB,MAAMD,MAAAA;AAE/CD,QAAMyB,SAASC,SAAS;AAExB,SAAOb;;CAGX,MACMc,KACF,IACA,MACA,OACe;EACf,MAAM1B,QAAQT,kBAAkBQ,MAAAA;EAChC,MAAMa,SAAS,MAAM,KAAKjB,QAAQgC,OAAOvB,IAAIH,MAAMD,MAAAA;AAEnDD,QAAMyB,SAASC,SAAS;AAExB,SAAOb;;CAGX,MACMgB,IACF,IACA,MACA,OACe;EACf,MAAM5B,QAAQT,kBAAkBQ,MAAAA;EAChC,MAAM,EACFa,QACAiB,YACA,MAAM,KAAKlC,QAAQmC,KACnB1B,MAAM2B,KAAAA,GACN9B,MACAD,MAAAA;AAGJD,QAAMyB,SAASC,SAASI,UAAU,MAAM;AACxC,SAAOjB;;CAGX,MACMoB,KACF,IACA,OACe;EACf,MAAMhC,QAAQT,kBAAkBQ,MAAAA;EAChC,MAAMa,SAAS,MAAM,KAAKjB,QAAQsC,OAAO7B,IAAIJ,MAAAA;AAE7CD,QAAMyB,SAASC,SAAS;AAExB,SAAOb;;;;;;;;;;;;;;;;;;;YAzDCvB,wBAAAA,CAAAA;;;;;;;;gBAaIA,wBAAAA,CAAAA;;;;;;;;;;;;;eAcDA,wBAAAA,CAAAA;;;;;;;;;;;;;kBAoBGA,wBAAAA,CAAAA"}

package/dist/adapters/http/controllers/entities/client-permission/module.d.ts

@@ -1,3 +1,6 @@
+import type { IRoutupEvent } from 'routup';
+import type { ClientPermissionCreatePayload, ClientPermissionUpdatePayload, EntityCollectionResponse } from '@authup/core-http-kit';
+import type { ClientPermission } from '@authup/core-kit';
 import type { IClientPermissionService } from '../../../../../core/index.ts';
 export type ClientPermissionControllerContext = {
     service: IClientPermissionService;
@@ -5,10 +8,10 @@ export type ClientPermissionControllerContext = {
 export declare class ClientPermissionController {
     protected service: IClientPermissionService;
     constructor(ctx: ClientPermissionControllerContext);
-    getMany(req: any, res: any): Promise<any>;
-    add(data: any, req: any, res: any): Promise<any>;
-    edit(id: string, data: any, req: any, res: any): Promise<any>;
-    getOne(id: string, req: any, res: any): Promise<any>;
-    drop(id: string, req: any, res: any): Promise<any>;
+    getMany(event: IRoutupEvent): Promise<EntityCollectionResponse<ClientPermission>>;
+    add(data: ClientPermissionCreatePayload, event: IRoutupEvent): Promise<ClientPermission>;
+    edit(id: string, data: ClientPermissionUpdatePayload, event: IRoutupEvent): Promise<ClientPermission>;
+    getOne(id: string, event: IRoutupEvent): Promise<ClientPermission>;
+    drop(id: string, event: IRoutupEvent): Promise<ClientPermission>;
 }
 //# sourceMappingURL=module.d.ts.map

package/dist/adapters/http/controllers/entities/client-permission/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/entities/client-permission/module.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAI7E,MAAM,MAAM,iCAAiC,GAAG;IAC5C,OAAO,EAAE,wBAAwB,CAAC;CACrC,CAAC;AAEF,qBAEa,0BAA0B;IACnC,SAAS,CAAC,OAAO,EAAE,wBAAwB,CAAC;gBAEhC,GAAG,EAAE,iCAAiC;IAK5C,OAAO,CACG,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GACtB,OAAO,CAAC,GAAG,CAAC;IAcT,GAAG,CACI,IAAI,EAAE,GAAG,EACN,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GACtB,OAAO,CAAC,GAAG,CAAC;IAST,IAAI,CACO,EAAE,EAAE,MAAM,EACd,IAAI,EAAE,GAAG,EACN,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GACtB,OAAO,CAAC,GAAG,CAAC;IAQT,MAAM,CACK,EAAE,EAAE,MAAM,EACX,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GACtB,OAAO,CAAC,GAAG,CAAC;IAQT,IAAI,CACO,EAAE,EAAE,MAAM,EACX,GAAG,EAAE,GAAG,EACP,GAAG,EAAE,GAAG,GACtB,OAAO,CAAC,GAAG,CAAC;CASlB"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/entities/client-permission/module.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,KAAK,EACR,6BAA6B,EAC7B,6BAA6B,EAC7B,wBAAwB,EAC3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAI7E,MAAM,MAAM,iCAAiC,GAAG;IAC5C,OAAO,EAAE,wBAAwB,CAAC;CACrC,CAAC;AAEF,qBAEa,0BAA0B;IACnC,SAAS,CAAC,OAAO,EAAE,wBAAwB,CAAC;gBAEhC,GAAG,EAAE,iCAAiC;IAK5C,OAAO,CACG,KAAK,EAAE,YAAY,GAChC,OAAO,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;IAchD,GAAG,CACI,IAAI,EAAE,6BAA6B,EAChC,KAAK,EAAE,YAAY,GAChC,OAAO,CAAC,gBAAgB,CAAC;IAWtB,IAAI,CACO,EAAE,EAAE,MAAM,EACd,IAAI,EAAE,6BAA6B,EAChC,KAAK,EAAE,YAAY,GAChC,OAAO,CAAC,gBAAgB,CAAC;IAUtB,MAAM,CACK,EAAE,EAAE,MAAM,EACX,KAAK,EAAE,YAAY,GAChC,OAAO,CAAC,gBAAgB,CAAC;IAQtB,IAAI,CACO,EAAE,EAAE,MAAM,EACX,KAAK,EAAE,YAAY,GAChC,OAAO,CAAC,gBAAgB,CAAC;CAW/B"}