diff --git a/src/abstractions/auth.service.ts b/src/abstractions/auth.service.ts
new file mode 100644
index 0000000000..56c93b07cc
--- /dev/null
+++ b/src/abstractions/auth.service.ts
@@ -0,0 +1,5 @@
+export abstract class AuthService {
+    logIn: (email: string, masterPassword: string, twoFactorProvider?: number,
+        twoFactorToken?: string, remember?: boolean) => any;
+    logOut: (callback: Function) => void;
+}
diff --git a/src/abstractions/index.ts b/src/abstractions/index.ts
index d74fbfe8a9..69f1295104 100644
--- a/src/abstractions/index.ts
+++ b/src/abstractions/index.ts
@@ -1,5 +1,6 @@
 export { ApiService } from './api.service';
 export { AppIdService } from './appId.service';
+export { AuthService } from './auth.service';
 export { CipherService } from './cipher.service';
 export { CollectionService } from './collection.service';
 export { CryptoService } from './crypto.service';
diff --git a/src/enums/deviceType.ts b/src/enums/deviceType.ts
index 3c00cf9ae2..c41ff92933 100644
--- a/src/enums/deviceType.ts
+++ b/src/enums/deviceType.ts
@@ -3,6 +3,9 @@ export enum DeviceType {
     Firefox = 3,
     Opera = 4,
     Edge = 5,
+    Windows = 6,
+    MacOs = 7,
+    Linux = 8,
     Vivaldi = 19,
     Safari = 20,
 }
diff --git a/src/services/auth.service.ts b/src/services/auth.service.ts
new file mode 100644
index 0000000000..4b123a5885
--- /dev/null
+++ b/src/services/auth.service.ts
@@ -0,0 +1,78 @@
+import { DeviceRequest } from '../models/request/deviceRequest';
+import { TokenRequest } from '../models/request/tokenRequest';
+
+import { ConstantsService } from '../services/constants.service';
+
+import { ApiService } from '../abstractions/api.service';
+import { AppIdService } from '../abstractions/appId.service';
+import { CryptoService } from '../abstractions/crypto.service';
+import { MessagingService } from '../abstractions/messaging.service';
+import { PlatformUtilsService } from '../abstractions/platformUtils.service';
+import { TokenService } from '../abstractions/token.service';
+import { UserService } from '../abstractions/user.service';
+
+export class AuthService {
+    constructor(public cryptoService: CryptoService, public apiService: ApiService, public userService: UserService,
+        public tokenService: TokenService, public $rootScope: any, public appIdService: AppIdService,
+        public platformUtilsService: PlatformUtilsService, public constantsService: ConstantsService,
+        public messagingService: MessagingService) {
+    }
+
+    async logIn(email: string, masterPassword: string, twoFactorProvider?: number,
+        twoFactorToken?: string, remember?: boolean) {
+        email = email.toLowerCase();
+
+        const key = this.cryptoService.makeKey(masterPassword, email);
+        const appId = await this.appIdService.getAppId();
+        const storedTwoFactorToken = await this.tokenService.getTwoFactorToken(email);
+        const hashedPassword = await this.cryptoService.hashPassword(masterPassword, key);
+
+        const deviceRequest = new DeviceRequest(appId, this.platformUtilsService);
+
+        let request: TokenRequest;
+
+        if (twoFactorToken != null && twoFactorProvider != null) {
+            request = new TokenRequest(email, hashedPassword, twoFactorProvider, twoFactorToken, remember,
+                deviceRequest);
+        } else if (storedTwoFactorToken) {
+            request = new TokenRequest(email, hashedPassword, this.constantsService.twoFactorProvider.remember,
+                storedTwoFactorToken, false, deviceRequest);
+        } else {
+            request = new TokenRequest(email, hashedPassword, null, null, false, deviceRequest);
+        }
+
+        const response = await this.apiService.postIdentityToken(request);
+        if (!response) {
+            return;
+        }
+
+        if (!response.accessToken) {
+            // two factor required
+            return {
+                twoFactor: true,
+                twoFactorProviders: response,
+            };
+        }
+
+        if (response.twoFactorToken) {
+            this.tokenService.setTwoFactorToken(response.twoFactorToken, email);
+        }
+
+        await this.tokenService.setTokens(response.accessToken, response.refreshToken);
+        await this.cryptoService.setKey(key);
+        await this.cryptoService.setKeyHash(hashedPassword);
+        await this.userService.setUserIdAndEmail(this.tokenService.getUserId(), this.tokenService.getEmail());
+        await this.cryptoService.setEncKey(response.key);
+        await this.cryptoService.setEncPrivateKey(response.privateKey);
+
+        this.messagingService.send('loggedIn');
+        return {
+            twoFactor: false,
+            twoFactorProviders: null,
+        };
+    }
+
+    logOut(callback: Function) {
+        callback();
+    }
+}
diff --git a/src/services/index.ts b/src/services/index.ts
index 0e6ab04f75..f66088a65b 100644
--- a/src/services/index.ts
+++ b/src/services/index.ts
@@ -1,5 +1,6 @@
 export { ApiService } from './api.service';
 export { AppIdService } from './appId.service';
+export { AuthService } from './auth.service';
 export { CipherService } from './cipher.service';
 export { CollectionService } from './collection.service';
 export { ConstantsService } from './constants.service';