Skip to content

Commit 5bc5b08

Browse files
committed
chore: lint and format
1 parent d32ac42 commit 5bc5b08

File tree

3 files changed

+39
-24
lines changed

3 files changed

+39
-24
lines changed

src/roles/util.ts

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,22 @@ export class Map {
130130
static roleFromWeaviate = (role: WeaviateRole): Role => PermissionsMapping.use(role).map();
131131

132132
static roles = (roles: WeaviateRole[]): Record<string, Role> =>
133-
roles.reduce((acc, role) => ({
134-
...acc,
135-
[role.name]: Map.roleFromWeaviate(role),
136-
}), {} as Record<string, Role>);
133+
roles.reduce(
134+
(acc, role) => ({
135+
...acc,
136+
[role.name]: Map.roleFromWeaviate(role),
137+
}),
138+
{} as Record<string, Role>
139+
);
137140

138141
static users = (users: string[]): Record<string, User> =>
139-
users.reduce((acc, user) => ({
140-
...acc,
141-
[user]: { id: user },
142-
}), {} as Record<string, User>);
142+
users.reduce(
143+
(acc, user) => ({
144+
...acc,
145+
[user]: { id: user },
146+
}),
147+
{} as Record<string, User>
148+
);
143149
static user = (user: WeaviateUser): User => ({
144150
id: user.username,
145151
roles: user.roles?.map(Map.roleFromWeaviate),
@@ -150,8 +156,7 @@ export class Map {
150156
roleNames: user.roles,
151157
active: user.active,
152158
});
153-
static dbUsers = (users: WeaviateDBUser[]): UserDB[] =>
154-
users.map(Map.dbUser);
159+
static dbUsers = (users: WeaviateDBUser[]): UserDB[] => users.map(Map.dbUser);
155160
static assignedUsers = (users: WeaviateAssignedUser[]): UserAssignment[] =>
156161
users.map((user) => ({
157162
id: user.userId || '',

src/users/index.ts

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export interface DBUsers extends UsersBase {
7272

7373
type GetAssingedRolesOptions = {
7474
includePermissions?: boolean;
75-
}
75+
};
7676

7777
/** Operations supported for namespaced 'oidc' users.*/
7878
export interface OIDCUsers extends UsersBase {
@@ -110,8 +110,10 @@ const db = (connection: ConnectionREST): DBUsers => {
110110
return {
111111
getAssignedRoles: (userId: string, opts?: GetAssingedRolesOptions) =>
112112
ns.getAssignedRoles('db', userId, opts),
113-
assignRoles: (roleNames: string | string[], userId: string) => ns.assignRoles(roleNames, userId, { userType: 'db' }),
114-
revokeRoles: (roleNames: string | string[], userId: string) => ns.revokeRoles(roleNames, userId, { userType: 'db' }),
113+
assignRoles: (roleNames: string | string[], userId: string) =>
114+
ns.assignRoles(roleNames, userId, { userType: 'db' }),
115+
revokeRoles: (roleNames: string | string[], userId: string) =>
116+
ns.revokeRoles(roleNames, userId, { userType: 'db' }),
115117

116118
create: (userId: string) =>
117119
connection.postNoBody<APIKeyResponse>(`/users/db/${userId}`).then((resp) => resp.apikey),
@@ -142,14 +144,19 @@ const oidc = (connection: ConnectionREST): OIDCUsers => {
142144
return {
143145
getAssignedRoles: (userId: string, opts?: GetAssingedRolesOptions) =>
144146
ns.getAssignedRoles('oidc', userId, opts),
145-
assignRoles: (roleNames: string | string[], userId: string) => ns.assignRoles(roleNames, userId, { userType: 'oidc' }),
146-
revokeRoles: (roleNames: string | string[], userId: string) => ns.revokeRoles(roleNames, userId, { userType: 'oidc' }),
147+
assignRoles: (roleNames: string | string[], userId: string) =>
148+
ns.assignRoles(roleNames, userId, { userType: 'oidc' }),
149+
revokeRoles: (roleNames: string | string[], userId: string) =>
150+
ns.revokeRoles(roleNames, userId, { userType: 'oidc' }),
147151
};
148152
};
149153

150154
/** Internal interface for operations that MAY accept a 'db'/'oidc' namespace. */
151155
interface NamespacedUsers {
152-
getAssignedRoles: (userType: UserTypeInternal, userId: string, opts?: GetAssingedRolesOptions
156+
getAssignedRoles: (
157+
userType: UserTypeInternal,
158+
userId: string,
159+
opts?: GetAssingedRolesOptions
153160
) => Promise<Record<string, Role>>;
154161
assignRoles: (roleNames: string | string[], userId: string, opts?: AssignRevokeOptions) => Promise<void>;
155162
revokeRoles: (roleNames: string | string[], userId: string, opts?: AssignRevokeOptions) => Promise<void>;
@@ -164,14 +171,16 @@ const baseUsers = (connection: ConnectionREST): UsersBase => {
164171
};
165172

166173
/** Optional arguments to /assign and /revoke endpoints. */
167-
type AssignRevokeOptions = { userType?: UserTypeInternal }
174+
type AssignRevokeOptions = { userType?: UserTypeInternal };
168175

169176
const namespacedUsers = (connection: ConnectionREST): NamespacedUsers => {
170177
return {
171178
getAssignedRoles: (userType: UserTypeInternal, userId: string, opts?: GetAssingedRolesOptions) =>
172179
connection
173180
.get<WeaviateRole[]>(
174-
`/authz/users/${userId}/roles/${userType}${opts?.includePermissions ? '?&includeFullRoles=true' : ''}`
181+
`/authz/users/${userId}/roles/${userType}${
182+
opts?.includePermissions ? '?&includeFullRoles=true' : ''
183+
}`
175184
)
176185
.then(Map.roles),
177186
assignRoles: (roleNames: string | string[], userId: string, opts?: AssignRevokeOptions) =>

src/users/integration.test.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import weaviate, { ApiKey, Role } from '..';
1+
import weaviate, { ApiKey } from '..';
22
import { requireAtLeast } from '../../test/version.js';
33
import { WeaviateUserTypeDB } from '../v2';
44
import { UserDB } from './types.js';
@@ -149,16 +149,17 @@ requireAtLeast(
149149
await admin.users.db.assignRoles('test', 'permission-peter');
150150

151151
const roles = await admin.users.db.getAssignedRoles('permission-peter', { includePermissions: true });
152-
expect(roles['test'].backupsPermissions).toHaveLength(1);
153-
expect(roles['test'].dataPermissions).toHaveLength(1);
154-
expect(roles['test'].nodesPermissions).toHaveLength(1);
155-
152+
expect(roles.test.backupsPermissions).toHaveLength(1);
153+
expect(roles.test.dataPermissions).toHaveLength(1);
154+
expect(roles.test.nodesPermissions).toHaveLength(1);
156155
});
157156

158157
afterAll(() =>
159158
makeClient('admin-key').then(async (c) => {
160159
await Promise.all(
161-
['jim', 'pam', 'dwight', 'dynamic-dave', 'api-ashley', 'role-rick', 'permission-peter'].map((n) => c.users.db.delete(n))
160+
['jim', 'pam', 'dwight', 'dynamic-dave', 'api-ashley', 'role-rick', 'permission-peter'].map((n) =>
161+
c.users.db.delete(n)
162+
)
162163
);
163164
})
164165
);

0 commit comments

Comments
 (0)