Skip to content

Commit a88db43

Browse files
committed
refactoring of path names
1 parent 5d5e425 commit a88db43

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

models/basicauth/BasicAuthUserService.cfc renamed to models/auth/BasicAuthUserService.cfc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ component accessors="true" singleton {
7777
/**
7878
* New User dispenser
7979
*/
80-
BasicAuthUser function new() provider="BasicAuthUser@cbsecurity"{
80+
User function new() provider="User@cbsecurity"{
8181
}
8282

8383
/**
@@ -87,7 +87,7 @@ component accessors="true" singleton {
8787
*
8888
* @return The located user or a new un-loaded user object
8989
*/
90-
BasicAuthUser function retrieveUserById( required id ){
90+
User function retrieveUserById( required id ){
9191
var userRecord = variables.settings.basicAuth.users
9292
.filter( ( key, value ) => value.id == id )
9393
.reduce( ( results, key, value ) => value, {} );
@@ -101,7 +101,7 @@ component accessors="true" singleton {
101101
*
102102
* @return The valid user object representing the username or an empty user object
103103
*/
104-
BasicAuthUser function retrieveUserByUsername( required username ){
104+
User function retrieveUserByUsername( required username ){
105105
return populator.populateFromStruct(
106106
new (),
107107
variables.settings.basicAuth.users.keyExists( arguments.username ) ? variables.settings.basicAuth.users[

models/basicauth/BasicAuthUser.cfc renamed to models/auth/User.cfc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ component accessors="true" {
6363
variables.lastName = "";
6464
variables.username = "";
6565
variables.password = "";
66-
6766
variables.permissions = [];
6867
variables.roles = [];
6968

@@ -75,7 +74,7 @@ component accessors="true" {
7574
*
7675
* @roles array or list of roles
7776
*/
78-
BasicAuthUser function setRoles( roles ){
77+
User function setRoles( roles ){
7978
if ( isSimpleValue( arguments.roles ) ) {
8079
arguments.roles = listToArray( arguments.roles );
8180
}
@@ -88,7 +87,7 @@ component accessors="true" {
8887
*
8988
* @permissions array or list of permissions
9089
*/
91-
BasicAuthUser function setPermissions( permissions ){
90+
User function setPermissions( permissions ){
9291
if ( isSimpleValue( arguments.permissions ) ) {
9392
arguments.permissions = listToArray( arguments.permissions );
9493
}

0 commit comments

Comments
 (0)