Merge branch '59053-no-oauth-for-cicd-github-fe' into 'master'

Resolve "Mirroring for external CI/CD repositories should not store OAuth token"

See merge request gitlab-org/gitlab-ce!31488

6 files changed, 44 insertions, 37 deletions

diff --git a/app/helpers/import_helper.rb b/app/helpers/import_helper.rb
index 3d494c3de6a..9122ad5b35a 100644
--- a/app/helpers/import_helper.rb
+++ b/app/helpers/import_helper.rb
@@ -45,17 +45,14 @@ module ImportHelper
   end
 
   def import_github_authorize_message
-    _('To import GitHub repositories, you first need to authorize GitLab to access the list of your GitHub repositories:')
+    _('To connect GitHub repositories, you first need to authorize GitLab to access the list of your GitHub repositories.')
   end
 
   def import_github_personal_access_token_message
-    personal_access_token_link = link_to _('Personal Access Token'), 'https://github.com/settings/tokens'
+    link_url = 'https://github.com/settings/tokens'
+    link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: link_url }
 
-    if github_import_configured?
-      _('Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import.').html_safe % { personal_access_token_link: personal_access_token_link }
-    else
-      _('To import GitHub repositories, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import.').html_safe % { personal_access_token_link: personal_access_token_link }
-    end
+    _('Create and provide your GitHub %{link_start}Personal Access Token%{link_end}. You will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
   end
 
   def import_configure_github_admin_message
diff --git a/app/views/import/github/new.html.haml b/app/views/import/github/new.html.haml
index 72e5934574a..518c44cc687 100644
--- a/app/views/import/github/new.html.haml
+++ b/app/views/import/github/new.html.haml
@@ -1,30 +1,32 @@
-- title = has_ci_cd_only_params? ? _('Connect repositories from GitHub') : _('GitHub import')
+- title = _('Authenticate with GitHub')
 - page_title title
 - breadcrumb_title title
 - header_title _("Projects"), root_path
 
-%h3.page-title
-  = icon 'github', text: _('Import repositories from GitHub')
+%h2.page-title
+  = title
 
-- if github_import_configured?
-  %p
-    = import_github_authorize_message
+%p
+  = import_github_authorize_message
 
-  = link_to _('List your GitHub repositories'), status_import_github_path(ci_cd_only: params[:ci_cd_only]), class: 'btn btn-success'
+- if github_import_configured? && !has_ci_cd_only_params?
+  = link_to icon('github', text: title), status_import_github_path, class: 'btn btn-success'
 
   %hr
 
-%p
-  = import_github_personal_access_token_message
+- unless github_import_configured? || has_ci_cd_only_params?
+  .bs-callout.bs-callout-info
+    = import_configure_github_admin_message
 
-= form_tag personal_access_token_import_github_path, method: :post, class: 'form-inline' do
+= form_tag personal_access_token_import_github_path, method: :post do
   .form-group
-    = text_field_tag :personal_access_token, '', class: 'form-control append-right-8', placeholder: _('Personal Access Token'), size: 40
-    = submit_tag _('List your GitHub repositories'), class: 'btn btn-success'
+    %label.label-bold= _('Personal Access Token')
+    = text_field_tag :personal_access_token, '', class: 'form-control', placeholder: _('e.g. %{token}') % { token: '8d3f016698e...' }
+    %span.form-text.text-muted
+      = import_github_personal_access_token_message
 
   = render_if_exists 'import/github/ci_cd_only'
 
-- unless github_import_configured?
-  %hr
-  %p
-    = import_configure_github_admin_message
+  .form-actions.d-flex.justify-content-end
+    = link_to _('Cancel'), new_project_path, class: 'btn'
+    = submit_tag _('Authenticate'), class: 'btn btn-success ml-2'
diff --git a/changelogs/unreleased/59053-no-oauth-for-cicd-github-fe.yml b/changelogs/unreleased/59053-no-oauth-for-cicd-github-fe.yml
new file mode 100644
index 00000000000..221e8408dad
--- /dev/null
+++ b/changelogs/unreleased/59053-no-oauth-for-cicd-github-fe.yml
@@ -0,0 +1,5 @@
+---
+title: Remove oauth form from GitHub CI/CD only import authentication
+merge_request: 31488
+author:
+type: changed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 0568bdbdfca..4f3c8e8046d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -996,9 +996,6 @@ msgstr ""
 msgid "Alternate support URL for help page and help dropdown"
 msgstr ""
 
-msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import."
-msgstr ""
-
 msgid "Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication"
 msgstr ""
 
@@ -1435,6 +1432,12 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+msgid "Authenticate"
+msgstr ""
+
+msgid "Authenticate with GitHub"
+msgstr ""
+
 msgid "Authentication Log"
 msgstr ""
 
@@ -3431,6 +3434,9 @@ msgstr ""
 msgid "Create a personal access token on your account to pull or push via %{protocol}."
 msgstr ""
 
+msgid "Create and provide your GitHub %{link_start}Personal Access Token%{link_end}. You will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import."
+msgstr ""
+
 msgid "Create board"
 msgstr ""
 
@@ -6588,9 +6594,6 @@ msgstr ""
 msgid "List your Bitbucket Server repositories"
 msgstr ""
 
-msgid "List your GitHub repositories"
-msgstr ""
-
 msgid "Live preview"
 msgstr ""
 
@@ -11941,6 +11944,9 @@ msgstr ""
 msgid "To add the entry manually, provide the following details to the application on your phone."
 msgstr ""
 
+msgid "To connect GitHub repositories, you first need to authorize GitLab to access the list of your GitHub repositories."
+msgstr ""
+
 msgid "To define internal users, first enable new users set to external"
 msgstr ""
 
@@ -11959,12 +11965,6 @@ msgstr ""
 msgid "To help improve GitLab, we would like to periodically collect usage information. This can be changed at any time in %{settings_link_start}Settings%{link_end}. %{info_link_start}More Information%{link_end}"
 msgstr ""
 
-msgid "To import GitHub repositories, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import."
-msgstr ""
-
-msgid "To import GitHub repositories, you first need to authorize GitLab to access the list of your GitHub repositories:"
-msgstr ""
-
 msgid "To import an SVN repository, check out %{svn_link}."
 msgstr ""
 
@@ -13496,6 +13496,9 @@ msgstr ""
 msgid "done"
 msgstr ""
 
+msgid "e.g. %{token}"
+msgstr ""
+
 msgid "element is not a hierarchy"
 msgstr ""
 
diff --git a/qa/qa/page/project/import/github.rb b/qa/qa/page/project/import/github.rb
index 5973a5a958e..cc0c4e1e835 100644
--- a/qa/qa/page/project/import/github.rb
+++ b/qa/qa/page/project/import/github.rb
@@ -9,7 +9,7 @@ module QA
 
           view 'app/views/import/github/new.html.haml' do
             element :personal_access_token_field, 'text_field_tag :personal_access_token' # rubocop:disable QA/ElementWithPattern
-            element :list_repos_button, "submit_tag _('List your GitHub repositories')" # rubocop:disable QA/ElementWithPattern
+            element :authenticate_button, "submit_tag _('Authenticate')" # rubocop:disable QA/ElementWithPattern
           end
 
           view 'app/assets/javascripts/import_projects/components/provider_repo_table_row.vue' do
diff --git a/spec/features/projects/new_project_spec.rb b/spec/features/projects/new_project_spec.rb
index 010a5de6930..22a0d268243 100644
--- a/spec/features/projects/new_project_spec.rb
+++ b/spec/features/projects/new_project_spec.rb
@@ -280,7 +280,7 @@ describe 'New project' do
         end
 
         it 'shows import instructions' do
-          expect(page).to have_content('Import repositories from GitHub')
+          expect(page).to have_content('Authenticate with GitHub')
           expect(current_path).to eq new_import_github_path
         end
       end