Prevent error when authorizing an admin-created OAauth application wi…

…thout a set owner
theodi · Nov 13, 2017 · 644fe00 · 644fe00
1 parent 3df677a
commit 644fe00
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/app/views/doorkeeper/authorizations/new.html.haml b/app/views/doorkeeper/authorizations/new.html.haml
@@ -1,5 +1,3 @@
-- auth_app_owner = @pre_auth.client.application.owner
-
 %main{ :role => "main" }
   .modal-no-backdrop.modal-doorkeepr-auth
     .modal-content
@@ -20,9 +18,14 @@
         %p
           An application called
           = link_to @pre_auth.client.name, @pre_auth.redirect_uri, target: '_blank', rel: 'noopener noreferrer'
-          is requesting access to your GitLab account. This application was created by
-          = succeed "." do
-            = link_to auth_app_owner.name, user_path(auth_app_owner)
+          is requesting access to your GitLab account.
+
+          - auth_app_owner = @pre_auth.client.application.owner
+          - if auth_app_owner
+            This application was created by
+            = succeed "." do
+              = link_to auth_app_owner.name, user_path(auth_app_owner)
+
           Please note that this application is not provided by GitLab and you should verify its authenticity before
           allowing access.
         - if @pre_auth.scopes

diff --git a/changelogs/unreleased/dm-authorize-admin-oauth-application.yml b/changelogs/unreleased/dm-authorize-admin-oauth-application.yml
@@ -0,0 +1,6 @@
+---
+title: Prevent error when authorizing an admin-created OAauth application without
+  a set owner
+merge_request:
+author:
+type: fixed