Merge pull request #13 from jcmcken/master

Fix a number of issues
devopskube · Feb 22, 2019 · d80ff74 · d80ff74
2 parents 330f76f + 60cf861
commit d80ff74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/models/oic_session.rb b/app/models/oic_session.rb
@@ -217,7 +217,7 @@ def complete?
   end
 
   def scopes
-    if client_config["scopes"].nil?
+    if client_config["scopes"].nil? 
       return "openid profile email user_name"
     else
       client_config["scopes"].split(',').each(&:strip).join(' ')

diff --git a/lib/redmine_openid_connect/account_controller_patch.rb b/lib/redmine_openid_connect/account_controller_patch.rb
@@ -109,12 +109,13 @@ def oic_local_login
 
           firstname = user_info["given_name"]
           lastname = user_info["family_name"]
+
           if (firstname.nil? || lastname.nil?) && user_info["name"]
             parts = user_info["name"].split
             if parts.length >= 2
               firstname = parts[0]
               lastname = parts[-1]
-            end
+            end            
           end
 
           attributes = {