@propelauth/nextjs - npm Package Compare versions

Comparing version 0.0.124 to 0.0.125

dist/client/index.d.ts

@@ -109,2 +109,6 @@ import React from 'react';
 };
+declare enum OrgRoleStructure {
+    SingleRole = "single_role_in_hierarchy",
+    MultiRole = "multi_role"
+}
 declare class OrgMemberInfo {
@@ -117,8 +121,10 @@ orgId: string;
     urlSafeOrgName: string;
+    orgRoleStructure: OrgRoleStructure;
     userAssignedRole: string;
     userInheritedRolesPlusCurrentRole: string[];
     userPermissions: string[];
+    userAssignedAdditionalRoles: string[];
     constructor(orgId: string, orgName: string, orgMetadata: {
         [key: string]: any;
-    }, urlSafeOrgName: string, userAssignedRole: string, userInheritedRolesPlusCurrentRole: string[], userPermissions: string[]);
+    }, urlSafeOrgName: string, userAssignedRole: string, userInheritedRolesPlusCurrentRole: string[], userPermissions: string[], orgRoleStructure: OrgRoleStructure, userAssignedAdditionalRoles: string[]);
     isRole(role: string): boolean;
@@ -130,2 +136,3 @@ isAtLeastRole(role: string): boolean;
     get assignedRole(): string;
+    get assignedRoles(): string[];
     get inheritedRolesPlusCurrentRole(): string[];
@@ -141,5 +148,7 @@ get permissions(): string[];
     url_safe_org_name: string;
+    org_role_structure: OrgRoleStructure;
     user_role: string;
     inherited_user_roles_plus_current_role: string[];
     user_permissions: string[];
+    additional_roles: string[];
 };
@@ -146,0 +155,0 @@ type InternalUser = {

dist/client/index.js

@@ -209,3 +209,3 @@ "use client";
 var OrgMemberInfo = class {
-  constructor(orgId, orgName, orgMetadata, urlSafeOrgName, userAssignedRole, userInheritedRolesPlusCurrentRole, userPermissions) {
+  constructor(orgId, orgName, orgMetadata, urlSafeOrgName, userAssignedRole, userInheritedRolesPlusCurrentRole, userPermissions, orgRoleStructure, userAssignedAdditionalRoles) {
     this.orgId = orgId;
@@ -215,12 +215,22 @@ this.orgName = orgName;
     this.urlSafeOrgName = urlSafeOrgName;
+    this.orgRoleStructure = orgRoleStructure;
     this.userAssignedRole = userAssignedRole;
     this.userInheritedRolesPlusCurrentRole = userInheritedRolesPlusCurrentRole;
     this.userPermissions = userPermissions;
+    this.userAssignedAdditionalRoles = userAssignedAdditionalRoles;
   }
   // validation methods
   isRole(role) {
-    return this.userAssignedRole === role;
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedRole === role || this.userAssignedAdditionalRoles.includes(role);
+    } else {
+      return this.userAssignedRole === role;
+    }
   }
   isAtLeastRole(role) {
-    return this.userInheritedRolesPlusCurrentRole.includes(role);
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedRole === role || this.userAssignedAdditionalRoles.includes(role);
+    } else {
+      return this.userInheritedRolesPlusCurrentRole.includes(role);
+    }
   }
@@ -242,3 +252,5 @@ hasPermission(permission) {
       obj.userInheritedRolesPlusCurrentRole,
-      obj.userPermissions
+      obj.userPermissions,
+      obj.orgRoleStructure,
+      obj.userAssignedAdditionalRoles
     );
@@ -250,4 +262,15 @@ }
   }
+  get assignedRoles() {
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedAdditionalRoles.concat(this.userAssignedRole);
+    } else {
+      return [this.userAssignedRole];
+    }
+  }
   get inheritedRolesPlusCurrentRole() {
-    return this.userInheritedRolesPlusCurrentRole;
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedAdditionalRoles.concat(this.userAssignedRole);
+    } else {
+      return this.userInheritedRolesPlusCurrentRole;
+    }
   }
@@ -273,3 +296,5 @@ get permissions() {
         snakeCaseValue.inherited_user_roles_plus_current_role,
-        snakeCaseValue.user_permissions
+        snakeCaseValue.user_permissions,
+        snakeCaseValue.org_role_structure,
+        snakeCaseValue.additional_roles
       );
@@ -276,0 +301,0 @@ }

dist/server/app-router/index.d.ts

@@ -120,2 +120,6 @@ import { NextRequest } from 'next/server.js';
 };
