Skip to content

Commit ac3ba0b

Browse files
RBoelterRBoelter
committed
legacy registration implemented (+ new settings option)
(cherry picked from commit 8b9ff97)
1 parent 8392dff commit ac3ba0b

6 files changed

Lines changed: 43 additions & 9 deletions

File tree

‎OpenIDPlugin.inc.php‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ public function callbackLoadHandler($hookName, $args)
102102
break;
103103
case 'login/index':
104104
case 'login/legacyLogin':
105-
case 'user/register':
106105
case 'login/signOut':
107-
$templateMgr->addStyleSheet('OpenIDPluginStyle', $request->getBaseUrl().'/'.$this->getPluginPath().'/css/style.css');
108-
$templateMgr->addJavaScript('OpenIDPluginScript', $request->getBaseUrl().'/'.$this->getPluginPath().'/js/scripts.js');
109-
$templateMgr->assign('openIDImageURL', $request->getBaseUrl().'/'.$this->getPluginPath().'/images/');
110-
define('HANDLER_CLASS', 'OpenIDLoginHandler');
111-
$args[2] = $this->getPluginPath().'/handler/OpenIDLoginHandler.inc.php';
106+
$this->_addScriptsAndHandler($templateMgr, $request, $args);
107+
break;
108+
case 'user/register':
109+
if(!$request->isPost()) {
110+
$this->_addScriptsAndHandler($templateMgr, $request, $args);
111+
}
112112
break;
113113
}
114114

@@ -183,5 +183,19 @@ public function manage($args, $request)
183183

184184
return parent::manage($args, $request);
185185
}
186+
187+
/**
188+
* @param $templateMgr
189+
* @param $request
190+
* @param $args
191+
*/
192+
private function _addScriptsAndHandler($templateMgr, $request, $args): void
193+
{
194+
$templateMgr->addStyleSheet('OpenIDPluginStyle', $request->getBaseUrl().'/'.$this->getPluginPath().'/css/style.css');
195+
$templateMgr->addJavaScript('OpenIDPluginScript', $request->getBaseUrl().'/'.$this->getPluginPath().'/js/scripts.js');
196+
$templateMgr->assign('openIDImageURL', $request->getBaseUrl().'/'.$this->getPluginPath().'/images/');
197+
define('HANDLER_CLASS', 'OpenIDLoginHandler');
198+
$args[2] = $this->getPluginPath().'/handler/OpenIDLoginHandler.inc.php';
199+
}
186200
}
187201

