@@ -67,10 +68,10 @@
This inspection offers the following fixes:
-
-
+
-
{{fix.replace('QuickFix','')}}
-
+
{{fix.name}}
+
{{fix.summary}}
diff --git a/rubberduckvba.client/src/app/routes/inspection/inspection.component.ts b/rubberduckvba.client/src/app/routes/inspection/inspection.component.ts
index e6fa44b..796e195 100644
--- a/rubberduckvba.client/src/app/routes/inspection/inspection.component.ts
+++ b/rubberduckvba.client/src/app/routes/inspection/inspection.component.ts
@@ -1,6 +1,6 @@
import { Component, OnInit } from "@angular/core";
import { InspectionViewModel } from "../../model/feature.model";
-import { ActivatedRoute } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
import { FaIconLibrary } from "@fortawesome/angular-fontawesome";
import { fas } from "@fortawesome/free-solid-svg-icons";
import { BehaviorSubject, switchMap } from "rxjs";
@@ -21,7 +21,7 @@ export class InspectionComponent implements OnInit {
return this._info.getValue();
}
- constructor(private api: ApiClientService, private fa: FaIconLibrary, private route: ActivatedRoute) {
+ constructor(private api: ApiClientService, private fa: FaIconLibrary, private route: ActivatedRoute, private router: Router) {
fa.addIconPacks(fas);
}
@@ -31,6 +31,7 @@ export class InspectionComponent implements OnInit {
const name = params.get('name')!;
return this.api.getInspection(name);
})).subscribe(e => {
+ console.log(e);
this.info = e;
});
}
diff --git a/rubberduckvba.client/src/app/services/auth.service.ts b/rubberduckvba.client/src/app/services/auth.service.ts
index db807a2..fc0c3da 100644
--- a/rubberduckvba.client/src/app/services/auth.service.ts
+++ b/rubberduckvba.client/src/app/services/auth.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from "@angular/core";
-import { Observable } from "rxjs";
+import { Observable, map } from "rxjs";
import { environment } from "../../environments/environment";
import { UserViewModel } from "../model/feature.model";
import { AuthViewModel, DataService } from "./data.service";
@@ -14,6 +14,11 @@ export class AuthService {
return new Promise(resolve => setTimeout(resolve, ms));
}
+ private redirect(url: string = '/'): void {
+ console.log(`redirecting: ${url}`);
+ window.location.href = url;
+ }
+
private writeStorage(key: string, value: string): void {
sessionStorage.setItem(key, value);
while (sessionStorage.getItem(key) != value) {
@@ -32,7 +37,7 @@ export class AuthService {
const url = `${environment.apiBaseUrl}auth/signin`;
this.data.postAsync(url, vm)
- .subscribe(redirectUrl => location.href = redirectUrl);
+ .subscribe((result: string) => this.redirect(result));
}
public signout(): void {
@@ -52,17 +57,17 @@ export class AuthService {
this.data.postAsync(url, vm)
.subscribe(result => {
this.writeStorage('github:access_token', result.token!);
- location.href = '/';
+ this.redirect();
});
}
catch (error) {
console.log(error);
- location.href = '/';
+ this.redirect();
}
}
else {
console.log('xsrf:state mismatched!');
- location.href = '/';
+ this.redirect();
}
}
}
diff --git a/rubberduckvba.client/src/app/services/data.service.ts b/rubberduckvba.client/src/app/services/data.service.ts
index 4b1f094..c66a376 100644
--- a/rubberduckvba.client/src/app/services/data.service.ts
+++ b/rubberduckvba.client/src/app/services/data.service.ts
@@ -36,6 +36,7 @@ export class DataService {
.append('Access-Control-Allow-Origin', '*')
.append('accept', 'application/json')
.append('Content-Type', 'application/json; charset=utf-8');
+
const token = sessionStorage.getItem('github:access_token');
let withCreds = false;
if (token) {
@@ -44,8 +45,8 @@ export class DataService {
}
return (content
- ? this.http.post(url, content, { headers, withCredentials:withCreds })
- : this.http.post(url, { headers, withCredentials: withCreds }))
+ ? this.http.post(url, content, { headers, withCredentials: withCreds })
+ : this.http.post(url, null, { headers, withCredentials: withCreds }))
.pipe(
map(result => result),
timeout(this.timeout),
diff --git a/rubberduckvba.client/src/environments/environment.test.ts b/rubberduckvba.client/src/environments/environment.test.ts
index 26d101a..0b96c60 100644
--- a/rubberduckvba.client/src/environments/environment.test.ts
+++ b/rubberduckvba.client/src/environments/environment.test.ts
@@ -1,4 +1,4 @@
export const environment = {
- production: true,
- apiBaseUrl: 'https://test.api.rubberduckvba.com/'
+ production: false,
+ apiBaseUrl: 'https://localhost:44314/'
};