Merge branch 'develop' of github.com:dreamfactorysoftware/dsp-laravel…

… into develop
jbelke · Jun 23, 2015 · 302cadc · 302cadc
2 parents c5ff929 + 94f1e2c
commit 302cadc
Show file tree

Hide file tree

Showing 7 changed files with 479 additions and 97 deletions.
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
@@ -134,8 +134,7 @@ public function postLogin(Request $request)
         if ($this->auth->attempt($credentials, $request->has('remember'))) {
             $user = \Auth::user();
             $user->update(['last_login_date' => Carbon::now()->toDateTimeString()]);
-            Session::setUserInfo($user);
-            Session::forgetApiKeys();
+            Session::setUserInfo($user->toArray());
 
             return redirect()->intended($this->redirectPath());
         }

diff --git a/app/Http/Controllers/SplashController.php b/app/Http/Controllers/SplashController.php
@@ -5,7 +5,6 @@
 use Carbon\Carbon;
 use DreamFactory\Core\OAuth\Services\BaseOAuthService;
 use DreamFactory\Core\Utility\ServiceHandler;
-use DreamFactory\Core\Models\User as DspUser;
 use DreamFactory\Core\ADLdap\Services\LDAP as LdapService;
 use DreamFactory\Core\ADLdap\Contracts\Provider as ADLdapProvider;
 use DreamFactory\Core\Utility\Session;
@@ -80,11 +79,11 @@ public static function handleADLdapLogin($provider)
 
             if ($auth) {
                 $ldapUser = $driver->getUser();
-
-                $user = DspUser::createShadowADLdapUser($ldapUser, $service);
+                $user = $service->createShadowADLdapUser($ldapUser);
                 $user->update(['last_login_date' => Carbon::now()->toDateTimeString()]);
 
                 \Auth::login($user, \Request::has('remember'));
+                Session::setUserInfo($user->toArray());
 
                 return redirect()->intended(env('LANDING_PAGE', '/launchpad'));
             }
@@ -119,10 +118,11 @@ public function handleOAuthCallback($serviceName)
         /** @var User $user */
         $user = $driver->user();
 
-        $dspUser = DspUser::createShadowOAuthUser($user, $service);
-        $dspUser->update(['last_login_date' => Carbon::now()->toDateTimeString()]);
+        $dfUser = $service->createShadowOAuthUser($user);
+        $dfUser->update(['last_login_date' => Carbon::now()->toDateTimeString()]);
 
-        \Auth::login($dspUser);
+        \Auth::login($dfUser);
+        Session::setUserInfo($dfUser->toArray());
 
         if (\Request::ajax()) {
             return ['success' => true, 'session_id' => Session::getId()];

diff --git a/composer.json b/composer.json
@@ -86,6 +86,7 @@
   ],
   "require": {
     "laravel/framework": "5.0.*",
+    "tymon/jwt-auth": "0.5.*",
     "dreamfactory/dsp-admin-app": "dev-develop as dev-master",
     "dreamfactory/df-core": "dev-develop as dev-master",
     "dreamfactory/df-aws": "dev-develop as dev-master",