From d6477de2aec9b23445b758d997cb8ee96d46fbcf Mon Sep 17 00:00:00 2001
From: Sergei Zaychenko <szaychenko@kamu.dev>
Date: Fri, 25 Aug 2023 09:28:11 -0700
Subject: [PATCH] Interpreting login instructions at startup

Auth login API publishes custom method, driven by app config.
Account component shows full name and avatar, if known.
GraphQL caching by User customized to use name instead of id
---
 src/app/api/account.api.ts                    |  1 +
 src/app/api/auth.api.ts                       | 30 +++++------
 src/app/api/dataset.api.spec.ts               | 18 +++----
 src/app/api/mock/auth.mock.ts                 | 17 +++++-
 src/app/api/mock/dataset.mock.ts              |  1 -
 src/app/app-config.model.ts                   | 15 ++++++
 src/app/app-config.service.ts                 | 28 ++--------
 src/app/app.component.ts                      |  6 +--
 src/app/app.module.ts                         | 12 ++++-
 src/app/auth/account/account.component.html   |  4 +-
 .../auth/account/account.component.spec.ts    |  4 +-
 src/app/auth/account/account.component.ts     | 52 +++++++++++++------
 .../datasets-tab/datasets-tab.component.ts    | 16 +++---
 src/app/auth/guards/login.guard.spec.ts       |  4 +-
 src/app/auth/logged-user-service.spec.ts      | 23 +++++---
 src/app/auth/logged-user.service.ts           | 11 ++--
 src/app/common/feature-flags.model.ts         |  4 --
 .../app-header/app-header.component.ts        |  4 +-
 18 files changed, 147 insertions(+), 103 deletions(-)
 create mode 100644 src/app/app-config.model.ts
 delete mode 100644 src/app/common/feature-flags.model.ts

