Skip to content

Commit 9bacf7e

Browse files
Move legacyOrgId to be the last argument for back-compat (#35)
1 parent 1827a80 commit 9bacf7e

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "git",
66
"url": "https://github.com/PropelAuth/javascript"
77
},
8-
"version": "2.0.19",
8+
"version": "2.0.20",
99
"keywords": [
1010
"auth",
1111
"user",

src/user.test.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { OrgRoleStructure } from "./org"
2-
import { UserClass, OrgMemberInfoClass } from "./user"
2+
import { OrgMemberInfoClass, UserClass } from "./user"
33

44
const mockUserOrgInfo = new OrgMemberInfoClass(
55
"mockOrgId",
@@ -9,6 +9,8 @@ const mockUserOrgInfo = new OrgMemberInfoClass(
99
"Admin",
1010
["Admin", "Member"],
1111
["user::create", "user::delete"],
12+
undefined,
13+
undefined,
1214
"mockLegacyOrgId"
1315
)
1416

@@ -111,9 +113,9 @@ const mockUserOrgInfoMultiRole = new OrgMemberInfoClass(
111113
"Role A",
112114
["Role A"],
113115
["user::create", "user::delete"],
114-
"mockLegacyOrgId",
115116
OrgRoleStructure.MultiRole,
116117
["Role B", "Role C"],
118+
"mockLegacyOrgId"
117119
)
118120

119121
const mockUserMultiRole = new UserClass(
@@ -205,7 +207,9 @@ describe("User multi-role", () => {
205207
expect(mockUserOrgInfoMultiRole.hasAllPermissions(["user::create", "user::update"])).toEqual(false)
206208
})
207209
it("should parse a org member info from JSON string", () => {
208-
expect(OrgMemberInfoClass.fromJSON(JSON.stringify(mockUserOrgInfoMultiRole))).toEqual(mockUserOrgInfoMultiRole)
210+
expect(OrgMemberInfoClass.fromJSON(JSON.stringify(mockUserOrgInfoMultiRole))).toEqual(
211+
mockUserOrgInfoMultiRole
212+
)
209213
expect(() => OrgMemberInfoClass.fromJSON("invalid json")).toThrowError()
210214
})
211215
})

src/user.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ export class OrgMemberInfoClass {
195195
userAssignedRole: string,
196196
userInheritedRolesPlusCurrentRole: string[],
197197
userPermissions: string[],
198-
legacyOrgId?: string,
199198
orgRoleStructure?: OrgRoleStructure,
200-
userAssignedAdditionalRoles?: string[]
199+
userAssignedAdditionalRoles?: string[],
200+
legacyOrgId?: string
201201
) {
202202
this.orgId = orgId
203203
this.orgName = orgName
@@ -248,9 +248,9 @@ export class OrgMemberInfoClass {
248248
obj.userAssignedRole,
249249
obj.userInheritedRolesPlusCurrentRole,
250250
obj.userPermissions,
251-
obj.legacyOrgId,
252251
obj.orgRoleStructure,
253-
obj.userAssignedAdditionalRoles
252+
obj.userAssignedAdditionalRoles,
253+
obj.legacyOrgId
254254
)
255255
} catch (e) {
256256
console.error(
@@ -278,9 +278,9 @@ export function convertOrgIdToOrgMemberInfo(
278278
orgMemberInfo.userAssignedRole,
279279
orgMemberInfo.userInheritedRolesPlusCurrentRole,
280280
orgMemberInfo.userPermissions,
281-
orgMemberInfo.legacyOrgId,
282281
orgMemberInfo.orgRoleStructure,
283-
orgMemberInfo.userAssignedAdditionalRoles
282+
orgMemberInfo.userAssignedAdditionalRoles,
283+
orgMemberInfo.legacyOrgId
284284
)
285285
}
286286
return orgIdToUserOrgInfo

0 commit comments

Comments
 (0)