Merge branch 'drepo-refine-user-registration' into 'master'

Drepo refine user registration

See merge request persper/gitlab-ce!46

Author: gingerhot

config/gitlab.yml.example

@@ -795,6 +795,11 @@ production: &base
     http_api: 'https://ipfs.infura.io:5001'
     storage_path: 'tmp/ipfs'
 
+  ## Uncomment the following to enable Drepo username registration
+  #  drepo:
+  #    need_check_username: true
+
+
 development:
   <<: *base
 

drepo/app/assets/javascripts/drepo_users/contract/central.json renamed to drepo/app/assets/javascripts/drepo_contract/central.json

@@ -123,7 +123,7 @@
 import Icon from '~/vue_shared/components/icon.vue';
 import { mapGetters, mapState } from 'vuex';
 import axios from 'axios';
-import contractInfo from '../contract';
+import contractInfo from '../../drepo_contract';
 
 export default {
   name: 'CheckUsername',

drepo/app/assets/javascripts/drepo_users/contract/gitlab.json renamed to drepo/app/assets/javascripts/drepo_contract/gitlab.json

@@ -13,13 +13,13 @@ def verified
     signature = params[:signature]
 
     if [username, message, signature].any? { |x| x.blank? }
-      @user.errors[:base] << "some param is invalid."
+      flash[:alert] = "some param is invalid."
       return
     end
 
     is_equal, address = verify_signature(username, message, signature)
     unless is_equal
-      @user.errors[:base] << "Unmatch signature. Verify failure."
+      flash[:alert] = "Unmatch signature. Verify failure."
       return
     end
 
@@ -77,7 +77,7 @@ def address_possess_this_username(username, address)
     client = Ethereum::HttpClient.new('https://rinkeby.infura.io/v3/8d1ba1e9ef484906ba94d560cc1d3a87')
     client.default_account = private_key.address
 
-    contract_file_path = Rails.root.join('drepo/app/assets/javascripts/drepo_users/contract/central.json').to_s
+    contract_file_path = Rails.root.join('drepo/app/assets/javascripts/drepo_contract/central.json').to_s
     contract_address, abi = parse_contract_file(contract_file_path)
 
     contract = Ethereum::Contract.create(name: 'Central', client: client, abi: abi, address: contract_address)

drepo/app/assets/javascripts/drepo_users/contract/index.js renamed to drepo/app/assets/javascripts/drepo_contract/index.js

@@ -8,15 +8,11 @@
 .row.prepend-top-default
   .col-lg-3.profile-settings-sidebar
     %p
-      - group_docs_path = help_page_path('user/group/index')
-      - group_docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: group_docs_path }
-      = s_('%{group_docs_link_start}Groups%{group_docs_link_end} allow you to manage and collaborate across multiple projects. Members of a group have access to all of its projects.').html_safe % { group_docs_link_start: group_docs_link_start, group_docs_link_end: '</a>'.html_safe }
+      = _('You need register a username used in both local GitLab client and remote Drepo smart contract, which could be served by Merico officially or any third parties. Your username is identical and valuable in a Drepo service.')
     %p
-      - subgroup_docs_path = help_page_path('user/group/subgroups/index')
-      - subgroup_docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: subgroup_docs_path }
-      = s_('Groups can also be nested by creating %{subgroup_docs_link_start}subgroups%{subgroup_docs_link_end}.').html_safe % { subgroup_docs_link_start: subgroup_docs_link_start, subgroup_docs_link_end: '</a>'.html_safe }
+      = _('To create a username you need: at first input a username to verify if it had been registered by others. If so you can choose another one until it is available. Then you can register it. After registration succeeds, you need to activate it by signing a message and complete registration. ')
     %p
-      = _('Projects that belong to a group are prefixed with the group namespace. Existing projects may be moved into a group.')
+      = _('To make a transition in Ethereum costs at least a few minutes or more. So if you don\'t like to wait when registering, you can leave and come back later to reregister it again. It can tell if it\'s your current Ethereum account registered the username. If so you can bind/activate it to current GitLab account and complete registration.')
 
   .col-lg-9
     #check-username-form