diff --git a/package.json b/package.json index 32b6d2a..77c023a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "type": "git", "url": "https://github.com/PropelAuth/javascript" }, - "version": "2.0.19", + "version": "2.0.20", "keywords": [ "auth", "user", diff --git a/src/user.test.ts b/src/user.test.ts index 9283a5f..ad44d2a 100644 --- a/src/user.test.ts +++ b/src/user.test.ts @@ -1,5 +1,5 @@ import { OrgRoleStructure } from "./org" -import { UserClass, OrgMemberInfoClass } from "./user" +import { OrgMemberInfoClass, UserClass } from "./user" const mockUserOrgInfo = new OrgMemberInfoClass( "mockOrgId", @@ -9,6 +9,8 @@ const mockUserOrgInfo = new OrgMemberInfoClass( "Admin", ["Admin", "Member"], ["user::create", "user::delete"], + undefined, + undefined, "mockLegacyOrgId" ) @@ -111,9 +113,9 @@ const mockUserOrgInfoMultiRole = new OrgMemberInfoClass( "Role A", ["Role A"], ["user::create", "user::delete"], - "mockLegacyOrgId", OrgRoleStructure.MultiRole, ["Role B", "Role C"], + "mockLegacyOrgId" ) const mockUserMultiRole = new UserClass( @@ -205,7 +207,9 @@ describe("User multi-role", () => { expect(mockUserOrgInfoMultiRole.hasAllPermissions(["user::create", "user::update"])).toEqual(false) }) it("should parse a org member info from JSON string", () => { - expect(OrgMemberInfoClass.fromJSON(JSON.stringify(mockUserOrgInfoMultiRole))).toEqual(mockUserOrgInfoMultiRole) + expect(OrgMemberInfoClass.fromJSON(JSON.stringify(mockUserOrgInfoMultiRole))).toEqual( + mockUserOrgInfoMultiRole + ) expect(() => OrgMemberInfoClass.fromJSON("invalid json")).toThrowError() }) }) diff --git a/src/user.ts b/src/user.ts index 7511c14..eddace2 100644 --- a/src/user.ts +++ b/src/user.ts @@ -195,9 +195,9 @@ export class OrgMemberInfoClass { userAssignedRole: string, userInheritedRolesPlusCurrentRole: string[], userPermissions: string[], - legacyOrgId?: string, orgRoleStructure?: OrgRoleStructure, - userAssignedAdditionalRoles?: string[] + userAssignedAdditionalRoles?: string[], + legacyOrgId?: string ) { this.orgId = orgId this.orgName = orgName @@ -248,9 +248,9 @@ export class OrgMemberInfoClass { obj.userAssignedRole, obj.userInheritedRolesPlusCurrentRole, obj.userPermissions, - obj.legacyOrgId, obj.orgRoleStructure, - obj.userAssignedAdditionalRoles + obj.userAssignedAdditionalRoles, + obj.legacyOrgId ) } catch (e) { console.error( @@ -278,9 +278,9 @@ export function convertOrgIdToOrgMemberInfo( orgMemberInfo.userAssignedRole, orgMemberInfo.userInheritedRolesPlusCurrentRole, orgMemberInfo.userPermissions, - orgMemberInfo.legacyOrgId, orgMemberInfo.orgRoleStructure, - orgMemberInfo.userAssignedAdditionalRoles + orgMemberInfo.userAssignedAdditionalRoles, + orgMemberInfo.legacyOrgId ) } return orgIdToUserOrgInfo