‎forms/OpenIDPluginSettingsForm.inc.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ function initData()
8181
'initProvider' => self::PUBLIC_OPENID_PROVIDER,
8282
'provider' => $provider,
8383
'legacyLogin' => key_exists('legacyLogin', $settings) ? $settings['legacyLogin'] : true,
84+
'legacyRegister' => key_exists('legacyRegister', $settings) ? $settings['legacyRegister'] : true,
8485
'disableConnect' => key_exists('disableConnect', $settings) ? $settings['disableConnect'] : false,
8586
'hashSecret' => $settings['hashSecret'],
8687
'generateAPIKey' => $settings['generateAPIKey'] ? $settings['generateAPIKey'] : 0,
@@ -91,6 +92,7 @@ function initData()
9192
$this->_data = array(
9293
'initProvider' => self::PUBLIC_OPENID_PROVIDER,
9394
'legacyLogin' => true,
95+
'legacyRegister' => false,
9496
'generateAPIKey' => false,
9597
);
9698
}
@@ -103,7 +105,7 @@ function initData()
103105
function readInputData()
104106
{
105107
$this->readUserVars(
106-
array('provider', 'legacyLogin', 'disableConnect', 'hashSecret', 'generateAPIKey', 'providerSync', 'disableFields')
108+
array('provider', 'legacyLogin', 'legacyRegister', 'disableConnect', 'hashSecret', 'generateAPIKey', 'providerSync', 'disableFields')
107109
);
108110
parent::readInputData();
109111
}
@@ -143,6 +145,7 @@ function execute(...$functionArgs)
143145
$settings = array(
144146
'provider' => $providerListResult,
145147
'legacyLogin' => $this->getData('legacyLogin'),
148+
'legacyRegister' => $this->getData('legacyRegister'),
146149
'disableConnect' => $this->getData('disableConnect'),
147150
'hashSecret' => $this->getData('hashSecret'),
148151
'generateAPIKey' => $this->getData('generateAPIKey'),

‎handler/OpenIDLoginHandler.inc.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,13 @@ function index($args, $request)
5656
if ($settingsJson != null) {
5757
$settings = json_decode($settingsJson, true);
5858
$legacyLogin = key_exists('legacyLogin', $settings) && isset($settings['legacyLogin']) ? $settings['legacyLogin'] : false;
59+
$legacyRegister = key_exists('legacyRegister', $settings) && isset($settings['legacyRegister']) ? $settings['legacyRegister'] : false;
5960
$providerList = key_exists('provider', $settings) ? $settings['provider'] : null;
6061
if (isset($providerList)) {
6162
foreach ($providerList as $name => $settings) {
6263
if (key_exists('authUrl', $settings) && !empty($settings['authUrl'])
6364
&& key_exists('clientId', $settings) && !empty($settings['clientId'])) {
64-
if (sizeof($providerList) == 1 && !$legacyLogin) {
65+
if (sizeof($providerList) == 1 && !$legacyLogin && !$legacyRegister) {
6566
$request->redirectUrl(
6667
$settings['authUrl'].
6768
'?client_id='.$settings['clientId'].
@@ -92,6 +93,9 @@ function index($args, $request)
9293
}
9394
}
9495
}
96+
if ($legacyRegister) {
97+
$linkList['legacyRegister'] = $router->url($request, null, "user", "registerUser");
98+
}
9599
}
96100
if (isset($linkList) && is_array($linkList) && sizeof($linkList) > 0) {
97101
$templateMgr->assign('linkList', $linkList);

‎images/legacyRegister-sign-in.png‎

808 Bytes
Loading

‎locale/en_US/locale.po‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,13 @@ msgid "plugins.generic.openid.settings.legacyLogin.check"
159159
msgstr "Enable legacy login"
160160

161161
msgid "plugins.generic.openid.settings.legacyLogin.desc"
162-
msgstr "Enable this option if you want users to be able to register and login with the application's login form in addition to the OpenID logon."
162+
msgstr "Enable this option if you want users to be able to login with the application's login form in addition to the OpenID logon."
163+
164+
msgid "plugins.generic.openid.settings.legacyRegister.check"
165+
msgstr "Enable legacy registration"
166+
167+
msgid "plugins.generic.openid.settings.legacyRegister.desc"
168+
msgstr "Enable this option if you want users to be able to register with the application's register form in addition to the OpenID logon."
163169

164170
msgid "plugins.generic.openid.settings.step2.connect"
165171
msgstr "Account Connection"
@@ -247,6 +253,9 @@ msgstr "Sign in with Microsoft"
247253
msgid "plugins.generic.openid.select.provider.apple"
248254
msgstr "Sign in with Apple"
249255

256+
msgid "plugins.generic.openid.select.provider.legacyRegister"
257+
msgstr "Register Account (without Oauth)"
258+
250259
# disabled fields info
251260
msgid "plugins.generic.openid.disables.fields.info"
252261
msgstr "Some information is provided by an authenticated account used to login and cannot be edited.<br /> The data will be synced whenever you log out and login again."

‎templates/settings.tpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@
121121
{fbvElement type="checkbox" id="legacyLogin" checked=$legacyLogin value=true label="plugins.generic.openid.settings.legacyLogin.check"}
122122
<label class="sub_label">{translate key="plugins.generic.openid.settings.legacyLogin.desc"}</label>
123123
{/fbvFormSection}
124+
{fbvFormSection list=true}
125+
{fbvElement type="checkbox" id="legacyRegister" checked=$legacyRegister value=true label="plugins.generic.openid.settings.legacyRegister.check"}
126+
<label class="sub_label">{translate key="plugins.generic.openid.settings.legacyRegister.desc"}</label>
127+
{/fbvFormSection}
124128
{fbvFormSection list=true}
125129
{fbvElement type="checkbox" id="disableConnect" checked=$disableConnect value=true label="plugins.generic.openid.settings.step2.connect.check"}
126130
<label class="sub_label">{translate key="plugins.generic.openid.settings.step2.connect.desc"}</label>

0 commit comments

Comments
 (0)