Skip to content
This repository was archived by the owner on Oct 13, 2019. It is now read-only.

Commit f67338a

Browse files
author
Fabian Wüthrich
committed
Redirect to login page when login modal is opened
1 parent 6031f2e commit f67338a

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

js/forum/dist/extension.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,35 @@
1-
System.register("wuethrich44/sso/main", ["flarum/extend", "flarum/app", "flarum/components/HeaderSecondary", "flarum/components/SettingsPage"], function (_export) {
1+
System.register("wuethrich44/sso/main", ["flarum/extend", "flarum/app", "flarum/components/HeaderSecondary", "flarum/components/SettingsPage", "flarum/components/LogInModal"], function (_export) {
22
"use strict";
33

4-
var extend, app, HeaderSecondary, SettingsPage;
4+
var extend, override, app, HeaderSecondary, SettingsPage, LogInModal;
55
return {
66
setters: [function (_flarumExtend) {
77
extend = _flarumExtend.extend;
8+
override = _flarumExtend.override;
89
}, function (_flarumApp) {
910
app = _flarumApp["default"];
1011
}, function (_flarumComponentsHeaderSecondary) {
1112
HeaderSecondary = _flarumComponentsHeaderSecondary["default"];
1213
}, function (_flarumComponentsSettingsPage) {
1314
SettingsPage = _flarumComponentsSettingsPage["default"];
15+
}, function (_flarumComponentsLogInModal) {
16+
LogInModal = _flarumComponentsLogInModal["default"];
1417
}],
1518
execute: function () {
1619

1720
app.initializers.add('wuethrich44-sso', function () {
21+
override(LogInModal.prototype, 'init', redirectWhenLoginModalIsOpened);
22+
1823
extend(HeaderSecondary.prototype, 'items', replaceLoginButton);
1924
extend(HeaderSecondary.prototype, 'items', replaceSignupButton);
2025

2126
extend(SettingsPage.prototype, 'accountItems', removeProfileActions);
2227

28+
function redirectWhenLoginModalIsOpened() {
29+
window.location.href = app.forum.data.attributes['wuethrich44-sso.login_url'];
30+
throw new Error('Stop execution');
31+
}
32+
2333
function replaceLoginButton(items) {
2434
if (!items.has('logIn')) {
2535
return;

js/forum/src/main.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
1-
import {extend} from "flarum/extend";
1+
import {extend, override} from "flarum/extend";
22
import app from "flarum/app";
33
import HeaderSecondary from "flarum/components/HeaderSecondary";
44
import SettingsPage from "flarum/components/SettingsPage";
5+
import LogInModal from "flarum/components/LogInModal";
56

67
app.initializers.add('wuethrich44-sso', function () {
8+
override(LogInModal.prototype, 'init', redirectWhenLoginModalIsOpened);
9+
710
extend(HeaderSecondary.prototype, 'items', replaceLoginButton);
811
extend(HeaderSecondary.prototype, 'items', replaceSignupButton);
912

1013
extend(SettingsPage.prototype, 'accountItems', removeProfileActions);
1114

15+
function redirectWhenLoginModalIsOpened() {
16+
window.location.href = app.forum.data.attributes['wuethrich44-sso.login_url'];
17+
throw new Error('Stop execution');
18+
}
19+
1220
function replaceLoginButton(items) {
1321
if (!items.has('logIn')) {
1422
return;

0 commit comments

Comments
 (0)