Merge pull request #29 from intelequia/superusers

Added SuperUsers role for RLS
intelequia · Nov 5, 2023 · 2671a37 · 2671a37
2 parents 7f0ca39 + 91a786b
commit 2671a37
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/docs/images/ReleaseBadge.svg b/docs/images/ReleaseBadge.svg
diff --git a/src/DotNetNuke.PowerBI/Components/Common.cs b/src/DotNetNuke.PowerBI/Components/Common.cs
@@ -72,9 +72,9 @@ public class Common
         public static UserInfo CurrentUser => UserController.Instance.GetCurrentUserInfo();
 
         public static bool IsSuperUser()
-        {
+        {            
             // Usuario no logueado
-            if (CurrentUser.UserID == -1)
+            if (CurrentUser == null || CurrentUser.UserID == -1)
                 return false;
 
             return CurrentUser.IsSuperUser;

diff --git a/src/DotNetNuke.PowerBI/DotNetNuke.PowerBI.dnn b/src/DotNetNuke.PowerBI/DotNetNuke.PowerBI.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="PowerBIEmbeddedList" type="Module" version="01.02.01">
+    <package name="PowerBIEmbeddedList" type="Module" version="01.02.02">
       <friendlyName>PowerBI Embedded Content List</friendlyName>
       <description>A set of modules to embed PowerBI Embedded dashboards and reports into a DNN Platform installation.</description>
       <iconFile>~/DesktopModules/MVC/PowerBIEmbedded/images/powerbi.png</iconFile>
@@ -176,7 +176,7 @@
         </component>
       </components>
     </package>
-    <package name="PowerBIEmbeddedContent" type="Module" version="01.02.01">
+    <package name="PowerBIEmbeddedContent" type="Module" version="01.02.02">
       <friendlyName>PowerBI Embedded Content View</friendlyName>
       <description>A set of modules to embed PowerBI Embedded dashboards and reports into a DNN Platform installation.</description>
       <iconFile>~/DesktopModules/MVC/PowerBIEmbedded/images/powerbi.png</iconFile>
@@ -231,7 +231,7 @@
         </component>
       </components>
     </package>
-    <package name="PowerBIEmbeddedCalendar" type="Module" version="01.02.01">
+    <package name="PowerBIEmbeddedCalendar" type="Module" version="01.02.02">
       <friendlyName>PowerBI Embedded Calendar View</friendlyName>
       <description>A set of modules to embed PowerBI Embedded dashboards and reports into a DNN Platform installation.</description>
       <iconFile>~/DesktopModules/MVC/PowerBIEmbedded/images/powerbi.png</iconFile>

diff --git a/src/DotNetNuke.PowerBI/Properties/AssemblyInfo.cs b/src/DotNetNuke.PowerBI/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("01.02.01.*")]
+[assembly: AssemblyVersion("01.02.02.*")]
 #pragma warning disable CS7035 // The specified version string does not conform to the recommended format - major.minor.build.revision
-[assembly: AssemblyFileVersion("01.02.01.*")]
+[assembly: AssemblyFileVersion("01.02.02.*")]
 #pragma warning restore CS7035 // The specified version string does not conform to the recommended format - major.minor.build.revision
diff --git a/src/DotNetNuke.PowerBI/Services/EmbedService.cs b/src/DotNetNuke.PowerBI/Services/EmbedService.cs
@@ -564,6 +564,10 @@ public async Task<EmbedConfig> GetDashboardEmbedConfigAsync(int userId, string u
                             rolesList.AddRange(roles.Split(','));
                             rls.Roles = rolesList;
                         }
+                        if (Components.Common.IsSuperUser())
+                        {
+                            rls.Roles.Add("SuperUsers");
+                        }
                         // Generate Embed Token with effective identities.
                         generateTokenRequestParameters = new GenerateTokenRequest(accessLevel: permission, identities: new List<EffectiveIdentity> { rls });
                     }

diff --git a/src/DotNetNuke.PowerBI/admin/personaBar/scripts/bundles/bundle-en.js b/src/DotNetNuke.PowerBI/admin/personaBar/scripts/bundles/bundle-en.js
diff --git a/src/DotNetNuke.PowerBI/admin/personaBar/scripts/bundles/bundle-en.js.map b/src/DotNetNuke.PowerBI/admin/personaBar/scripts/bundles/bundle-en.js.map