From 36a01c7f7003e884a3d28e12a216f2f1d83f48fb Mon Sep 17 00:00:00 2001
From: maximest-pierre <me@maximest-pierre.me>
Date: Wed, 14 Mar 2018 11:58:31 -0400
Subject: [PATCH] Change regex to match more closely the  api

---
 controller/action/AcquisitionActions.class.php | 10 +++++++++-
 view/template/acquisition/youtube_edit.php     |  2 +-
 view/template/acquisition/youtube_token.php    |  5 ++++-
 web/js/yt2/FormValidation.js                   |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/controller/action/AcquisitionActions.class.php b/controller/action/AcquisitionActions.class.php
index d08de50b..21ff67f7 100644
--- a/controller/action/AcquisitionActions.class.php
+++ b/controller/action/AcquisitionActions.class.php
@@ -55,7 +55,15 @@ class AcquisitionActions extends Actions
 
     if ($desired_lbry_channel_name_is_valid) {
       $token = LBRY::connectYoutube($desired_lbry_channel_name);
-      Controller::redirect($token['data']);
+      var_dump($token);
+      var_dump($desired_lbry_channel_name);
+      if ($token['success'] == false) {
+          Controller::redirect('/youtube?error=true&error_message=' . $token['error']);
+      }
+      else {
+          Controller::redirect($token['data']);
+      }
+
     }
   }
   public static function actionYoutubeEdit($status_token, $channel_name, $email, $sync_consent, $current_value)
diff --git a/view/template/acquisition/youtube_edit.php b/view/template/acquisition/youtube_edit.php
index 92884925..39825ff7 100644
--- a/view/template/acquisition/youtube_edit.php
+++ b/view/template/acquisition/youtube_edit.php
@@ -6,7 +6,7 @@ $sync_consent = isset($_POST['sync_consent']);
 
 $current_value = LBRY::statusYoutube($status_token);
 
-if(!preg_match("/([@][1-z]+)/", $channel_name)){
+if(!preg_match("/@[A-Za-z0-9_-]+$/", $channel_name)){
     $channel_name = "@" . $channel_name;
 }
 
diff --git a/view/template/acquisition/youtube_token.php b/view/template/acquisition/youtube_token.php
index 460ec13e..18ce0f0b 100644
--- a/view/template/acquisition/youtube_token.php
+++ b/view/template/acquisition/youtube_token.php
@@ -1,7 +1,10 @@
 <?php
 $desired_lbry_channel_name = $_POST['desired_lbry_channel_name'];
 
-if(!preg_match("/([@][1-z]+)/", $desired_lbry_channel_name)){
+if(!preg_match("/@[A-Za-z0-9_-]+$/", $desired_lbry_channel_name)){
   $desired_lbry_channel_name = "@" . $desired_lbry_channel_name;
 }
+
 AcquisitionActions::actionYoutubeToken($desired_lbry_channel_name);
+
+
diff --git a/web/js/yt2/FormValidation.js b/web/js/yt2/FormValidation.js
index 8cb59b2c..3a7aae7c 100644
--- a/web/js/yt2/FormValidation.js
+++ b/web/js/yt2/FormValidation.js
@@ -51,7 +51,7 @@ function validateEmail(email) {
 }
 
 function validateLBRYName(lbry_channel_name){
-    var re = /[1-z]+/;
+    var re = /[@A-Za-z0-9_-]+$/;
     return re.test(lbry_channel_name);
 }