diff --git a/src/app/api/account.api.ts b/src/app/api/account.api.ts
index 5f0d58b81..d6510e798 100644
--- a/src/app/api/account.api.ts
+++ b/src/app/api/account.api.ts
@@ -6,6 +6,7 @@ import { AccountDetailsFragment } from "./kamu.graphql.interface";
 
 @Injectable({ providedIn: "root" })
 export class AccountApi {
+    // TODO: issue a GraphQL query
     public getAccountInfoByName(name: string): Observable<AccountDetailsFragment> {
         return of({ ...mockAccountDetails, login: name });
     }
diff --git a/src/app/api/auth.api.ts b/src/app/api/auth.api.ts
index d51cb7408..00b2ca950 100644
--- a/src/app/api/auth.api.ts
+++ b/src/app/api/auth.api.ts
@@ -36,20 +36,21 @@ export class AuthApi {
 
     public fetchUserInfoAndTokenFromPasswordLogin(login: string, password: string): Observable<void> {
         const passwordCredentials: PasswordLoginCredentials = { login, password };
-        return this.fetchUserInfoAndTokenFromLoginMethod(LOGIN_METHOD_PASSWORD, passwordCredentials);
+        return this.fetchUserInfoAndTokenFromLoginMethod(LOGIN_METHOD_PASSWORD, JSON.stringify(passwordCredentials));
     }
 
     public fetchUserInfoAndTokenFromGithubCallackCode(code: string): Observable<void> {
         const githubCredentials: GithubLoginCredentials = { code };
-        return this.fetchUserInfoAndTokenFromLoginMethod(LOGIN_METHOD_GITHUB, githubCredentials);
+        return this.fetchUserInfoAndTokenFromLoginMethod(LOGIN_METHOD_GITHUB, JSON.stringify(githubCredentials));
     }
 
-    public fetchUserInfoFromAccessToken(accessToken: string): Observable<void> {
-        return this.fetchAccountInfoGQL.mutate({ accessToken }).pipe(
-            map((result: MutationResult<FetchAccountInfoMutation>) => {
+    public fetchUserInfoAndTokenFromLoginMethod(loginMethod: string, loginCredentialsJson: string): Observable<void> {
+        return this.loginGQL.mutate({ login_method: loginMethod, login_credentials_json: loginCredentialsJson }).pipe(
+            map((result: MutationResult<LoginMutation>) => {
                 if (result.data) {
-                    const data: FetchAccountInfoMutation = result.data;
-                    this.accountChanged$.next(data.auth.accountInfo);
+                    const data: LoginMutation = result.data;
+                    this.accessTokenObtained$.next(data.auth.login.accessToken);
+                    this.accountChanged$.next(data.auth.login.accountInfo);
                 } else {
                     throw new AuthenticationError(result.errors ?? []);
                 }
@@ -58,17 +59,12 @@ export class AuthApi {
         );
     }
 
-    private fetchUserInfoAndTokenFromLoginMethod<TCredentials>(
-        loginMethod: string,
-        loginCredentials: TCredentials,
-    ): Observable<void> {
-        const loginCredentialsJson: string = JSON.stringify(loginCredentials);
-        return this.loginGQL.mutate({ login_method: loginMethod, login_credentials_json: loginCredentialsJson }).pipe(
-            map((result: MutationResult<LoginMutation>) => {
+    public fetchUserInfoFromAccessToken(accessToken: string): Observable<void> {
+        return this.fetchAccountInfoGQL.mutate({ accessToken }).pipe(
+            map((result: MutationResult<FetchAccountInfoMutation>) => {
                 if (result.data) {
-                    const data: LoginMutation = result.data;
-                    this.accessTokenObtained$.next(data.auth.login.accessToken);
-                    this.accountChanged$.next(data.auth.login.accountInfo);
+                    const data: FetchAccountInfoMutation = result.data;
+                    this.accountChanged$.next(data.auth.accountInfo);
                 } else {
                     throw new AuthenticationError(result.errors ?? []);
                 }
diff --git a/src/app/api/dataset.api.spec.ts b/src/app/api/dataset.api.spec.ts
index 7fac55d52..6412661f7 100644
--- a/src/app/api/dataset.api.spec.ts
+++ b/src/app/api/dataset.api.spec.ts
@@ -4,7 +4,6 @@ import {
     mockGetMetadataBlockQuery,
     TEST_BLOCK_HASH,
     TEST_DATASET_NAME,
-    TEST_USER_NAME,
 } from "./mock/dataset.mock";
 import {
     mockCommitEventResponse,
@@ -29,6 +28,7 @@ import {
     GetMetadataBlockQuery,
 } from "./kamu.graphql.interface";
 import { MaybeNullOrUndefined } from "../common/app.types";
+import { TEST_LOGIN } from "./mock/auth.mock";
 
 describe("DatasetApi", () => {
     let service: DatasetApi;
@@ -54,7 +54,7 @@ describe("DatasetApi", () => {
     it("should query dataset main data", () => {
         service
             .getDatasetMainData({
-                accountName: TEST_USER_NAME,
+                accountName: TEST_LOGIN,
                 datasetName: TEST_DATASET_NAME,
             })
             .subscribe((res: GetDatasetMainDataQuery) => {
@@ -65,7 +65,7 @@ describe("DatasetApi", () => {
             });
 
         const op = controller.expectOne(GetDatasetMainDataDocument);
-        expect(op.operation.variables.accountName).toEqual(TEST_USER_NAME);
+        expect(op.operation.variables.accountName).toEqual(TEST_LOGIN);
         expect(op.operation.variables.datasetName).toEqual(TEST_DATASET_NAME);
 
         op.flush({
@@ -105,7 +105,7 @@ describe("DatasetApi", () => {
     it("should extract dataset history", () => {
         service
             .getDatasetHistory({
-                accountName: TEST_USER_NAME,
+                accountName: TEST_LOGIN,
                 datasetName: TEST_DATASET_NAME,
                 numRecords: 20,
                 numPage: 1,
@@ -117,7 +117,7 @@ describe("DatasetApi", () => {
             });
 
         const op = controller.expectOne(GetDatasetHistoryDocument);
-        expect(op.operation.variables.accountName).toEqual(TEST_USER_NAME);
+        expect(op.operation.variables.accountName).toEqual(TEST_LOGIN);
         expect(op.operation.variables.datasetName).toEqual(TEST_DATASET_NAME);
 
         op.flush({
@@ -126,7 +126,7 @@ describe("DatasetApi", () => {
     });
 
     it("should extract datasets by account name", () => {
-        service.fetchDatasetsByAccountName(TEST_USER_NAME).subscribe((res: DatasetsByAccountNameQuery) => {
+        service.fetchDatasetsByAccountName(TEST_LOGIN).subscribe((res: DatasetsByAccountNameQuery) => {
             expect(res.datasets.byAccountName.totalCount).toEqual(
                 mockDatasetsByAccountNameQuery.datasets.byAccountName.totalCount,
             );
@@ -136,7 +136,7 @@ describe("DatasetApi", () => {
         });
 
         const op = controller.expectOne(DatasetsByAccountNameDocument);
-        expect(op.operation.variables.accountName).toEqual(TEST_USER_NAME);
+        expect(op.operation.variables.accountName).toEqual(TEST_LOGIN);
 
         op.flush({
             data: mockDatasetsByAccountNameQuery,
@@ -147,7 +147,7 @@ describe("DatasetApi", () => {
         const blockByHash = mockGetMetadataBlockQuery.datasets.byOwnerAndName?.metadata.chain.blockByHash;
         service
             .getBlockByHash({
-                accountName: TEST_USER_NAME,
+                accountName: TEST_LOGIN,
                 datasetName: TEST_DATASET_NAME,
                 blockHash: TEST_BLOCK_HASH,
             })
@@ -161,7 +161,7 @@ describe("DatasetApi", () => {
             });
 
         const op = controller.expectOne(GetMetadataBlockDocument);
-        expect(op.operation.variables.accountName).toEqual(TEST_USER_NAME);
+        expect(op.operation.variables.accountName).toEqual(TEST_LOGIN);
         expect(op.operation.variables.datasetName).toEqual(TEST_DATASET_NAME);
         expect(op.operation.variables.blockHash).toEqual(TEST_BLOCK_HASH);
         op.flush({
diff --git a/src/app/api/mock/auth.mock.ts b/src/app/api/mock/auth.mock.ts
index 2230733b1..c73cb55fe 100644
--- a/src/app/api/mock/auth.mock.ts
+++ b/src/app/api/mock/auth.mock.ts
@@ -1,16 +1,29 @@
 import { GraphQLError } from "graphql";
 import { AccountDetailsFragment, FetchAccountInfoMutation, LoginMutation } from "../kamu.graphql.interface";
 import AppValues from "src/app/common/app.values";
+import { AppConfigLoginInstructions } from "src/app/app-config.model";
+import { LOGIN_METHOD_PASSWORD, PasswordLoginCredentials } from "../auth.api.model";
 
 export const TEST_GITHUB_CODE = "12345";
 export const TEST_ACCESS_TOKEN_GITHUB = "someTokenViaGithub";
 export const TEST_ACCESS_TOKEN_PASSWORD = "someTokenViaPassword";
 export const TEST_LOGIN = "foo";
 export const TEST_PASSWORD = "bar";
+export const TEST_USER_NAME = "Test User";
+
+const mockPasswordLoginCredentials: PasswordLoginCredentials = {
+    login: TEST_LOGIN,
+    password: TEST_PASSWORD,
+};
+
+export const mockLoginInstructions: AppConfigLoginInstructions = {
+    loginMethod: LOGIN_METHOD_PASSWORD,
+    loginCredentialsJson: JSON.stringify(mockPasswordLoginCredentials),
+};
 
 export const mockAccountDetails: AccountDetailsFragment = {
-    login: "test-user",
-    name: "Test User",
+    login: TEST_LOGIN,
+    name: TEST_USER_NAME,
     avatarUrl: AppValues.DEFAULT_AVATAR_URL,
 };
 
diff --git a/src/app/api/mock/dataset.mock.ts b/src/app/api/mock/dataset.mock.ts
index ede8ee9fc..b9b81f961 100644
--- a/src/app/api/mock/dataset.mock.ts
+++ b/src/app/api/mock/dataset.mock.ts
@@ -9,7 +9,6 @@ import {
 import { DataSchemaFormat } from "../kamu.graphql.interface";
 import { DatasetsAccountResponse } from "src/app/interface/dataset.interface";
 
-export const TEST_USER_NAME = "test-user";
 export const TEST_DATASET_NAME = "test-dataset";
 export const TEST_BLOCK_HASH = "zW1hNbxPz28K1oLNGbddudUzKKLT9LDPh8chjksEo6HcDev";
 
diff --git a/src/app/app-config.model.ts b/src/app/app-config.model.ts
new file mode 100644
index 000000000..80677f673
--- /dev/null
+++ b/src/app/app-config.model.ts
@@ -0,0 +1,15 @@
+export interface AppConfig {
+    apiServerGqlUrl: string;
+    featureFlags: AppConfigFeatureFlags;
+    loginInstructions?: AppConfigLoginInstructions;
+}
+
+export interface AppConfigLoginInstructions {
+    loginMethod: string;
+    loginCredentialsJson: string;
+}
+
+export interface AppConfigFeatureFlags {
+    enableLogin: boolean;
+    enableLogout: boolean;
+}
diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index c711cf757..f28d26f69 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -1,21 +1,5 @@
 import { Injectable } from "@angular/core";
-import { AccountDetailsFragment } from "./api/kamu.graphql.interface";
-import { FeatureFlags } from "./common/feature-flags.model";
-
-interface AppConfig {
-    apiServerGqlUrl: string;
-    featureFlags: {
-        enableLogin: boolean;
-        enableLogout: boolean;
-    };
-    loggedUser?: AppConfigLoggedUser;
-}
-
-interface AppConfigLoggedUser {
-    login: string;
-    name: string;
-    avatarUrl?: string;
-}
+import { AppConfig, AppConfigFeatureFlags, AppConfigLoginInstructions } from "./app-config.model";
 
 @Injectable({
     providedIn: "root",
@@ -31,7 +15,7 @@ export class AppConfigService {
         return this.appConfig.apiServerGqlUrl;
     }
 
-    get featureFlags(): FeatureFlags {
+    get featureFlags(): AppConfigFeatureFlags {
         if (!this.appConfig) {
             this.appConfig = AppConfigService.loadAppConfig();
         }
@@ -39,15 +23,13 @@ export class AppConfigService {
         return this.appConfig.featureFlags;
     }
 
-    get loggedUser(): AccountDetailsFragment | null {
+    get loginInstructions(): AppConfigLoginInstructions | null {
         if (!this.appConfig) {
             this.appConfig = AppConfigService.loadAppConfig();
         }
 
-        if (this.appConfig.loggedUser) {
-            return {
-                ...this.appConfig.loggedUser,
-            } as AccountDetailsFragment;
+        if (this.appConfig.loginInstructions) {
+            return this.appConfig.loginInstructions;
         } else {
             return null;
         }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 9aa57e389..25a39aa63 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -15,8 +15,8 @@ import { MaybeNull } from "./common/app.types";
 import _ from "lodash";
 import { isMobileView, promiseWithCatch } from "./common/app.helpers";
 import { AppConfigService } from "./app-config.service";
-import { FeatureFlags } from "./common/feature-flags.model";
 import { LoggedUserService } from "./auth/logged-user.service";
+import { AppConfigFeatureFlags } from "./app-config.model";
 
 export const ALL_URLS_WITHOUT_HEADER: string[] = [ProjectLinks.URL_LOGIN, ProjectLinks.URL_GITHUB_CALLBACK];
 
@@ -31,7 +31,7 @@ export class AppComponent extends BaseComponent implements OnInit {
         login: "",
         name: AppValues.DEFAULT_USERNAME,
     };
-    public static readonly DEFAULT_FEATURE_FLAGS: FeatureFlags = {
+    public static readonly DEFAULT_FEATURE_FLAGS: AppConfigFeatureFlags = {
         enableLogin: true,
         enableLogout: true,
     };
@@ -41,7 +41,7 @@ export class AppComponent extends BaseComponent implements OnInit {
     public isMobileView = false;
     public isHeaderVisible = true;
 
-    public featureFlags: FeatureFlags = AppComponent.DEFAULT_FEATURE_FLAGS;
+    public featureFlags: AppConfigFeatureFlags = AppComponent.DEFAULT_FEATURE_FLAGS;
     public loggedUserInfo: AccountDetailsFragment = AppComponent.ANONYMOUS_ACCOUNT_INFO;
 
     @HostListener("window:resize")
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 419e8e488..5c799bad3 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -65,6 +65,7 @@ import { ToastrModule } from "ngx-toastr";
 import { LoggedUserService } from "./auth/logged-user.service";
 import { firstValueFrom } from "rxjs";
 import { LoginService } from "./auth/login/login.service";
+import { logError } from "./common/app.helpers";
 
 const Services = [
     {
@@ -93,7 +94,14 @@ const Services = [
         provide: APOLLO_OPTIONS,
         useFactory: (httpLink: HttpLink, appConfig: AppConfigService) => {
             return {
-                cache: new InMemoryCache(),
+                cache: new InMemoryCache({
+                    typePolicies: {
+                        User: {
+                            // For now we are faking account IDs on the server, so they are a bad caching field
+                            keyFields: ["name"],
+                        },
+                    },
+                }),
                 link: httpLink.create({
                     uri: appConfig.apiServerGqlUrl,
                 }),
@@ -115,7 +123,7 @@ const Services = [
         provide: APP_INITIALIZER,
         useFactory: (loggedUserService: LoggedUserService) => {
             return (): Promise<void> => {
-                return firstValueFrom(loggedUserService.initialize());
+                return firstValueFrom(loggedUserService.initialize()).catch((e) => logError(e));
             };
         },
         deps: [LoggedUserService],
diff --git a/src/app/auth/account/account.component.html b/src/app/auth/account/account.component.html
index be7b075ef..48b52ff86 100644
--- a/src/app/auth/account/account.component.html
+++ b/src/app/auth/account/account.component.html
@@ -24,7 +24,7 @@
                 </ng-template>
             </div>
             <span class="vcard-username d-block p-2" itemprop="additionalName">
-                {{ accountName }}
+                {{ user?.name }}
             </span>
             <div class="my-3 text-center me-4">
                 <button
@@ -125,7 +125,7 @@ <h2 class="text-start pt-3 px-3 h6 organization">Organizations</h2>
             <ng-container *ngIf="isAccountViewTypeDatasets">
                 <app-datasets-tab
                     [datasets]="datasets"
-                    [accountName]="accountName"
+                    [accountName]="user?.login"
                     [accountViewType]="accountViewType"
                     [pageInfo]="pageInfo"
                 ></app-datasets-tab>
diff --git a/src/app/auth/account/account.component.spec.ts b/src/app/auth/account/account.component.spec.ts
index d566783df..445a8a1ba 100644
--- a/src/app/auth/account/account.component.spec.ts
+++ b/src/app/auth/account/account.component.spec.ts
@@ -1,5 +1,5 @@
 import { NavigationService } from "src/app/services/navigation.service";
-import { mockAccountDetails } from "./../../api/mock/auth.mock";
+import { TEST_LOGIN, mockAccountDetails } from "./../../api/mock/auth.mock";
 import { AccountTabs } from "./account.constants";
 import { MatButtonToggleModule } from "@angular/material/button-toggle";
 import { MatIconModule } from "@angular/material/icon";
@@ -25,7 +25,7 @@ describe("AccountComponent", () => {
         page: 2,
     });
     const mockParams = new BehaviorSubject({
-        [ProjectLinks.URL_PARAM_ACCOUNT_NAME]: "test-user",
+        [ProjectLinks.URL_PARAM_ACCOUNT_NAME]: TEST_LOGIN,
     });
     beforeEach(async () => {
         await TestBed.configureTestingModule({
diff --git a/src/app/auth/account/account.component.ts b/src/app/auth/account/account.component.ts
index 7ca7d7e42..c73d2c565 100644
--- a/src/app/auth/account/account.component.ts
+++ b/src/app/auth/account/account.component.ts
@@ -13,6 +13,7 @@ import { AccountService } from "src/app/services/account.service";
 import { DatasetsAccountResponse } from "src/app/interface/dataset.interface";
 import { filter, map } from "rxjs/operators";
 import { LoggedUserService } from "../logged-user.service";
+import { of } from "rxjs";
 
 @Component({
     selector: "app-account",
@@ -22,11 +23,10 @@ import { LoggedUserService } from "../logged-user.service";
 })
 export class AccountComponent extends BaseComponent implements OnInit {
     public accountViewType = AccountTabs.overview;
-    public user: AccountDetailsFragment;
+    public user: AccountDetailsFragment | undefined;
     public datasets: DatasetSearchOverviewFragment[] = [];
     public pageInfo: PageBasedInfo;
     public accountTabs = AccountTabs;
-    public accountName: string;
     public datasetTotalCount: number;
     public isDropdownMenu = false;
     public currentPage = 1;
@@ -56,9 +56,9 @@ export class AccountComponent extends BaseComponent implements OnInit {
                 params.page ? (this.currentPage = params.page as number) : (this.currentPage = 1);
             }),
             this.route.params.subscribe((params: Params) => {
-                this.accountName = params[ProjectLinks.URL_PARAM_ACCOUNT_NAME] as string;
-                this.getAccountInfo();
-                this.getDatasets();
+                const accountName: string = params[ProjectLinks.URL_PARAM_ACCOUNT_NAME] as string;
+                this.fetchAccountInfo(accountName);
+                this.fetchAccountDatasets(accountName);
             }),
             this.router.events
                 .pipe(
@@ -66,7 +66,9 @@ export class AccountComponent extends BaseComponent implements OnInit {
                     map((event) => event as RouterEvent),
                 )
                 .subscribe(() => {
-                    this.getDatasets();
+                    if (this.user) {
+                        this.fetchAccountDatasets(this.user.login);
+                    }
                 }),
             this.accountService.onDatasetsChanges.subscribe((data: DatasetsAccountResponse) => {
                 this.datasets = data.datasets;
@@ -98,7 +100,7 @@ export class AccountComponent extends BaseComponent implements OnInit {
     }
 
     public get isOwner(): boolean {
-        return this.loggedUserService.currentlyLoggedInUser?.login === this.accountName;
+        return this.user ? this.loggedUserService.currentlyLoggedInUser?.login === this.user.login : false;
     }
 
     public onEditProfile(): void {
@@ -120,32 +122,50 @@ export class AccountComponent extends BaseComponent implements OnInit {
     }
 
     public onSelectOverviewTab(): void {
-        this.navigationService.navigateToOwnerView(this.accountName, AccountTabs.overview);
+        if (this.user) {
+            this.navigationService.navigateToOwnerView(this.user.login, AccountTabs.overview);
+        }
     }
+
     public onSelectDatasetsTab(): void {
-        this.navigationService.navigateToOwnerView(this.accountName, AccountTabs.datasets);
+        if (this.user) {
+            this.navigationService.navigateToOwnerView(this.user.login, AccountTabs.datasets);
+        }
     }
 
     public onSelectOrganizationsTab(): void {
-        this.navigationService.navigateToOwnerView(this.accountName, AccountTabs.organizations);
+        if (this.user) {
+            this.navigationService.navigateToOwnerView(this.user.login, AccountTabs.organizations);
+        }
     }
 
     public onSelectInboxTab(): void {
-        this.navigationService.navigateToOwnerView(this.accountName, AccountTabs.inbox);
+        if (this.user) {
+            this.navigationService.navigateToOwnerView(this.user.login, AccountTabs.inbox);
+        }
     }
 
     public onSelectStarsTab(): void {
-        this.navigationService.navigateToOwnerView(this.accountName, AccountTabs.stars);
+        if (this.user) {
+            this.navigationService.navigateToOwnerView(this.user.login, AccountTabs.stars);
+        }
     }
 
-    private getAccountInfo(): void {
-        this.accountService.getAccountInfoByName(this.accountName).subscribe((user: AccountDetailsFragment) => {
+    private fetchAccountInfo(accountName: string): void {
+        // TODO: this is temporary, account info API should return correct data for the logged user too, but now it's mocked
+        const loggedUserInfo = this.loggedUserService.currentlyLoggedInUser;
+        const accountInfoSource$ =
+            loggedUserInfo && loggedUserInfo.login === accountName
+                ? of(loggedUserInfo)
+                : this.accountService.getAccountInfoByName(accountName);
+
+        accountInfoSource$.subscribe((user: AccountDetailsFragment) => {
             this.user = user;
             this.avatarLink = this.user.avatarUrl ?? AppValues.DEFAULT_AVATAR_URL;
         });
     }
 
-    private getDatasets(): void {
-        this.accountService.getDatasetsByAccountName(this.accountName, this.currentPage - 1).subscribe();
+    private fetchAccountDatasets(accountName: string): void {
+        this.accountService.getDatasetsByAccountName(accountName, this.currentPage - 1).subscribe();
     }
 }
diff --git a/src/app/auth/account/additional-components/datasets-tab/datasets-tab.component.ts b/src/app/auth/account/additional-components/datasets-tab/datasets-tab.component.ts
index bab692150..f04b0f04a 100644
--- a/src/app/auth/account/additional-components/datasets-tab/datasets-tab.component.ts
+++ b/src/app/auth/account/additional-components/datasets-tab/datasets-tab.component.ts
@@ -12,7 +12,7 @@ import { AccountTabs } from "../../account.constants";
 })
 export class DatasetsTabComponent {
     @Input() public datasets: DatasetSearchOverviewFragment[];
-    @Input() public accountName: string;
+    @Input() public accountName: string | undefined;
     @Input() public accountViewType: AccountTabs;
     @Input() public pageInfo: PageBasedInfo;
     public currentPage = 1;
@@ -23,16 +23,18 @@ export class DatasetsTabComponent {
     public onSelectDataset(row: DatasetSearchOverviewFragment): void {
         this.navigationService.navigateToDatasetView({
             accountName: (row.owner as User).name,
-            datasetName: row.name ,
+            datasetName: row.name,
         });
     }
 
     public onPageChange(currentPage?: number): void {
-        currentPage ? (this.currentPage = currentPage) : (this.currentPage = 1);
-        if (this.currentPage === 1) {
-            this.navigationService.navigateToOwnerView(this.accountName, this.accountViewType);
-            return;
+        if (this.accountName) {
+            currentPage ? (this.currentPage = currentPage) : (this.currentPage = 1);
+            if (this.currentPage === 1) {
+                this.navigationService.navigateToOwnerView(this.accountName, this.accountViewType);
+                return;
+            }
+            this.navigationService.navigateToOwnerView(this.accountName, this.accountViewType, currentPage);
         }
-        this.navigationService.navigateToOwnerView(this.accountName, this.accountViewType, currentPage);
     }
 }
diff --git a/src/app/auth/guards/login.guard.spec.ts b/src/app/auth/guards/login.guard.spec.ts
index ba6c114f1..328e418f3 100644
--- a/src/app/auth/guards/login.guard.spec.ts
+++ b/src/app/auth/guards/login.guard.spec.ts
@@ -3,8 +3,8 @@ import { ApolloTestingModule } from "apollo-angular/testing";
 
 import { LoginGuard } from "./login.guard";
 import { AppConfigService } from "src/app/app-config.service";
-import { FeatureFlags } from "src/app/common/feature-flags.model";
 import ProjectLinks from "src/app/project-links";
+import { AppConfigFeatureFlags } from "src/app/app-config.model";
 
 describe("LoginGuard", () => {
     let guard: LoginGuard;
@@ -23,7 +23,7 @@ describe("LoginGuard", () => {
 
     interface TestCase {
         route: string;
-        featureFlags: FeatureFlags;
+        featureFlags: AppConfigFeatureFlags;
         expectedResult: boolean;
     }
 
diff --git a/src/app/auth/logged-user-service.spec.ts b/src/app/auth/logged-user-service.spec.ts
index 07c7aa851..915f35b1f 100644
--- a/src/app/auth/logged-user-service.spec.ts
+++ b/src/app/auth/logged-user-service.spec.ts
@@ -11,6 +11,7 @@ import {
     TEST_PASSWORD,
     mockAccountDetails,
     mockGithubLoginResponse,
+    mockLoginInstructions,
     mockPasswordLoginResponse,
     mockUserInfoFromAccessToken,
 } from "../api/mock/auth.mock";
@@ -21,11 +22,12 @@ import AppValues from "../common/app.values";
 import { AppConfigService } from "../app-config.service";
 
 describe("LoggedUserService", () => {
+    let controller: ApolloTestingController;
+    let service: LoggedUserService;
+
     describe("Main Test Suite", () => {
-        let service: LoggedUserService;
         let navigationService: NavigationService;
         let authApi: AuthApi;
-        let controller: ApolloTestingController;
 
         beforeEach(() => {
             TestBed.configureTestingModule({
@@ -88,7 +90,7 @@ describe("LoggedUserService", () => {
         it("should check user is non-authenticated if no access token exists", () => {
             const localStorageGetItemSpy = spyOn(localStorage, "getItem").and.returnValue(null);
 
-            service.initialize();
+            service.initialize().subscribe();
 
             controller.expectNone(FetchAccountInfoDocument);
             expect(service.isAuthenticated).toBeFalse();
@@ -178,8 +180,6 @@ describe("LoggedUserService", () => {
     });
 
     describe("Custom configuration", () => {
-        let service: LoggedUserService;
-
         beforeEach(() => {
             TestBed.configureTestingModule({
                 providers: [
@@ -189,7 +189,9 @@ describe("LoggedUserService", () => {
                         provide: AppConfigService,
                         useFactory: () => {
                             const realService = new AppConfigService();
-                            spyOnProperty(realService, "loggedUser", "get").and.returnValue(mockAccountDetails);
+                            spyOnProperty(realService, "loginInstructions", "get").and.returnValue(
+                                mockLoginInstructions,
+                            );
                             return realService;
                         },
                     },
@@ -197,10 +199,17 @@ describe("LoggedUserService", () => {
                 imports: [ApolloTestingModule],
             });
             service = TestBed.inject(LoggedUserService);
+            controller = TestBed.inject(ApolloTestingController);
         });
 
         it("should use custom configuration's initial user", fakeAsync(() => {
-            service.initialize();
+            service.initialize().subscribe();
+
+            const op = controller.expectOne(LoginDocument);
+            op.flush({
+                data: mockPasswordLoginResponse,
+            });
+
             tick();
 
             expect(service.isAuthenticated).toBeTrue();
diff --git a/src/app/auth/logged-user.service.ts b/src/app/auth/logged-user.service.ts
index c22dafa45..21244d9f4 100644
--- a/src/app/auth/logged-user.service.ts
+++ b/src/app/auth/logged-user.service.ts
@@ -9,6 +9,7 @@ import { AppConfigService } from "../app-config.service";
 import { AuthApi } from "../api/auth.api";
 import { AccountDetailsFragment } from "../api/kamu.graphql.interface";
 import { UnsubscribeOnDestroyAdapter } from "../common/unsubscribe.ondestroy.adapter";
+import { AppConfigLoginInstructions } from "../app-config.model";
 
 @Injectable({
     providedIn: "root",
@@ -34,10 +35,12 @@ export class LoggedUserService extends UnsubscribeOnDestroyAdapter {
     }
 
     public initialize(): Observable<void> {
-        if (this.appConfigService.loggedUser) {
-            // TODO: emit login here instead with configuration-predefined user name and password
-            this.changeUser(this.appConfigService.loggedUser);
-            return of(void {});
+        const loginInstructions: AppConfigLoginInstructions | null = this.appConfigService.loginInstructions;
+        if (loginInstructions) {
+            return this.authApi.fetchUserInfoAndTokenFromLoginMethod(
+                loginInstructions.loginMethod,
+                loginInstructions.loginCredentialsJson,
+            );
         } else {
             return this.attemptPreviousAuthentication();
         }
diff --git a/src/app/common/feature-flags.model.ts b/src/app/common/feature-flags.model.ts
deleted file mode 100644
index a48b33ae7..000000000
--- a/src/app/common/feature-flags.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface FeatureFlags {
-    enableLogin: boolean;
-    enableLogout: boolean;
-}
diff --git a/src/app/components/app-header/app-header.component.ts b/src/app/components/app-header/app-header.component.ts
index 6b34a03a2..c6ad5d435 100644
--- a/src/app/components/app-header/app-header.component.ts
+++ b/src/app/components/app-header/app-header.component.ts
@@ -21,7 +21,7 @@ import { AccountDetailsFragment } from "src/app/api/kamu.graphql.interface";
 import { NgbTypeaheadSelectItemEvent } from "@ng-bootstrap/ng-bootstrap";
 import ProjectLinks from "src/app/project-links";
 import { NavigationService } from "src/app/services/navigation.service";
-import { FeatureFlags } from "src/app/common/feature-flags.model";
+import { AppConfigFeatureFlags } from "src/app/app-config.model";
 
 @Component({
     selector: "app-header",
@@ -35,7 +35,7 @@ export class AppHeaderComponent extends BaseComponent implements OnInit {
     @Input() public isMobileView: boolean;
     @Input() public isVisible: boolean;
     @Input() public loggedUserInfo: AccountDetailsFragment;
-    @Input() public featureFlags: FeatureFlags;
+    @Input() public featureFlags: AppConfigFeatureFlags;
 
     @Output() public onSelectedDataset = new EventEmitter<DatasetAutocompleteItem>();
     @Output() public onClickedAddNew = new EventEmitter<null>();