Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP migration to CI4 #1273

Merged
merged 288 commits into from
Nov 28, 2018
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
288 commits
Select commit Hold shift + click to select a range
1040e17
Update Installing.md
Oct 3, 2018
c479ec8
Fix login
Oct 3, 2018
3a22462
Update userguide
Oct 3, 2018
2e7a299
Fix somes bugs
Oct 3, 2018
eb1221c
Modify loading config file
Oct 3, 2018
7b5f71b
FIXs
Oct 3, 2018
b042943
WIP migration
Oct 3, 2018
9148607
WIP README.md
Oct 3, 2018
387c919
Change way order to install
Oct 4, 2018
f6baec6
Fix typo
Oct 4, 2018
0a5b1ac
Change DB section
Oct 4, 2018
5a33378
Change languages files to new CI4 format
Oct 4, 2018
999d798
Change sub-languages directory names to follow ISO 639-1 conventions.
Oct 4, 2018
72509bf
Set config file namespace to IonAuth\Config
Oct 5, 2018
f5a0fff
Fix bug with email use
Oct 5, 2018
969d294
Fix login redirection
Oct 7, 2018
4e733bc
Rename config varaiables in lowerCamelCase
Oct 7, 2018
1cb38d2
Code format to CI 4 styles
Oct 7, 2018
02ec38d
Replace TRUE/FALSE by true/false
Oct 7, 2018
2fb87f6
Fix logout
Oct 7, 2018
4023ad5
fixed ukrainian translation
wadealer Oct 8, 2018
d8b088a
Merge pull request #1274 from wadealer/3
benedmunds Oct 8, 2018
666053c
fixed ukrainian translation
Oct 8, 2018
dc60794
Code review
Oct 8, 2018
b70d0d1
Fix forgot password
Oct 12, 2018
6214bd2
Fix TSQL syntax for UNIQUE constraint that can be NULL
Indigo744 Oct 13, 2018
8a4bcd1
Fix Code style
Oct 13, 2018
84e347f
Create .prettyci.composer.json
Oct 13, 2018
d62c920
Create phpcs.xml
Oct 13, 2018
c1b8475
Add library test class
Oct 13, 2018
ad96ef1
Create .gitignore file based on CodeIgniter4 one
Oct 13, 2018
a601868
Update .editorconfig file with trim_trailing_whitespace = true
Oct 13, 2018
949d0b3
Remove unused code
Oct 13, 2018
db8ad57
Merge pull request #1276 from Indigo744/3
benedmunds Oct 13, 2018
ebf4ac8
Merge #1276 Fix TSQL syntax for UNIQUE constraint that can be NULL
Oct 14, 2018
4005b3a
Fix phpcs errors
Oct 14, 2018
cbbaddd
Fix errors displays
Oct 14, 2018
3a9b4fb
ADD test presence of post data
Oct 14, 2018
b2d279a
Fix Auth::deactivate
Oct 14, 2018
27fb845
Fix edit_user label
Oct 14, 2018
244ad13
Change FALSE to false
Oct 15, 2018
d06257d
Fix language wit setError()
Oct 15, 2018
fa032ee
Add some explanation for activation_code
Indigo744 Oct 15, 2018
f196efb
Remove forgotten_password_code member no longer used
Indigo744 Oct 15, 2018
8496842
Split activate into two functions (check and activate)
Indigo744 Oct 15, 2018
7a07148
Fix some codesniffer warnings
Oct 15, 2018
edf6940
Change errors and messages delimiters to CI templates
Oct 16, 2018
0f89f69
Remove old comment
Oct 16, 2018
a36a8ec
Fix language translation
Oct 16, 2018
d11e4c1
Fix errors()
Oct 16, 2018
3c6247d
Fix file doc
Oct 16, 2018
a568b77
Fix activate & deactivate function
Oct 16, 2018
b2db798
fix languages errors
Oct 16, 2018
8d8cd4f
Minors fixes in Auth->edit_user
Oct 16, 2018
edfbd27
Minors changes in Auth->index()
Oct 16, 2018
4b1cccd
Add message in Auth->deactivate()
Oct 16, 2018
c96e910
Define get_user_by_activation_code()
Indigo744 Oct 16, 2018
77c5ca1
Change errors and messages functions
Oct 17, 2018
a9789e7
Merge pull request #1277 from Indigo744/indigo_activation_comment
benedmunds Oct 18, 2018
ce77616
Up create/register user
Oct 18, 2018
8c7510a
Merge branch '3' into 4
Oct 18, 2018
f060a7e
Remove phpcs.xml
Oct 18, 2018
f8bf2e2
Add squizlabs/php_codesniffer
Oct 18, 2018
745354f
Fix somes errors messages
Oct 18, 2018
01d7ecf
Fix forgottenPassword send CI email
Oct 18, 2018
60c6e8b
Fix reset password
Oct 18, 2018
4d55b65
getLastAttemptTime
Oct 18, 2018
3f06a68
users
Oct 18, 2018
5178e5b
create, update, delete group
Oct 18, 2018
25993ff
_filterData
Oct 18, 2018
fa108cf
_randomToken
Oct 18, 2018
e466769
clearForgottenPasswordCode
Oct 18, 2018
bd54395
clearRememberCode
Oct 18, 2018
4f86613
Add library test
Oct 24, 2018
a40f232
Add doc comment
Oct 24, 2018
f096fbe
Remove unused properties (#1230) : status, new_password
Oct 24, 2018
3e39859
Remove unused properties (#1230) : $_extra_set
Oct 24, 2018
8d5cae4
Rename public _renderPage() to protected renderPage()
Oct 26, 2018
4add44a
Fix updateGroup
Oct 26, 2018
49089ae
ReAdd $returnHtml in renderPage()
Oct 26, 2018
5d81fe7
Remove test conflicting with défault test config
Oct 27, 2018
cb9333d
Move namespace declaration to second line
Oct 27, 2018
97a9045
typo
benedmunds Oct 27, 2018
0a3ce18
Typo
benedmunds Oct 27, 2018
2f73fd8
Remove unused $_extra_where member
Oct 27, 2018
1fe0938
Set proper visibility instead of using the old CI underscore format f…
benedmunds Oct 27, 2018
577a349
Set proper visibility instead of using the old CI underscore format f…
benedmunds Oct 27, 2018
21a0223
Remove extra space
benedmunds Oct 27, 2018
5de2480
add typehint
benedmunds Oct 27, 2018
729a6ac
Fix
benedmunds Oct 27, 2018
1c8f450
Set proper visibility and camelCase
benedmunds Oct 27, 2018
c09808a
Set proper visibility and camelCase
benedmunds Oct 27, 2018
1c0bf0e
Set proper visibility and camelCase
benedmunds Oct 27, 2018
465fe76
Set proper visibility and camelCase
benedmunds Oct 27, 2018
366b89c
Set proper visibility and camelCase
benedmunds Oct 27, 2018
6453427
Set proper visibility and camelCase
benedmunds Oct 27, 2018
9c82bb2
Set proper visibility and camelCase
benedmunds Oct 27, 2018
a4cddb9
Set proper visibility and camelCase
benedmunds Oct 27, 2018
6023e32
Typo
benedmunds Oct 27, 2018
a0fd725
Typo
benedmunds Oct 27, 2018
8b67876
Set proper visibility and remove underscore
benedmunds Oct 27, 2018
a8d5bca
camelCase
benedmunds Oct 27, 2018
01b6f1c
camelCase
benedmunds Oct 27, 2018
1f3bed7
camelCase
benedmunds Oct 27, 2018
f4a6422
Typehint
benedmunds Oct 27, 2018
6a2cc96
Typehint
benedmunds Oct 27, 2018
a0f0d8b
Typehint
benedmunds Oct 27, 2018
026b5c4
Typehint
benedmunds Oct 27, 2018
fae2a51
Typehint
benedmunds Oct 27, 2018
f613bc6
Typehint
benedmunds Oct 27, 2018
976a74b
Typehint
benedmunds Oct 27, 2018
b9cf2f1
Return typehint
benedmunds Oct 27, 2018
0097208
Typehint
benedmunds Oct 27, 2018
6425464
Typehint
benedmunds Oct 27, 2018
9baa23b
Typehint
benedmunds Oct 27, 2018
2bb7759
camelCase
benedmunds Oct 27, 2018
72793a8
typehint
benedmunds Oct 27, 2018
fe43496
camelCase
benedmunds Oct 27, 2018
dba019f
camelCase
benedmunds Oct 27, 2018
6af4707
camelCase
benedmunds Oct 27, 2018
4be19a6
camelCase
benedmunds Oct 27, 2018
240ccb5
camelCase
benedmunds Oct 27, 2018
28dc83c
camelCase
benedmunds Oct 27, 2018
99b1503
camelCase
benedmunds Oct 27, 2018
803a686
camelCase
benedmunds Oct 27, 2018
c3d3015
camelCase
benedmunds Oct 27, 2018
28f7cbd
camelCase
benedmunds Oct 27, 2018
a3fc1fd
camelCase
benedmunds Oct 27, 2018
bb242e3
camelCase
benedmunds Oct 27, 2018
f31a617
camelCase
benedmunds Oct 27, 2018
5583235
camelCase
benedmunds Oct 27, 2018
3c0435a
camelCase
benedmunds Oct 27, 2018
ecae672
camelCase
benedmunds Oct 27, 2018
1499feb
camelCase
benedmunds Oct 27, 2018
32679a8
camelCase
benedmunds Oct 27, 2018
7d5443a
camelCase
benedmunds Oct 27, 2018
987bbf2
camelCase
benedmunds Oct 27, 2018
5dde453
camelCase
benedmunds Oct 27, 2018
fb531cf
camelCase
benedmunds Oct 27, 2018
e07360a
camelCase
benedmunds Oct 27, 2018
61e1d91
camelCase
benedmunds Oct 27, 2018
93ad41c
camelCase
benedmunds Oct 27, 2018
ac5f524
typehint return
benedmunds Oct 27, 2018
4e61e2e
typehint return
benedmunds Oct 27, 2018
7c8ed8b
return typehint
benedmunds Oct 27, 2018
98e251b
camelCase + typehint
benedmunds Oct 27, 2018
ef6fbeb
camelCase
benedmunds Oct 27, 2018
7d67208
camelCase
benedmunds Oct 27, 2018
79204fc
typehint return
benedmunds Oct 27, 2018
e576fcb
return type hint
benedmunds Oct 27, 2018
75d9362
Typehint
benedmunds Oct 27, 2018
6164963
Return type hint
benedmunds Oct 27, 2018
cfcb289
Typehint
benedmunds Oct 27, 2018
cc9aa12
Typehint
benedmunds Oct 27, 2018
bef2b2d
Typehint
benedmunds Oct 27, 2018
d1b4551
Typehint
benedmunds Oct 27, 2018
48ce67c
Typehint
benedmunds Oct 27, 2018
5b8b44e
Typehint
benedmunds Oct 27, 2018
aa7f9f0
use this->session instead since it's available
benedmunds Oct 27, 2018
f88a41a
use this->session instead since it's available
benedmunds Oct 27, 2018
53fe747
Set this->session here so we can use it elsewhere, should allow easie…
benedmunds Oct 27, 2018
79ad08a
camelCase
benedmunds Oct 27, 2018
76a0498
camelCase
benedmunds Oct 27, 2018
079f81b
camelCase
benedmunds Oct 27, 2018
a124c5f
camelCase
benedmunds Oct 27, 2018
8efd89d
camelCase
benedmunds Oct 27, 2018
4963d19
Use null coalescing operator
benedmunds Oct 27, 2018
e2e036e
Remove typehint due to mixed
benedmunds Oct 27, 2018
d7720cc
Remove typehint due to mixed
benedmunds Oct 27, 2018
aef9e71
Typehint
benedmunds Oct 27, 2018
a24b9a8
Typehint
benedmunds Oct 27, 2018
edf7156
Typehint
benedmunds Oct 27, 2018
7482832
setHook return self
benedmunds Oct 27, 2018
3959426
camelCase
benedmunds Oct 27, 2018
1684a89
camelCase
benedmunds Oct 27, 2018
4e38580
camelCase
benedmunds Oct 27, 2018
10eb3db
camelCase
benedmunds Oct 27, 2018
97682c8
Rename all _cacheUserInGroup to cacheUserInGroup
Oct 27, 2018
5568b53
remove unused cacheUserInGroup member
Oct 27, 2018
68e2f0a
rename identity_column to identityColumn
Oct 27, 2018
b8b9dcc
Rename group_id to groupId
Oct 27, 2018
37af244
Fix increaseLoginAttempts
Oct 27, 2018
7fccbd5
Fix Auth:edit_user() for first_name and/or last_name empty
Oct 27, 2018
39c80d7
code style review
Oct 27, 2018
1c70cba
camelCase members
Oct 27, 2018
d0cdd91
camelCase
Oct 28, 2018
4415f26
Change addToGroup() and removeFromGroup()
Oct 28, 2018
328f4ff
Remove __get()
Oct 28, 2018
de0baa3
Remove version_compare(PHP_VERSION, '7.0.0') >= 0 as the min version …
Oct 28, 2018
5995131
Change doc comment
Oct 28, 2018
8ba51bf
camelCase
Oct 28, 2018
2aa5522
Rename _randomToken() to randomToken()
Oct 28, 2018
116bc98
Drop support for mcrypt and openssl
Oct 28, 2018
fc5b307
Fix codesniffer errors
Oct 28, 2018
f4edec0
Fix activate() function
Oct 28, 2018
a3ff662
Remove unused languages strings
Oct 28, 2018
3a537ca
Remove pirate language
Oct 28, 2018
126aa59
improved Auth:deactivate()
Oct 28, 2018
883ae29
improved Auth:edit_user()
Oct 29, 2018
a3ff264
improved IonAuth library
Oct 29, 2018
5b5fe73
improved forgottenPassword()
Oct 29, 2018
e9fdf9d
improved IonAuth library
Oct 29, 2018
0a1355e
Add phpdoc
Oct 29, 2018
c138ec4
rename activation_code to activationCode
Oct 29, 2018
2e84669
Change NULL to null
Oct 29, 2018
e478079
Fix codesniffer errors
Oct 29, 2018
5d5ea45
Add typehint to hashPassword
Oct 29, 2018
18a5333
Add typehint to verifyPassword
Oct 29, 2018
e713ad3
improved rehashPasswordIfNeededdeactivate()
Oct 29, 2018
5339025
Fix getUserByActivationCode
Oct 29, 2018
8f5d438
improved deactivate() and generateSelectorValidatorCouple()
Oct 29, 2018
d6d40d1
Remove _passwordVerifySha1Legacy() function
Oct 29, 2018
0bbe01b
Rename IonAuthModel:_retrieveSelectorValidatorCouple to retrieveSelec…
Oct 29, 2018
9a52f61
Rename _getHashAlgo to getHashAlgo
Oct 29, 2018
a426f96
rename _getHashParameters to getHashParameters
Oct 29, 2018
6d87160
Fix codesniffer errors
Oct 29, 2018
610c47d
Rename _setPasswordDb to setPasswordDb and improved it
Oct 29, 2018
243c2a4
Fix codeSniffer errors
Oct 29, 2018
027e443
Rename all occurence of _ion_hooks to ionHooks
Oct 29, 2018
745d3cb
Improved callHook
Oct 29, 2018
280877c
removeHooks
Oct 29, 2018
cb110cf
removeHook
Oct 29, 2018
0d35ce3
setHook
Oct 29, 2018
65941c7
deleteGroup
Oct 29, 2018
7345dd0
updateGroup
Oct 29, 2018
dd64518
codesniffer + typehint
Oct 29, 2018
1a9f00c
Add typehint to deleteUser
Oct 29, 2018
a763451
Add typeHint to update
Oct 29, 2018
763eebb
Add typeHint to group
Oct 29, 2018
582204c
Change session uses
Oct 29, 2018
beaf167
Add testLogin()
Oct 29, 2018
fcea426
fix code sniffer
Oct 29, 2018
f5bbb1a
Improved inGroup
Oct 29, 2018
ff0a7fb
getUsersGroups
Oct 29, 2018
6c16af1
Imporoved user()
Oct 29, 2018
aa8dd03
fix code sniffer errors
Oct 29, 2018
e348633
add typehint
Oct 29, 2018
e584b53
fix rowArray()
Oct 29, 2018
97e52d7
Add phpDoc to row()
Oct 29, 2018
8984a86
fix code sniffer errors
Oct 29, 2018
ad4d783
fix code sniffer errors
Oct 29, 2018
dd15e7c
fix create_group()
Oct 29, 2018
f5031e1
fix some codesniffer errors
Oct 29, 2018
b793789
update documentation
Oct 29, 2018
1aa8e46
Add codeigniter4/framework to composer.json
Oct 29, 2018
d7cd116
fix install with git
Nov 12, 2018
04004ad
rename migration file name to Timestamp format
Nov 12, 2018
62240e2
update install db doc
Nov 12, 2018
2977002
change input type to email
Nov 14, 2018
9d6d8bf
improve getUserIdFromIdentity
Nov 19, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Ion Auth Changelog
===================================

## xx Octobre 2018 - Ion Auth 4

- **General:**
- Migration from CodeIgniter 3 to CodeIgniter 4
- **New server requirements:**
- Drop CodeIgniter 3 support
- Drop PHP < 7.1 support

## xx March 2018 - Ion Auth 3

- **General:**
Expand Down
90 changes: 48 additions & 42 deletions Config/IonAuth.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace IonAuth\Config;
<?php namespace Config;
bvrignaud marked this conversation as resolved.
Show resolved Hide resolved

/**
* Name: Ion Auth
Expand All @@ -22,41 +22,47 @@
* @filesource
*/

/**
* Configuration file for Ion Auth
*
* @package CodeIgniter-Ion-Auth
*/
class IonAuth extends \CodeIgniter\Config\BaseConfig
{

/*
| -------------------------------------------------------------------------
| Database group name option.
| -------------------------------------------------------------------------
| Allows to select a specific group for the database connection
|
| Default is empty: uses default group defined in CI's configuration
| (see application/config/database.php, $active_group variable)
/**
* Database group name option.
* -------------------------------------------------------------------------
* Allows to select a specific group for the database connection
*
* Default is empty: uses default group defined in CI's configuration
* (see application/config/database.php, $active_group variable)
*
* @var string
*/
public $database_group_name = '';
public $databaseGroupName = '';

/*
| -------------------------------------------------------------------------
| Tables.
| -------------------------------------------------------------------------
| Database table names.
/**
* Tables (Database table names)
*
* @var array
*/
public $tables = [
'users' => 'users',
'groups' => 'groups',
'users_groups' => 'users_groups',
'users' => 'users',
'groups' => 'groups',
'users_groups' => 'users_groups',
'login_attempts' => 'login_attempts',
];

/*
| Users table column and Group table column you want to join WITH.
|
| Joins from users.id
| Joins from groups.id
/**
* Users table column and Group table column you want to join WITH.
* Joins from users.id
* Joins from groups.id
*
* @var array
*/
public $join = [
'users' => 'user_id',
'users' => 'user_id',
'groups' => 'group_id',
];

Expand Down Expand Up @@ -163,13 +169,13 @@ class IonAuth extends \CodeIgniter\Config\BaseConfig
Leave 0 if you don't want session recheck. if you really think you need to recheck the session against database, we would
recommend a higher value, as this would affect performance */

/*
| -------------------------------------------------------------------------
| Cookie options.
| -------------------------------------------------------------------------
| remember_cookie_name Default: remember_code
/**
* Cookie options.
* rememberCookieName Default: remember_code
*
* @var string
*/
public $remember_cookie_name = 'remember_code';
public $rememberCookieName = 'remember_code';

/*
| -------------------------------------------------------------------------
Expand All @@ -184,14 +190,14 @@ class IonAuth extends \CodeIgniter\Config\BaseConfig
'mailtype' => 'html',
];

/*
| -------------------------------------------------------------------------
| Email templates.
| -------------------------------------------------------------------------
| Folder where email templates are stored.
| Default: auth/
/**
* Email templates.
* Folder where email templates are stored.
* Default: auth/
*
* @var string
*/
public $email_templates = 'auth/email/';
public $emailTemplates = 'auth/email/';

/*
| -------------------------------------------------------------------------
Expand All @@ -214,10 +220,10 @@ class IonAuth extends \CodeIgniter\Config\BaseConfig
| Message Delimiters.
| -------------------------------------------------------------------------
*/
public $delimiters_source = 'config'; // "config" = use the settings defined here, "form_validation" = use the settings defined in CI's form validation library
public $message_start_delimiter = '<p>'; // Message start delimiter
public $message_end_delimiter = '</p>'; // Message end delimiter
public $error_start_delimiter = '<p>'; // Error message start delimiter
public $error_end_delimiter = '</p>'; // Error message end delimiter
public $delimitersSource = 'config'; // "config" = use the settings defined here, "form_validation" = use the settings defined in CI's form validation library
public $messageStartDelimiter = '<p>'; // Message start delimiter
public $messageEndDelimiter = '</p>'; // Message end delimiter
public $errorStartDelimiter = '<p>'; // Error message start delimiter
public $errorEndDelimiter = '</p>'; // Error message end delimiter

}
Loading