+declare enum OrgRoleStructure {
+    SingleRole = "single_role_in_hierarchy",
+    MultiRole = "multi_role"
+}
 declare class OrgMemberInfo {
@@ -128,8 +132,10 @@ orgId: string;
     urlSafeOrgName: string;
+    orgRoleStructure: OrgRoleStructure;
     userAssignedRole: string;
     userInheritedRolesPlusCurrentRole: string[];
     userPermissions: string[];
+    userAssignedAdditionalRoles: string[];
     constructor(orgId: string, orgName: string, orgMetadata: {
         [key: string]: any;
-    }, urlSafeOrgName: string, userAssignedRole: string, userInheritedRolesPlusCurrentRole: string[], userPermissions: string[]);
+    }, urlSafeOrgName: string, userAssignedRole: string, userInheritedRolesPlusCurrentRole: string[], userPermissions: string[], orgRoleStructure: OrgRoleStructure, userAssignedAdditionalRoles: string[]);
     isRole(role: string): boolean;
@@ -141,2 +147,3 @@ isAtLeastRole(role: string): boolean;
     get assignedRole(): string;
+    get assignedRoles(): string[];
     get inheritedRolesPlusCurrentRole(): string[];
@@ -152,5 +159,7 @@ get permissions(): string[];
     url_safe_org_name: string;
+    org_role_structure: OrgRoleStructure;
     user_role: string;
     inherited_user_roles_plus_current_role: string[];
     user_permissions: string[];
+    additional_roles: string[];
 };
@@ -157,0 +166,0 @@ type InternalUser = {

dist/server/app-router/index.js

@@ -209,3 +209,3 @@ "use strict";
 var OrgMemberInfo = class {
-  constructor(orgId, orgName, orgMetadata, urlSafeOrgName, userAssignedRole, userInheritedRolesPlusCurrentRole, userPermissions) {
+  constructor(orgId, orgName, orgMetadata, urlSafeOrgName, userAssignedRole, userInheritedRolesPlusCurrentRole, userPermissions, orgRoleStructure, userAssignedAdditionalRoles) {
     this.orgId = orgId;
@@ -215,12 +215,22 @@ this.orgName = orgName;
     this.urlSafeOrgName = urlSafeOrgName;
+    this.orgRoleStructure = orgRoleStructure;
     this.userAssignedRole = userAssignedRole;
     this.userInheritedRolesPlusCurrentRole = userInheritedRolesPlusCurrentRole;
     this.userPermissions = userPermissions;
+    this.userAssignedAdditionalRoles = userAssignedAdditionalRoles;
   }
   // validation methods
   isRole(role) {
-    return this.userAssignedRole === role;
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedRole === role || this.userAssignedAdditionalRoles.includes(role);
+    } else {
+      return this.userAssignedRole === role;
+    }
   }
   isAtLeastRole(role) {
-    return this.userInheritedRolesPlusCurrentRole.includes(role);
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedRole === role || this.userAssignedAdditionalRoles.includes(role);
+    } else {
+      return this.userInheritedRolesPlusCurrentRole.includes(role);
+    }
   }
@@ -242,3 +252,5 @@ hasPermission(permission) {
       obj.userInheritedRolesPlusCurrentRole,
-      obj.userPermissions
+      obj.userPermissions,
+      obj.orgRoleStructure,
+      obj.userAssignedAdditionalRoles
     );
@@ -250,4 +262,15 @@ }
   }
+  get assignedRoles() {
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedAdditionalRoles.concat(this.userAssignedRole);
+    } else {
+      return [this.userAssignedRole];
+    }
+  }
   get inheritedRolesPlusCurrentRole() {
-    return this.userInheritedRolesPlusCurrentRole;
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedAdditionalRoles.concat(this.userAssignedRole);
+    } else {
+      return this.userInheritedRolesPlusCurrentRole;
+    }
   }
@@ -276,3 +299,5 @@ get permissions() {
         snakeCaseValue.inherited_user_roles_plus_current_role,
-        snakeCaseValue.user_permissions
+        snakeCaseValue.user_permissions,
+        snakeCaseValue.org_role_structure,
+        snakeCaseValue.additional_roles
       );
@@ -279,0 +304,0 @@ }

dist/server/index.d.ts

@@ -110,2 +110,6 @@ import * as _propelauth_node_apis from '@propelauth/node-apis';
 };
