Skip to content

Commit 2445df2

Browse files
authored
Merge pull request #2 from thats4shaw/feature/cms5-support
CMS5 support
2 parents b0e1e63 + 6acb4ad commit 2445df2

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
],
1717
"require": {
18-
"silverstripe/framework": "^4",
18+
"silverstripe/framework": "^5",
1919
"level51/silverstripe-jwt-utils": "^0.2"
2020
},
2121
"require-dev": {

src/Controllers/ApiController.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
use SilverStripe\Control\HTTPResponse;
99
use SilverStripe\Control\HTTPResponse_Exception;
1010
use SilverStripe\Core\Config\Config;
11+
use SilverStripe\Core\Injector\Injector;
1112
use SilverStripe\ORM\PaginatedList;
1213
use SilverStripe\ORM\SS_List;
14+
use SilverStripe\Security\IdentityStore;
1315
use SilverStripe\Security\Member;
1416
use SilverStripe\Security\Permission;
1517
use SilverStripe\Security\Security;
@@ -238,7 +240,7 @@ public function ensureUserLoggedIn($permissionCodes = [])
238240
}
239241
}
240242

241-
$member->login();
243+
Injector::inst()->get(IdentityStore::class)->logIn($member);
242244

243245
Security::setCurrentUser($member);
244246

0 commit comments

Comments
 (0)