init

Author: easystartup-io

backend/src/main/java/io/easystartup/suggestfeature/AuthService.java

@@ -17,6 +17,7 @@
 import io.jsonwebtoken.JwtBuilder;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.time.StopWatch;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.FindAndModifyOptions;
@@ -98,8 +99,13 @@ public LoginResponse getLoginSignUpResponseJson(User user) {
         user.setPassword(null);
 
         List<Member> orgsForUser = getOrgsForUser(user.getId());
+        if (CollectionUtils.isNotEmpty(orgsForUser)) {
+            Member member = orgsForUser.get(0);
+            Organization org = getOrganizationForId(member.getOrganizationId());
+            return new LoginResponse("Bearer " + jwtToken, safeUser, org.getSlug(), member.getRole());
+        }
 
-        return new LoginResponse("Bearer " + jwtToken, safeUser);
+        return new LoginResponse("Bearer " + jwtToken, safeUser, null, null);
     }
 
     /**
@@ -145,6 +151,7 @@ public void sendMagicLink(String to, String linkCode) {
                 + "<h1 style=\"color: #333333;\">Your Verification Code</h1>"
                 + "<p style=\"font-size: 16px; color: #666666;\">Use the following verification code to complete your sign-in process:</p>"
                 + "<p style=\"font-size: 32px; font-weight: bold; color: #007BFF; background-color: #e9ecef; padding: 10px; border-radius: 5px; display: inline-block; text-align: center; margin: 20px 0;\">" + linkCode + "</p>"
+                + "<p style=\"font-size: 16px; color: #666666;\">This code is only valid for 10 minutes.</p>"
                 + "<p style=\"font-size: 16px; color: #666666;\">If you didn't request this code, please ignore this email.</p>"
                 + "</div>"
                 + "</body>"
@@ -223,4 +230,10 @@ public Member getMemberForSlug(String userId, String orgSlug) {
 
         return mongoTemplateFactory.getDefaultMongoTemplate().findOne(new Query(Criteria.where(Member.FIELD_USER_ID).is(userId).and(Member.FIELD_ORGANIZATION_ID).is(organization.getId())), Member.class);
     }
+
+    // Todo: add cache
+    private Organization getOrganizationForId(String organizationId) {
+        return mongoTemplateFactory.getDefaultMongoTemplate().findOne(new Query(Criteria.where(Organization.FIELD_ID).is(organizationId)), Organization.class);
+    }
+
 }

backend/src/main/java/io/easystartup/suggestfeature/dto/LoginResponse.java

@@ -12,11 +12,6 @@ public class LoginResponse {
     private String organizationSlug;
     private Member.Role role;
 
-    public LoginResponse(String token, User user) {
-        this.token = token;
-        this.user = user;
-    }
-
     public LoginResponse(String token, User user, String organizationSlug, Member.Role role) {
         this.token = token;
         this.user = user;

frontend/src/app/not-found.tsx

@@ -0,0 +1,10 @@
+"use client"
+import { useRouter } from 'next/navigation';
+
+export default function NotFound() {
+  const router = useRouter();
+  router.push('/login');
+  return (<div>    </div>
+  );
+}
+

frontend/src/context/AuthContext.tsx

@@ -82,7 +82,7 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
       const { token, user, organizationSlug } = await response.json();
       Cookies.set('token', token);
       setUser(user);
-      if (organizationSlug && organization.length > 0) {
+      if (organizationSlug && organizationSlug.length > 0) {
         router.push(`/${organizationSlug}/dashboard`);
       } else {
         router.push(`/create-org`);