+declare enum OrgRoleStructure {
+    SingleRole = "single_role_in_hierarchy",
+    MultiRole = "multi_role"
+}
 declare class OrgMemberInfo {
@@ -118,8 +122,10 @@ orgId: string;
     urlSafeOrgName: string;
+    orgRoleStructure: OrgRoleStructure;
     userAssignedRole: string;
     userInheritedRolesPlusCurrentRole: string[];
     userPermissions: string[];
+    userAssignedAdditionalRoles: string[];
     constructor(orgId: string, orgName: string, orgMetadata: {
         [key: string]: any;
-    }, urlSafeOrgName: string, userAssignedRole: string, userInheritedRolesPlusCurrentRole: string[], userPermissions: string[]);
+    }, urlSafeOrgName: string, userAssignedRole: string, userInheritedRolesPlusCurrentRole: string[], userPermissions: string[], orgRoleStructure: OrgRoleStructure, userAssignedAdditionalRoles: string[]);
     isRole(role: string): boolean;
@@ -131,2 +137,3 @@ isAtLeastRole(role: string): boolean;
     get assignedRole(): string;
+    get assignedRoles(): string[];
     get inheritedRolesPlusCurrentRole(): string[];
@@ -142,5 +149,7 @@ get permissions(): string[];
     url_safe_org_name: string;
+    org_role_structure: OrgRoleStructure;
     user_role: string;
     inherited_user_roles_plus_current_role: string[];
     user_permissions: string[];
+    additional_roles: string[];
 };
@@ -147,0 +156,0 @@ type InternalUser = {

dist/server/index.js

@@ -187,3 +187,3 @@ "use strict";
 var OrgMemberInfo = class {
-  constructor(orgId, orgName, orgMetadata, urlSafeOrgName, userAssignedRole, userInheritedRolesPlusCurrentRole, userPermissions) {
+  constructor(orgId, orgName, orgMetadata, urlSafeOrgName, userAssignedRole, userInheritedRolesPlusCurrentRole, userPermissions, orgRoleStructure, userAssignedAdditionalRoles) {
     this.orgId = orgId;
@@ -193,12 +193,22 @@ this.orgName = orgName;
     this.urlSafeOrgName = urlSafeOrgName;
+    this.orgRoleStructure = orgRoleStructure;
     this.userAssignedRole = userAssignedRole;
     this.userInheritedRolesPlusCurrentRole = userInheritedRolesPlusCurrentRole;
     this.userPermissions = userPermissions;
+    this.userAssignedAdditionalRoles = userAssignedAdditionalRoles;
   }
   // validation methods
   isRole(role) {
-    return this.userAssignedRole === role;
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedRole === role || this.userAssignedAdditionalRoles.includes(role);
+    } else {
+      return this.userAssignedRole === role;
+    }
   }
   isAtLeastRole(role) {
-    return this.userInheritedRolesPlusCurrentRole.includes(role);
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedRole === role || this.userAssignedAdditionalRoles.includes(role);
+    } else {
+      return this.userInheritedRolesPlusCurrentRole.includes(role);
+    }
   }
@@ -220,3 +230,5 @@ hasPermission(permission) {
       obj.userInheritedRolesPlusCurrentRole,
-      obj.userPermissions
+      obj.userPermissions,
+      obj.orgRoleStructure,
+      obj.userAssignedAdditionalRoles
     );
@@ -228,4 +240,15 @@ }
   }
+  get assignedRoles() {
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedAdditionalRoles.concat(this.userAssignedRole);
+    } else {
+      return [this.userAssignedRole];
+    }
+  }
   get inheritedRolesPlusCurrentRole() {
-    return this.userInheritedRolesPlusCurrentRole;
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedAdditionalRoles.concat(this.userAssignedRole);
+    } else {
+      return this.userInheritedRolesPlusCurrentRole;
+    }
   }
@@ -254,3 +277,5 @@ get permissions() {
         snakeCaseValue.inherited_user_roles_plus_current_role,
-        snakeCaseValue.user_permissions
+        snakeCaseValue.user_permissions,
+        snakeCaseValue.org_role_structure,
+        snakeCaseValue.additional_roles
       );
@@ -257,0 +282,0 @@ }

dist/server/pages/index.d.ts

@@ -109,2 +109,6 @@ import { GetServerSidePropsContext, NextApiRequest, NextApiResponse } from 'next';
 };
