@ogcio/api-auth 5.1.0 → 5.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/logto-client/user-scope.d.ts +10 -10
- package/dist/logto-client/user-scope.d.ts.map +1 -1
- package/dist/logto-client/user-scope.js +10 -1
- package/dist/logto-client/user-scope.js.map +1 -1
- package/package.json +1 -5
- package/src/index.ts +4 -0
- package/src/logto-client/user-scope.ts +10 -10
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAK7E,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAK7E,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAIF,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,cAAc;QACtB,QAAQ,CAAC,EAAE,iBAAiB,CAAC;KAC9B;CACF;AA2BD,eAAO,MAAM,uBAAuB,mBAClB,iBAAiB,GAAG,SAAS,mBAC5B,MAAM,KACtB,iBAUF,CAAC;AAEF,eAAO,MAAM,gBAAgB,eACf,MAAM,UACV;IACN,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,uBACoB,MAAM,EAAE;;MAE5B,OAAO,CAAC,iBAAiB,CAsC3B,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAC5B,eAAe,QACd,0BAA0B,kBA2BjC,CAAC;8BA5BK,eAAe,QACd,0BAA0B;AA6BlC,wBAEG;AAEH,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -30,7 +30,7 @@ export const ensureUserCanAccessUser = (loggedUserData, requestedUserId) => {
|
|
|
30
30
|
export const checkPermissions = async (authHeader, config, requiredPermissions, matchConfig = { method: "OR" }) => {
|
|
31
31
|
const token = extractBearerToken(authHeader);
|
|
32
32
|
const payload = await decodeLogtoToken(token, config);
|
|
33
|
-
const { scope, sub, aud, client_id: clientId, } = payload;
|
|
33
|
+
const { scope, sub, aud, client_id: clientId, signInMethod } = payload;
|
|
34
34
|
const scopesMap = getMapFromScope(scope);
|
|
35
35
|
const grantAccess = matchConfig.method === "AND"
|
|
36
36
|
? requiredPermissions.every((p) => validatePermission(p, scopesMap))
|
|
@@ -46,6 +46,7 @@ export const checkPermissions = async (authHeader, config, requiredPermissions,
|
|
|
46
46
|
organizationId: organizationId,
|
|
47
47
|
accessToken: token,
|
|
48
48
|
isM2MApplication: sub === clientId,
|
|
49
|
+
signInMethod
|
|
49
50
|
};
|
|
50
51
|
};
|
|
51
52
|
export const checkPermissionsPlugin = async (app, opts) => {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
export declare
|
|
2
|
-
Profile
|
|
3
|
-
Email
|
|
4
|
-
Phone
|
|
5
|
-
CustomData
|
|
6
|
-
Identities
|
|
7
|
-
Roles
|
|
8
|
-
Organizations
|
|
9
|
-
OrganizationRoles
|
|
10
|
-
}
|
|
1
|
+
export declare const UserScope: {
|
|
2
|
+
Profile: string;
|
|
3
|
+
Email: string;
|
|
4
|
+
Phone: string;
|
|
5
|
+
CustomData: string;
|
|
6
|
+
Identities: string;
|
|
7
|
+
Roles: string;
|
|
8
|
+
Organizations: string;
|
|
9
|
+
OrganizationRoles: string;
|
|
10
|
+
};
|
|
11
11
|
//# sourceMappingURL=user-scope.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-scope.d.ts","sourceRoot":"","sources":["../../src/logto-client/user-scope.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"user-scope.d.ts","sourceRoot":"","sources":["../../src/logto-client/user-scope.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS;;;;;;;;;CASrB,CAAC"}
|
|
@@ -1,2 +1,11 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export const UserScope = {
|
|
2
|
+
Profile: "profile",
|
|
3
|
+
Email: "email",
|
|
4
|
+
Phone: "phone",
|
|
5
|
+
CustomData: "custom_data",
|
|
6
|
+
Identities: "identities",
|
|
7
|
+
Roles: "roles",
|
|
8
|
+
Organizations: "urn:logto:scope:organizations",
|
|
9
|
+
OrganizationRoles: "urn:logto:scope:organization_roles",
|
|
10
|
+
};
|
|
2
11
|
//# sourceMappingURL=user-scope.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-scope.js","sourceRoot":"","sources":["../../src/logto-client/user-scope.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"user-scope.js","sourceRoot":"","sources":["../../src/logto-client/user-scope.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;IACd,UAAU,EAAE,aAAa;IACzB,UAAU,EAAE,YAAY;IACxB,KAAK,EAAE,OAAO;IACd,aAAa,EAAE,+BAA+B;IAC9C,iBAAiB,EAAE,oCAAoC;CACxD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ogcio/api-auth",
|
|
3
|
-
"version": "5.1.
|
|
3
|
+
"version": "5.1.2",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -15,9 +15,5 @@
|
|
|
15
15
|
"build": "rm -rf dist tsconfig.prod.tsbuildinfo tsconfig.tsbuildinfo && tsc -p tsconfig.prod.json",
|
|
16
16
|
"test": "vitest run --coverage --outputFile=results.xml",
|
|
17
17
|
"prepublishOnly": "npm i && npm run build && npm run test"
|
|
18
|
-
},
|
|
19
|
-
"devDependencies": {
|
|
20
|
-
"@types/node": "22.10.1",
|
|
21
|
-
"typescript": "^5.7.2"
|
|
22
18
|
}
|
|
23
19
|
}
|
package/src/index.ts
CHANGED
|
@@ -10,6 +10,7 @@ type ExtractedUserData = {
|
|
|
10
10
|
organizationId?: string;
|
|
11
11
|
isM2MApplication: boolean;
|
|
12
12
|
accessToken: string;
|
|
13
|
+
signInMethod?: string;
|
|
13
14
|
};
|
|
14
15
|
|
|
15
16
|
type MatchConfig = { method: "AND" | "OR" };
|
|
@@ -76,11 +77,13 @@ export const checkPermissions = async (
|
|
|
76
77
|
sub,
|
|
77
78
|
aud,
|
|
78
79
|
client_id: clientId,
|
|
80
|
+
signInMethod
|
|
79
81
|
} = payload as {
|
|
80
82
|
scope: string;
|
|
81
83
|
sub: string;
|
|
82
84
|
aud: string;
|
|
83
85
|
client_id: string;
|
|
86
|
+
signInMethod?: string;
|
|
84
87
|
};
|
|
85
88
|
const scopesMap = getMapFromScope(scope);
|
|
86
89
|
|
|
@@ -102,6 +105,7 @@ export const checkPermissions = async (
|
|
|
102
105
|
organizationId: organizationId,
|
|
103
106
|
accessToken: token,
|
|
104
107
|
isM2MApplication: sub === clientId,
|
|
108
|
+
signInMethod
|
|
105
109
|
};
|
|
106
110
|
};
|
|
107
111
|
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
export
|
|
2
|
-
Profile
|
|
3
|
-
Email
|
|
4
|
-
Phone
|
|
5
|
-
CustomData
|
|
6
|
-
Identities
|
|
7
|
-
Roles
|
|
8
|
-
Organizations
|
|
9
|
-
OrganizationRoles
|
|
10
|
-
}
|
|
1
|
+
export const UserScope = {
|
|
2
|
+
Profile: "profile",
|
|
3
|
+
Email: "email",
|
|
4
|
+
Phone: "phone",
|
|
5
|
+
CustomData: "custom_data",
|
|
6
|
+
Identities: "identities",
|
|
7
|
+
Roles: "roles",
|
|
8
|
+
Organizations: "urn:logto:scope:organizations",
|
|
9
|
+
OrganizationRoles: "urn:logto:scope:organization_roles",
|
|
10
|
+
};
|