Check session expiration and update if still valid

Signed-off-by: William Brawner <me@wbrawner.com>

angular.json

@@ -5,7 +5,7 @@
   "projects": {
     "twigs": {
       "root": "",
-      "sourceRoot": "src",
+      "sourceRoot": "src/client",
       "projectType": "application",
       "prefix": "app",
       "schematics": {},
@@ -13,23 +13,23 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/twigs",
+            "outputPath": "dist/public",
-            "index": "src/index.html",
+            "index": "src/client/index.html",
-            "main": "src/main.ts",
+            "main": "src/client/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": "src/client/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "src/client/tsconfig.app.json",
             "assets": [
-              "src/browserconfig.xml",
+              "src/client/browserconfig.xml",
-              "src/favicon-16x16.png",
+              "src/client/favicon-16x16.png",
-              "src/favicon-32x32.png",
+              "src/client/favicon-32x32.png",
-              "src/favicon-96x96.png",
+              "src/client/favicon-96x96.png",
-              "src/favicon.ico",
+              "src/client/favicon.ico",
-              "src/assets",
+              "src/client/assets",
-              "src/manifest.json"
+              "src/client/manifest.json"
             ],
             "styles": [
-              "src/styles.css",
+              "src/client/styles.css",
-              "src/styles.scss"
+              "src/client/styles.scss"
             ],
             "scripts": [],
             "vendorChunk": true,
@@ -49,8 +49,8 @@
               ],
               "fileReplacements": [
                 {
-                  "replace": "src/environments/environment.ts",
+                  "replace": "src/client/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
+                  "with": "src/client/environments/environment.prod.ts"
                 }
               ],
               "optimization": true,
@@ -71,8 +71,8 @@
               ],
               "fileReplacements": [
                 {
-                  "replace": "src/environments/environment.ts",
+                  "replace": "src/client/environments/environment.ts",
-                  "with": "src/environments/environment.codeserver.ts"
+                  "with": "src/client/environments/environment.codeserver.ts"
                 }
               ]
             }
@@ -102,18 +102,18 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
+            "main": "src/client/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": "src/client/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
+            "tsConfig": "src/client/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
+            "karmaConfig": "src/client/karma.conf.js",
             "styles": [
-              "src/styles.css"
+              "src/client/styles.css"
             ],
             "scripts": [],
             "assets": [
-              "src/favicon.ico",
+              "src/client/favicon.ico",
-              "src/assets",
+              "src/client/assets",
-              "src/manifest.json"
+              "src/client/manifest.json"
             ]
           }
         }

e2e/protractor.conf.js