+declare enum OrgRoleStructure {
+    SingleRole = "single_role_in_hierarchy",
+    MultiRole = "multi_role"
+}
 declare class OrgMemberInfo {
@@ -117,8 +121,10 @@ orgId: string;
     urlSafeOrgName: string;
+    orgRoleStructure: OrgRoleStructure;
     userAssignedRole: string;
     userInheritedRolesPlusCurrentRole: string[];
     userPermissions: string[];
+    userAssignedAdditionalRoles: string[];
     constructor(orgId: string, orgName: string, orgMetadata: {
         [key: string]: any;
-    }, urlSafeOrgName: string, userAssignedRole: string, userInheritedRolesPlusCurrentRole: string[], userPermissions: string[]);
+    }, urlSafeOrgName: string, userAssignedRole: string, userInheritedRolesPlusCurrentRole: string[], userPermissions: string[], orgRoleStructure: OrgRoleStructure, userAssignedAdditionalRoles: string[]);
     isRole(role: string): boolean;
@@ -130,2 +136,3 @@ isAtLeastRole(role: string): boolean;
     get assignedRole(): string;
+    get assignedRoles(): string[];
     get inheritedRolesPlusCurrentRole(): string[];
@@ -141,5 +148,7 @@ get permissions(): string[];
     url_safe_org_name: string;
+    org_role_structure: OrgRoleStructure;
     user_role: string;
     inherited_user_roles_plus_current_role: string[];
     user_permissions: string[];
+    additional_roles: string[];
 };
@@ -146,0 +155,0 @@ type InternalUser = {

dist/server/pages/index.js

@@ -182,3 +182,3 @@ "use strict";
 var OrgMemberInfo = class {
-  constructor(orgId, orgName, orgMetadata, urlSafeOrgName, userAssignedRole, userInheritedRolesPlusCurrentRole, userPermissions) {
+  constructor(orgId, orgName, orgMetadata, urlSafeOrgName, userAssignedRole, userInheritedRolesPlusCurrentRole, userPermissions, orgRoleStructure, userAssignedAdditionalRoles) {
     this.orgId = orgId;
@@ -188,12 +188,22 @@ this.orgName = orgName;
     this.urlSafeOrgName = urlSafeOrgName;
+    this.orgRoleStructure = orgRoleStructure;
     this.userAssignedRole = userAssignedRole;
     this.userInheritedRolesPlusCurrentRole = userInheritedRolesPlusCurrentRole;
     this.userPermissions = userPermissions;
+    this.userAssignedAdditionalRoles = userAssignedAdditionalRoles;
   }
   // validation methods
   isRole(role) {
-    return this.userAssignedRole === role;
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedRole === role || this.userAssignedAdditionalRoles.includes(role);
+    } else {
+      return this.userAssignedRole === role;
+    }
   }
   isAtLeastRole(role) {
-    return this.userInheritedRolesPlusCurrentRole.includes(role);
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedRole === role || this.userAssignedAdditionalRoles.includes(role);
+    } else {
+      return this.userInheritedRolesPlusCurrentRole.includes(role);
+    }
   }
@@ -215,3 +225,5 @@ hasPermission(permission) {
       obj.userInheritedRolesPlusCurrentRole,
-      obj.userPermissions
+      obj.userPermissions,
+      obj.orgRoleStructure,
+      obj.userAssignedAdditionalRoles
     );
@@ -223,4 +235,15 @@ }
   }
+  get assignedRoles() {
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedAdditionalRoles.concat(this.userAssignedRole);
+    } else {
+      return [this.userAssignedRole];
+    }
+  }
   get inheritedRolesPlusCurrentRole() {
-    return this.userInheritedRolesPlusCurrentRole;
+    if (this.orgRoleStructure === "multi_role" /* MultiRole */) {
+      return this.userAssignedAdditionalRoles.concat(this.userAssignedRole);
+    } else {
+      return this.userInheritedRolesPlusCurrentRole;
+    }
   }
@@ -249,3 +272,5 @@ get permissions() {
         snakeCaseValue.inherited_user_roles_plus_current_role,
-        snakeCaseValue.user_permissions
+        snakeCaseValue.user_permissions,
+        snakeCaseValue.org_role_structure,
+        snakeCaseValue.additional_roles
       );
@@ -252,0 +277,0 @@ }

package.json

 {
     "name": "@propelauth/nextjs",
-    "version": "0.0.124",
+    "version": "0.0.125",
     "exports": {
@@ -71,5 +71,5 @@ "./server": {
     "dependencies": {
-        "@propelauth/node-apis": "^2.1.9",
+        "@propelauth/node-apis": "^2.1.10",
         "jose": "^5.2.4"
     }
 }

No alert changes

Improved metrics

Total package byte prevSize

587113

increased by4.82%

Lines of code

6235

increased by3.93%

Dependency changes

• Updated@propelauth/node-apis@^2.1.10