Subversion Repositories SmartDukaan

Rev

Rev 22533 | Rev 22927 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 22533 Rev 22860
Line 36... Line 36...
36
		REQUESTED_URI_PATTERNS.add("/fofo/");
36
		REQUESTED_URI_PATTERNS.add("/fofo/");
37
		REQUESTED_URI_PATTERNS.add("/fofo/-?[0-9]{1,10}/edit");
37
		REQUESTED_URI_PATTERNS.add("/fofo/-?[0-9]{1,10}/edit");
38
		REQUESTED_URI_PATTERNS.add("/fofo/-?[0-9]{1,10}/edit/");
38
		REQUESTED_URI_PATTERNS.add("/fofo/-?[0-9]{1,10}/edit/");
39
		REQUESTED_URI_PATTERNS.add("/fofo/-?[0-9]{1,10}/file-display");
39
		REQUESTED_URI_PATTERNS.add("/fofo/-?[0-9]{1,10}/file-display");
40
		REQUESTED_URI_PATTERNS.add("/fofo/-?[0-9]{1,10}/file-display/");
40
		REQUESTED_URI_PATTERNS.add("/fofo/-?[0-9]{1,10}/file-display/");
-
 
41
		REQUESTED_URI_PATTERNS.add("/adminDashboard");
41
	}
42
	}
42
	@Autowired
43
	@Autowired
43
	UserRepository userRepository;
44
	UserRepository userRepository;
44
	
45
	
45
	@Autowired
46
	@Autowired
Line 83... Line 84...
83
					};
84
					};
84
				})
85
				})
85
				// first condition end
86
				// first condition end
86
				&&
87
				&&
87
				// second condition start
88
				// second condition start
88
				fofoDetails.getRoleTypes().stream().anyMatch((new Predicate<RoleType>() {
-
 
89
					@Override
-
 
90
					public boolean test(RoleType roleType) {
-
 
91
						return roleType == RoleType.FOFO_ADMIN;
89
				fofoDetails.getRoleTypes().contains(RoleType.FOFO_ADMIN)
92
					};
-
 
93
				}))
-
 
94
				) 
90
				) 
95
				|| 
91
				|| 
96
				(REQUESTED_URI_PATTERNS.stream().noneMatch((new Predicate<String>() {
92
				(REQUESTED_URI_PATTERNS.stream().noneMatch((new Predicate<String>() {
97
					@Override
93
					@Override
98
					public boolean test(String regexUriPattern) {
94
					public boolean test(String regexUriPattern) {