Ver Fonte

фиксы после теста с новым аккаунтом

kpmy há 5 anos atrás
pai
commit
5fc3e27e24

+ 1 - 1
src/app/package.json

@@ -2,7 +2,7 @@
   "name": "frei-app",
   "version": "0.0.1",
   "scripts": {
-    "start": "npx ng serve --aot --source-map --proxy-config proxyconf.json --base-href / --serve-path /",
+    "start": "npx ng serve --host=0.0.0.0 --disable-host-check --aot --source-map --proxy-config proxyconf.json --base-href / --serve-path /",
     "build": "npx ng build --prod --base-href /"
   },
   "private": true,

+ 1 - 1
src/app/src/app/app.module.ts

@@ -67,7 +67,7 @@ export function jwtTokenGetter() {
     JwtModule.forRoot({
       config: {
         tokenGetter: jwtTokenGetter,
-        whitelistedDomains: ["127.0.0.1", "localhost"],
+        whitelistedDomains: ["127.0.0.1", "localhost", "77.244.213.167"],
         blacklistedRoutes: [],
       },
     }),

+ 1 - 0
src/app/src/app/person/person.credit.dialog.component.html

@@ -4,6 +4,7 @@
     <mat-form-field>
       <mat-label id="credit-dialog-code-label">Код пополнения</mat-label>
       <input (ngModelChange)="checkCode($event)" [ngModel]="data.code" aria-labelledby="credit-dialog-code-label" matInput/>
+      <mat-hint>Этот код должен был передать вам получатель</mat-hint>
     </mat-form-field>
     <mat-icon *ngIf="codeOk === 1">done</mat-icon>
     <mat-icon *ngIf="codeOk === 0">not_interested</mat-icon>

+ 21 - 20
src/app/src/app/person/person.page.component.ts

@@ -78,7 +78,7 @@ export class PersonPageComponent implements OnInit {
   showCreditDialog(account: AccountInfo) {
     this.personService.getCurrentPerson().subscribe(person => {
       let ref = this.matDialog.open(PersonCreditDialogComponent, {
-        width: '480px', height: '640px', data: <PersonCreditData>{
+        width: '480px', height: '400px', data: <PersonCreditData>{
           accounts: this.accounts,
           account: account,
           personId: person.auth.id
@@ -123,25 +123,6 @@ export class PersonDebitDialogComponent {
   }
 }
 
-abstract class PersonAccountData {
-  account: AccountInfo
-  accounts: AccountInfo[]
-  personId: string
-}
-
-export class PersonCreditData extends PersonAccountData {
-  code: string
-  amount: number
-}
-
-export class PersonDebitData extends PersonAccountData {
-  amount: number
-  time: number
-  once: boolean
-  limited: boolean
-  code: string
-}
-
 @Component({
   selector: 'person-credit-dialog',
   templateUrl: 'person.credit.dialog.component.html',
@@ -187,3 +168,23 @@ export class PersonCreditDialogComponent {
   }
 
 }
+
+
+abstract class PersonAccountData {
+  account: AccountInfo
+  accounts: AccountInfo[]
+  personId: string
+}
+
+export class PersonCreditData extends PersonAccountData {
+  code: string
+  amount: number
+}
+
+export class PersonDebitData extends PersonAccountData {
+  amount: number
+  time: number
+  once: boolean
+  limited: boolean
+  code: string
+}

+ 2 - 2
src/main/kotlin/inn/ocsf/bee/freigeld/serve/Security.kt

@@ -164,9 +164,9 @@ class JwtRequestFilter : OncePerRequestFilter() {
             try {
                 username = jwtTokenUtil.getUsernameFromToken(jwtToken)
             } catch (e: IllegalArgumentException) {
-                System.out.println("Unable to get JWT Token")
+                //System.out.println("Unable to get JWT Token")
             } catch (e: ExpiredJwtException) {
-                System.out.println("JWT Token has expired")
+                //System.out.println("JWT Token has expired")
             }
         } else if (requestTokenHeader != null) {
             logger.warn("JWT Token does not begin with Bearer String")

+ 5 - 2
src/main/kotlin/inn/ocsf/bee/freigeld/serve/rest/PersonController.kt

@@ -114,11 +114,14 @@ class PersonController {
     }
 
 
+    @ExperimentalStdlibApi
     @Profile("dev")
     @RequestMapping("api/old/person/{personId}/givemoney", method = [RequestMethod.POST])
     fun giveMoney(@PathVariable("personId") personId: UUID): ResponseEntity<Map<String, Any?>> {
-        val account = bank.getAccounts(personId).random()
-        bank.exchange(account, bank.getSelfAccount(), (100 * Math.random()).toLong()).get(5, TimeUnit.SECONDS)
+        val account = bank.getAccounts(personId).randomOrNull()
+        if (account != null) {
+            bank.exchange(account, bank.getSelfAccount(), (100 * Math.random()).toLong()).get(5, TimeUnit.SECONDS)
+        }
         return ResponseEntity.ok(mapOf())
     }