fix: remap iso country db for TW

Change-Id: Ifa4de875e21b7d3254b319b5e610e3ead61606bd

Author: smarcet

app/Http/Controllers/UserController.php

@@ -16,7 +16,6 @@
 use App\Http\Controllers\OpenId\OpenIdController;
 use App\Http\Controllers\Traits\JsonResponses;
 use App\Http\Utils\CountryList;
-use App\Jobs\RevokeUserGrantsOnExplicitLogout;
 use App\libs\OAuth2\Strategies\LoginHintProcessStrategy;
 use App\ModelSerializers\SerializerRegistry;
 use Auth\Exceptions\AuthenticationException;

app/Http/Utils/CountryList.php

@@ -19,18 +19,26 @@
 final class CountryList
 {
     private static function countrySort($a,$b) {
-        $al = strtolower($a->getName());
-        $bl = strtolower($b->getName());
+        $al = strtolower($a['name']);
+        $bl = strtolower($b['name']);
         if ($al == $bl) {
             return 0;
         }
         return ($al > $bl) ? +1 : -1;
     }
 
+    private static function countryMap2Dic($country) {
+        return [
+            'name' => $country->getAlpha2() == 'TW'? 'Taiwan' : $country->getName(),
+            'alpha2' => $country->getAlpha2(),
+        ];
+    }
+
     public static function getCountries(){
         // init database
         $isoCodes = new IsoCodesFactory();
         $countries  = $isoCodes->getCountries()->toArray();
+        $countries = array_map( array('App\Http\Utils\CountryList','countryMap2Dic'), $countries);
         usort($countries, array('App\Http\Utils\CountryList','countrySort'));
         return $countries;
     }

resources/views/admin/edit-user.blade.php

@@ -68,7 +68,7 @@
 
         let countries = [];
         @foreach($countries as $country)
-        countries.push({value: "{!! $country->getAlpha2() !!}", text: "{!! $country->getName() !!}"});
+        countries.push({value: "{!! $country['alpha2'] !!}", text: "{!! $country['name'] !!}"});
         @endforeach
 
         let languages = [];

resources/views/auth/passwords/set.blade.php

@@ -43,7 +43,7 @@
 
         let countries = [];
         @foreach($countries as $country)
-            countries.push({ value: "{!! $country->getAlpha2() !!}", text: "{!! $country->getName() !!}" });
+        countries.push({value: "{!! $country['alpha2'] !!}", text: "{!! $country['name'] !!}"});
         @endforeach
 
         let config = {

resources/views/auth/register.blade.php

@@ -42,7 +42,7 @@
 
         let countries = [];
         @foreach($countries as $country)
-            countries.push({ value: "{!! $country->getAlpha2() !!}", text: "{!! $country->getName() !!}" });
+        countries.push({value: "{!! $country['alpha2'] !!}", text: "{!! $country['name'] !!}"});
         @endforeach
 
         let config = {

resources/views/profile.blade.php

@@ -86,7 +86,7 @@
 
         let countries = [];
         @foreach($countries as $country)
-        countries.push({value: "{!! $country->getAlpha2() !!}", text: "{!! $country->getName() !!}"});
+        countries.push({value: "{!! $country['alpha2'] !!}", text: "{!! $country['name'] !!}"});
         @endforeach
 
         let languages = [];