Commit @d1eda8db7256f67f2a9d78571576f8e5c57b895e

d1eda8d

app/actions/GuestProhibitAction.java (added)

+++ app/actions/GuestProhibitAction.java

...	...	@@ -0,0 +1,41 @@
	1	+/**
	2	+ * Yona, 21st Century Project Hosting SW
	3	+ * <p>
	4	+ * Copyright Yona & Yobi Authors & NAVER Corp.
	5	+ * https://yona.io
	6	+ **/
	7	+package actions;
	8	+
	9	+import controllers.UserApp;
	10	+import controllers.annotation.GuestProhibit;
	11	+import controllers.routes;
	12	+import play.libs.F.Promise;
	13	+import play.mvc.Action;
	14	+import play.mvc.Http.Context;
	15	+import play.mvc.Result;
	16	+import utils.AccessControl;
	17	+import utils.AccessLogger;
	18	+import utils.Constants;
	19	+
	20	+/**
	21	+ * After execute {@link AbstractProjectCheckAction},
	22	+ * If current user is anonymous, redirect to the login page.
	23	+ *
	24	+ * @author Wansoon Park, Keesun Beak
	25	+ *
	26	+ */
	27	+public class GuestProhibitAction extends Action<GuestProhibit> {
	28	+
	29	+ @Override
	30	+ public Promise<Result> call(Context context) throws Throwable {
	31	+ if (UserApp.currentUser().isGuest) {
	32	+ if (configuration.displaysFlashMessage()) {
	33	+ play.mvc.Controller.flash(Constants.WARNING, "error.forbidden.or.not.allowed");
	34	+ }
	35	+ Promise<Result> promise = Promise.pure(redirect(routes.Application.index()));
	36	+ AccessLogger.log(context.request(), promise, null);
	37	+ return promise;
	38	+ }
	39	+ return delegate.call(context);
	40	+ }
	41	+}

7da14ba

d1eda8d

app/controllers/OrganizationApp.java

--- app/controllers/OrganizationApp.java

+++ app/controllers/OrganizationApp.java


 import com.avaje.ebean.ExpressionList;
 import com.avaje.ebean.Page;
 import controllers.annotation.AnonymousCheck;
+import controllers.annotation.GuestProhibit;
 import models.*;
 import models.enumeration.Operation;
 import models.enumeration.RequestState;

      * @throws Exception
      */
     @AnonymousCheck(requiresLogin = true, displaysFlashMessage = true)
+    @GuestProhibit
     public static Result newOrganization() throws Exception {
         Form<Organization> newOrgForm = form(Organization.class).bindFromRequest();
         if (newOrgForm.hasErrors()) {

             return result;
         }
 
-        User user = User.findByLoginId(addMemberForm.get().loginId);
+        User targetUser = User.findByLoginId(addMemberForm.get().loginId);
         Organization organization = Organization.findByName(organizationName);
-        OrganizationUser.assignRole(user.id, organization.id, RoleType.ORG_MEMBER.roleType());
+        OrganizationUser.assignRole(targetUser.id, organization.id, RoleType.ORG_MEMBER.roleType());
         organization.cleanEnrolledUsers();
-        NotificationEvent.afterOrganizationMemberRequest(organization, user, RequestState.ACCEPT);
+        NotificationEvent.afterOrganizationMemberRequest(organization, targetUser, RequestState.ACCEPT);
 
         return redirect(routes.OrganizationApp.members(organizationName));
     }

 
         if (addMemberForm.hasErrors() || userToBeAdded.isAnonymous()) {
             flash(Constants.WARNING, "organization.member.unknownUser");
+            return redirect(routes.OrganizationApp.members(organizationName));
+        }
+
+        if (userToBeAdded.isGuest) {
+            flash(Constants.WARNING, "error.forbidden.to.guest.user");
             return redirect(routes.OrganizationApp.members(organizationName));
         }
 

         return new ValidationResult(okWithLocation(routes.OrganizationApp.organization(organization.name).url()), false);
     }
 
