Refactor login redirection/button links

Correctly handle external auth redirection in all cases

3 files changed, 2 insertions, 12 deletions

diff --git a/client/src/app/+videos/+video-watch/shared/action-buttons/video-rate.component.ts b/client/src/app/+videos/+video-watch/shared/action-buttons/video-rate.component.ts
index 0fef246b3..d0c138834 100644
--- a/client/src/app/+videos/+video-watch/shared/action-buttons/video-rate.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/action-buttons/video-rate.component.ts
@@ -82,7 +82,7 @@ export class VideoRateComponent implements OnInit, OnChanges, OnDestroy {
   getRatePopoverText () {
     if (this.isUserLoggedIn) return undefined
 
-    return $localize`You need to be <a href="/login">logged in</a> to rate this video.`
+    return $localize`You need to be logged in to rate this video.`
   }
 
   private checkUserRating () {
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.html b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.html
index 6bc201f32..203e9ce62 100644
--- a/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.html
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.html
@@ -74,10 +74,7 @@
       (click)="hideModals()" (key.enter)="hideModals()"
     >
 
-    <input
-      type="submit" i18n-value value="Login to comment" class="peertube-button orange-button"
-      (click)="gotoLogin()"
-    >
+    <my-login-link i18n-label label="Login to comment" className="peertube-button-link orange-button"></my-login-link>
   </div>
 </ng-template>
 
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts
index 9a9bfe710..033097084 100644
--- a/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts
@@ -13,7 +13,6 @@ import {
   SimpleChanges,
   ViewChild
 } from '@angular/core'
-import { Router } from '@angular/router'
 import { Notifier, User } from '@app/core'
 import { VIDEO_COMMENT_TEXT_VALIDATOR } from '@app/shared/form-validators/video-comment-validators'
 import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
@@ -52,7 +51,6 @@ export class VideoCommentAddComponent extends FormReactive implements OnChanges,
     private notifier: Notifier,
     private videoCommentService: VideoCommentService,
     private modalService: NgbModal,
-    private router: Router,
     @Inject(LOCALE_ID) private localeId: string
   ) {
     super()
@@ -161,11 +159,6 @@ export class VideoCommentAddComponent extends FormReactive implements OnChanges,
     return window.location.href
   }
 
-  gotoLogin () {
-    this.hideModals()
-    this.router.navigate([ '/login' ])
-  }
-
   cancelCommentReply () {
     this.cancel.emit(null)
     this.form.value['text'] = this.textareaElement.nativeElement.value = ''