NPE-aware fix.

kounoike · Oct 14, 2017 · 17778b7 · 17778b7
1 parent 969f0fb
commit 17778b7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/main/scala/waldap/core/service/LDAPAccountService.scala b/src/main/scala/waldap/core/service/LDAPAccountService.scala
@@ -28,9 +28,11 @@ trait LDAPAccountService {
   def GetLDAPUsersGroups(userName: String)(implicit context: Context): List[Entry] = {
     val dn = s"uid=${userName},${LDAPUtil.usersDn}"
     val entry = context.ldapSession.lookup(new Dn(context.ldapSession.getDirectoryService.getSchemaManager, dn))
-    entry.get("memberOf").iterator().asScala.map{dn =>
-      context.ldapSession.lookup(new Dn(context.ldapSession.getDirectoryService.getSchemaManager, dn.getString))
-    }.toList
+    Option(entry.get("memberOf")).map {
+      _.iterator().asScala.map { dn =>
+        context.ldapSession.lookup(new Dn(context.ldapSession.getDirectoryService.getSchemaManager, dn.getString))
+      }.toList
+    }.getOrElse(List[Entry]())
   }
 
   def AddLDAPUser(userName: String, password: String, givenName: String, sn: String, displayName: String, mail: String)(implicit context: Context): Unit = {

diff --git a/src/main/twirl/waldap/core/user/apps.scala.html b/src/main/twirl/waldap/core/user/apps.scala.html
@@ -2,14 +2,18 @@
 @waldap.core.user.html.main("WebApps", "apps") {
 <div class="box">
   <div class="content">
-    @instances.map{ instance =>
-      <div class="card">
-        <div class="card-content">
-          <p>
-            <a href="@instance.url" target="_blank">@{instance.webAppName}(@{instance.webAppName}_@{instance.instanceSuffix})</a>
-          </p>
+    @if(instances.isEmpty){
+      No Apps.
+    }else{
+      @instances.map{ instance =>
+        <div class="card">
+          <div class="card-content">
+            <p>
+              <a href="@instance.url" target="_blank">@{instance.webAppName}(@{instance.webAppName}_@{instance.instanceSuffix})</a>
+            </p>
+          </div>
         </div>
-      </div>
+      }
     }
   </div>
 </div>