@@ -6,7 +6,7 @@ const { SpecReporter } = require('jasmine-spec-reporter');
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [
-    './src/**/*.e2e-spec.ts'
+    './src/client/**/*.e2e-spec.ts'
   ],
   capabilities: {
     'browserName': 'chrome'

package.json

@@ -2,12 +2,16 @@
   "name": "budget",
   "version": "0.0.0",
   "scripts": {
-    "ng": "ng",
+    "prestart": "npm run build",
-    "start": "ng serve --host '0.0.0.0'",
+    "start": "node dist/index.js",
     "code-server": "ng serve --configuration=codeserver --host \"0.0.0.0\" --disable-host-check --poll=2000",
-    "build": "ng build",
+    "build:client": "ng build",
-    "package": "ng build --configuration=production --service-worker",
+    "build:server": "tsc -p src/server",
-    "publish": "ng build --configuration=production --service-worker && firebase deploy",
+    "build": "npm run build:client && npm run build:server",
+    "watch:client": "ng build --watch",
+    "watch:server": "nodemon -w src/server -e ts --exec \"npm run build:server && node dist/index.js\"",
+    "watch": "concurrently -k \"npm run watch:client\" \"npm run watch:server\"",
+    "package": "ng build --configuration=prod --service-worker",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e",
@@ -30,6 +34,7 @@
     "core-js": "^3.20.3",
     "ng2-charts": "^3.0.8",
     "rxjs": "^7.5.2",
+    "sqlite3": "^5.0.1",
     "tslib": "^2.3.1",
     "zone.js": "~0.11.4"
   },
@@ -38,10 +43,17 @@
     "@angular/cli": "^14.0.4",
     "@angular/compiler-cli": "^14.0.4",
     "@angular/language-service": "^14.0.4",
+    "@types/bcrypt": "^3.0.0",
+    "@types/express": "^4.17.11",
+    "@types/express-serve-static-core": "^4.17.18",
     "@types/jasmine": "~3.10.3",
     "@types/jasminewd2": "^2.0.10",
     "@types/node": "^17.0.10",
+    "@types/sqlite3": "^3.1.7",
+    "bcrypt": "^5.0.0",
+    "concurrently": "^5.3.0",
     "eslint": "^8.7.0",
+    "express": "^4.17.1",
     "jasmine-core": "~4.0.0",
     "jasmine-spec-reporter": "~7.0.0",
     "karma": "~6.3.11",
@@ -49,8 +61,10 @@
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~4.0.1",
     "karma-jasmine-html-reporter": "^1.7.0",
+    "nodemon": "^2.0.7",
     "npm-check-updates": "^15.0.1",
     "protractor": "^7.0.0",
+    "sqlite3": "^5.0.1",
     "ts-node": "~10.4.0",
     "tslint": "^6.1.3",
     "typescript": "4.7.4"

src/client/app/app.component.ts

@@ -5,7 +5,7 @@ import { TWIGS_SERVICE, TwigsService } from './shared/twigs.service';
 import { SwUpdate } from '@angular/service-worker';
 import { first, filter, map } from 'rxjs/operators';
 import { interval, concat, BehaviorSubject } from 'rxjs';
-import { Router, ActivationEnd, ActivatedRoute } from '@angular/router';
+import { Router } from '@angular/router';
 import { Actionable, isActionable } from './shared/actionable';
 
 @Component({
@@ -43,7 +43,7 @@ export class AppComponent implements OnInit {
     let auth = this.storage.getItem('Authorization');
     let userId = this.storage.getItem('userId');
     let savedUser = JSON.parse(this.storage.getItem('user')) as User;
-    if (auth && auth.length == 255 && userId) {
+    if (auth) {
       if (savedUser) {
         this.user.next(savedUser);
       }

src/client/app/app.module.ts

@@ -36,7 +36,7 @@ import { EditProfileComponent } from './users/edit-profile/edit-profile.componen
 import { UserComponent } from './users/user.component';
 import { NewBudgetComponent } from './budgets/new-budget/new-budget.component';
 import { BudgetDetailsComponent } from './budgets/budget-details/budget-details.component';
-import { environment } from 'src/environments/environment';
+import { environment } from 'src/client/environments/environment';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { ServiceWorkerModule } from '@angular/service-worker';
 import { CategoryBreakdownComponent } from './categories/category-breakdown/category-breakdown.component';

src/client/app/budgets/add-edit-budget/add-edit-budget.component.ts

@@ -1,8 +1,9 @@
 import { Component, OnInit, Input, Inject, OnDestroy } from '@angular/core';
 import { Budget } from '../budget';
-import { AppComponent } from 'src/app/app.component';
+import { AppComponent } from 'src/client/app/app.component';
-import { User, UserPermission, Permission } from 'src/app/users/user';
+import { User, UserPermission, Permission } from 'src/client/app/users/user';
-import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service';
+import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service';
+import { Router } from '@angular/router';
 
 @Component({
     selector: 'app-add-edit-budget',
@@ -20,6 +21,7 @@ export class AddEditBudgetComponent {
     constructor(
         private app: AppComponent,
         @Inject(TWIGS_SERVICE) private twigsService: TwigsService,
+        private router: Router
     ) {
         this.app.setTitle(this.title)
         this.app.setBackEnabled(true);
@@ -51,7 +53,7 @@ export class AddEditBudgetComponent {
         this.isLoading = true;
         this.twigsService.deleteBudget(this.budget.id)
             .subscribe(() => {
-                this.app.goBack();
+                this.router.navigateByUrl('/budgets');
             });
     }
 

src/client/app/budgets/budget-details/budget-details.component.ts

@@ -1,13 +1,13 @@
 import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
 import { Budget } from '../budget';
 import { ActivatedRoute, Router } from '@angular/router';
-import { AppComponent } from 'src/app/app.component';
+import { AppComponent } from 'src/client/app/app.component';
-import { Transaction } from 'src/app/transactions/transaction';
+import { Transaction } from 'src/client/app/transactions/transaction';
-import { Category } from 'src/app/categories/category';
+import { Category } from 'src/client/app/categories/category';
 import { Observable } from 'rxjs';
 // import { Label } from 'ng2-charts';
 import { ChartDataset } from 'chart.js';
-import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service';
+import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service';
 import { Actionable } from '../../shared/actionable';
 
 @Component({

src/client/app/categories/category-form/category-form.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, Input, OnDestroy, Inject } from '@angular/core';
 import { Category } from '../category';
-import { AppComponent } from 'src/app/app.component';
+import { AppComponent } from 'src/client/app/app.component';
-import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service';
+import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service';
 
 @Component({
   selector: 'app-category-form',

src/client/app/shared/twigs.http.service.ts

@@ -122,18 +122,11 @@ export class TwigsHttpService implements TwigsService {
     id: string,
     name: string,
     description: string,
-    users: UserPermission[],
   ): Observable<Budget> {
     const params = {
       'id': id,
       'name': name,
       'description': description,
-      'users': users.map(userPermission => {
-        return {
-          user: userPermission.user,
-          permission: Permission[userPermission.permission]
-        };
-      })
     };
     return this.http.post<Budget>(this.apiUrl + '/budgets', params, this.options)
       .pipe(map(budget => {
@@ -150,12 +143,6 @@ export class TwigsHttpService implements TwigsService {
     const params = {
       'name': budget.name,
       'description': budget.description,
-      'users': budget.users.map(userPermission => {
-        return {
-          user: userPermission.user,
-          permission: Permission[userPermission.permission]
-        };
-      })
     };
     return this.http.put<Budget>(`${this.apiUrl}/budgets/${id}`, params, this.options)
       .pipe(map(budget => {

src/client/app/transactions/add-edit-transaction/add-edit-transaction.component.ts

@@ -1,9 +1,9 @@
 import { Component, OnInit, Input, OnChanges, OnDestroy, Inject, SimpleChanges } from '@angular/core';
 import { Transaction } from '../transaction';
 import { TransactionType } from '../transaction.type';
-import { Category } from 'src/app/categories/category';
+import { Category } from 'src/client/app/categories/category';
-import { AppComponent } from 'src/app/app.component';
+import { AppComponent } from 'src/client/app/app.component';
-import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service';
+import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service';
 import { MatRadioChange } from '@angular/material/radio';
 
 @Component({

src/client/app/transactions/transaction-details/transaction-details.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, Input, Inject } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Transaction } from '../transaction';
-import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service';
+import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service';
 
 @Component({
   selector: 'app-transaction-details',

src/client/app/users/login/login.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy, Inject, ChangeDetectorRef } from '@angular/core';
 import { TwigsService, TWIGS_SERVICE } from '../../shared/twigs.service';
 import { User } from '../user';
-import { AppComponent } from 'src/app/app.component';
+import { AppComponent } from 'src/client/app/app.component';
 import { ActivatedRoute, Router } from '@angular/router';
 
 @Component({