github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 13:06:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Remove Discourse.authenticationComplete

Browse Source
This commit is contained in:
Robin Ward
2020-08-19 11:22:21 -04:00
parent 20e1233f89
commit ebc0298ea0
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/app.js
View File

@ -18,12 +18,6 @@ const Discourse = Application.extend({
Resolver: buildResolver("discourse"),
authenticationComplete(options) {
// TODO, how to dispatch this to the controller without the container?
const loginController = this.__container__.lookup("controller:login");
return loginController.authenticationComplete(options);
},
_prepareInitializer(moduleName) {
const module = requirejs(moduleName, null, null, true);
if (!module) {

7
app/assets/javascripts/discourse/app/initializers/auth-complete.js
View File

@ -14,9 +14,10 @@ export default {
if (lastAuthResult) {
const router = container.lookup("router:main");
router.one("didTransition", () => {
next(() =>
Discourse.authenticationComplete(JSON.parse(lastAuthResult))
);
next(() => {
let loginController = container.lookup("controller:login");
loginController.authenticationComplete(JSON.parse(lastAuthResult));
});
});
}
}