| |
@@ -129,7 +129,7 @@ |
| 129 |
129 |
|
mLastUserXrefRestrictedResource = null; |
| 130 |
130 |
|
} |
| 131 |
131 |
|
|
| 132 |
|
- |
public UserRestrictedResourcePair<User, RestrictedResource> loginToRestrictedResourceIfAcceptable( RestrictedResource pRestrictedResource ) { |
| |
132 |
+ |
public UserRestrictedResourcePair loginToRestrictedResourceIfAcceptable( RestrictedResource pRestrictedResource ) { |
| 133 |
133 |
|
Confirm.isNotNull( "RestrictedResource", pRestrictedResource ); |
| 134 |
134 |
|
Object o = attemptRestrictedResourceLink( pRestrictedResource ); |
| 135 |
135 |
|
if ( o instanceof UserRestrictedResourcePair ) { |
| |
@@ -138,7 +138,7 @@ |
| 138 |
138 |
|
throw new DisplayableRuntimeException( "RestrictedResource Not Authorized" ); |
| 139 |
139 |
|
} |
| 140 |
140 |
|
|
| 141 |
|
- |
public UserRestrictedResourcePair<User, RestrictedResource> getLoginRestrictedResource( RestrictedResource pCurrentRestrictedResource ) { |
| |
141 |
+ |
public UserRestrictedResourcePair getLoginRestrictedResource( RestrictedResource pCurrentRestrictedResource ) { |
| 142 |
142 |
|
Object o = attemptRestrictedResourceLink( pCurrentRestrictedResource ); |
| 143 |
143 |
|
if ( o instanceof UserRestrictedResourcePair ) { |
| 144 |
144 |
|
return Cast.it( o ); |
| |
@@ -148,14 +148,14 @@ |
| 148 |
148 |
|
if ( zLastRestrictedResource != null ) { |
| 149 |
149 |
|
for ( RestrictedResource zRestrictedResource : zAuthorizedRestrictedResources ) { |
| 150 |
150 |
|
if ( zRestrictedResource.equals( zLastRestrictedResource ) ) { |
| 151 |
|
- |
return new UserRestrictedResourcePair<User, RestrictedResource>( this, zLastRestrictedResource ); |
| |
151 |
+ |
return new UserRestrictedResourcePair( this, zLastRestrictedResource ); |
| 152 |
152 |
|
} |
| 153 |
153 |
|
} |
| 154 |
154 |
|
} |
| 155 |
155 |
|
if ( zAuthorizedRestrictedResources.isEmpty() ) { |
| 156 |
156 |
|
throw new DisplayableRuntimeException( "NoAuthorizedRestrictedResources" ); |
| 157 |
157 |
|
} |
| 158 |
|
- |
return new UserRestrictedResourcePair<User, RestrictedResource>( this, zAuthorizedRestrictedResources.get( 0 ) ); |
| |
158 |
+ |
return new UserRestrictedResourcePair( this, zAuthorizedRestrictedResources.get( 0 ) ); |
| 159 |
159 |
|
} |
| 160 |
160 |
|
|
| 161 |
161 |
|
private Object attemptRestrictedResourceLink( RestrictedResource pRestrictedResource ) { |
| |
@@ -164,7 +164,7 @@ |
| 164 |
164 |
|
if ( zUserXrefRestrictedResource.isLoginAllowed() ) { |
| 165 |
165 |
|
RestrictedResource zRestrictedResource = zUserXrefRestrictedResource.getRestrictedResource(); |
| 166 |
166 |
|
if ( zRestrictedResource.equals( pRestrictedResource ) ) { |
| 167 |
|
- |
return new UserRestrictedResourcePair<User, RestrictedResource>( this, pRestrictedResource ); |
| |
167 |
+ |
return new UserRestrictedResourcePair( this, pRestrictedResource ); |
| 168 |
168 |
|
} |
| 169 |
169 |
|
zAuthorizedRestrictedResources.add( zRestrictedResource ); |
| 170 |
170 |
|
} |
| |
@@ -178,7 +178,7 @@ |
| 178 |
178 |
|
RestrictedResource zRestrictedResource = pRestrictedResource.copyInto( zTransaction ); |
| 179 |
179 |
|
new UserXrefRestrictedResource( zTransaction, zUser, zRestrictedResource ).setVisible( false ); |
| 180 |
180 |
|
zTransaction.commit(); |
| 181 |
|
- |
return new UserRestrictedResourcePair<User, RestrictedResource>( zUser, zRestrictedResource ); |
| |
181 |
+ |
return new UserRestrictedResourcePair( zUser, zRestrictedResource ); |
| 182 |
182 |
|
} |
| 183 |
183 |
|
if ( zAuthorizedRestrictedResources.isEmpty() ) { |
| 184 |
184 |
|
throw new DisplayableRuntimeException( "NoAuthorizedRestrictedResources" ); |
| |
@@ -186,6 +186,7 @@ |
| 186 |
186 |
|
return zAuthorizedRestrictedResources; |
| 187 |
187 |
|
} |
| 188 |
188 |
|
|
| |
189 |
+ |
@Override |
| 189 |
190 |
|
public String acceptablePassword( String pPassword ) { |
| 190 |
191 |
|
if ( !isDemo() ) { |
| 191 |
192 |
|
if ( pPassword.length() < 8 ) { |
| |
@@ -198,6 +199,7 @@ |
| 198 |
199 |
|
return null; |
| 199 |
200 |
|
} |
| 200 |
201 |
|
|
| |
202 |
+ |
@Override |
| 201 |
203 |
|
public boolean validatePassword( String pPassword ) { |
| 202 |
204 |
|
return isDemo() || ConstrainTo.notNull( pPassword ).trim().equals( getPassword() ); |
| 203 |
205 |
|
} |
| |
@@ -213,6 +215,7 @@ |
| 213 |
215 |
|
return zOptions.toArray( new RestrictedResource[zOptions.size()] ); |
| 214 |
216 |
|
} |
| 215 |
217 |
|
|
| |
218 |
+ |
@Override |
| 216 |
219 |
|
public boolean canAccessAllRestrictedResources() { |
| 217 |
220 |
|
return Booleans.isAnyTrue( getRestrictedResourceManage(), getSuperAdmin(), getHelpDeskMember() ); |
| 218 |
221 |
|
} |
View this file contents
View the full history
Commits for