removed social logins

Author: ismcagdas

angular/src/account/account.component.ts

@@ -31,7 +31,6 @@ export class AccountComponent extends AppComponentBase implements OnInit {
     }
 
     ngOnInit(): void {
-        this._loginService.init();
         $('body').attr('class', 'login-page');
     }
 }

angular/src/account/login/login.component.html

@@ -36,16 +36,5 @@ <h4 class="text-center">{{l("LogIn")}}</h4>
                 </div>
             </div>
         </form>
-
-        <div class="login-options" *ngIf="multiTenancySideIsTeanant && loginService.externalLoginProviders.length > 0">
-            <h4>{{l("OrLoginWith")}}</h4>
-            <ul class="social-icons">
-                <li *ngFor="let provider of loginService.externalLoginProviders">
-                    <a class="btn btn-default btn-sm fa fa-{{provider.icon == 'googleplus' ? 'google-plus' : provider.icon}}"
-                       (click)="externalLogin(provider)"
-                       title="{{provider.name}}"></a>
-                </li>
-            </ul>
-        </div>
     </div>
 </div>

angular/src/account/login/login.component.ts

@@ -1,7 +1,7 @@
 import { Component, Injector, ElementRef, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { AppComponentBase } from '@shared/app-component-base';
-import { LoginService, ExternalLoginProvider } from './login.service';
+import { LoginService } from './login.service';
 import { accountModuleAnimation } from '@shared/animations/routerTransition';
 import { AbpSessionService } from '@abp/session/abp-session.service';
 
@@ -49,8 +49,4 @@ export class LoginComponent extends AppComponentBase {
             () => this.submitting = false
         );
     }
-
-    externalLogin(provider: ExternalLoginProvider) {
-        this.loginService.externalAuthenticate(provider);
-    }
 }

angular/src/account/login/login.service.ts

@@ -10,35 +10,6 @@ import { TokenService } from '@abp/auth/token.service';
 import { UtilsService } from '@abp/utils/utils.service';
 
 import * as _ from 'lodash';