+    @GuestProhibit
     public static Result orgList(String query, int pageNum){
         if(Application.HIDE_PROJECT_LISTING){
             return forbidden(ErrorViews.Forbidden.render("error.auth.unauthorized.waringMessage"));

7da14ba

d1eda8d

app/controllers/ProjectApp.java

--- app/controllers/ProjectApp.java

+++ app/controllers/ProjectApp.java


 import com.avaje.ebean.*;
 
 import controllers.annotation.AnonymousCheck;
+import controllers.annotation.GuestProhibit;
 import controllers.annotation.IsAllowed;
 import info.schleichardt.play2.mailplugin.Mailer;
 import models.*;

      * @param pageNum the page num
      * @return
      */
+    @GuestProhibit
     public static Result projects(String query, int pageNum) {
         if(Application.HIDE_PROJECT_LISTING){
             return forbidden(ErrorViews.Forbidden.render("error.auth.unauthorized.waringMessage"));

d1eda8d

app/controllers/annotation/GuestProhibit.java (added)

+++ app/controllers/annotation/GuestProhibit.java

...	...	@@ -0,0 +1,22 @@
	1	+/**
	2	+ * Yona, 21st Century Project Hosting SW
	3	+ * <p>
	4	+ * Copyright Yona & Yobi Authors & NAVER Corp.
	5	+ * https://yona.io
	6	+ **/
	7	+package controllers.annotation;
	8	+
	9	+import actions.GuestProhibitAction;
	10	+import play.mvc.With;
	11	+
	12	+import java.lang.annotation.ElementType;
	13	+import java.lang.annotation.Retention;
	14	+import java.lang.annotation.RetentionPolicy;
	15	+import java.lang.annotation.Target;
	16	+
	17	+@With(GuestProhibitAction.class)
	18	+@Target({ElementType.TYPE, ElementType.METHOD})
	19	+@Retention(RetentionPolicy.RUNTIME)
	20	+public @interface GuestProhibit {
	21	+ boolean displaysFlashMessage() default true;
	22	+}

7da14ba

d1eda8d

app/models/Organization.java

--- app/models/Organization.java

+++ app/models/Organization.java


 import com.avaje.ebean.Page;
 import com.avaje.ebean.PagingList;
 import controllers.Application;
+import controllers.UserApp;
 import models.enumeration.RequestState;
 import models.enumeration.ResourceType;
 import models.resource.GlobalResource;

         } else {
             if(!Application.HIDE_PROJECT_LISTING){
                 for(Project project : this.projects) {
-                    if(project.isPublic() || user.isMemberOf(project)) {
+                    if(project.isPublic() && !user.isGuest || user.isMemberOf(project)) {
                         result.add(project);
                     }
                 }

7da14ba

d1eda8d

app/models/User.java

--- app/models/User.java

+++ app/models/User.java


     }
 
     public boolean isMemberOf(Project project) {
-        if (!projectMembersMemo.containsKey(project.id)) {
-            projectMembersMemo.put(project.id, ProjectUser.isMember(id, project.id));
-        }
-
-        return projectMembersMemo.get(project.id);
+        // TODO: Performance! Removed cache. If performance problem is occurred, fix it!
+        return ProjectUser.isMember(id, project.id);
     }
 
     public List<Project> getEnrolledProjects() {

7da14ba

d1eda8d

app/utils/AccessControl.java

--- app/utils/AccessControl.java

+++ app/utils/AccessControl.java


         // Site manager, Group admin, Project members can create anything.
         if (user.isSiteManager()
             || OrganizationUser.isAdmin(project.organization, user)
-            || ProjectUser.isManager(user.id, project.id)
+            || ProjectUser.isMember(user.id, project.id)
             || isAllowedIfGroupMember(project, user)) {
             return true;
         }

                 if (project == null) {
                     return false;
                 }
-                return project.isPublic()
+                return project.isPublic() && !user.isGuest
                         || user.isMemberOf(project)
                         || isAdmin(project.organization, user)
                         || isAllowedIfGroupMember(project, user);

         // See docs/technical/access-control.md for more information.
         switch(operation) {
         case READ:
-            return project.isPublic()
+            return project.isPublic() && !user.isGuest
                     || user.isMemberOf(project)
                     || isAllowedIfGroupMember(project, user);
         case UPDATE:

7da14ba

d1eda8d

app/views/common/navbar.scala.html

--- app/views/common/navbar.scala.html

+++ app/views/common/navbar.scala.html


 @**
- * Yobi, Project Hosting SW
- *
- * Copyright 2014 NAVER Corp.
- * http://yobi.io
- *
- * @author Deokhong Kim
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **@
+* Yona, 21st Century Project Hosting SW
+*
+* Copyright Yona & Yobi Authors & NAVER Corp.
+* https://yona.io
+**@
 @(menuType:utils.MenuType, project:Project, org:Organization)
 
 @import utils._

             <li>
                 <a href="@routes.Application.index()" class="logo logo-letter">Y</a>
             </li>
-            @if(!Application.HIDE_PROJECT_LISTING){
+            @if(!Application.HIDE_PROJECT_LISTING && !UserApp.currentUser().isGuest){
                 <li class="@isActiveMenu(MenuType.PROJECTS)">
                     <a href="@routes.ProjectApp.projects()" class="show-progress-bar">@Messages("title.list")</a>
                 </li>

                             }
                             } 
                             @if(org != null) {
-                                @if(Application.HIDE_PROJECT_LISTING) {
+                                @if(Application.HIDE_PROJECT_LISTING || UserApp.currentUser().isGuest) {
                                     @if(UserApp.currentUser().isMemberOf(org) || UserApp.currentUser().isAdminOf(org)){
                                         <li>
                                             <a href="#" data-toggle="search-scope" data-action="@routes.SearchApp.searchInAGroup(org.name)">

                                 }
 
                             }
-                            @if(!Application.HIDE_PROJECT_LISTING || UserApp.currentUser().isSiteManager) {
+                            @if(!Application.HIDE_PROJECT_LISTING && !UserApp.currentUser().isGuest || UserApp.currentUser().isSiteManager) {
                             <li>
                                 <a href="#" data-toggle="search-scope" data-action="@routes.SearchApp.searchInAll()">
                                     @Messages("search.scope.all")

7da14ba

d1eda8d

app/views/common/usermenu.scala.html

--- app/views/common/usermenu.scala.html

+++ app/views/common/usermenu.scala.html


 @import com.feth.play.module.pa.views.html._
 @import play.mvc.Http._;
 @orderString = @{"createdDate DESC"}
-@if(UserApp.currentUser().isAnonymous){
+
+@currentUser = @{
+    UserApp.currentUser()
+}
+
+@if(currentUser.isAnonymous){
     @currentAuth() { auth => @{
             if(auth == null) {
                 val redirect = Context.current().request().getQueryString("redirectUrl")

 }
 
 @myOpenIssueCount = @{
-    val count = Issue.countOpenIssuesByUser(UserApp.currentUser())
+    val count = Issue.countOpenIssuesByUser(currentUser)
     if(count > 0) {
         Html("<span class=\"counter-badge\">" + count + "</span>")
     }

 <div id="mySidenav" class="sidenav">
     <div class="span5 right-menu span-hard-wrap">
         <div class="row-fluid user-menu-wrap">
-            <span class="user-menu"><a href="@routes.UserApp.userInfo(UserApp.currentUser().loginId)">@Messages("userinfo.profile")</a></span>
+            <span class="user-menu"><a href="@routes.UserApp.userInfo(currentUser.loginId)">@Messages("userinfo.profile")</a></span>
             <span class="user-menu"><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></span>
             @currentAuth() { auth =>
                 @if(auth != null) {

     </div>
 </div>
 <ul class="gnb-usermenu">
-    @if( !UserApp.currentUser().isAnonymous()) {
+    @if( !currentUser.isAnonymous()) {
        <li class="gnb-usermenu-item hide-in-mobile">
           <a href="@routes.Application.notifications()" class="user-item-btn loggged-in">@Messages("notification")</a>
        </li>

            <a href="@routes.IssueApp.userIssues()" class="user-item-btn loggged-in">@Messages("issue.myIssue")@myOpenIssueCount</a>
         </li>
         <li class="divider"></li>
-        @if(UserApp.currentUser.isSiteManager) {
+        @if(currentUser.isSiteManager) {
         <li class="gnb-usermenu-item">
             <a href="@routes.SiteApp.userList()" data-toggle="tooltip" title="@Messages("menu.siteAdmin")" data-placement="bottom" class="usermenu-icon-button show-progress-bar">
                 <i class="yobicon-wrench"></i>

         <li class="gnb-usermenu-dropdown" id="sidebar-open-btn">
             <a href="javascript:void(0);" class="gnb-dropdown-toggle">
                 <span class="avatar-wrap smaller">
-                    <img src="@UserApp.currentUser().avatarUrl(32)" />
+                    <img src="@currentUser.avatarUrl(32)" />
                 </span>
-                <span class="caret-text">@UserApp.currentUser().name</span>
+                <span class="caret-text">@currentUser.name</span>
                 <span class="caret"></span>
             </a>
         </li>

                   @Messages("button.newProject")
                   </a>
               </li>
+              @if(!currentUser.isGuest){
               <li>
                   <a href="@routes.OrganizationApp.newForm()">
                   @Messages("title.newOrganization")
                   </a>
               </li>
+              }
           </ul>
       </li>
       } else {

7da14ba

d1eda8d

app/views/organization/header.scala.html

--- app/views/organization/header.scala.html

+++ app/views/organization/header.scala.html


             <div class="project-util-wrap">
                 <ul class="project-util">
                     <button class="ybtn ybtn-small @if(User.enrolled(org)) { ybtn-info } dropdown-toggle" type="button" data-toggle="dropdown">
-                        <i class="yobicon-addfriend"> @Messages("organization.member.enrollment.title") </i>
+                        <i class="yobicon-addfriend"></i> @Messages("organization.member.enrollment.title")
                     </button>
                     <div class="dropdown-menu flat right title">
                         <div class="pop-title">@getPopupTitle</div>

7da14ba

d1eda8d

app/views/project/header.scala.html

--- app/views/project/header.scala.html

+++ app/views/project/header.scala.html


                         </div>
                         } else {
                         <button class="ybtn ybtn-small dropdown-toggle" type="button" data-toggle="dropdown">
-                            <i class="yobicon-addfriend"> @Messages("organization.member.enrollment.title")</i>
+                            <i class="yobicon-addfriend"></i>@Messages("organization.member.enrollment.title")
                         </button>
                         <div class="dropdown-menu flat right title">
                             <div class="pop-title">@Messages("project.you.may.want.to.be.a.member", project)</div>

7da14ba

d1eda8d

app/views/user/view.scala.html

--- app/views/user/view.scala.html

+++ app/views/user/view.scala.html


             </div>
 
             <div class="user-stream-box">
+                @if(!UserApp.currentUser().isGuest){
                 <div class="pull-right">
                     @Messages("userinfo.daysAgo.prefix")<input id="daysAgoBtn" name="daysAgo" type="number" min="1" max="99" class="input-mini-min" value="@daysAgo" style="margin:0px 5px; vertical-align:bottom;">@Messages("userinfo.daysAgo.suffix")
                 </div>

                     }
                </div>
             </div>
+            }
         </section>
     </div>
 </div>

7da14ba

d1eda8d

conf/application.conf.default

--- conf/application.conf.default

+++ conf/application.conf.default


 # want to allow that, set signup.require.confirm to true.
 application.allowsAnonymousAccess=true
 
+# Guest User Id Rule
+# ~~~~~~~~~~~~~
+# If login id is created with following prefixes,
+# Yona treat that user is Guest User.
+# Guest user is extremely restricted in use of Yona.
+# They can not see any project listing of instance and
+# only create own account's projects.
+# In other words, they cannot create organization.
+# If multiple prefixes are needed, user , (comma)
+#
+# eg.
+# "PT_, GUEST_"
+
+application.guest.user.login.id.prefix = ""
+
 #
 # Signup options
 # ~~~~~~~~~~~~~~

7da14ba

d1eda8d

conf/messages

--- conf/messages

+++ conf/messages


 error.forbidden = You are not authorized
 error.forbidden.or.notfound = Project not exists or unauthorized user
 error.forbidden.or.not.allowed = Forbidden or not allowed request
+error.forbidden.to.guest.user = This is a request that is not allowed for guest user
 error.timeout = Your request could not be processed because of server timeout
 error.internalServerError = Server error has occurred; service is not available
 error.notfound = Page not found

7da14ba

d1eda8d

conf/messages.ko-KR

--- conf/messages.ko-KR

+++ conf/messages.ko-KR

...	...	@@ -211,6 +211,7 @@
211	211	error.forbidden = 권한이 없습니다
212	212	error.forbidden.or.notfound = 권한이 없거나 존재하지 않는 프로젝트입니다.
213	213	error.forbidden.or.not.allowed = 권한이 없거나 허용하지 않는 요청입니다.
	214	+error.forbidden.to.guest.user = 게스트 유저에게는 허용하지 않는 요청입니다
214	215	error.timeout = 요청 처리가 너무 오래 걸려 중단되었습니다
215	216	error.internalServerError = 서버 오류가 발생하여 서비스를 이용할 수 없습니다
216	217	error.notfound = 페이지를 찾을 수 없습니다

...	...	@@ -8,6 +8,7 @@
8	8	import com.avaje.ebean.ExpressionList;
9	9	import com.avaje.ebean.Page;
10	10	import controllers.annotation.AnonymousCheck;
	11	+import controllers.annotation.GuestProhibit;
11	12	import models.*;
12	13	import models.enumeration.Operation;
13	14	import models.enumeration.RequestState;
...	...	@@ -59,6 +60,7 @@
59	60	* @throws Exception
60	61	*/
61	62	@AnonymousCheck(requiresLogin = true, displaysFlashMessage = true)
	63	+ @GuestProhibit
62	64	public static Result newOrganization() throws Exception {
63	65	Form<Organization> newOrgForm = form(Organization.class).bindFromRequest();
64	66	if (newOrgForm.hasErrors()) {
...	...	@@ -120,11 +122,11 @@
120	122	return result;
121	123	}
122	124
123		- User user = User.findByLoginId(addMemberForm.get().loginId);
	125	+ User targetUser = User.findByLoginId(addMemberForm.get().loginId);
124	126	Organization organization = Organization.findByName(organizationName);
125		- OrganizationUser.assignRole(user.id, organization.id, RoleType.ORG_MEMBER.roleType());
	127	+ OrganizationUser.assignRole(targetUser.id, organization.id, RoleType.ORG_MEMBER.roleType());
126	128	organization.cleanEnrolledUsers();
127		- NotificationEvent.afterOrganizationMemberRequest(organization, user, RequestState.ACCEPT);
	129	+ NotificationEvent.afterOrganizationMemberRequest(organization, targetUser, RequestState.ACCEPT);
128	130
129	131	return redirect(routes.OrganizationApp.members(organizationName));
130	132	}
...	...	@@ -135,6 +137,11 @@
135	137
136	138	if (addMemberForm.hasErrors() \|\| userToBeAdded.isAnonymous()) {
137	139	flash(Constants.WARNING, "organization.member.unknownUser");
	140	+ return redirect(routes.OrganizationApp.members(organizationName));
	141	+ }
	142	+
	143	+ if (userToBeAdded.isGuest) {
	144	+ flash(Constants.WARNING, "error.forbidden.to.guest.user");
138	145	return redirect(routes.OrganizationApp.members(organizationName));
139	146	}
140	147
...	...	@@ -447,6 +454,7 @@
447	454	return new ValidationResult(okWithLocation(routes.OrganizationApp.organization(organization.name).url()), false);
448	455	}
449	456
	457	+ @GuestProhibit
450	458	public static Result orgList(String query, int pageNum){
451	459	if(Application.HIDE_PROJECT_LISTING){
452	460	return forbidden(ErrorViews.Forbidden.render("error.auth.unauthorized.waringMessage"));

...	...	@@ -534,11 +534,8 @@
534	534	}
535	535
536	536	public boolean isMemberOf(Project project) {
537		- if (!projectMembersMemo.containsKey(project.id)) {
538		- projectMembersMemo.put(project.id, ProjectUser.isMember(id, project.id));
539		- }
540		-
541		- return projectMembersMemo.get(project.id);
	537	+ // TODO: Performance! Removed cache. If performance problem is occurred, fix it!
	538	+ return ProjectUser.isMember(id, project.id);
542	539	}
543	540
544	541	public List<Project> getEnrolledProjects() {

...	...	@@ -67,7 +67,7 @@
67	67	// Site manager, Group admin, Project members can create anything.
68	68	if (user.isSiteManager()
69	69	\|\| OrganizationUser.isAdmin(project.organization, user)
70		- \|\| ProjectUser.isManager(user.id, project.id)
	70	+ \|\| ProjectUser.isMember(user.id, project.id)
71	71	\|\| isAllowedIfGroupMember(project, user)) {
72	72	return true;
73	73	}
...	...	@@ -161,7 +161,7 @@
161	161	if (project == null) {
162	162	return false;
163	163	}
164		- return project.isPublic()
	164	+ return project.isPublic() && !user.isGuest
165	165	\|\| user.isMemberOf(project)
166	166	\|\| isAdmin(project.organization, user)
167	167	\|\| isAllowedIfGroupMember(project, user);
...	...	@@ -283,7 +283,7 @@
283	283	// See docs/technical/access-control.md for more information.
284	284	switch(operation) {
285	285	case READ:
286		- return project.isPublic()
	286	+ return project.isPublic() && !user.isGuest
287	287	\|\| user.isMemberOf(project)
288	288	\|\| isAllowedIfGroupMember(project, user);
289	289	case UPDATE:

...	...	@@ -45,7 +45,7 @@
45	45	<div class="project-util-wrap">
46	46	<ul class="project-util">
47	47	<button class="ybtn ybtn-small @if(User.enrolled(org)) { ybtn-info } dropdown-toggle" type="button" data-toggle="dropdown">
48		- <i class="yobicon-addfriend"> @Messages("organization.member.enrollment.title") </i>
	48	+ <i class="yobicon-addfriend"></i> @Messages("organization.member.enrollment.title")
49	49	</button>
50	50	<div class="dropdown-menu flat right title">
51	51	<div class="pop-title">@getPopupTitle</div>

...	...	@@ -89,6 +89,7 @@
89	89	</div>
90	90
91	91	<div class="user-stream-box">
	92	+ @if(!UserApp.currentUser().isGuest){
92	93	<div class="pull-right">
93	94	@Messages("userinfo.daysAgo.prefix")<input id="daysAgoBtn" name="daysAgo" type="number" min="1" max="99" class="input-mini-min" value="@daysAgo" style="margin:0px 5px; vertical-align:bottom;">@Messages("userinfo.daysAgo.suffix")
94	95	</div>
...	...	@@ -191,6 +192,7 @@
191	192	}
192	193	</div>
193	194	</div>
	195	+ }
194	196	</section>
195	197	</div>
196	198	</div>

...	...	@@ -10,6 +10,7 @@
10	10	import com.avaje.ebean.*;
11	11
12	12	import controllers.annotation.AnonymousCheck;
	13	+import controllers.annotation.GuestProhibit;
13	14	import controllers.annotation.IsAllowed;
14	15	import info.schleichardt.play2.mailplugin.Mailer;
15	16	import models.*;
...	...	@@ -956,6 +957,7 @@
956	957	* @param pageNum the page num
957	958	* @return
958	959	*/
	960	+ @GuestProhibit
959	961	public static Result projects(String query, int pageNum) {
960	962	if(Application.HIDE_PROJECT_LISTING){
961	963	return forbidden(ErrorViews.Forbidden.render("error.auth.unauthorized.waringMessage"));

...	...	@@ -24,6 +24,7 @@
24	24	import com.avaje.ebean.Page;
25	25	import com.avaje.ebean.PagingList;
26	26	import controllers.Application;
	27	+import controllers.UserApp;
27	28	import models.enumeration.RequestState;
28	29	import models.enumeration.ResourceType;
29	30	import models.resource.GlobalResource;
...	...	@@ -125,7 +126,7 @@
125	126	} else {
126	127	if(!Application.HIDE_PROJECT_LISTING){
127	128	for(Project project : this.projects) {
128		- if(project.isPublic() \|\| user.isMemberOf(project)) {
	129	+ if(project.isPublic() && !user.isGuest \|\| user.isMemberOf(project)) {
129	130	result.add(project);
130	131	}
131	132	}

...	...	@@ -1,23 +1,9 @@
1	1	@**
2		- * Yobi, Project Hosting SW
3		- *
4		- * Copyright 2014 NAVER Corp.
5		- * http://yobi.io
6		- *
7		- * @author Deokhong Kim
8		- *
9		- * Licensed under the Apache License, Version 2.0 (the "License");
10		- * you may not use this file except in compliance with the License.
11		- * You may obtain a copy of the License at
12		- *
13		- * http://www.apache.org/licenses/LICENSE-2.0
14		- *
15		- * Unless required by applicable law or agreed to in writing, software
16		- * distributed under the License is distributed on an "AS IS" BASIS,
17		- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18		- * See the License for the specific language governing permissions and
19		- * limitations under the License.
20		- **@
	2	+* Yona, 21st Century Project Hosting SW
	3	+*
	4	+* Copyright Yona & Yobi Authors & NAVER Corp.
	5	+* https://yona.io
	6	+**@
21	7	@(menuType:utils.MenuType, project:Project, org:Organization)
22	8
23	9	@import utils._
...	...	@@ -54,7 +40,7 @@
54	40	<li>
55	41	<a href="@routes.Application.index()" class="logo logo-letter">Y</a>
56	42	</li>
57		- @if(!Application.HIDE_PROJECT_LISTING){
	43	+ @if(!Application.HIDE_PROJECT_LISTING && !UserApp.currentUser().isGuest){
58	44	<li class="@isActiveMenu(MenuType.PROJECTS)">
59	45	<a href="@routes.ProjectApp.projects()" class="show-progress-bar">@Messages("title.list")</a>
60	46	</li>
...	...	@@ -94,7 +80,7 @@
94	80	}
95	81	}
96	82	@if(org != null) {
97		- @if(Application.HIDE_PROJECT_LISTING) {
	83	+ @if(Application.HIDE_PROJECT_LISTING \|\| UserApp.currentUser().isGuest) {
98	84	@if(UserApp.currentUser().isMemberOf(org) \|\| UserApp.currentUser().isAdminOf(org)){
99	85	<li>
100	86	<a href="#" data-toggle="search-scope" data-action="@routes.SearchApp.searchInAGroup(org.name)">
...	...	@@ -105,7 +91,7 @@
105	91	}
106	92
107	93	}
108		- @if(!Application.HIDE_PROJECT_LISTING \|\| UserApp.currentUser().isSiteManager) {
	94	+ @if(!Application.HIDE_PROJECT_LISTING && !UserApp.currentUser().isGuest \|\| UserApp.currentUser().isSiteManager) {
109	95	<li>
110	96	<a href="#" data-toggle="search-scope" data-action="@routes.SearchApp.searchInAll()">
111	97	@Messages("search.scope.all")

...	...	@@ -11,7 +11,12 @@
11	11	@import com.feth.play.module.pa.views.html._
12	12	@import play.mvc.Http._;
13	13	@orderString = @{"createdDate DESC"}
14		-@if(UserApp.currentUser().isAnonymous){
	14	+
	15	+@currentUser = @{
	16	+ UserApp.currentUser()
	17	+}
	18	+
	19	+@if(currentUser.isAnonymous){
15	20	@currentAuth() { auth => @{
16	21	if(auth == null) {
17	22	val redirect = Context.current().request().getQueryString("redirectUrl")
...	...	@@ -26,7 +31,7 @@
26	31	}
27	32
28	33	@myOpenIssueCount = @{
29		- val count = Issue.countOpenIssuesByUser(UserApp.currentUser())
	34	+ val count = Issue.countOpenIssuesByUser(currentUser)
30	35	if(count > 0) {
31	36	Html("<span class=\"counter-badge\">" + count + "</span>")
32	37	}
...	...	@@ -35,7 +40,7 @@
35	40	<div id="mySidenav" class="sidenav">
36	41	<div class="span5 right-menu span-hard-wrap">
37	42	<div class="row-fluid user-menu-wrap">
38		- <span class="user-menu"><a href="@routes.UserApp.userInfo(UserApp.currentUser().loginId)">@Messages("userinfo.profile")</a></span>
	43	+ <span class="user-menu"><a href="@routes.UserApp.userInfo(currentUser.loginId)">@Messages("userinfo.profile")</a></span>
39	44	<span class="user-menu"><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></span>
40	45	@currentAuth() { auth =>
41	46	@if(auth != null) {
...	...	@@ -65,7 +70,7 @@
65	70	</div>
66	71	</div>
67	72	<ul class="gnb-usermenu">
68		- @if( !UserApp.currentUser().isAnonymous()) {
	73	+ @if( !currentUser.isAnonymous()) {
69	74	<li class="gnb-usermenu-item hide-in-mobile">
70	75	<a href="@routes.Application.notifications()" class="user-item-btn loggged-in">@Messages("notification")</a>
71	76	</li>
...	...	@@ -74,7 +79,7 @@
74	79	<a href="@routes.IssueApp.userIssues()" class="user-item-btn loggged-in">@Messages("issue.myIssue")@myOpenIssueCount</a>
75	80	</li>
76	81	<li class="divider"></li>
77		- @if(UserApp.currentUser.isSiteManager) {
	82	+ @if(currentUser.isSiteManager) {
78	83	<li class="gnb-usermenu-item">
79	84	<a href="@routes.SiteApp.userList()" data-toggle="tooltip" title="@Messages("menu.siteAdmin")" data-placement="bottom" class="usermenu-icon-button show-progress-bar">
80	85	<i class="yobicon-wrench"></i>
...	...	@@ -85,9 +90,9 @@
85	90	<li class="gnb-usermenu-dropdown" id="sidebar-open-btn">
86	91	<a href="javascript:void(0);" class="gnb-dropdown-toggle">
87	92	<span class="avatar-wrap smaller">
88		- <img src="@UserApp.currentUser().avatarUrl(32)" />
	93	+ <img src="@currentUser.avatarUrl(32)" />
89	94	</span>
90		- <span class="caret-text">@UserApp.currentUser().name</span>
	95	+ <span class="caret-text">@currentUser.name</span>
91	96	<span class="caret"></span>
92	97	</a>
93	98	</li>
...	...	@@ -102,11 +107,13 @@
102	107	@Messages("button.newProject")
103	108	</a>
104	109	</li>
	110	+ @if(!currentUser.isGuest){
105	111	<li>
106	112	<a href="@routes.OrganizationApp.newForm()">
107	113	@Messages("title.newOrganization")
108	114	</a>
109	115	</li>
	116	+ }
110	117	</ul>
111	118	</li>
112	119	} else {

...	...	@@ -21,6 +21,21 @@
21	21	# want to allow that, set signup.require.confirm to true.
22	22	application.allowsAnonymousAccess=true
23	23
	24	+# Guest User Id Rule
	25	+# ~~~~~~~~~~~~~
	26	+# If login id is created with following prefixes,
	27	+# Yona treat that user is Guest User.
	28	+# Guest user is extremely restricted in use of Yona.
	29	+# They can not see any project listing of instance and
	30	+# only create own account's projects.
	31	+# In other words, they cannot create organization.
	32	+# If multiple prefixes are needed, user , (comma)
	33	+#
	34	+# eg.
	35	+# "PT_, GUEST_"
	36	+
	37	+application.guest.user.login.id.prefix = ""
	38	+
24	39	#
25	40	# Signup options
26	41	# ~~~~~~~~~~~~~~

...	...	@@ -207,6 +207,7 @@
207	207	error.forbidden = You are not authorized
208	208	error.forbidden.or.notfound = Project not exists or unauthorized user
209	209	error.forbidden.or.not.allowed = Forbidden or not allowed request
	210	+error.forbidden.to.guest.user = This is a request that is not allowed for guest user
210	211	error.timeout = Your request could not be processed because of server timeout
211	212	error.internalServerError = Server error has occurred; service is not available
212	213	error.notfound = Page not found

Delete comment