Merge branch 'dev' into dev-vj

app/Http/Controllers/LoginController.php

@@ -182,4 +182,25 @@ class LoginController extends Controller
 
         return redirect()->route('login');
     }
+
+    public function loginWithSessionKey($sessionKey, Request $request){
+        $url = "/session/pro_log_in_with_session_key/${sessionKey}";
+        $api = new Backend();
+        try {
+            $apiResponse = $api->post($url, []);
+            $data = json_decode($apiResponse->getContents());
+
+            if (!property_exists($data, 'success') || !$data->success) {
+                return redirect('/mc');
+            }
+
+
+            Cookie::queue('sessionKey', $data->data->sessionKey);
+
+            return redirect('/mc');
+
+        } catch (\Exception $e) {
+            return redirect('/mc');
+        }
+    }
 }

app/Models/Client.php

@@ -49,7 +49,7 @@ class Client extends Model
             ->distinct('label')
             ->where('is_removed', false)
             ->orderBy('label', 'asc')
-            ->orderBy('created_at', 'desc');
+            ->orderBy('effective_date', 'desc');
     }
 
     public function smses() {

routes/web.php

@@ -29,6 +29,8 @@ Route::post('request_password_reset', 'LoginController@processRequestPasswordRes
 Route::get('self_reset_password', 'LoginController@showSelfResetPassword')->name('self_reset_password');
 Route::post('self_reset_password', 'LoginController@processSelfResetPassword')->name('process_self_reset_password');
 
+Route::get('/pro_log_in_with_session_key/{sessionKey}', 'LoginController@loginWithSessionKey')->name('login_with_session_key');
+
 Route::post('logout', 'LoginController@logout')->name('logout');
 
 Route::post('/confirm_sms_auth_token', 'HomeController@postConfirmSmsAuthToken')->name('post-confirm_sms_auth_token');