-declare const FB: any; //Facebook API
-declare const gapi: any; //Facebook API
-
-export class ExternalLoginProvider extends ExternalLoginProviderInfoModel {
-
-    static readonly FACEBOOK: string = 'Facebook';
-    static readonly GOOGLE: string = 'Google';
-
-    icon: string;
-    initialized = false;
-
-    constructor(providerInfo: ExternalLoginProviderInfoModel) {
-        super();
-
-        this.name = providerInfo.name;
-        this.clientId = providerInfo.clientId;
-        this.icon = ExternalLoginProvider.getSocialIcon(this.name);
-    }
-
-    private static getSocialIcon(providerName: string): string {
-        providerName = providerName.toLowerCase();
-
-        if (providerName === 'google') {
-            providerName = 'googleplus';
-        }
-
-        return providerName;
-    }
-}
 
 @Injectable()
 export class LoginService {
@@ -48,8 +19,6 @@ export class LoginService {
     authenticateModel: AuthenticateModel;
     authenticateResult: AuthenticateResultModel;
 
-    externalLoginProviders: ExternalLoginProvider[] = [];
-
     rememberMe: boolean;
 
     constructor(
@@ -74,20 +43,6 @@ export class LoginService {
             });
     }
 
-    externalAuthenticate(provider: ExternalLoginProvider): void {
-        this.ensureExternalLoginProviderInitialized(provider, () => {
-            if (provider.name === ExternalLoginProvider.FACEBOOK) {
-                FB.login();
-            } else if (provider.name === ExternalLoginProvider.GOOGLE) {
-                gapi.auth2.getAuthInstance().signIn();
-            }
-        });
-    }
-
-    init(): void {
-        this.initExternalLoginProviders();
-    }
-
     private processAuthenticateResult(authenticateResult: AuthenticateResultModel) {
         this.authenticateResult = authenticateResult;
 
@@ -133,89 +88,4 @@ export class LoginService {
         this.authenticateResult = null;
         this.rememberMe = false;
     }
-
-    private initExternalLoginProviders() {
-        this._tokenAuthService
-            .getExternalAuthenticationProviders()
-            .subscribe((providers: ExternalLoginProviderInfoModel[]) => {
-                this.externalLoginProviders = _.map(providers, p => new ExternalLoginProvider(p));
-            });
-    }
-
-    ensureExternalLoginProviderInitialized(loginProvider: ExternalLoginProvider, callback: () => void) {
-        if (loginProvider.initialized) {
-            callback();
-            return;
-        }
-
-        if (loginProvider.name === ExternalLoginProvider.FACEBOOK) {
-            jQuery.getScript('//connect.facebook.net/en_US/sdk.js', () => {
-                FB.init({
-                    appId: loginProvider.clientId,
-                    cookie: false,
-                    xfbml: true,
-                    version: 'v2.5'
-                });
-
-                FB.getLoginStatus(response => {
-                    this.facebookLoginStatusChangeCallback(response);
-                });
-
-                callback();
-            });
-        } else if (loginProvider.name === ExternalLoginProvider.GOOGLE) {
-            jQuery.getScript('https://apis.google.com/js/api.js', () => {
-                gapi.load('client:auth2',
-                    () => {
-                        gapi.client.init({
-                            clientId: loginProvider.clientId,
-                            scope: 'openid profile email'
-                        }).then(() => {
-                            gapi.auth2.getAuthInstance().isSignedIn.listen((isSignedIn) => {
-                                this.googleLoginStatusChangeCallback(isSignedIn);
-                            });
-                            this.googleLoginStatusChangeCallback(gapi.auth2.getAuthInstance().isSignedIn.get());
-                        });
-
-                        callback();
-                    });
-            });
-        }
-    }
-
-    private facebookLoginStatusChangeCallback(resp) {
-        if (resp.status === 'connected') {
-            var model = new ExternalAuthenticateModel();
-            model.authProvider = ExternalLoginProvider.FACEBOOK;
-            model.providerAccessCode = resp.authResponse.accessToken;
-            model.providerKey = resp.authResponse.userID;
-            this._tokenAuthService.externalAuthenticate(model)
-                .subscribe((result: ExternalAuthenticateResultModel) => {
-                    if (result.waitingForActivation) {
-                        this._messageService.info('You have successfully registered. Waiting for activation!');
-                        return;
-                    }
-
-                    this.login(result.accessToken, result.encryptedAccessToken, result.expireInSeconds);
-                });
-        }
-    }
-
-    private googleLoginStatusChangeCallback(isSignedIn) {
-        if (isSignedIn) {
-            var model = new ExternalAuthenticateModel();
-            model.authProvider = ExternalLoginProvider.GOOGLE;
-            model.providerAccessCode = gapi.auth2.getAuthInstance().currentUser.get().getAuthResponse().access_token;
-            model.providerKey = gapi.auth2.getAuthInstance().currentUser.get().getBasicProfile().getId();
-            this._tokenAuthService.externalAuthenticate(model)
-                .subscribe((result: ExternalAuthenticateResultModel) => {
-                    if (result.waitingForActivation) {
-                        this._messageService.info('You have successfully registered. Waiting for activation!');
-                        return;
-                    }
-
-                    this.login(result.accessToken, result.encryptedAccessToken, result.expireInSeconds);
-                });
-        }
-    }
 }

angular/src/app/roles/edit-role/edit-role.component.ts

@@ -29,7 +29,6 @@ export class EditRoleComponent extends AppComponentBase implements OnInit {
         this._roleService.getAllPermissions()
             .subscribe((permissions: ListResultDtoOfPermissionDto) => {
                 this.permissions = permissions;
-                console.log(permissions);
             });
     }
 

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpZeroTemplateDbContextConfigurer.cs renamed to aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextConfigurer.cs

@@ -5,9 +5,9 @@
 
 namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
 {
-    public class AbpZeroDbMigrator : AbpZeroDbMigrator<AbpProjectNameDbContext>
+    public class AbpProjectNameDbMigrator : AbpZeroDbMigrator<AbpProjectNameDbContext>
     {
-        public AbpZeroDbMigrator(
+        public AbpProjectNameDbMigrator(
             IUnitOfWorkManager unitOfWorkManager,
             IDbPerTenantConnectionStringResolver connectionStringResolver,
             IDbContextResolver dbContextResolver) :

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpZeroTemplateDbContextFactory.cs renamed to aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs

@@ -9,10 +9,10 @@ namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore.Repositories
     /// </summary>
     /// <typeparam name="TEntity">Entity type</typeparam>
     /// <typeparam name="TPrimaryKey">Primary key type of the entity</typeparam>
-    public abstract class AbpZeroTemplateRepositoryBase<TEntity, TPrimaryKey> : EfCoreRepositoryBase<AbpProjectNameDbContext, TEntity, TPrimaryKey>
+    public abstract class AbpProjectNameRepositoryBase<TEntity, TPrimaryKey> : EfCoreRepositoryBase<AbpProjectNameDbContext, TEntity, TPrimaryKey>
         where TEntity : class, IEntity<TPrimaryKey>
     {
-        protected AbpZeroTemplateRepositoryBase(IDbContextProvider<AbpProjectNameDbContext> dbContextProvider)
+        protected AbpProjectNameRepositoryBase(IDbContextProvider<AbpProjectNameDbContext> dbContextProvider)
             : base(dbContextProvider)
         {
 
@@ -23,13 +23,13 @@ protected AbpZeroTemplateRepositoryBase(IDbContextProvider<AbpProjectNameDbConte
 
     /// <summary>
     /// Base class for custom repositories of the application.
-    /// This is a shortcut of <see cref="AbpZeroTemplateRepositoryBase{TEntity,TPrimaryKey}"/> for <see cref="int"/> primary key.
+    /// This is a shortcut of <see cref="AbpProjectNameRepositoryBase{TEntity,TPrimaryKey}"/> for <see cref="int"/> primary key.
     /// </summary>
     /// <typeparam name="TEntity">Entity type</typeparam>
-    public abstract class AbpZeroTemplateRepositoryBase<TEntity> : AbpZeroTemplateRepositoryBase<TEntity, int>
+    public abstract class AbpProjectNameRepositoryBase<TEntity> : AbpProjectNameRepositoryBase<TEntity, int>
         where TEntity : class, IEntity<int>
     {
-        protected AbpZeroTemplateRepositoryBase(IDbContextProvider<AbpProjectNameDbContext> dbContextProvider)
+        protected AbpProjectNameRepositoryBase(IDbContextProvider<AbpProjectNameDbContext> dbContextProvider)
             : base(dbContextProvider)
         {
 

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpZeroDbMigrator.cs renamed to aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbMigrator.cs

@@ -7,6 +7,7 @@
 using Abp.Extensions;
 using Abp.MultiTenancy;
 using Abp.Runtime.Security;
+using Abp.Zero.EntityFrameworkCore;
 using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
 using AbpCompanyName.AbpProjectName.EntityFrameworkCore.Seed;
 using AbpCompanyName.AbpProjectName.Migrator;
@@ -18,12 +19,12 @@ public class MultiTenantMigrateExecuter : ITransientDependency
     {
         public Log Log { get; private set; }
 
-        private readonly AbpZeroDbMigrator _migrator;
+        private readonly AbpZeroDbMigrator<AbpProjectNameDbContext> _migrator;
         private readonly IRepository<Tenant> _tenantRepository;
         private readonly IDbPerTenantConnectionStringResolver _connectionStringResolver;
 
         public MultiTenantMigrateExecuter(
-            AbpZeroDbMigrator migrator,
+            AbpZeroDbMigrator<AbpProjectNameDbContext> migrator,
             IRepository<Tenant> tenantRepository,
             Log log,
             IDbPerTenantConnectionStringResolver connectionStringResolver)