diff --git a/brewman/__version__.py b/brewman/__version__.py new file mode 100644 index 00000000..7ffab095 --- /dev/null +++ b/brewman/__version__.py @@ -0,0 +1 @@ +__version__ = "7.6.0" diff --git a/brewman/routers/login.py b/brewman/routers/login.py index a7643930..cad9f4a9 100644 --- a/brewman/routers/login.py +++ b/brewman/routers/login.py @@ -14,6 +14,7 @@ from fastapi.responses import JSONResponse from fastapi.security import OAuth2PasswordRequestForm from sqlalchemy.orm import Session +from .. import __version__ from ..core.config import settings from ..core.security import ( Token, @@ -85,6 +86,7 @@ async def login_for_access_token( ), "userId": str(user.id), "lockedOut": user.locked_out, + "ver": __version__.__version__, }, expires_delta=access_token_expires, ) @@ -100,6 +102,7 @@ async def refresh_token(user: UserToken = Security(get_current_active_user)): "scopes": user.permissions, "userId": str(user.id_), "lockedOut": user.locked_out, + "ver": __version__.__version__, }, expires_delta=access_token_expires, ) diff --git a/overlord/package.json b/overlord/package.json index 1213d180..80c62fd5 100644 --- a/overlord/package.json +++ b/overlord/package.json @@ -1,6 +1,6 @@ { "name": "overlord", - "version": "7.5.0", + "version": "7.6.0", "scripts": { "ng": "ng", "prettier": "prettier", diff --git a/overlord/src/app/auth/auth.service.ts b/overlord/src/app/auth/auth.service.ts index ed2861ed..2ecf646a 100644 --- a/overlord/src/app/auth/auth.service.ts +++ b/overlord/src/app/auth/auth.service.ts @@ -91,6 +91,7 @@ export class AuthService { perms: decoded.scopes, access_token: token, exp: decoded.exp, + ver: decoded.ver }); } diff --git a/overlord/src/app/core/user.ts b/overlord/src/app/core/user.ts index c9bc46fd..5708b6cc 100644 --- a/overlord/src/app/core/user.ts +++ b/overlord/src/app/core/user.ts @@ -8,6 +8,7 @@ export class User { isAuthenticated: boolean; access_token?: string; exp?: number; + ver: string; public constructor(init?: Partial) { Object.assign(this, init); diff --git a/overlord/src/app/settings/settings.component.html b/overlord/src/app/settings/settings.component.html index 4dd03dbb..301f444d 100644 --- a/overlord/src/app/settings/settings.component.html +++ b/overlord/src/app/settings/settings.component.html @@ -218,3 +218,8 @@ + diff --git a/overlord/src/app/settings/settings.component.ts b/overlord/src/app/settings/settings.component.ts index 591004a9..ecf3582d 100644 --- a/overlord/src/app/settings/settings.component.ts +++ b/overlord/src/app/settings/settings.component.ts @@ -12,6 +12,7 @@ import { Product } from '../core/product'; import { debounceTime, distinctUntilChanged, map, startWith, switchMap } from 'rxjs/operators'; import { Observable, of as observableOf } from 'rxjs'; import { ProductService } from '../product/product.service'; +import {environment} from '../../environments/environment'; @Component({ selector: 'app-settings', @@ -30,6 +31,8 @@ export class SettingsComponent implements OnInit { maintenance: any; + version: string; + constructor( private route: ActivatedRoute, private router: Router, @@ -51,6 +54,7 @@ export class SettingsComponent implements OnInit { this.listenToProductChanges(); this.maintenance = { enabled: false, user: '' }; + this.version = environment.version; } ngOnInit() { diff --git a/overlord/src/environments/environment.prod.ts b/overlord/src/environments/environment.prod.ts index 0dc912d3..e2315d9d 100644 --- a/overlord/src/environments/environment.prod.ts +++ b/overlord/src/environments/environment.prod.ts @@ -1,4 +1,5 @@ export const environment = { production: true, ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry + version: '7.6.0', }; diff --git a/overlord/src/environments/environment.ts b/overlord/src/environments/environment.ts index 24987922..3c84e316 100644 --- a/overlord/src/environments/environment.ts +++ b/overlord/src/environments/environment.ts @@ -5,6 +5,7 @@ export const environment = { production: false, ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry + version: '7.6.0', }; /* diff --git a/pyproject.toml b/pyproject.toml index 35d11eea..8e8d4343 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "brewman" -version = "7.5.0" +version = "7.6.0" description = "Accounting plus inventory management for a restaurant." authors = ["tanshu "]