Merge pull request #6226 from weseek/fix/check-username-api

fix: Use APIv3 for api get check_username

packages/app/src/components/CompleteUserRegistrationForm.tsx

@@ -1,6 +1,9 @@
 import React, { useState, useEffect } from 'react';
+
 import { useTranslation } from 'react-i18next';
+
 import { apiv3Get, apiv3Post } from '~/client/util/apiv3-client';
+
 import { toastSuccess, toastError } from '../client/util/apiNotification';
 
 interface Props {
@@ -28,7 +31,7 @@ const CompleteUserRegistrationForm: React.FC<Props> = (props: Props) => {
   useEffect(() => {
     const delayDebounceFn = setTimeout(async() => {
       try {
-        const { data } = await apiv3Get('/check_username', { username });
+        const { data } = await apiv3Get('/check-username', { username });
         if (data.ok) {
           setUsernameAvailable(data.valid);
         }

packages/app/src/components/InstallerForm.jsx

@@ -38,7 +38,7 @@ class InstallerForm extends React.Component {
   //     },
   //     responseType: 'json',
   //   });
-  //   axios.get('/_api/check_username', { params: { username: event.target.value } })
+  //   axios.get('/_api/v3/check-username', { params: { username: event.target.value } })
   //     .then((res) => { return this.setState({ isValidUserName: res.data.valid }) });
   // }
 

packages/app/src/server/routes/apiv3/index.js

@@ -70,7 +70,7 @@ module.exports = (crowi) => {
   router.use('/forgot-password', require('./forgot-password')(crowi));
 
   const user = require('../user')(crowi, null);
-  router.get('/check_username', user.api.checkUsername);
+  router.get('/check-username', user.api.checkUsername);
 
   router.post('/complete-registration',
     injectUserRegistrationOrderByTokenMiddleware,

packages/app/src/server/routes/index.js

@@ -168,7 +168,6 @@ module.exports = function(crowi, app) {
 
   apiV1Router.get('/search'                        , accessTokenParser , loginRequired , search.api.search);
 
-  apiV1Router.get('/check_username'           , user.api.checkUsername);
   apiV1Router.get('/me/user-group-relations'  , accessTokenParser , loginRequiredStrictly , me.api.userGroupRelations);
 
   // HTTP RPC Styled API (に徐々に移行していいこうと思う)

packages/app/src/server/views/invited.html

@@ -133,7 +133,7 @@ $(function() {
     $('#input-group-username').removeClass('has-error');
     $('#help-block-username').html("");
 
-    $.getJSON('/_api/check_username', {username: username}, function(json) {
+    $.getJSON('/_api/v3/check-username', {username: username}, function(json) {
       if (!json.valid) {
         $('#help-block-username').html(
           '<i class="icon-fw icon-ban"></i>このユーザーIDは利用できません。'

packages/app/src/server/views/login.html

@@ -158,7 +158,7 @@
     $('#input-group-username').removeClass('has-error');
     $('#help-block-username').html("");
 
-    $.getJSON('/_api/check_username', {username: username}, function(json) {
+    $.getJSON('/_api/v3/check-username', {username: username}, function(json) {
       if (!json.valid) {
         $('#help-block-username').html(
           '<i class="icon-fw icon-ban"></i> This User ID is not available.'